diff options
Diffstat (limited to 'sd/source/ui')
392 files changed, 5419 insertions, 5419 deletions
diff --git a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx index 034a0bc5e863..674bee67da56 100644..100755 --- a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx +++ b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx @@ -151,7 +151,7 @@ void AccessibleDocumentViewBase::Init (void) pWindow->AddChildEventListener (maWindowLink); - USHORT nCount = pWindow->GetChildCount(); + sal_uInt16 nCount = pWindow->GetChildCount(); for (sal_uInt16 i=0; i<nCount; i++) { Window* pChildWindow = pWindow->GetChild (i); diff --git a/sd/source/ui/accessibility/AccessibleOutlineEditSource.cxx b/sd/source/ui/accessibility/AccessibleOutlineEditSource.cxx index 97ec7b3ddee1..09a45cdcdae4 100755 --- a/sd/source/ui/accessibility/AccessibleOutlineEditSource.cxx +++ b/sd/source/ui/accessibility/AccessibleOutlineEditSource.cxx @@ -109,12 +109,12 @@ namespace accessibility return *( const_cast< AccessibleOutlineEditSource* > (this) ); } - BOOL AccessibleOutlineEditSource::IsValid() const + sal_Bool AccessibleOutlineEditSource::IsValid() const { if( mpOutliner && mpOutlinerView ) { // Our view still on outliner? - ULONG nCurrView, nViews; + sal_uLong nCurrView, nViews; for( nCurrView=0, nViews=mpOutliner->GetViewCount(); nCurrView<nViews; ++nCurrView ) { diff --git a/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx b/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx index 510f0233667c..19d618ffd20b 100755 --- a/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx +++ b/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx @@ -479,7 +479,7 @@ sal_Int32 SAL_CALL AccessibleSlideSorterObject::getForeground (void) { ThrowIfDisposed (); svtools::ColorConfig aColorConfig; - UINT32 nColor = aColorConfig.GetColorValue( svtools::FONTCOLOR ).nColor; + sal_uInt32 nColor = aColorConfig.GetColorValue( svtools::FONTCOLOR ).nColor; return static_cast<sal_Int32>(nColor); } @@ -490,7 +490,7 @@ sal_Int32 SAL_CALL AccessibleSlideSorterObject::getBackground (void) throw (::com::sun::star::uno::RuntimeException) { ThrowIfDisposed (); - UINT32 nColor = Application::GetSettings().GetStyleSettings().GetWindowColor().GetColor(); + sal_uInt32 nColor = Application::GetSettings().GetStyleSettings().GetWindowColor().GetColor(); return static_cast<sal_Int32>(nColor); } diff --git a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx index 91c09b55697d..852b5427e053 100644 --- a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx +++ b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx @@ -106,8 +106,8 @@ private: ::Window* mpWindow; sal_Int32 mnFocusedIndex; bool mbModelChangeLocked; - ULONG mnUpdateChildrenUserEventId; - ULONG mnSelectionChangeUserEventId; + sal_uLong mnUpdateChildrenUserEventId; + sal_uLong mnSelectionChangeUserEventId; void UpdateChildren (void); }; @@ -570,7 +570,7 @@ sal_Int32 SAL_CALL AccessibleSlideSorterView::getForeground (void) { ThrowIfDisposed(); svtools::ColorConfig aColorConfig; - UINT32 nColor = aColorConfig.GetColorValue( svtools::FONTCOLOR ).nColor; + sal_uInt32 nColor = aColorConfig.GetColorValue( svtools::FONTCOLOR ).nColor; return static_cast<sal_Int32>(nColor); } @@ -581,7 +581,7 @@ sal_Int32 SAL_CALL AccessibleSlideSorterView::getBackground (void) throw (RuntimeException) { ThrowIfDisposed(); - UINT32 nColor = Application::GetSettings().GetStyleSettings().GetWindowColor().GetColor(); + sal_uInt32 nColor = Application::GetSettings().GetStyleSettings().GetWindowColor().GetColor(); return static_cast<sal_Int32>(nColor); } diff --git a/sd/source/ui/accessibility/AccessibleTreeNode.cxx b/sd/source/ui/accessibility/AccessibleTreeNode.cxx index ced9852b74c3..71e4c74dd70f 100755 --- a/sd/source/ui/accessibility/AccessibleTreeNode.cxx +++ b/sd/source/ui/accessibility/AccessibleTreeNode.cxx @@ -548,7 +548,7 @@ sal_Int32 SAL_CALL AccessibleTreeNode::getForeground (void) { ThrowIfDisposed(); svtools::ColorConfig aColorConfig; - UINT32 nColor = aColorConfig.GetColorValue( svtools::FONTCOLOR ).nColor; + sal_uInt32 nColor = aColorConfig.GetColorValue( svtools::FONTCOLOR ).nColor; return static_cast<sal_Int32>(nColor); } @@ -559,7 +559,7 @@ sal_Int32 SAL_CALL AccessibleTreeNode::getBackground (void) throw (RuntimeException) { ThrowIfDisposed(); - UINT32 nColor = Application::GetSettings().GetStyleSettings().GetWindowColor().GetColor(); + sal_uInt32 nColor = Application::GetSettings().GetStyleSettings().GetWindowColor().GetColor(); return static_cast<sal_Int32>(nColor); } diff --git a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx index f76b84d29826..430f3f7f6a9e 100755 --- a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx +++ b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx @@ -97,7 +97,7 @@ public: virtual void MouseButtonUp( const MouseEvent& rMEvt ); - USHORT InsertCategory( const XubString& rStr, USHORT nPos = LISTBOX_APPEND ); + sal_uInt16 InsertCategory( const XubString& rStr, sal_uInt16 nPos = LISTBOX_APPEND ); void SetDoubleClickLink( const Link& rDoubleClickHdl ) { maDoubleClickHdl = rDoubleClickHdl; } @@ -112,7 +112,7 @@ private: CategoryListBox::CategoryListBox( Window* pParent, const ResId& rResId ) : ListBox( pParent, rResId ) { - EnableUserDraw( TRUE ); + EnableUserDraw( sal_True ); SetDoubleClickHdl( LINK( this, CategoryListBox, implDoubleClickHdl ) ); } @@ -120,9 +120,9 @@ CategoryListBox::~CategoryListBox() { } -USHORT CategoryListBox::InsertCategory( const XubString& rStr, USHORT nPos /* = LISTBOX_APPEND */ ) +sal_uInt16 CategoryListBox::InsertCategory( const XubString& rStr, sal_uInt16 nPos /* = LISTBOX_APPEND */ ) { - USHORT n = ListBox::InsertEntry( rStr, nPos ); + sal_uInt16 n = ListBox::InsertEntry( rStr, nPos ); if( n != LISTBOX_ENTRY_NOTFOUND ) ListBox::SetEntryFlags( n, ListBox::GetEntryFlags(n) | LISTBOX_ENTRY_FLAG_DISABLE_SELECTION ); @@ -131,7 +131,7 @@ USHORT CategoryListBox::InsertCategory( const XubString& rStr, USHORT nPos /* = void CategoryListBox::UserDraw( const UserDrawEvent& rUDEvt ) { - const USHORT nItem = rUDEvt.GetItemId(); + const sal_uInt16 nItem = rUDEvt.GetItemId(); if( ListBox::GetEntryFlags(nItem) & LISTBOX_ENTRY_FLAG_DISABLE_SELECTION ) { @@ -157,7 +157,7 @@ void CategoryListBox::UserDraw( const UserDrawEvent& rUDEvt ) } else { - DrawEntry( rUDEvt, TRUE, TRUE ); + DrawEntry( rUDEvt, sal_True, sal_True ); } } @@ -219,9 +219,9 @@ private: CustomAnimationCreateDialog* mpParent; - USHORT mnCurvePathPos; - USHORT mnPolygonPathPos; - USHORT mnFreeformPathPos; + sal_uInt16 mnCurvePathPos; + sal_uInt16 mnPolygonPathPos; + sal_uInt16 mnFreeformPathPos; }; @@ -270,7 +270,7 @@ CustomAnimationCreateTabPage::CustomAnimationCreateTabPage( Window* pParent, Cus FreeResource(); - USHORT nFirstEffect = LISTBOX_ENTRY_NOTFOUND; + sal_uInt16 nFirstEffect = LISTBOX_ENTRY_NOTFOUND; if( nTabId == MOTIONPATH ) { @@ -302,7 +302,7 @@ CustomAnimationCreateTabPage::CustomAnimationCreateTabPage( Window* pParent, Cus CustomAnimationPresetPtr pDescriptor = (*aIter++); if( pDescriptor.get() && (bHasText || !pDescriptor->isTextOnly() ) ) { - USHORT nPos = mpLBEffects->InsertEntry( pDescriptor->getLabel() ); + sal_uInt16 nPos = mpLBEffects->InsertEntry( pDescriptor->getLabel() ); mpLBEffects->SetEntryData( nPos, static_cast<void*>( new CustomAnimationPresetPtr( pDescriptor ) ) ); if( nFirstEffect == LISTBOX_ENTRY_NOTFOUND ) @@ -345,7 +345,7 @@ IMPL_LINK( CustomAnimationCreateTabPage, implDoubleClickHdl, Control*, pControl if( pControl == mpLBEffects ) { if( mpLBEffects->GetSelectEntryCount() ) - mpParent->EndDialog( TRUE ); + mpParent->EndDialog( sal_True ); } return 0; } @@ -360,7 +360,7 @@ void CustomAnimationCreateTabPage::onSelectEffect() CustomAnimationPresetPtr pPreset( *p ); const double fDuration = pPreset->getDuration(); - USHORT nPos = 0xffff; + sal_uInt16 nPos = 0xffff; if( fDuration == 5.0 ) nPos = 0; @@ -387,7 +387,7 @@ void CustomAnimationCreateTabPage::onSelectEffect() void CustomAnimationCreateTabPage::clearEffects() { - USHORT nPos = mpLBEffects->GetEntryCount(); + sal_uInt16 nPos = mpLBEffects->GetEntryCount(); while( nPos-- ) delete static_cast< CustomAnimationPresetPtr* >( mpLBEffects->GetEntryData( nPos ) ); @@ -414,7 +414,7 @@ PathKind CustomAnimationCreateTabPage::getCreatePathKind() const if( mpLBEffects->GetSelectEntryCount() == 1 ) { - const USHORT nPos = mpLBEffects->GetSelectEntryPos(); + const sal_uInt16 nPos = mpLBEffects->GetSelectEntryPos(); if( nPos == mnCurvePathPos ) { eKind = CURVE; @@ -436,7 +436,7 @@ PathKind CustomAnimationCreateTabPage::getCreatePathKind() const double CustomAnimationCreateTabPage::getDuration() const { - USHORT nPos = mpCBSpeed->GetSelectEntryPos(); + sal_uInt16 nPos = mpCBSpeed->GetSelectEntryPos(); if( (nPos == 0xffff) || !mpCBSpeed->IsEnabled() ) { CustomAnimationPresetPtr pPreset = getSelectedPreset(); @@ -458,7 +458,7 @@ double CustomAnimationCreateTabPage::getDuration() const void CustomAnimationCreateTabPage::setDuration( double fDuration ) { - USHORT nPos = 0; + sal_uInt16 nPos = 0; if( fDuration < 2.0f ) { if( fDuration < 1.0f ) @@ -492,12 +492,12 @@ bool CustomAnimationCreateTabPage::getIsPreview() const void CustomAnimationCreateTabPage::setIsPreview( bool bIsPreview ) { - mpCBXPReview->Check( bIsPreview ? TRUE : FALSE ); + mpCBXPReview->Check( bIsPreview ? sal_True : sal_False ); } bool CustomAnimationCreateTabPage::select( const OUString& rsPresetId ) { - USHORT nPos = mpLBEffects->GetEntryCount(); + sal_uInt16 nPos = mpLBEffects->GetEntryCount(); while( nPos-- ) { void* pEntryData = mpLBEffects->GetEntryData( nPos ); diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx index 7f942562b951..4beb1a7d8e0b 100644..100755 --- a/sd/source/ui/animations/CustomAnimationDialog.cxx +++ b/sd/source/ui/animations/CustomAnimationDialog.cxx @@ -132,7 +132,7 @@ public: virtual Control* getControl(); private: - std::map< USHORT, rtl::OUString > maPropertyValues; + std::map< sal_uInt16, rtl::OUString > maPropertyValues; ListBox* mpControl; }; @@ -172,7 +172,7 @@ void PresetPropertyBox::setValue( const Any& rValue, const OUString& rPresetId ) while( aIter != aEnd ) { - USHORT nPos = mpControl->InsertEntry( rPresets.getUINameForProperty( (*aIter) ) ); + sal_uInt16 nPos = mpControl->InsertEntry( rPresets.getUINameForProperty( (*aIter) ) ); if( (*aIter) == aPropertyValue ) mpControl->SelectEntryPos( nPos ); maPropertyValues[nPos] = (*aIter++); @@ -180,7 +180,7 @@ void PresetPropertyBox::setValue( const Any& rValue, const OUString& rPresetId ) } else { - mpControl->Enable( FALSE ); + mpControl->Enable( sal_False ); } } } @@ -244,7 +244,7 @@ ColorPropertyBox::ColorPropertyBox( sal_Int32 nControlType, Window* pParent, con if ( !pColorTable ) { pColorTable = new XColorTable( SvtPathOptions().GetPalettePath() ); - bKillTable = TRUE; + bKillTable = sal_True; } sal_Int32 nColor = 0; @@ -253,7 +253,7 @@ ColorPropertyBox::ColorPropertyBox( sal_Int32 nControlType, Window* pParent, con for ( long i = 0; i < pColorTable->Count(); i++ ) { XColorEntry* pEntry = pColorTable->GetColor(i); - USHORT nPos = mpControl->InsertEntry( pEntry->GetColor(), pEntry->GetName() ); + sal_uInt16 nPos = mpControl->InsertEntry( pEntry->GetColor(), pEntry->GetName() ); if( pEntry->GetColor().GetRGBColor() == (sal_uInt32)nColor ) mpControl->SelectEntryPos( nPos ); } @@ -335,7 +335,7 @@ FontPropertyBox::FontPropertyBox( sal_Int32 nControlType, Window* pParent, const if(!pFontList) { - pFontList = new FontList( Application::GetDefaultDevice(), NULL, FALSE ); + pFontList = new FontList( Application::GetDefaultDevice(), NULL, sal_False ); bMustDelete = true; } @@ -594,7 +594,7 @@ TransparencyPropertyBox::TransparencyPropertyBox( sal_Int32 nControlType, Window mpMetric->SetMax( 100 ); mpMenu = new PopupMenu(); - for( USHORT i = 25; i < 101; i += 25 ) + for( sal_uInt16 i = 25; i < 101; i += 25 ) { String aStr( String::CreateFromInt32( i ) ); aStr += sal_Unicode('%'); @@ -624,7 +624,7 @@ TransparencyPropertyBox::~TransparencyPropertyBox() void TransparencyPropertyBox::updateMenu() { sal_Int64 nValue = mpMetric->GetValue(); - for( USHORT i = 25; i < 101; i += 25 ) + for( sal_uInt16 i = 25; i < 101; i += 25 ) mpMenu->CheckItem( i, nValue == i ); } @@ -1264,10 +1264,10 @@ CustomAnimationEffectTabPage::CustomAnimationEffectTabPage( Window* pParent, con if ( !pColorTable ) { pColorTable = new XColorTable( SvtPathOptions().GetPalettePath() ); - bKillTable = TRUE; + bKillTable = sal_True; } - mpCLBDimColor->SetUpdateMode( FALSE ); + mpCLBDimColor->SetUpdateMode( sal_False ); for ( long i = 0; i < pColorTable->Count(); i++ ) { @@ -1275,7 +1275,7 @@ CustomAnimationEffectTabPage::CustomAnimationEffectTabPage( Window* pParent, con mpCLBDimColor->InsertEntry( pEntry->GetColor(), pEntry->GetName() ); } - mpCLBDimColor->SetUpdateMode( TRUE ); + mpCLBDimColor->SetUpdateMode( sal_True ); if ( bKillTable ) delete pColorTable; @@ -1400,7 +1400,7 @@ CustomAnimationEffectTabPage::CustomAnimationEffectTabPage( Window* pParent, con sal_Bool bHasAfterEffect = sal_False; pSet->getPropertyValue( nHandleHasAfterEffect ) >>= bHasAfterEffect; - USHORT nPos = 0; + sal_uInt16 nPos = 0; if( bHasAfterEffect ) { nPos++; @@ -1414,7 +1414,7 @@ CustomAnimationEffectTabPage::CustomAnimationEffectTabPage( Window* pParent, con sal_Int32 nColor = 0; aDimColor >>= nColor; Color aColor( nColor ); - USHORT nColorPos = mpCLBDimColor->GetEntryPos( aColor ); + sal_uInt16 nColorPos = mpCLBDimColor->GetEntryPos( aColor ); if ( LISTBOX_ENTRY_NOTFOUND != nColorPos ) mpCLBDimColor->SelectEntryPos( nColorPos ); else @@ -1439,7 +1439,7 @@ CustomAnimationEffectTabPage::CustomAnimationEffectTabPage( Window* pParent, con { if( pSet->getPropertyState( nHandleIterateType ) != STLPropertyState_AMBIGUOUS) { - USHORT nPos = LISTBOX_ENTRY_NOTFOUND; + sal_uInt16 nPos = LISTBOX_ENTRY_NOTFOUND; sal_Int32 nIterateType = 0; pSet->getPropertyValue( nHandleIterateType ) >>= nIterateType; @@ -1462,16 +1462,16 @@ CustomAnimationEffectTabPage::CustomAnimationEffectTabPage( Window* pParent, con } else { - mpFTTextAnim->Enable( FALSE ); - mpLBTextAnim->Enable( FALSE ); - mpMFTextDelay->Enable( FALSE ); - mpFTTextDelay->Enable( FALSE ); + mpFTTextAnim->Enable( sal_False ); + mpLBTextAnim->Enable( sal_False ); + mpMFTextDelay->Enable( sal_False ); + mpFTTextDelay->Enable( sal_False ); } if( pSet->getPropertyState( nHandleSoundURL ) != STLPropertyState_AMBIGUOUS ) { - USHORT nPos = 0; + sal_uInt16 nPos = 0; const Any aValue( pSet->getPropertyValue( nHandleSoundURL ) ); @@ -1488,20 +1488,20 @@ CustomAnimationEffectTabPage::CustomAnimationEffectTabPage( Window* pParent, con { const String aTmp( aSoundURL ); - ULONG i; + sal_uLong i; for( i = 0; i < maSoundList.Count(); i++ ) { String* pString = (String*)maSoundList.GetObject( i ); if( *pString == aTmp ) { - nPos = (USHORT)i+2; + nPos = (sal_uInt16)i+2; break; } } if( nPos == 0 ) { - nPos = (USHORT)maSoundList.Count()+2; + nPos = (sal_uInt16)maSoundList.Count()+2; maSoundList.Insert( new String( aTmp ), LIST_APPEND ); INetURLObject aURL( aTmp ); nPos = mpLBSound->InsertEntry( aURL.GetBase(), nPos ); @@ -1549,7 +1549,7 @@ CustomAnimationEffectTabPage::~CustomAnimationEffectTabPage() void CustomAnimationEffectTabPage::updateControlStates() { - USHORT nPos = mpLBAfterEffect->GetSelectEntryPos(); + sal_uInt16 nPos = mpLBAfterEffect->GetSelectEntryPos(); mpCLBDimColor->Enable( nPos == 1 ); mpFTDimColor->Enable( nPos == 1 ); @@ -1568,7 +1568,7 @@ IMPL_LINK( CustomAnimationEffectTabPage, implSelectHdl, Control*, pControl ) { if( pControl == mpLBAfterEffect ) { - USHORT nPos = static_cast<ListBox*>( mpLBAfterEffect )->GetSelectEntryPos(); + sal_uInt16 nPos = static_cast<ListBox*>( mpLBAfterEffect )->GetSelectEntryPos(); if( nPos == 1 ) { if( mpCLBDimColor->GetSelectEntryPos() == LISTBOX_ENTRY_NOTFOUND ) @@ -1582,7 +1582,7 @@ IMPL_LINK( CustomAnimationEffectTabPage, implSelectHdl, Control*, pControl ) } else if( pControl == mpLBSound ) { - USHORT nPos = mpLBSound->GetSelectEntryPos(); + sal_uInt16 nPos = mpLBSound->GetSelectEntryPos(); if( nPos == (mpLBSound->GetEntryCount() - 1) ) { openSoundFileDialog(); @@ -1648,7 +1648,7 @@ void CustomAnimationEffectTabPage::update( STLPropertySet* pSet ) pSet->setPropertyValue( nHandleDecelerate, makeAny( fTemp ) ); } - USHORT nPos = mpLBAfterEffect->GetSelectEntryPos(); + sal_uInt16 nPos = mpLBAfterEffect->GetSelectEntryPos(); if( nPos != LISTBOX_ENTRY_NOTFOUND ) { sal_Bool bAfterEffect = nPos != 0; @@ -1759,7 +1759,7 @@ void CustomAnimationEffectTabPage::fillSoundListBox() mpLBSound->InsertEntry( String( SdResId( STR_CUSTOMANIMATION_NO_SOUND ) ) ); mpLBSound->InsertEntry( String( SdResId( STR_CUSTOMANIMATION_STOP_PREVIOUS_SOUND ) ) ); - for( ULONG i = 0; i < maSoundList.Count(); i++ ) + for( sal_uLong i = 0; i < maSoundList.Count(); i++ ) { String* pString = (String*)maSoundList.GetObject( i ); INetURLObject aURL( *pString ); @@ -1834,8 +1834,8 @@ void CustomAnimationEffectTabPage::openSoundFileDialog() String aStr; aStr += sal_Unicode('%'); aStrWarning.SearchAndReplace( aStr , aFile ); WarningBox aWarningBox( NULL, WB_3DLOOK | WB_RETRY_CANCEL, aStrWarning ); - aWarningBox.SetModalInputMode (TRUE); - bQuitLoop = aWarningBox.Execute()==RET_RETRY ? FALSE : TRUE; + aWarningBox.SetModalInputMode (sal_True); + bQuitLoop = aWarningBox.Execute()==RET_RETRY ? sal_False : sal_True; bValidSoundFile=false; } @@ -1850,12 +1850,12 @@ void CustomAnimationEffectTabPage::openSoundFileDialog() if( !bValidSoundFile ) nPos = 0; - mpLBSound->SelectEntryPos( (USHORT) nPos ); + mpLBSound->SelectEntryPos( (sal_uInt16) nPos ); } void CustomAnimationEffectTabPage::onSoundPreview() { - const USHORT nPos = mpLBSound->GetSelectEntryPos(); + const sal_uInt16 nPos = mpLBSound->GetSelectEntryPos(); if( nPos >= 2 ) try { @@ -1928,7 +1928,7 @@ CustomAnimationDurationTabPage::CustomAnimationDurationTabPage(Window* pParent, { sal_Int16 nStart = 0; pSet->getPropertyValue( nHandleStart ) >>= nStart; - USHORT nPos = 0; + sal_uInt16 nPos = 0; switch( nStart ) { case EffectNodeType::WITH_PREVIOUS: nPos = 1; break; @@ -1959,7 +1959,7 @@ CustomAnimationDurationTabPage::CustomAnimationDurationTabPage(Window* pParent, } else { - USHORT nPos = LISTBOX_ENTRY_NOTFOUND; + sal_uInt16 nPos = LISTBOX_ENTRY_NOTFOUND; if( fDuration == 5.0 ) nPos = 0; @@ -1988,7 +1988,7 @@ CustomAnimationDurationTabPage::CustomAnimationDurationTabPage(Window* pParent, if( aRepeatCount.hasValue() ) aRepeatCount >>= fRepeat; - USHORT nPos = LISTBOX_ENTRY_NOTFOUND; + sal_uInt16 nPos = LISTBOX_ENTRY_NOTFOUND; if( fRepeat == 0 ) nPos = 0; @@ -2023,7 +2023,7 @@ CustomAnimationDurationTabPage::CustomAnimationDurationTabPage(Window* pParent, sal_Int16 nFill = 0; if( pSet->getPropertyValue( nHandleRewind ) >>= nFill ) { - mpCBXRewind->Check( (nFill == AnimationFill::REMOVE) ? TRUE : FALSE ); + mpCBXRewind->Check( (nFill == AnimationFill::REMOVE) ? sal_True : sal_False ); } else { @@ -2065,7 +2065,7 @@ CustomAnimationDurationTabPage::CustomAnimationDurationTabPage(Window* pParent, } String aDescription( getShapeDescription( xShape, true ) ); - USHORT nPos = mpLBTrigger->InsertEntry( aDescription ); + sal_uInt16 nPos = mpLBTrigger->InsertEntry( aDescription ); mpLBTrigger->SetEntryData( nPos, (void*)nShape ); if( xShape == xTrigger ) @@ -2082,8 +2082,8 @@ IMPL_LINK( CustomAnimationDurationTabPage, implControlHdl, Control*, pControl ) { if( pControl == mpLBTrigger.get() ) { - mpRBClickSequence->Check( FALSE ); - mpRBInteractive->Check( TRUE ); + mpRBClickSequence->Check( sal_False ); + mpRBInteractive->Check( sal_True ); } return 0; @@ -2091,7 +2091,7 @@ IMPL_LINK( CustomAnimationDurationTabPage, implControlHdl, Control*, pControl ) void CustomAnimationDurationTabPage::update( STLPropertySet* pSet ) { - USHORT nPos = mpLBStart->GetSelectEntryPos(); + sal_uInt16 nPos = mpLBStart->GetSelectEntryPos(); if( nPos != LISTBOX_ENTRY_NOTFOUND ) { sal_Int16 nStart; @@ -2291,7 +2291,7 @@ CustomAnimationTextAnimTabPage::CustomAnimationTextAnimTabPage(Window* pParent, { sal_Int32 nTextGrouping = 0; if( pSet->getPropertyValue( nHandleTextGrouping ) >>= nTextGrouping ) - maLBGroupText.SelectEntryPos( (USHORT)(nTextGrouping + 1) ); + maLBGroupText.SelectEntryPos( (sal_uInt16)(nTextGrouping + 1) ); } if( pSet->getPropertyState( nHandleHasVisibleShape ) != STLPropertyState_AMBIGUOUS ) @@ -2323,7 +2323,7 @@ CustomAnimationTextAnimTabPage::CustomAnimationTextAnimTabPage(Window* pParent, } else { - maCBXAnimateForm.Enable( FALSE ); + maCBXAnimateForm.Enable( sal_False ); } maCBXReverse.SetState( STATE_DONTKNOW ); @@ -2345,7 +2345,7 @@ CustomAnimationTextAnimTabPage::CustomAnimationTextAnimTabPage(Window* pParent, sal_Int32 nPos = 6; while( (nPos > 2) && (nPos > nMaxParaDepth) ) { - maLBGroupText.RemoveEntry( (USHORT)nPos ); + maLBGroupText.RemoveEntry( (sal_uInt16)nPos ); nPos--; } } @@ -2355,7 +2355,7 @@ CustomAnimationTextAnimTabPage::CustomAnimationTextAnimTabPage(Window* pParent, void CustomAnimationTextAnimTabPage::update( STLPropertySet* pSet ) { - USHORT nPos = maLBGroupText.GetSelectEntryPos(); + sal_uInt16 nPos = maLBGroupText.GetSelectEntryPos(); if( nPos != LISTBOX_ENTRY_NOTFOUND ) { sal_Int32 nTextGrouping = nPos - 1; @@ -2404,7 +2404,7 @@ void CustomAnimationTextAnimTabPage::update( STLPropertySet* pSet ) void CustomAnimationTextAnimTabPage::updateControlStates() { - USHORT nPos = maLBGroupText.GetSelectEntryPos(); + sal_uInt16 nPos = maLBGroupText.GetSelectEntryPos(); maCBXGroupAuto.Enable( nPos > 1 ); maMFGroupAuto.Enable( nPos > 1 ); @@ -2412,12 +2412,12 @@ void CustomAnimationTextAnimTabPage::updateControlStates() if( !mbHasVisibleShapes && nPos > 0 ) { - maCBXAnimateForm.Check(FALSE); - maCBXAnimateForm.Enable(FALSE); + maCBXAnimateForm.Check(sal_False); + maCBXAnimateForm.Enable(sal_False); } else { - maCBXAnimateForm.Enable(TRUE); + maCBXAnimateForm.Enable(sal_True); } } @@ -2429,7 +2429,7 @@ IMPL_LINK( CustomAnimationTextAnimTabPage, implSelectHdl, Control*, EMPTYARG ) // -------------------------------------------------------------------- -CustomAnimationDialog::CustomAnimationDialog( Window* pParent, STLPropertySet* pSet, USHORT nPage /* = 0 */ ) +CustomAnimationDialog::CustomAnimationDialog( Window* pParent, STLPropertySet* pSet, sal_uInt16 nPage /* = 0 */ ) : TabDialog( pParent, SdResId( DLG_CUSTOMANIMATION ) ), mpSet( pSet ), mpResultSet( 0 ) { mpTabControl = new TabControl( this, SdResId( 1 ) ); diff --git a/sd/source/ui/animations/CustomAnimationDialog.hxx b/sd/source/ui/animations/CustomAnimationDialog.hxx index e732f4a0e731..cf479d874470 100644..100755 --- a/sd/source/ui/animations/CustomAnimationDialog.hxx +++ b/sd/source/ui/animations/CustomAnimationDialog.hxx @@ -158,7 +158,7 @@ class STLPropertySet; class CustomAnimationDialog : public TabDialog { public: - CustomAnimationDialog( Window* pParent, STLPropertySet* pSet, USHORT nPage = 0 ); + CustomAnimationDialog( Window* pParent, STLPropertySet* pSet, sal_uInt16 nPage = 0 ); ~CustomAnimationDialog(); STLPropertySet* getDefaultSet() { return mpSet; } diff --git a/sd/source/ui/animations/CustomAnimationList.cxx b/sd/source/ui/animations/CustomAnimationList.cxx index 8dbb9fd95c41..a80617e17eb0 100755 --- a/sd/source/ui/animations/CustomAnimationList.cxx +++ b/sd/source/ui/animations/CustomAnimationList.cxx @@ -214,10 +214,10 @@ static OUString getDescription( const Any& rTarget, bool bWithText = true ) class CustomAnimationListEntryItem : public SvLBoxString { public: - CustomAnimationListEntryItem( SvLBoxEntry*,USHORT nFlags, OUString aDescription, CustomAnimationEffectPtr pEffect, CustomAnimationList* pParent ); + CustomAnimationListEntryItem( SvLBoxEntry*,sal_uInt16 nFlags, OUString aDescription, CustomAnimationEffectPtr pEffect, CustomAnimationList* pParent ); virtual ~CustomAnimationListEntryItem(); void InitViewData( SvLBox*,SvLBoxEntry*,SvViewDataItem* ); - void Paint( const Point&, SvLBox& rDev, USHORT nFlags,SvLBoxEntry* ); + void Paint( const Point&, SvLBox& rDev, sal_uInt16 nFlags,SvLBoxEntry* ); SvLBoxItem* Create() const; void Clone( SvLBoxItem* pSource ); @@ -229,7 +229,7 @@ private: // -------------------------------------------------------------------- -CustomAnimationListEntryItem::CustomAnimationListEntryItem( SvLBoxEntry* pEntry, USHORT nFlags, OUString aDescription, CustomAnimationEffectPtr pEffect, CustomAnimationList* pParent ) +CustomAnimationListEntryItem::CustomAnimationListEntryItem( SvLBoxEntry* pEntry, sal_uInt16 nFlags, OUString aDescription, CustomAnimationEffectPtr pEffect, CustomAnimationList* pParent ) : SvLBoxString( pEntry, nFlags, aDescription ) , mpParent( pParent ) , maDescription( aDescription ) @@ -258,7 +258,7 @@ void CustomAnimationListEntryItem::InitViewData( SvLBox* pView, SvLBoxEntry* pEn // -------------------------------------------------------------------- -void CustomAnimationListEntryItem::Paint( const Point& rPos, SvLBox& rDev, USHORT, SvLBoxEntry* pEntry ) +void CustomAnimationListEntryItem::Paint( const Point& rPos, SvLBox& rDev, sal_uInt16, SvLBoxEntry* pEntry ) { const bool bHighContrast = Application::GetSettings().GetStyleSettings().GetHighContrastMode(); @@ -279,7 +279,7 @@ void CustomAnimationListEntryItem::Paint( const Point& rPos, SvLBox& rDev, USHOR aPos.X() += 19; - USHORT nImage; + sal_uInt16 nImage; switch( mpEffect->getPresetClass() ) { case EffectPresetClass::ENTRANCE: nImage = IMG_CUSTOMANIMATION_ENTRANCE_EFFECT; break; @@ -365,11 +365,11 @@ CustomAnimationListEntry::~CustomAnimationListEntry() class CustomAnimationTriggerEntryItem : public SvLBoxString { public: - CustomAnimationTriggerEntryItem( SvLBoxEntry*,USHORT nFlags, OUString aDescription, CustomAnimationList* pParent ); + CustomAnimationTriggerEntryItem( SvLBoxEntry*,sal_uInt16 nFlags, OUString aDescription, CustomAnimationList* pParent ); virtual ~CustomAnimationTriggerEntryItem(); - virtual USHORT IsA(); + virtual sal_uInt16 IsA(); void InitViewData( SvLBox*,SvLBoxEntry*,SvViewDataItem* ); - void Paint( const Point&, SvLBox& rDev, USHORT nFlags,SvLBoxEntry* ); + void Paint( const Point&, SvLBox& rDev, sal_uInt16 nFlags,SvLBoxEntry* ); SvLBoxItem* Create() const; void Clone( SvLBoxItem* pSource ); @@ -380,7 +380,7 @@ private: // -------------------------------------------------------------------- -CustomAnimationTriggerEntryItem::CustomAnimationTriggerEntryItem( SvLBoxEntry* pEntry, USHORT nFlags, OUString aDescription, CustomAnimationList* pParent ) +CustomAnimationTriggerEntryItem::CustomAnimationTriggerEntryItem( SvLBoxEntry* pEntry, sal_uInt16 nFlags, OUString aDescription, CustomAnimationList* pParent ) : SvLBoxString( pEntry, nFlags, aDescription ), mpParent( pParent ), maDescription( aDescription ) { } @@ -393,9 +393,9 @@ CustomAnimationTriggerEntryItem::~CustomAnimationTriggerEntryItem() // -------------------------------------------------------------------- -USHORT CustomAnimationTriggerEntryItem::IsA() +sal_uInt16 CustomAnimationTriggerEntryItem::IsA() { - return (USHORT)-1; + return (sal_uInt16)-1; } // -------------------------------------------------------------------- @@ -419,7 +419,7 @@ void CustomAnimationTriggerEntryItem::InitViewData( SvLBox* pView, SvLBoxEntry* // -------------------------------------------------------------------- -void CustomAnimationTriggerEntryItem::Paint( const Point& rPos, SvLBox& rDev, USHORT, SvLBoxEntry* ) +void CustomAnimationTriggerEntryItem::Paint( const Point& rPos, SvLBox& rDev, sal_uInt16, SvLBoxEntry* ) { Size aSize( rDev.GetOutputSizePixel().Width(), static_cast< SvTreeListBox* >(&rDev)->GetEntryHeight() ); @@ -487,7 +487,7 @@ CustomAnimationList::CustomAnimationList( ::Window* pParent, const ResId& rResId // -------------------------------------------------------------------- -const Image& CustomAnimationList::getImage( USHORT nId, bool bHighContrast ) +const Image& CustomAnimationList::getImage( sal_uInt16 nId, bool bHighContrast ) { DBG_ASSERT( (nId >= IMG_CUSTOMANIMATION_ON_CLICK) && (nId <= IMG_CUSTOMANIMATION_MEDIA_STOP), "sd::CustomAnimationList::getImage(), illegal index!" ); @@ -819,7 +819,7 @@ void CustomAnimationList::onSelectionChanged( Any aSelection ) { try { - SelectAll(FALSE); + SelectAll(sal_False); if( aSelection.hasValue() ) { @@ -917,7 +917,7 @@ EffectSequence CustomAnimationList::getSelection() const // -------------------------------------------------------------------- -BOOL CustomAnimationList::DoubleClickHdl() +sal_Bool CustomAnimationList::DoubleClickHdl() { mpController->onDoubleClick(); return false; @@ -967,7 +967,7 @@ PopupMenu* CustomAnimationList::CreateContextMenu() // -------------------------------------------------------------------- -void CustomAnimationList::ExcecuteContextMenuAction( USHORT nSelectedPopupEntry ) +void CustomAnimationList::ExcecuteContextMenuAction( sal_uInt16 nSelectedPopupEntry ) { mpController->onContextMenu( nSelectedPopupEntry ); } diff --git a/sd/source/ui/animations/CustomAnimationList.hxx b/sd/source/ui/animations/CustomAnimationList.hxx index 66b1e2c6a436..185c1a6dbb5c 100755 --- a/sd/source/ui/animations/CustomAnimationList.hxx +++ b/sd/source/ui/animations/CustomAnimationList.hxx @@ -46,7 +46,7 @@ class ICustomAnimationListController public: virtual void onSelect() = 0; virtual void onDoubleClick() = 0; - virtual void onContextMenu( USHORT nSelectedPopupEntry ) = 0; + virtual void onContextMenu( sal_uInt16 nSelectedPopupEntry ) = 0; virtual ~ICustomAnimationListController() {} }; @@ -83,12 +83,12 @@ public: // overrides virtual void SelectHdl(); - virtual BOOL DoubleClickHdl(); + virtual sal_Bool DoubleClickHdl(); virtual void Paint( const Rectangle& rRect ); virtual PopupMenu* CreateContextMenu( void ); - virtual void ExcecuteContextMenuAction( USHORT nSelectedPopupEntry ); + virtual void ExcecuteContextMenuAction( sal_uInt16 nSelectedPopupEntry ); virtual void KeyInput( const KeyEvent& rKEvt ); @@ -97,7 +97,7 @@ public: virtual void notify_change(); - const Image& getImage( USHORT nId, bool bHighContrast ); + const Image& getImage( sal_uInt16 nId, bool bHighContrast ); bool isExpanded( const CustomAnimationEffectPtr& pEffect ) const; diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx index 2d70316c1432..73d595a8eb1e 100755 --- a/sd/source/ui/animations/CustomAnimationPane.cxx +++ b/sd/source/ui/animations/CustomAnimationPane.cxx @@ -729,15 +729,15 @@ void CustomAnimationPane::updateControls() if( !mxView.is() ) { - mpPBAddEffect->Enable( FALSE ); - mpPBChangeEffect->Enable( FALSE ); - mpPBRemoveEffect->Enable( FALSE ); - mpFLEffect->Enable( FALSE ); - mpFTStart->Enable( FALSE ); - mpLBStart->Enable( FALSE ); - mpPBPropertyMore->Enable( FALSE ); - mpLBProperty->Enable( FALSE ); - mpFTProperty->Enable( FALSE ); + mpPBAddEffect->Enable( sal_False ); + mpPBChangeEffect->Enable( sal_False ); + mpPBRemoveEffect->Enable( sal_False ); + mpFLEffect->Enable( sal_False ); + mpFTStart->Enable( sal_False ); + mpLBStart->Enable( sal_False ); + mpPBPropertyMore->Enable( sal_False ); + mpLBProperty->Enable( sal_False ); + mpFTProperty->Enable( sal_False ); mpCustomAnimationList->clear(); return; } @@ -818,15 +818,15 @@ void CustomAnimationPane::updateControls() else { mpLBProperty->setSubControl( 0 ); - mpFTProperty->Enable( FALSE ); - mpLBProperty->Enable( FALSE ); - mpPBPropertyMore->Enable( FALSE ); + mpFTProperty->Enable( sal_False ); + mpLBProperty->Enable( sal_False ); + mpPBPropertyMore->Enable( sal_False ); } // // --- // - USHORT nPos = 0xffff; + sal_uInt16 nPos = 0xffff; sal_Int16 nNodeType = pEffect->getNodeType(); switch( nNodeType ) @@ -862,19 +862,19 @@ void CustomAnimationPane::updateControls() mpCBSpeed->SelectEntryPos( nPos ); } - mpPBPropertyMore->Enable( TRUE ); + mpPBPropertyMore->Enable( sal_True ); - mpFTChangeOrder->Enable( TRUE ); + mpFTChangeOrder->Enable( sal_True ); } else { mpLBProperty->setSubControl( 0 ); - mpFTProperty->Enable( FALSE ); - mpLBProperty->Enable( FALSE ); - mpPBPropertyMore->Enable( FALSE ); - mpFTSpeed->Enable(FALSE); - mpCBSpeed->Enable(FALSE); - mpFTChangeOrder->Enable( FALSE ); + mpFTProperty->Enable( sal_False ); + mpLBProperty->Enable( sal_False ); + mpPBPropertyMore->Enable( sal_False ); + mpFTSpeed->Enable(sal_False); + mpCBSpeed->Enable(sal_False); + mpFTChangeOrder->Enable( sal_False ); mpLBStart->SetNoSelection(); mpCBSpeed->SetNoSelection(); mpFLEffect->SetText( maStrModify ); @@ -1061,7 +1061,7 @@ void CustomAnimationPane::onDoubleClick() showOptions(); } -void CustomAnimationPane::onContextMenu( USHORT nSelectedPopupEntry ) +void CustomAnimationPane::onContextMenu( sal_uInt16 nSelectedPopupEntry ) { switch( nSelectedPopupEntry ) { @@ -1747,7 +1747,7 @@ void CustomAnimationPane::changeSelection( STLPropertySet* pResultSet, STLProper } } -void CustomAnimationPane::showOptions( USHORT nPage /* = 0 */ ) +void CustomAnimationPane::showOptions( sal_uInt16 nPage /* = 0 */ ) { STLPropertySet* pSet = createSelectionSet(); @@ -1943,7 +1943,7 @@ void CustomAnimationPane::onChange( bool bCreate ) { if( bCreate ) { - mpCustomAnimationList->SelectAll( FALSE ); + mpCustomAnimationList->SelectAll( sal_False ); // gather shapes from the selection std::vector< Any >::iterator aIter( aTargets.begin() ); @@ -2012,7 +2012,7 @@ void CustomAnimationPane::onChange( bool bCreate ) void CustomAnimationPane::createPath( PathKind eKind, std::vector< Any >& rTargets, double fDuration) { - USHORT nSID = 0; + sal_uInt16 nSID = 0; switch( eKind ) { @@ -2081,7 +2081,7 @@ void CustomAnimationPane::onChangeStart() if( mpLBStart->GetSelectEntryCount() == 1 ) { sal_Int16 nNodeType; - USHORT nPos= mpLBStart->GetSelectEntryPos(); + sal_uInt16 nPos= mpLBStart->GetSelectEntryPos(); switch( nPos ) { case 0: nNodeType = EffectNodeType::ON_CLICK; break; @@ -2167,7 +2167,7 @@ void CustomAnimationPane::onChangeSpeed() double fDuration; - USHORT nPos= mpCBSpeed->GetSelectEntryPos(); + sal_uInt16 nPos= mpCBSpeed->GetSelectEntryPos(); switch( nPos ) { @@ -2445,7 +2445,7 @@ void CustomAnimationPane::markShapesFromSelectedEffects() Reference< XShape > xShape( pEffect->getTargetShape() ); SdrObject* pObj = GetSdrObjectFromXShape( xShape ); if( pObj ) - pView->MarkObj(pObj, pView->GetSdrPageView(), FALSE, FALSE); + pView->MarkObj(pObj, pView->GetSdrPageView(), sal_False, sal_False); } } } diff --git a/sd/source/ui/animations/CustomAnimationPane.hxx b/sd/source/ui/animations/CustomAnimationPane.hxx index 7343bc547f32..33dd25ebaf66 100644..100755 --- a/sd/source/ui/animations/CustomAnimationPane.hxx +++ b/sd/source/ui/animations/CustomAnimationPane.hxx @@ -95,7 +95,7 @@ public: // ICustomAnimationListController virtual void onSelect(); virtual void onDoubleClick(); - virtual void onContextMenu( USHORT nSelectedPopupEntry ); + virtual void onContextMenu( sal_uInt16 nSelectedPopupEntry ); void addUndo(); @@ -109,7 +109,7 @@ private: void updateMotionPathTags(); void markShapesFromSelectedEffects(); - void showOptions( USHORT nPage = 0 ); + void showOptions( sal_uInt16 nPage = 0 ); void moveSelection( bool bUp ); void onPreview( bool bForcePreview ); diff --git a/sd/source/ui/animations/DialogListBox.cxx b/sd/source/ui/animations/DialogListBox.cxx index e1fe8d5d3918..83e4cbdd4d65 100644..100755 --- a/sd/source/ui/animations/DialogListBox.cxx +++ b/sd/source/ui/animations/DialogListBox.cxx @@ -279,7 +279,7 @@ void DialogListBox::StateChanged( StateChangedType nType ) } else if ( ( nType == STATE_CHANGE_UPDATEMODE ) || ( nType == STATE_CHANGE_DATA ) ) { - BOOL bUpdate = IsUpdateMode(); + sal_Bool bUpdate = IsUpdateMode(); mpChild->SetUpdateMode( bUpdate ); if ( bUpdate && IsReallyVisible() ) ImplCheckScrollBars(); diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx b/sd/source/ui/animations/SlideTransitionPane.cxx index 88b30ab658e3..82b6a47c3735 100755 --- a/sd/source/ui/animations/SlideTransitionPane.cxx +++ b/sd/source/ui/animations/SlideTransitionPane.cxx @@ -133,9 +133,9 @@ struct TransitionEffect mfDuration = 2.0; mnTime = 0; mePresChange = PRESCHANGE_MANUAL; - mbSoundOn = FALSE; - mbLoopSound = FALSE; - mbStopSound = FALSE; + mbSoundOn = sal_False; + mbLoopSound = sal_False; + mbStopSound = sal_False; mbEffectAmbiguous = false; mbDurationAmbiguous = false; @@ -184,12 +184,12 @@ struct TransitionEffect { if( mbStopSound ) { - rOutPage.SetStopSound( TRUE ); - rOutPage.SetSound( FALSE ); + rOutPage.SetStopSound( sal_True ); + rOutPage.SetSound( sal_False ); } else { - rOutPage.SetStopSound( FALSE ); + rOutPage.SetStopSound( sal_False ); rOutPage.SetSound( mbSoundOn ); rOutPage.SetSoundFile( maSound ); } @@ -223,9 +223,9 @@ struct TransitionEffect // other settings double mfDuration; - ULONG mnTime; + sal_uLong mnTime; PresChange mePresChange; - BOOL mbSoundOn; + sal_Bool mbSoundOn; String maSound; bool mbLoopSound; bool mbStopSound; @@ -839,7 +839,7 @@ void SlideTransitionPane::updateControls() if( lcl_findSoundInList( maSoundList, aEffect.maSound, nPos )) { // skip first three entries - maLB_SOUND.SelectEntryPos( (USHORT)nPos + 3 ); + maLB_SOUND.SelectEntryPos( (sal_uInt16)nPos + 3 ); maCurrentSoundFile = aEffect.maSound; } } @@ -860,8 +860,8 @@ void SlideTransitionPane::updateControls() if( aEffect.mbPresChangeAmbiguous ) { - maRB_ADVANCE_ON_MOUSE.Check( FALSE ); - maRB_ADVANCE_AUTO.Check( FALSE ); + maRB_ADVANCE_ON_MOUSE.Check( sal_False ); + maRB_ADVANCE_AUTO.Check( sal_False ); } else { @@ -890,7 +890,7 @@ void SlideTransitionPane::updateControlState() maPB_APPLY_TO_ALL.Enable( mbHasSelection ); maPB_PLAY.Enable( mbHasSelection ); -// maPB_SLIDE_SHOW.Enable( TRUE ); +// maPB_SLIDE_SHOW.Enable( sal_True ); maCB_AUTO_PREVIEW.Enable( mbHasSelection ); } @@ -964,7 +964,7 @@ void SlideTransitionPane::openSoundFileDialog() String aStr( sal_Unicode( '%' )); aStrWarning.SearchAndReplace( aStr , aFile ); WarningBox aWarningBox( NULL, WB_3DLOOK | WB_RETRY_CANCEL, aStrWarning ); - aWarningBox.SetModalInputMode (TRUE); + aWarningBox.SetModalInputMode (sal_True); bQuitLoop = (aWarningBox.Execute() != RET_RETRY); bValidSoundFile = false; @@ -973,7 +973,7 @@ void SlideTransitionPane::openSoundFileDialog() if( bValidSoundFile ) // skip first three entries in list - maLB_SOUND.SelectEntryPos( (USHORT)nPos + 3 ); + maLB_SOUND.SelectEntryPos( (sal_uInt16)nPos + 3 ); } if( ! bValidSoundFile ) @@ -982,7 +982,7 @@ void SlideTransitionPane::openSoundFileDialog() { tSoundListType::size_type nPos = 0; if( lcl_findSoundInList( maSoundList, maCurrentSoundFile, nPos )) - maLB_SOUND.SelectEntryPos( (USHORT)nPos + 3 ); + maLB_SOUND.SelectEntryPos( (sal_uInt16)nPos + 3 ); else maLB_SOUND.SelectEntryPos( 0 ); // NONE } diff --git a/sd/source/ui/animations/motionpathtag.cxx b/sd/source/ui/animations/motionpathtag.cxx index 30992f913705..c6105919e645 100644..100755 --- a/sd/source/ui/animations/motionpathtag.cxx +++ b/sd/source/ui/animations/motionpathtag.cxx @@ -135,7 +135,7 @@ bool PathDragMove::BeginSdrDrag() } } Show(); - return TRUE; + return sal_True; } bool PathDragMove::EndSdrDrag(bool /*bCopy*/) @@ -143,7 +143,7 @@ bool PathDragMove::EndSdrDrag(bool /*bCopy*/) Hide(); if( mxTag.is() ) mxTag->MovePath( DragStat().GetDX(), DragStat().GetDY() ); - return TRUE; + return sal_True; } // -------------------------------------------------------------------- @@ -203,7 +203,7 @@ bool PathDragResize::EndSdrDrag(bool /*bCopy*/) pPathObj->SetPathPoly( aDragPoly ); } } - return TRUE; + return sal_True; } // -------------------------------------------------------------------- @@ -266,7 +266,7 @@ public: SdPathHdl( const SmartTagReference& xTag, SdrPathObj* mpPathObj ); virtual ~SdPathHdl(); virtual void CreateB2dIAObject(); - virtual BOOL IsFocusHdl() const; + virtual sal_Bool IsFocusHdl() const; virtual Pointer GetSdrDragPointer() const; virtual bool isMarkable() const; @@ -331,9 +331,9 @@ void SdPathHdl::CreateB2dIAObject() // -------------------------------------------------------------------- -BOOL SdPathHdl::IsFocusHdl() const +sal_Bool SdPathHdl::IsFocusHdl() const { - return FALSE; + return sal_False; } // -------------------------------------------------------------------- @@ -401,7 +401,7 @@ MotionPathTag::MotionPathTag( CustomAnimationPane& rPane, ::sd::View& rView, con aStartArrow.setClosed(true); mpPathObj->SetMergedItem(XLineStartItem(aEmpty,::basegfx::B2DPolyPolygon(aStartArrow))); mpPathObj->SetMergedItem(XLineStartWidthItem(400)); - mpPathObj->SetMergedItem(XLineStartCenterItem(TRUE)); + mpPathObj->SetMergedItem(XLineStartCenterItem(sal_True)); updatePathAttributes(); @@ -449,7 +449,7 @@ void MotionPathTag::updatePathAttributes() aEndArrow.setClosed(true); mpPathObj->SetMergedItem(XLineEndItem(aEmpty,::basegfx::B2DPolyPolygon(aEndArrow))); mpPathObj->SetMergedItem(XLineEndWidthItem(400)); - mpPathObj->SetMergedItem(XLineEndCenterItem(TRUE)); + mpPathObj->SetMergedItem(XLineEndCenterItem(sal_True)); } else { @@ -584,7 +584,7 @@ bool MotionPathTag::MouseButtonDown( const MouseEvent& rMEvt, SmartHdl& rHdl ) if( pHdl && !rMEvt.IsRight() ) { mrView.BrkAction(); - const USHORT nDrgLog = (USHORT)pOut->PixelToLogic(Size(DRGPIX,0)).Width(); + const sal_uInt16 nDrgLog = (sal_uInt16)pOut->PixelToLogic(Size(DRGPIX,0)).Width(); rtl::Reference< MotionPathTag > xTag( this ); SdrDragMethod* pDragMethod; @@ -625,7 +625,7 @@ bool MotionPathTag::KeyInput( const KeyEvent& rKEvt ) if( !mpPathObj ) return false; - USHORT nCode = rKEvt.GetKeyCode().GetCode(); + sal_uInt16 nCode = rKEvt.GetKeyCode().GetCode(); switch( nCode ) { case KEY_DELETE: @@ -799,13 +799,13 @@ bool MotionPathTag::OnMove( const KeyEvent& rKEvt ) if(mrView.IsDragObj()) { FASTBOOL bWasNoSnap = mrView.GetDragStat().IsNoSnap(); - BOOL bWasSnapEnabled = mrView.IsSnapEnabled(); + sal_Bool bWasSnapEnabled = mrView.IsSnapEnabled(); // switch snapping off if(!bWasNoSnap) - ((SdrDragStat&)mrView.GetDragStat()).SetNoSnap(TRUE); + ((SdrDragStat&)mrView.GetDragStat()).SetNoSnap(sal_True); if(bWasSnapEnabled) - mrView.SetSnapEnabled(FALSE); + mrView.SetSnapEnabled(sal_False); mrView.MovAction(aEndPoint); mrView.EndDragObj(); @@ -829,7 +829,7 @@ bool MotionPathTag::OnMove( const KeyEvent& rKEvt ) // -------------------------------------------------------------------- -ULONG MotionPathTag::GetMarkablePointCount() const +sal_uLong MotionPathTag::GetMarkablePointCount() const { if( mpPathObj && isSelected() ) { @@ -843,7 +843,7 @@ ULONG MotionPathTag::GetMarkablePointCount() const // -------------------------------------------------------------------- -ULONG MotionPathTag::GetMarkedPointCount() const +sal_uLong MotionPathTag::GetMarkedPointCount() const { if( mpMark ) { @@ -858,9 +858,9 @@ ULONG MotionPathTag::GetMarkedPointCount() const // -------------------------------------------------------------------- -BOOL MotionPathTag::MarkPoint(SdrHdl& rHdl, BOOL bUnmark ) +sal_Bool MotionPathTag::MarkPoint(SdrHdl& rHdl, sal_Bool bUnmark ) { - BOOL bRet=FALSE; + sal_Bool bRet=sal_False; if( mpPathObj && mrView.IsPointMarkable( rHdl ) && (rHdl.GetKind() != HDL_SMARTTAG) ) { SmartHdl* pSmartHdl = dynamic_cast< SmartHdl* >( &rHdl ); @@ -872,7 +872,7 @@ BOOL MotionPathTag::MarkPoint(SdrHdl& rHdl, BOOL bUnmark ) { pPts->ForceSort(); mrView.MarkListHasChanged(); - bRet=TRUE; + bRet=sal_True; } } } @@ -881,16 +881,16 @@ BOOL MotionPathTag::MarkPoint(SdrHdl& rHdl, BOOL bUnmark ) // -------------------------------------------------------------------- -BOOL MotionPathTag::MarkPoints(const Rectangle* pRect, BOOL bUnmark ) +sal_Bool MotionPathTag::MarkPoints(const Rectangle* pRect, sal_Bool bUnmark ) { - BOOL bChgd=FALSE; + sal_Bool bChgd=sal_False; if( mpPathObj && isSelected() ) { sal_Int32 nHdlNum = mrView.GetHdlList().GetHdlCount() - 1; while( nHdlNum > 0 ) { - SmartHdl* pHdl = dynamic_cast< SmartHdl* >( mrView.GetHdl( sal::static_int_cast< ULONG >( nHdlNum-- ) ) ); + SmartHdl* pHdl = dynamic_cast< SmartHdl* >( mrView.GetHdl( sal::static_int_cast< sal_uLong >( nHdlNum-- ) ) ); if( pHdl && (pHdl->getTag().get() == this) && mrView.IsPointMarkable(*pHdl) && pHdl->IsSelected()==bUnmark) { @@ -898,7 +898,7 @@ BOOL MotionPathTag::MarkPoints(const Rectangle* pRect, BOOL bUnmark ) if( pRect==NULL || pRect->IsInside(aPos)) { if( mrView.MarkPointHelper(pHdl,mpMark,bUnmark) ) - bChgd=TRUE; + bChgd=sal_True; } } } @@ -981,7 +981,7 @@ void MotionPathTag::addCustomHandles( SdrHdlList& rHandlerList ) if( isSelected() ) { - mrView.GetSdrPageView()->SetHasMarkedObj(TRUE); + mrView.GetSdrPageView()->SetHasMarkedObj(sal_True); if( !mrView.IsFrameDragSingles() ) { @@ -1004,7 +1004,7 @@ void MotionPathTag::addCustomHandles( SdrHdlList& rHandlerList ) rHandlerList.AddHdl( pSmartHdl ); - const bool bSelected= pMrkPnts && pMrkPnts->Exist(sal::static_int_cast< USHORT >(nHandle)); + const bool bSelected= pMrkPnts && pMrkPnts->Exist(sal::static_int_cast< sal_uInt16 >(nHandle)); pSmartHdl->SetSelected(bSelected); if( mrView.IsPlusHandlesAlwaysVisible() || bSelected ) @@ -1017,7 +1017,7 @@ void MotionPathTag::addCustomHandles( SdrHdlList& rHandlerList ) { pPlusHdl->SetObj(mpPathObj); pPlusHdl->SetPageView(mrView.GetSdrPageView()); - pPlusHdl->SetPlusHdl(TRUE); + pPlusHdl->SetPlusHdl(sal_True); rHandlerList.AddHdl(pPlusHdl); } } @@ -1030,10 +1030,10 @@ void MotionPathTag::addCustomHandles( SdrHdlList& rHandlerList ) if(!aRect.IsEmpty()) { - ULONG nCount = rHandlerList.GetHdlCount(); + sal_uLong nCount = rHandlerList.GetHdlCount(); - BOOL bWdt0=aRect.Left()==aRect.Right(); - BOOL bHgt0=aRect.Top()==aRect.Bottom(); + sal_Bool bWdt0=aRect.Left()==aRect.Right(); + sal_Bool bHgt0=aRect.Top()==aRect.Bottom(); if (bWdt0 && bHgt0) { rHandlerList.AddHdl(new SmartHdl( xThis, mpPathObj, aRect.TopLeft(),HDL_UPLFT)); @@ -1115,7 +1115,7 @@ void MotionPathTag::selectionChanged() if( mrView.GetViewShell() && mrView.GetViewShell()->GetViewFrame() ) { SfxBindings& rBindings = mrView.GetViewShell()->GetViewFrame()->GetBindings(); - rBindings.InvalidateAll(TRUE); + rBindings.InvalidateAll(sal_True); } } // -------------------------------------------------------------------- @@ -1159,7 +1159,7 @@ void MotionPathTag::DeleteMarkedPoints() } } -BOOL MotionPathTag::IsDeleteMarkedPointsPossible() const +sal_Bool MotionPathTag::IsDeleteMarkedPointsPossible() const { return mpPathObj && isSelected() && (GetMarkedPointCount() != 0); } @@ -1175,12 +1175,12 @@ bool MotionPathTag::IsRipUpAtMarkedPointsPossible() const return false; } -BOOL MotionPathTag::IsSetMarkedSegmentsKindPossible() const +sal_Bool MotionPathTag::IsSetMarkedSegmentsKindPossible() const { if( mpPathObj ) return mrView.IsSetMarkedSegmentsKindPossible(); else - return FALSE; + return sal_False; } SdrPathSegmentKind MotionPathTag::GetMarkedSegmentsKind() const @@ -1210,12 +1210,12 @@ void MotionPathTag::SetMarkedSegmentsKind(SdrPathSegmentKind eKind) } } -BOOL MotionPathTag::IsSetMarkedPointsSmoothPossible() const +sal_Bool MotionPathTag::IsSetMarkedPointsSmoothPossible() const { if( mpPathObj ) return mrView.IsSetMarkedPointsSmoothPossible(); else - return FALSE; + return sal_False; } SdrPathSmoothKind MotionPathTag::GetMarkedPointsSmooth() const @@ -1264,7 +1264,7 @@ void MotionPathTag::SetMarkedPointsSmooth(SdrPathSmoothKind eKind) } } -void MotionPathTag::CloseMarkedObjects(BOOL /*bToggle*/, BOOL /*bOpen*/ ) +void MotionPathTag::CloseMarkedObjects(sal_Bool /*bToggle*/, sal_Bool /*bOpen*/ ) { // not supported for motion path } diff --git a/sd/source/ui/animations/motionpathtag.hxx b/sd/source/ui/animations/motionpathtag.hxx index 1413636fca2b..1e286e0e760e 100644..100755 --- a/sd/source/ui/animations/motionpathtag.hxx +++ b/sd/source/ui/animations/motionpathtag.hxx @@ -64,11 +64,11 @@ public: virtual bool KeyInput( const KeyEvent& rKEvt ); // callbacks from sdr view - virtual ULONG GetMarkablePointCount() const; - virtual ULONG GetMarkedPointCount() const; - virtual BOOL MarkPoint(SdrHdl& rHdl, BOOL bUnmark=FALSE); + virtual sal_uLong GetMarkablePointCount() const; + virtual sal_uLong GetMarkedPointCount() const; + virtual sal_Bool MarkPoint(SdrHdl& rHdl, sal_Bool bUnmark=sal_False); virtual void CheckPossibilities(); - virtual BOOL MarkPoints(const Rectangle* pRect, BOOL bUnmark); + virtual sal_Bool MarkPoints(const Rectangle* pRect, sal_Bool bUnmark); const CustomAnimationEffectPtr& getEffect() const { return mpEffect; } @@ -76,20 +76,20 @@ public: // IPolyPolygonEditorController virtual void DeleteMarkedPoints(); - virtual BOOL IsDeleteMarkedPointsPossible() const; + virtual sal_Bool IsDeleteMarkedPointsPossible() const; virtual void RipUpAtMarkedPoints(); virtual bool IsRipUpAtMarkedPointsPossible() const; - virtual BOOL IsSetMarkedSegmentsKindPossible() const; + virtual sal_Bool IsSetMarkedSegmentsKindPossible() const; virtual SdrPathSegmentKind GetMarkedSegmentsKind() const; virtual void SetMarkedSegmentsKind(SdrPathSegmentKind eKind); - virtual BOOL IsSetMarkedPointsSmoothPossible() const; + virtual sal_Bool IsSetMarkedPointsSmoothPossible() const; virtual SdrPathSmoothKind GetMarkedPointsSmooth() const; virtual void SetMarkedPointsSmooth(SdrPathSmoothKind eKind); - virtual void CloseMarkedObjects(BOOL bToggle, BOOL bOpen ); + virtual void CloseMarkedObjects(sal_Bool bToggle, sal_Bool bOpen ); virtual bool IsOpenCloseMarkedObjectsPossible() const; virtual SdrObjClosedKind GetMarkedObjectsClosedState() const; diff --git a/sd/source/ui/annotations/annotationmanager.cxx b/sd/source/ui/annotations/annotationmanager.cxx index 1e64617edab8..cea71438ee4f 100755 --- a/sd/source/ui/annotations/annotationmanager.cxx +++ b/sd/source/ui/annotations/annotationmanager.cxx @@ -196,7 +196,7 @@ AnnotationManagerImpl::AnnotationManagerImpl( ViewShellBase& rViewShellBase ) { SdOptions* pOptions = SD_MOD()->GetSdOptions(mpDoc->GetDocumentType()); if( pOptions ) - mbShowAnnotations = pOptions->IsShowComments() == TRUE; + mbShowAnnotations = pOptions->IsShowComments() == sal_True; } // -------------------------------------------------------------------- @@ -338,7 +338,7 @@ void AnnotationManagerImpl::ExecuteDeleteAnnotation(SfxRequest& rReq) if( pArgs ) { const SfxPoolItem* pPoolItem = NULL; - if( SFX_ITEM_SET == pArgs->GetItemState( SID_DELETEALLBYAUTHOR_POSTIT, TRUE, &pPoolItem ) ) + if( SFX_ITEM_SET == pArgs->GetItemState( SID_DELETEALLBYAUTHOR_POSTIT, sal_True, &pPoolItem ) ) { OUString sAuthor( (( const SfxStringItem* ) pPoolItem )->GetValue() ); DeleteAnnotationsByAuthor( sAuthor ); @@ -354,7 +354,7 @@ void AnnotationManagerImpl::ExecuteDeleteAnnotation(SfxRequest& rReq) if( pArgs ) { const SfxPoolItem* pPoolItem = NULL; - if( SFX_ITEM_SET == pArgs->GetItemState( SID_DELETE_POSTIT, TRUE, &pPoolItem ) ) + if( SFX_ITEM_SET == pArgs->GetItemState( SID_DELETE_POSTIT, sal_True, &pPoolItem ) ) ( ( const SfxUnoAnyItem* ) pPoolItem )->GetValue() >>= xAnnotation; } } @@ -458,7 +458,7 @@ void AnnotationManagerImpl::ExecuteReplyToAnnotation( SfxRequest& rReq ) if( pArgs ) { const SfxPoolItem* pPoolItem = NULL; - if( SFX_ITEM_SET == pArgs->GetItemState( rReq.GetSlot(), TRUE, &pPoolItem ) ) + if( SFX_ITEM_SET == pArgs->GetItemState( rReq.GetSlot(), sal_True, &pPoolItem ) ) ( ( const SfxUnoAnyItem* ) pPoolItem )->GetValue() >>= xAnnotation; } @@ -469,7 +469,7 @@ void AnnotationManagerImpl::ExecuteReplyToAnnotation( SfxRequest& rReq ) std::auto_ptr< ::Outliner > pOutliner( new ::Outliner(GetAnnotationPool(),OUTLINERMODE_TEXTOBJECT) ); mpDoc->SetCalcFieldValueHdl( pOutliner.get() ); - pOutliner->SetUpdateMode( TRUE ); + pOutliner->SetUpdateMode( sal_True ); String aStr(SdResId(STR_ANNOTATION_REPLY)); OUString sAuthor( xAnnotation->getAuthor() ); @@ -489,8 +489,8 @@ void AnnotationManagerImpl::ExecuteReplyToAnnotation( SfxRequest& rReq ) aStr.Append( sQuote ); aStr.Append( String(RTL_CONSTASCII_USTRINGPARAM("\"\n") ) ); - USHORT nParaCount = aStr.GetTokenCount( '\n' ); - for( USHORT nPara = 0; nPara < nParaCount; nPara++ ) + sal_uInt16 nParaCount = aStr.GetTokenCount( '\n' ); + for( sal_uInt16 nPara = 0; nPara < nParaCount; nPara++ ) pOutliner->Insert( aStr.GetToken( nPara, '\n' ), LIST_APPEND, -1 ); if( pOutliner->GetParagraphCount() > 1 ) @@ -499,7 +499,7 @@ void AnnotationManagerImpl::ExecuteReplyToAnnotation( SfxRequest& rReq ) aAnswerSet.Put(SvxPostureItem(ITALIC_NORMAL,EE_CHAR_ITALIC)); ESelection aSel; - aSel.nEndPara = (USHORT)pOutliner->GetParagraphCount()-2; + aSel.nEndPara = (sal_uInt16)pOutliner->GetParagraphCount()-2; aSel.nEndPos = pOutliner->GetText( pOutliner->GetParagraph( aSel.nEndPara ) ).Len(); pOutliner->QuickSetAttribs( aAnswerSet, aSel ); @@ -721,7 +721,7 @@ void AnnotationManagerImpl::SelectNextAnnotation(bool bForeward) ::boost::shared_ptr<DrawViewShell> pDrawViewShell(::boost::dynamic_pointer_cast<DrawViewShell>(mrBase.GetMainViewShell())); if (pDrawViewShell.get() != NULL) { - pDrawViewShell->ChangeEditMode(pPage->IsMasterPage() ? EM_MASTERPAGE : EM_PAGE, FALSE); + pDrawViewShell->ChangeEditMode(pPage->IsMasterPage() ? EM_MASTERPAGE : EM_PAGE, sal_False); pDrawViewShell->SwitchPage((pPage->GetPageNum() - 1) >> 1); SfxDispatcher* pDispatcher = getDispatcher( mrBase ); @@ -749,7 +749,7 @@ void AnnotationManagerImpl::SelectNextAnnotation(bool bForeward) WB_YES_NO | WB_DEF_YES, String(SdResId(nStringId))); aQuestionBox.SetImage (QueryBox::GetStandardImage()); - USHORT nBoxResult = aQuestionBox.Execute(); + sal_uInt16 nBoxResult = aQuestionBox.Execute(); if(nBoxResult != BUTTONID_YES) break; } @@ -777,7 +777,7 @@ void AnnotationManagerImpl::onTagDeselected( AnnotationTag& rTag ) // -------------------------------------------------------------------- -void AnnotationManagerImpl::SelectAnnotation( ::com::sun::star::uno::Reference< ::com::sun::star::office::XAnnotation > xAnnotation, bool bEdit /* = FALSE */ ) +void AnnotationManagerImpl::SelectAnnotation( ::com::sun::star::uno::Reference< ::com::sun::star::office::XAnnotation > xAnnotation, bool bEdit /* = sal_False */ ) { mxSelectedAnnotation = xAnnotation; @@ -1021,7 +1021,7 @@ void AnnotationManagerImpl::ExecuteAnnotationContextMenu( Reference< XAnnotation aStr.SearchAndReplaceAscii("%1", aReplace); pMenu->SetItemText( SID_DELETEALLBYAUTHOR_POSTIT, aStr ); pMenu->EnableItem( SID_REPLYTO_POSTIT, (sAuthor != sCurrentAuthor) && !bReadOnly ); - pMenu->EnableItem( SID_DELETE_POSTIT, (xAnnotation.is() && !bReadOnly) ? TRUE : FALSE ); + pMenu->EnableItem( SID_DELETE_POSTIT, (xAnnotation.is() && !bReadOnly) ? sal_True : sal_False ); pMenu->EnableItem( SID_DELETEALLBYAUTHOR_POSTIT, !bReadOnly ); pMenu->EnableItem( SID_DELETEALL_POSTIT, !bReadOnly ); @@ -1029,11 +1029,11 @@ void AnnotationManagerImpl::ExecuteAnnotationContextMenu( Reference< XAnnotation { if( pAnnotationWindow->IsProtected() || bReadOnly ) { - pMenu->EnableItem( SID_ATTR_CHAR_WEIGHT, FALSE ); - pMenu->EnableItem( SID_ATTR_CHAR_POSTURE, FALSE ); - pMenu->EnableItem( SID_ATTR_CHAR_UNDERLINE, FALSE ); - pMenu->EnableItem( SID_ATTR_CHAR_STRIKEOUT, FALSE ); - pMenu->EnableItem( SID_PASTE, FALSE ); + pMenu->EnableItem( SID_ATTR_CHAR_WEIGHT, sal_False ); + pMenu->EnableItem( SID_ATTR_CHAR_POSTURE, sal_False ); + pMenu->EnableItem( SID_ATTR_CHAR_UNDERLINE, sal_False ); + pMenu->EnableItem( SID_ATTR_CHAR_STRIKEOUT, sal_False ); + pMenu->EnableItem( SID_PASTE, sal_False ); } else { @@ -1069,14 +1069,14 @@ void AnnotationManagerImpl::ExecuteAnnotationContextMenu( Reference< XAnnotation pMenu->EnableItem( SID_COPY, pAnnotationWindow->getView()->HasSelection() ); } - USHORT nId = 0; + sal_uInt16 nId = 0; // set slot images Reference< ::com::sun::star::frame::XFrame > xFrame( mrBase.GetMainViewShell()->GetViewFrame()->GetFrame().GetFrameInterface() ); if( xFrame.is() ) { const bool bHighContrast = Application::GetSettings().GetStyleSettings().GetHighContrastMode(); - for( USHORT nPos = 0; nPos < pMenu->GetItemCount(); nPos++ ) + for( sal_uInt16 nPos = 0; nPos < pMenu->GetItemCount(); nPos++ ) { nId = pMenu->GetItemId( nPos ); if( pMenu->IsItemEnabled( nId ) ) diff --git a/sd/source/ui/annotations/annotationmanagerimpl.hxx b/sd/source/ui/annotations/annotationmanagerimpl.hxx index 70b95c2a509b..af88c852ff73 100755 --- a/sd/source/ui/annotations/annotationmanagerimpl.hxx +++ b/sd/source/ui/annotations/annotationmanagerimpl.hxx @@ -79,7 +79,7 @@ public: void SelectNextAnnotation(bool bForeward); - void SelectAnnotation( ::com::sun::star::uno::Reference< ::com::sun::star::office::XAnnotation > xAnnotation, bool bEdit = FALSE ); + void SelectAnnotation( ::com::sun::star::uno::Reference< ::com::sun::star::office::XAnnotation > xAnnotation, bool bEdit = sal_False ); void GetSelectedAnnotation( ::com::sun::star::uno::Reference< ::com::sun::star::office::XAnnotation >& xAnnotation ); void InsertAnnotation(); @@ -135,7 +135,7 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::office::XAnnotation > mxSelectedAnnotation; bool mbShowAnnotations; - ULONG mnUpdateTagsEvent; + sal_uLong mnUpdateTagsEvent; Font maFont; }; diff --git a/sd/source/ui/annotations/annotationtag.cxx b/sd/source/ui/annotations/annotationtag.cxx index 6439245a94c0..f73ff0377102 100644..100755 --- a/sd/source/ui/annotations/annotationtag.cxx +++ b/sd/source/ui/annotations/annotationtag.cxx @@ -161,7 +161,7 @@ bool AnnotationDragMove::EndSdrDrag(bool /*bCopy*/) Hide(); if( mxTag.is() ) mxTag->Move( DragStat().GetDX(), DragStat().GetDY() ); - return TRUE; + return sal_True; } void AnnotationDragMove::CancelSdrDrag() @@ -177,7 +177,7 @@ public: AnnotationHdl( const SmartTagReference& xTag, const Reference< XAnnotation >& xAnnotation, const Point& rPnt ); virtual ~AnnotationHdl(); virtual void CreateB2dIAObject(); - virtual BOOL IsFocusHdl() const; + virtual sal_Bool IsFocusHdl() const; virtual Pointer GetSdrDragPointer() const; virtual bool isMarkable() const; @@ -250,10 +250,10 @@ void AnnotationHdl::CreateB2dIAObject() pOverlayObject = new ::sdr::overlay::OverlayAnimatedBitmapEx(aPosition, aBitmapEx, aBitmapEx2, nBlinkTime, 0, 0, 0, 0 ); /* - (UINT16)(aBitmapEx.GetSizePixel().Width() - 1) >> 1, - (UINT16)(aBitmapEx.GetSizePixel().Height() - 1) >> 1, - (UINT16)(aBitmapEx2.GetSizePixel().Width() - 1) >> 1, - (UINT16)(aBitmapEx2.GetSizePixel().Height() - 1) >> 1); + (sal_uInt16)(aBitmapEx.GetSizePixel().Width() - 1) >> 1, + (sal_uInt16)(aBitmapEx.GetSizePixel().Height() - 1) >> 1, + (sal_uInt16)(aBitmapEx2.GetSizePixel().Width() - 1) >> 1, + (sal_uInt16)(aBitmapEx2.GetSizePixel().Height() - 1) >> 1); */ } else @@ -273,9 +273,9 @@ void AnnotationHdl::CreateB2dIAObject() // -------------------------------------------------------------------- -BOOL AnnotationHdl::IsFocusHdl() const +sal_Bool AnnotationHdl::IsFocusHdl() const { - return TRUE; + return sal_True; } // -------------------------------------------------------------------- @@ -377,7 +377,7 @@ bool AnnotationTag::KeyInput( const KeyEvent& rKEvt ) if( !mxAnnotation.is() ) return false; - USHORT nCode = rKEvt.GetKeyCode().GetCode(); + sal_uInt16 nCode = rKEvt.GetKeyCode().GetCode(); switch( nCode ) { case KEY_DELETE: @@ -517,31 +517,31 @@ void AnnotationTag::CheckPossibilities() // -------------------------------------------------------------------- -ULONG AnnotationTag::GetMarkablePointCount() const +sal_uLong AnnotationTag::GetMarkablePointCount() const { return 0; } // -------------------------------------------------------------------- -ULONG AnnotationTag::GetMarkedPointCount() const +sal_uLong AnnotationTag::GetMarkedPointCount() const { return 0; } // -------------------------------------------------------------------- -BOOL AnnotationTag::MarkPoint(SdrHdl& /*rHdl*/, BOOL /*bUnmark*/ ) +sal_Bool AnnotationTag::MarkPoint(SdrHdl& /*rHdl*/, sal_Bool /*bUnmark*/ ) { - BOOL bRet=FALSE; + sal_Bool bRet=sal_False; return bRet; } // -------------------------------------------------------------------- -BOOL AnnotationTag::MarkPoints(const Rectangle* /*pRect*/, BOOL /*bUnmark*/ ) +sal_Bool AnnotationTag::MarkPoints(const Rectangle* /*pRect*/, sal_Bool /*bUnmark*/ ) { - BOOL bChgd=FALSE; + sal_Bool bChgd=sal_False; return bChgd; } @@ -638,7 +638,7 @@ BitmapEx AnnotationTag::CreateAnnotationBitmap( bool bSelected ) const int BORDER_Y = 4; // pixels maSize = Size( aVDev.GetTextWidth( sAuthor ) + 2*BORDER_X, aVDev.GetTextHeight() + 2*BORDER_Y ); - aVDev.SetOutputSizePixel( maSize, FALSE ); + aVDev.SetOutputSizePixel( maSize, sal_False ); Color aBorderColor( maColor ); @@ -692,7 +692,7 @@ void AnnotationTag::OpenPopup( bool bEdit ) mpAnnotationWindow->InitControls(); mpAnnotationWindow->setAnnotation(mxAnnotation); - USHORT nArrangeIndex = 0; + sal_uInt16 nArrangeIndex = 0; Point aPopupPos( FloatingWindow::CalcFloatingPosition( mpAnnotationWindow.get(), aRect, FLOATWIN_POPUPMODE_RIGHT, nArrangeIndex ) ); Size aPopupSize( 320, 240 ); @@ -760,7 +760,7 @@ IMPL_LINK(AnnotationTag, WindowEventHandler, VclWindowEvent*, pEvent) if( pHdl ) { mrView.BrkAction(); - const USHORT nDrgLog = (USHORT)pWindow->PixelToLogic(Size(DRGPIX,0)).Width(); + const sal_uInt16 nDrgLog = (sal_uInt16)pWindow->PixelToLogic(Size(DRGPIX,0)).Width(); rtl::Reference< AnnotationTag > xTag( this ); @@ -776,7 +776,7 @@ IMPL_LINK(AnnotationTag, WindowEventHandler, VclWindowEvent*, pEvent) } } } - return TRUE; + return sal_True; } IMPL_LINK( AnnotationTag, ClosePopupHdl, void *, EMPTYARG ) diff --git a/sd/source/ui/annotations/annotationtag.hxx b/sd/source/ui/annotations/annotationtag.hxx index ea0d57fd3e3e..cce7e73eb6f3 100644..100755 --- a/sd/source/ui/annotations/annotationtag.hxx +++ b/sd/source/ui/annotations/annotationtag.hxx @@ -60,11 +60,11 @@ public: virtual bool Command( const CommandEvent& rCEvt ); // callbacks from sdr view - virtual ULONG GetMarkablePointCount() const; - virtual ULONG GetMarkedPointCount() const; - virtual BOOL MarkPoint(SdrHdl& rHdl, BOOL bUnmark=FALSE); + virtual sal_uLong GetMarkablePointCount() const; + virtual sal_uLong GetMarkedPointCount() const; + virtual sal_Bool MarkPoint(SdrHdl& rHdl, sal_Bool bUnmark=sal_False); virtual void CheckPossibilities(); - virtual BOOL MarkPoints(const Rectangle* pRect, BOOL bUnmark); + virtual sal_Bool MarkPoints(const Rectangle* pRect, sal_Bool bUnmark); void Move( int nDX, int nDY ); bool OnMove( const KeyEvent& rKEvt ); @@ -96,7 +96,7 @@ private: int mnIndex; const Font& mrFont; Size maSize; - ULONG mnClosePopupEvent; + sal_uLong mnClosePopupEvent; ::Window* mpListenWindow; Point maMouseDownPos; }; diff --git a/sd/source/ui/annotations/annotationwindow.cxx b/sd/source/ui/annotations/annotationwindow.cxx index a4642bb68096..c84bf7d76aa3 100755 --- a/sd/source/ui/annotations/annotationwindow.cxx +++ b/sd/source/ui/annotations/annotationwindow.cxx @@ -114,11 +114,11 @@ extern OUString getAnnotationDateTimeString( const Reference< XAnnotation >& xAn extern SfxItemPool* GetAnnotationPool(); extern com::sun::star::util::DateTime getCurrentDateTime(); -Color ColorFromAlphaColor(UINT8 aTransparency, Color &aFront, Color &aBack ) +Color ColorFromAlphaColor(sal_uInt8 aTransparency, Color &aFront, Color &aBack ) { - return Color((UINT8)(aFront.GetRed() * aTransparency/(double)255 + aBack.GetRed() * (1-aTransparency/(double)255)), - (UINT8)(aFront.GetGreen() * aTransparency/(double)255 + aBack.GetGreen() * (1-aTransparency/(double)255)), - (UINT8)(aFront.GetBlue() * aTransparency/(double)255 + aBack.GetBlue() * (1-aTransparency/(double)255))); + return Color((sal_uInt8)(aFront.GetRed() * aTransparency/(double)255 + aBack.GetRed() * (1-aTransparency/(double)255)), + (sal_uInt8)(aFront.GetGreen() * aTransparency/(double)255 + aBack.GetGreen() * (1-aTransparency/(double)255)), + (sal_uInt8)(aFront.GetBlue() * aTransparency/(double)255 + aBack.GetBlue() * (1-aTransparency/(double)255))); } /************ AnnotationTextWindow **********************************/ @@ -160,7 +160,7 @@ void AnnotationTextWindow::Paint( const Rectangle& rRect) void AnnotationTextWindow::KeyInput( const KeyEvent& rKeyEvt ) { const KeyCode& rKeyCode = rKeyEvt.GetKeyCode(); - USHORT nKey = rKeyCode.GetCode(); + sal_uInt16 nKey = rKeyCode.GetCode(); if ((rKeyCode.IsMod1() && rKeyCode.IsMod2()) && ((nKey == KEY_PAGEUP) || (nKey == KEY_PAGEDOWN))) { @@ -211,7 +211,7 @@ void AnnotationTextWindow::MouseButtonDown( const MouseEvent& rMEvt ) GrabFocus(); if ( mpOutlinerView ) mpOutlinerView->MouseButtonDown( rMEvt ); - // todo mpOutlinerView->DocView()->GetViewFrame()->GetBindings().InvalidateAll(FALSE); + // todo mpOutlinerView->DocView()->GetViewFrame()->GetBindings().InvalidateAll(sal_False); } void AnnotationTextWindow::MouseButtonUp( const MouseEvent& rMEvt ) @@ -338,7 +338,7 @@ void AnnotationWindow::InitControls() mpOutliner = new ::Outliner(GetAnnotationPool(),OUTLINERMODE_TEXTOBJECT); Doc()->SetCalcFieldValueHdl( mpOutliner ); - mpOutliner->SetUpdateMode( TRUE ); + mpOutliner->SetUpdateMode( sal_True ); Rescale(); OutputDevice* pDev = Doc()->GetRefDevice(); @@ -368,7 +368,7 @@ void AnnotationWindow::InitControls() mpVScrollbar->EnableDrag(); // mpVScrollbar->AddEventListener( LINK( this, AnnotationWindow, WindowEventListener ) ); - ULONG nCntrl = mpOutliner->GetControlWord(); + sal_uLong nCntrl = mpOutliner->GetControlWord(); nCntrl |= EE_CNTRL_PASTESPECIAL | EE_CNTRL_AUTOCORRECT | EV_CNTRL_AUTOSCROLL | EE_CNTRL_NOCOLORS; /* if (pVOpt->IsFieldShadings()) @@ -381,14 +381,14 @@ void AnnotationWindow::InitControls() nCntrl &= ~EE_CNTRL_ONLINESPELLING; */ mpOutliner->SetControlWord(nCntrl); -// mpOutliner->SetFlatMode( TRUE ); +// mpOutliner->SetFlatMode( sal_True ); Engine()->SetModifyHdl( Link() ); - Engine()->EnableUndo( FALSE ); + Engine()->EnableUndo( sal_False ); Engine()->ClearModifyFlag(); Engine()->GetUndoManager().Clear(); - Engine()->EnableUndo( TRUE ); + Engine()->EnableUndo( sal_True ); Engine()->SetModifyHdl( LINK( this, AnnotationWindow, ModifyHdl ) ); Invalidate(); @@ -509,7 +509,7 @@ void AnnotationWindow::SetLanguage(const SvxLanguageItem aNewItem) Engine()->SetModifyHdl( Link() ); ESelection aOld = getView()->GetSelection(); - ESelection aNewSelection( 0, 0, (USHORT)Engine()->GetParagraphCount()-1, USHRT_MAX ); + ESelection aNewSelection( 0, 0, (sal_uInt16)Engine()->GetParagraphCount()-1, USHRT_MAX ); getView()->SetSelection( aNewSelection ); SfxItemSet aEditAttr(getView()->GetAttribs()); aEditAttr.Put(aNewItem); @@ -798,7 +798,7 @@ void AnnotationWindow::GetFocus() FloatingWindow::GetFocus(); } -void AnnotationWindow::ExecuteSlot( USHORT nSID ) +void AnnotationWindow::ExecuteSlot( sal_uInt16 nSID ) { if( nSID == SID_COPY ) { diff --git a/sd/source/ui/annotations/annotationwindow.hxx b/sd/source/ui/annotations/annotationwindow.hxx index 264cb2fa1afe..09a03e02d87d 100755 --- a/sd/source/ui/annotations/annotationwindow.hxx +++ b/sd/source/ui/annotations/annotationwindow.hxx @@ -124,7 +124,7 @@ class AnnotationWindow : public FloatingWindow void setAnnotation( const ::com::sun::star::uno::Reference< ::com::sun::star::office::XAnnotation >& xAnnotation, bool bGrabFocus = false ); const ::com::sun::star::uno::Reference< ::com::sun::star::office::XAnnotation >& getAnnotation() const { return mxAnnotation; } - void ExecuteSlot( USHORT nSID ); + void ExecuteSlot( sal_uInt16 nSID ); ScrollBar* Scrollbar() { return mpVScrollbar;} diff --git a/sd/source/ui/app/optsitem.cxx b/sd/source/ui/app/optsitem.cxx index 3366a0ea98db..1b68e3ee0031 100644 --- a/sd/source/ui/app/optsitem.cxx +++ b/sd/source/ui/app/optsitem.cxx @@ -110,7 +110,7 @@ void SdOptionsItem::SetModified() // - SdOptionsGeneric - // -------------------- -SdOptionsGeneric::SdOptionsGeneric( USHORT nConfigId, const OUString& rSubTree ) : +SdOptionsGeneric::SdOptionsGeneric( sal_uInt16 nConfigId, const OUString& rSubTree ) : maSubTree ( rSubTree ), mpCfgItem ( NULL ), mnConfigId ( nConfigId ), @@ -136,12 +136,12 @@ void SdOptionsGeneric::Init() const { const Any* pValues = aValues.getConstArray(); - pThis->EnableModify( FALSE ); + pThis->EnableModify( sal_False ); pThis->mbInit = pThis->ReadData( pValues ); - pThis->EnableModify( TRUE ); + pThis->EnableModify( sal_True ); } else - pThis->mbInit = TRUE; + pThis->mbInit = sal_True; } } @@ -175,7 +175,7 @@ void SdOptionsGeneric::Commit( SdOptionsItem& rCfgItem ) const Sequence< OUString > SdOptionsGeneric::GetPropertyNames() const { - ULONG nCount; + sal_uLong nCount; const char** ppPropNames; GetPropNameArray( ppPropNames, nCount ); @@ -183,7 +183,7 @@ Sequence< OUString > SdOptionsGeneric::GetPropertyNames() const Sequence< OUString > aNames( nCount ); OUString* pNames = aNames.getArray(); - for( ULONG i = 0; i < nCount; i++ ) + for( sal_uLong i = 0; i < nCount; i++ ) pNames[ i ] = OUString::createFromAscii( ppPropNames[ i ] ); return aNames; @@ -213,26 +213,26 @@ bool SdOptionsGeneric::isMetricSystem() |* \************************************************************************/ -SdOptionsLayout::SdOptionsLayout( USHORT nConfigId, BOOL bUseConfig ) : +SdOptionsLayout::SdOptionsLayout( sal_uInt16 nConfigId, sal_Bool bUseConfig ) : SdOptionsGeneric( nConfigId, bUseConfig ? ( ( SDCFG_DRAW == nConfigId ) ? B2U( "Office.Draw/Layout" ) : B2U( "Office.Impress/Layout" ) ) : OUString() ), - bRuler( TRUE ), - bMoveOutline( TRUE ), - bDragStripes( FALSE ), - bHandlesBezier( FALSE ), - bHelplines( TRUE ), - nMetric((UINT16)(isMetricSystem() ? FUNIT_CM : FUNIT_INCH)), + bRuler( sal_True ), + bMoveOutline( sal_True ), + bDragStripes( sal_False ), + bHandlesBezier( sal_False ), + bHelplines( sal_True ), + nMetric((sal_uInt16)(isMetricSystem() ? FUNIT_CM : FUNIT_INCH)), nDefTab( 1250 ) { - EnableModify( TRUE ); + EnableModify( sal_True ); } // ----------------------------------------------------------------------------- -BOOL SdOptionsLayout::operator==( const SdOptionsLayout& rOpt ) const +sal_Bool SdOptionsLayout::operator==( const SdOptionsLayout& rOpt ) const { return( IsRulerVisible() == rOpt.IsRulerVisible() && IsMoveOutline() == rOpt.IsMoveOutline() && @@ -245,7 +245,7 @@ BOOL SdOptionsLayout::operator==( const SdOptionsLayout& rOpt ) const // ----------------------------------------------------------------------------- -void SdOptionsLayout::GetPropNameArray( const char**& ppNames, ULONG& rCount ) const +void SdOptionsLayout::GetPropNameArray( const char**& ppNames, sal_uLong& rCount ) const { static const char* aPropNamesMetric[] = { @@ -279,22 +279,22 @@ void SdOptionsLayout::GetPropNameArray( const char**& ppNames, ULONG& rCount ) c // ----------------------------------------------------------------------------- -BOOL SdOptionsLayout::ReadData( const Any* pValues ) +sal_Bool SdOptionsLayout::ReadData( const Any* pValues ) { if( pValues[0].hasValue() ) SetRulerVisible( *(sal_Bool*) pValues[ 0 ].getValue() ); if( pValues[1].hasValue() ) SetHandlesBezier( *(sal_Bool*) pValues[ 1 ].getValue() ); if( pValues[2].hasValue() ) SetMoveOutline( *(sal_Bool*) pValues[ 2 ].getValue() ); if( pValues[3].hasValue() ) SetDragStripes( *(sal_Bool*) pValues[ 3 ].getValue() ); if( pValues[4].hasValue() ) SetHelplines( *(sal_Bool*) pValues[ 4 ].getValue() ); - if( pValues[5].hasValue() ) SetMetric( (UINT16) *(sal_Int32*) pValues[ 5 ].getValue() ); - if( pValues[6].hasValue() ) SetDefTab( (UINT16) *(sal_Int32*) pValues[ 6 ].getValue() ); + if( pValues[5].hasValue() ) SetMetric( (sal_uInt16) *(sal_Int32*) pValues[ 5 ].getValue() ); + if( pValues[6].hasValue() ) SetDefTab( (sal_uInt16) *(sal_Int32*) pValues[ 6 ].getValue() ); - return TRUE; + return sal_True; } // ----------------------------------------------------------------------------- -BOOL SdOptionsLayout::WriteData( Any* pValues ) const +sal_Bool SdOptionsLayout::WriteData( Any* pValues ) const { pValues[ 0 ] <<= IsRulerVisible(); pValues[ 1 ] <<= IsHandlesBezier(); @@ -304,7 +304,7 @@ BOOL SdOptionsLayout::WriteData( Any* pValues ) const pValues[ 5 ] <<= (sal_Int32) GetMetric(); pValues[ 6 ] <<= (sal_Int32) GetDefTab(); - return TRUE; + return sal_True; } /************************************************************************* @@ -313,17 +313,17 @@ BOOL SdOptionsLayout::WriteData( Any* pValues ) const |* \************************************************************************/ -SdOptionsLayoutItem::SdOptionsLayoutItem( USHORT _nWhich ) +SdOptionsLayoutItem::SdOptionsLayoutItem( sal_uInt16 _nWhich ) : SfxPoolItem ( _nWhich ) -, maOptionsLayout ( 0, FALSE ) +, maOptionsLayout ( 0, sal_False ) { } // ---------------------------------------------------------------------- -SdOptionsLayoutItem::SdOptionsLayoutItem( USHORT _nWhich, SdOptions* pOpts, ::sd::FrameView* pView ) +SdOptionsLayoutItem::SdOptionsLayoutItem( sal_uInt16 _nWhich, SdOptions* pOpts, ::sd::FrameView* pView ) : SfxPoolItem ( _nWhich ) -, maOptionsLayout ( 0, FALSE ) +, maOptionsLayout ( 0, sal_False ) { if( pOpts ) { @@ -388,26 +388,26 @@ void SdOptionsLayoutItem::SetOptions( SdOptions* pOpts ) const |* \************************************************************************/ -SdOptionsContents::SdOptionsContents( USHORT nConfigId, BOOL bUseConfig ) : +SdOptionsContents::SdOptionsContents( sal_uInt16 nConfigId, sal_Bool bUseConfig ) : SdOptionsGeneric( nConfigId, bUseConfig ? ( ( SDCFG_DRAW == nConfigId ) ? B2U( "Office.Draw/Content" ) : B2U( "Office.Impress/Content" ) ) : OUString() ) { - EnableModify( TRUE ); + EnableModify( sal_True ); } // ----------------------------------------------------------------------------- -BOOL SdOptionsContents::operator==(const SdOptionsContents&) const +sal_Bool SdOptionsContents::operator==(const SdOptionsContents&) const { return true; } // ----------------------------------------------------------------------------- -void SdOptionsContents::GetPropNameArray( const char**& ppNames, ULONG& rCount ) const +void SdOptionsContents::GetPropNameArray( const char**& ppNames, sal_uLong& rCount ) const { static const char* aPropNames[] = { @@ -423,22 +423,22 @@ void SdOptionsContents::GetPropNameArray( const char**& ppNames, ULONG& rCount ) // ----------------------------------------------------------------------------- -BOOL SdOptionsContents::ReadData(const Any*) +sal_Bool SdOptionsContents::ReadData(const Any*) { - return TRUE; + return sal_True; } // ----------------------------------------------------------------------------- -BOOL SdOptionsContents::WriteData( Any* pValues ) const +sal_Bool SdOptionsContents::WriteData( Any* pValues ) const { //#i80528# no draft anymore - pValues[ 0 ] <<= (BOOL)false; - pValues[ 1 ] <<= (BOOL)false; - pValues[ 2 ] <<= (BOOL)false; - pValues[ 3 ] <<= (BOOL)false; + pValues[ 0 ] <<= (sal_Bool)false; + pValues[ 1 ] <<= (sal_Bool)false; + pValues[ 2 ] <<= (sal_Bool)false; + pValues[ 3 ] <<= (sal_Bool)false; - return TRUE; + return sal_True; } /************************************************************************* @@ -447,9 +447,9 @@ BOOL SdOptionsContents::WriteData( Any* pValues ) const |* \************************************************************************/ -SdOptionsContentsItem::SdOptionsContentsItem(USHORT _nWhich, SdOptions*, ::sd::FrameView*) +SdOptionsContentsItem::SdOptionsContentsItem(sal_uInt16 _nWhich, SdOptions*, ::sd::FrameView*) : SfxPoolItem ( _nWhich ) -, maOptionsContents ( 0, FALSE ) +, maOptionsContents ( 0, sal_False ) { } @@ -481,7 +481,7 @@ void SdOptionsContentsItem::SetOptions(SdOptions*) const |* \************************************************************************/ -SdOptionsMisc::SdOptionsMisc( USHORT nConfigId, BOOL bUseConfig ) : +SdOptionsMisc::SdOptionsMisc( sal_uInt16 nConfigId, sal_Bool bUseConfig ) : SdOptionsGeneric( nConfigId, bUseConfig ? ( ( SDCFG_DRAW == nConfigId ) ? B2U( "Office.Draw/Misc" ) : @@ -490,28 +490,28 @@ SdOptionsMisc::SdOptionsMisc( USHORT nConfigId, BOOL bUseConfig ) : // #97016# nDefaultObjectSizeWidth(8000), nDefaultObjectSizeHeight(5000), - bStartWithTemplate( TRUE ), - bMarkedHitMovesAlways( TRUE ), - bMoveOnlyDragging( FALSE ), - bCrookNoContortion( FALSE ), + bStartWithTemplate( sal_True ), + bMarkedHitMovesAlways( sal_True ), + bMoveOnlyDragging( sal_False ), + bCrookNoContortion( sal_False ), bQuickEdit( GetConfigId() != SDCFG_DRAW ), - bMasterPageCache( TRUE ), - bDragWithCopy( FALSE ), - bPickThrough( TRUE ), - bBigHandles( FALSE ), - bDoubleClickTextEdit( TRUE ), - bClickChangeRotation( FALSE ), - bStartWithActualPage( FALSE ), - bSolidDragging( TRUE ), - bSolidMarkHdl( TRUE ), - bSummationOfParagraphs( FALSE ), + bMasterPageCache( sal_True ), + bDragWithCopy( sal_False ), + bPickThrough( sal_True ), + bBigHandles( sal_False ), + bDoubleClickTextEdit( sal_True ), + bClickChangeRotation( sal_False ), + bStartWithActualPage( sal_False ), + bSolidDragging( sal_True ), + bSolidMarkHdl( sal_True ), + bSummationOfParagraphs( sal_False ), // #90356# - bShowUndoDeleteWarning( TRUE ), - bSlideshowRespectZOrder( TRUE ), - bShowComments( TRUE ), - bPreviewNewEffects( TRUE ), - bPreviewChangedEffects( FALSE ), - bPreviewTransitions( TRUE ), + bShowUndoDeleteWarning( sal_True ), + bSlideshowRespectZOrder( sal_True ), + bShowComments( sal_True ), + bPreviewNewEffects( sal_True ), + bPreviewChangedEffects( sal_False ), + bPreviewTransitions( sal_True ), mnDisplay( 0 ), mnPenColor( 0xff0000 ), mnPenWidth( 150.0 ), @@ -520,12 +520,12 @@ SdOptionsMisc::SdOptionsMisc( USHORT nConfigId, BOOL bUseConfig ) : // formatting. mnPrinterIndependentLayout (1) { - EnableModify( TRUE ); + EnableModify( sal_True ); } // ----------------------------------------------------------------------------- -BOOL SdOptionsMisc::operator==( const SdOptionsMisc& rOpt ) const +sal_Bool SdOptionsMisc::operator==( const SdOptionsMisc& rOpt ) const { return( IsStartWithTemplate() == rOpt.IsStartWithTemplate() && IsMarkedHitMovesAlways() == rOpt.IsMarkedHitMovesAlways() && @@ -562,7 +562,7 @@ BOOL SdOptionsMisc::operator==( const SdOptionsMisc& rOpt ) const // ----------------------------------------------------------------------------- -void SdOptionsMisc::GetPropNameArray( const char**& ppNames, ULONG& rCount ) const +void SdOptionsMisc::GetPropNameArray( const char**& ppNames, sal_uLong& rCount ) const { static const char* aPropNames[] = { @@ -610,7 +610,7 @@ void SdOptionsMisc::GetPropNameArray( const char**& ppNames, ULONG& rCount ) con // ----------------------------------------------------------------------------- -BOOL SdOptionsMisc::ReadData( const Any* pValues ) +sal_Bool SdOptionsMisc::ReadData( const Any* pValues ) { if( pValues[0].hasValue() ) SetMarkedHitMovesAlways( *(sal_Bool*) pValues[ 0 ].getValue() ); if( pValues[1].hasValue() ) SetCrookNoContortion( *(sal_Bool*) pValues[ 1 ].getValue() ); @@ -667,12 +667,12 @@ BOOL SdOptionsMisc::ReadData( const Any* pValues ) SetPresentationPenWidth( getSafeValue< double >( pValues[ 26 ] ) ); } - return TRUE; + return sal_True; } // ----------------------------------------------------------------------------- -BOOL SdOptionsMisc::WriteData( Any* pValues ) const +sal_Bool SdOptionsMisc::WriteData( Any* pValues ) const { pValues[ 0 ] <<= IsMarkedHitMovesAlways(); pValues[ 1 ] <<= IsCrookNoContortion(); @@ -713,7 +713,7 @@ BOOL SdOptionsMisc::WriteData( Any* pValues ) const pValues[ 26 ] <<= GetPresentationPenWidth(); } - return TRUE; + return sal_True; } /************************************************************************* @@ -722,17 +722,17 @@ BOOL SdOptionsMisc::WriteData( Any* pValues ) const |* \************************************************************************/ -SdOptionsMiscItem::SdOptionsMiscItem( USHORT _nWhich ) +SdOptionsMiscItem::SdOptionsMiscItem( sal_uInt16 _nWhich ) : SfxPoolItem ( _nWhich ) -, maOptionsMisc ( 0, FALSE ) +, maOptionsMisc ( 0, sal_False ) { } // ---------------------------------------------------------------------- -SdOptionsMiscItem::SdOptionsMiscItem( USHORT _nWhich, SdOptions* pOpts, ::sd::FrameView* pView ) +SdOptionsMiscItem::SdOptionsMiscItem( sal_uInt16 _nWhich, SdOptions* pOpts, ::sd::FrameView* pView ) : SfxPoolItem ( _nWhich ) -, maOptionsMisc ( 0, FALSE ) +, maOptionsMisc ( 0, sal_False ) { if( pOpts ) { @@ -768,8 +768,8 @@ SdOptionsMiscItem::SdOptionsMiscItem( USHORT _nWhich, SdOptions* pOpts, ::sd::Fr maOptionsMisc.SetMasterPagePaintCaching( pView->IsMasterPagePaintCaching() ); maOptionsMisc.SetDragWithCopy( pView->IsDragWithCopy() ); - maOptionsMisc.SetPickThrough( (BOOL)pView->GetModel()->IsPickThroughTransparentTextFrames() ); - maOptionsMisc.SetBigHandles( (BOOL)pView->IsBigHandles() ); + maOptionsMisc.SetPickThrough( (sal_Bool)pView->GetModel()->IsPickThroughTransparentTextFrames() ); + maOptionsMisc.SetBigHandles( (sal_Bool)pView->IsBigHandles() ); maOptionsMisc.SetDoubleClickTextEdit( pView->IsDoubleClickTextEdit() ); maOptionsMisc.SetClickChangeRotation( pView->IsClickChangeRotation() ); maOptionsMisc.SetSolidDragging( pView->IsSolidDragging() ); @@ -855,30 +855,30 @@ void SdOptionsMiscItem::SetOptions( SdOptions* pOpts ) const |* \************************************************************************/ -SdOptionsSnap::SdOptionsSnap( USHORT nConfigId, BOOL bUseConfig ) : +SdOptionsSnap::SdOptionsSnap( sal_uInt16 nConfigId, sal_Bool bUseConfig ) : SdOptionsGeneric( nConfigId, bUseConfig ? ( ( SDCFG_DRAW == nConfigId ) ? B2U( "Office.Draw/Snap" ) : B2U( "Office.Impress/Snap" ) ) : OUString() ), - bSnapHelplines( TRUE ), - bSnapBorder( TRUE ), - bSnapFrame( FALSE ), - bSnapPoints( FALSE ), - bOrtho( FALSE ), - bBigOrtho( TRUE ), - bRotate( FALSE ), + bSnapHelplines( sal_True ), + bSnapBorder( sal_True ), + bSnapFrame( sal_False ), + bSnapPoints( sal_False ), + bOrtho( sal_False ), + bBigOrtho( sal_True ), + bRotate( sal_False ), nSnapArea( 5 ), nAngle( 1500 ), nBezAngle( 1500 ) { - EnableModify( TRUE ); + EnableModify( sal_True ); } // ----------------------------------------------------------------------------- -BOOL SdOptionsSnap::operator==( const SdOptionsSnap& rOpt ) const +sal_Bool SdOptionsSnap::operator==( const SdOptionsSnap& rOpt ) const { return( IsSnapHelplines() == rOpt.IsSnapHelplines() && IsSnapBorder() == rOpt.IsSnapBorder() && @@ -894,7 +894,7 @@ BOOL SdOptionsSnap::operator==( const SdOptionsSnap& rOpt ) const // ----------------------------------------------------------------------------- -void SdOptionsSnap::GetPropNameArray( const char**& ppNames, ULONG& rCount ) const +void SdOptionsSnap::GetPropNameArray( const char**& ppNames, sal_uLong& rCount ) const { static const char* aPropNames[] = { @@ -916,7 +916,7 @@ void SdOptionsSnap::GetPropNameArray( const char**& ppNames, ULONG& rCount ) con // ----------------------------------------------------------------------------- -BOOL SdOptionsSnap::ReadData( const Any* pValues ) +sal_Bool SdOptionsSnap::ReadData( const Any* pValues ) { if( pValues[0].hasValue() ) SetSnapHelplines( *(sal_Bool*) pValues[ 0 ].getValue() ); if( pValues[1].hasValue() ) SetSnapBorder( *(sal_Bool*)pValues[ 1 ].getValue() ); @@ -925,16 +925,16 @@ BOOL SdOptionsSnap::ReadData( const Any* pValues ) if( pValues[4].hasValue() ) SetOrtho( *(sal_Bool*) pValues[ 4 ].getValue() ); if( pValues[5].hasValue() ) SetBigOrtho( *(sal_Bool*) pValues[ 5 ].getValue() ); if( pValues[6].hasValue() ) SetRotate( *(sal_Bool*) pValues[ 6 ].getValue() ); - if( pValues[7].hasValue() ) SetSnapArea( (INT16) *(sal_Int32*) pValues[ 7 ].getValue() ); - if( pValues[8].hasValue() ) SetAngle( (INT16) *(sal_Int32*) pValues[ 8 ].getValue() ); - if( pValues[9].hasValue() ) SetEliminatePolyPointLimitAngle( (INT16) *(sal_Int32*) pValues[ 9 ].getValue() ); + if( pValues[7].hasValue() ) SetSnapArea( (sal_Int16) *(sal_Int32*) pValues[ 7 ].getValue() ); + if( pValues[8].hasValue() ) SetAngle( (sal_Int16) *(sal_Int32*) pValues[ 8 ].getValue() ); + if( pValues[9].hasValue() ) SetEliminatePolyPointLimitAngle( (sal_Int16) *(sal_Int32*) pValues[ 9 ].getValue() ); - return TRUE; + return sal_True; } // ----------------------------------------------------------------------------- -BOOL SdOptionsSnap::WriteData( Any* pValues ) const +sal_Bool SdOptionsSnap::WriteData( Any* pValues ) const { pValues[ 0 ] <<= IsSnapHelplines(); pValues[ 1 ] <<= IsSnapBorder(); @@ -947,7 +947,7 @@ BOOL SdOptionsSnap::WriteData( Any* pValues ) const pValues[ 8 ] <<= (sal_Int32) GetAngle(); pValues[ 9 ] <<= (sal_Int32) GetEliminatePolyPointLimitAngle(); - return TRUE; + return sal_True; } /************************************************************************* @@ -956,17 +956,17 @@ BOOL SdOptionsSnap::WriteData( Any* pValues ) const |* \************************************************************************/ -SdOptionsSnapItem::SdOptionsSnapItem( USHORT _nWhich ) +SdOptionsSnapItem::SdOptionsSnapItem( sal_uInt16 _nWhich ) : SfxPoolItem ( _nWhich ) -, maOptionsSnap ( 0, FALSE ) +, maOptionsSnap ( 0, sal_False ) { } // ---------------------------------------------------------------------- -SdOptionsSnapItem::SdOptionsSnapItem( USHORT _nWhich, SdOptions* pOpts, ::sd::FrameView* pView ) +SdOptionsSnapItem::SdOptionsSnapItem( sal_uInt16 _nWhich, SdOptions* pOpts, ::sd::FrameView* pView ) : SfxPoolItem ( _nWhich ) -, maOptionsSnap ( 0, FALSE ) +, maOptionsSnap ( 0, sal_False ) { if( pView ) { @@ -978,8 +978,8 @@ SdOptionsSnapItem::SdOptionsSnapItem( USHORT _nWhich, SdOptions* pOpts, ::sd::Fr maOptionsSnap.SetBigOrtho( pView->IsBigOrtho() ); maOptionsSnap.SetRotate( pView->IsAngleSnapEnabled() ); maOptionsSnap.SetSnapArea( pView->GetSnapMagneticPixel() ); - maOptionsSnap.SetAngle( (INT16) pView->GetSnapAngle() ); - maOptionsSnap.SetEliminatePolyPointLimitAngle( (INT16) pView->GetEliminatePolyPointLimitAngle() ); + maOptionsSnap.SetAngle( (sal_Int16) pView->GetSnapAngle() ); + maOptionsSnap.SetEliminatePolyPointLimitAngle( (sal_Int16) pView->GetEliminatePolyPointLimitAngle() ); } else if( pOpts ) { @@ -1038,7 +1038,7 @@ void SdOptionsSnapItem::SetOptions( SdOptions* pOpts ) const |* \************************************************************************/ -SdOptionsZoom::SdOptionsZoom( USHORT nConfigId, BOOL bUseConfig ) : +SdOptionsZoom::SdOptionsZoom( sal_uInt16 nConfigId, sal_Bool bUseConfig ) : SdOptionsGeneric( nConfigId, ( bUseConfig && ( SDCFG_DRAW == nConfigId ) ) ? B2U( "Office.Draw/Zoom" ) : OUString() ), @@ -1046,14 +1046,14 @@ SdOptionsZoom::SdOptionsZoom( USHORT nConfigId, BOOL bUseConfig ) : nY( 1 ) { - EnableModify( TRUE ); + EnableModify( sal_True ); } // ----------------------------------------------------------------------------- -BOOL SdOptionsZoom::operator==( const SdOptionsZoom& rOpt ) const +sal_Bool SdOptionsZoom::operator==( const SdOptionsZoom& rOpt ) const { - INT32 nX1, nX2, nY1, nY2; + sal_Int32 nX1, nX2, nY1, nY2; GetScale( nX1, nY1 ); rOpt.GetScale( nX2, nY2 ); @@ -1064,7 +1064,7 @@ BOOL SdOptionsZoom::operator==( const SdOptionsZoom& rOpt ) const // ----------------------------------------------------------------------------- -void SdOptionsZoom::GetPropNameArray( const char**& ppNames, ULONG& rCount ) const +void SdOptionsZoom::GetPropNameArray( const char**& ppNames, sal_uLong& rCount ) const { static const char* aPropNames[] = { @@ -1078,30 +1078,30 @@ void SdOptionsZoom::GetPropNameArray( const char**& ppNames, ULONG& rCount ) con // ----------------------------------------------------------------------------- -BOOL SdOptionsZoom::ReadData( const Any* pValues ) +sal_Bool SdOptionsZoom::ReadData( const Any* pValues ) { - INT32 x = 1, y = 1; + sal_Int32 x = 1, y = 1; if( pValues[0].hasValue() ) x = ( *(sal_Int32*) pValues[ 0 ].getValue() ); if( pValues[1].hasValue() ) y = ( *(sal_Int32*) pValues[ 1 ].getValue() ); SetScale( x, y ); - return TRUE; + return sal_True; } // ----------------------------------------------------------------------------- -BOOL SdOptionsZoom::WriteData( Any* pValues ) const +sal_Bool SdOptionsZoom::WriteData( Any* pValues ) const { - INT32 x, y; + sal_Int32 x, y; GetScale( x, y ); pValues[ 0 ] <<= (sal_Int32) x; pValues[ 1 ] <<= (sal_Int32) y; - return TRUE; + return sal_True; } /************************************************************************* @@ -1110,16 +1110,16 @@ BOOL SdOptionsZoom::WriteData( Any* pValues ) const |* \************************************************************************/ -SdOptionsGrid::SdOptionsGrid( USHORT nConfigId, BOOL bUseConfig ) : +SdOptionsGrid::SdOptionsGrid( sal_uInt16 nConfigId, sal_Bool bUseConfig ) : SdOptionsGeneric( nConfigId, bUseConfig ? ( ( SDCFG_DRAW == nConfigId ) ? B2U( "Office.Draw/Grid" ) : B2U( "Office.Impress/Grid" ) ) : OUString() ) { - EnableModify( FALSE ); + EnableModify( sal_False ); SetDefaults(); - EnableModify( TRUE ); + EnableModify( sal_True ); } // ----------------------------------------------------------------------------- @@ -1132,7 +1132,7 @@ SdOptionsGrid::~SdOptionsGrid() void SdOptionsGrid::SetDefaults() { - const UINT32 nVal = 1000; + const sal_uInt32 nVal = 1000; SetFldDivisionX( nVal ); SetFldDivisionY( nVal ); @@ -1140,15 +1140,15 @@ void SdOptionsGrid::SetDefaults() SetFldDrawY( nVal ); SetFldSnapX( nVal ); SetFldSnapY( nVal ); - SetUseGridSnap( FALSE ); - SetSynchronize( TRUE ); - SetGridVisible( FALSE ); - SetEqualGrid( TRUE ); + SetUseGridSnap( sal_False ); + SetSynchronize( sal_True ); + SetGridVisible( sal_False ); + SetEqualGrid( sal_True ); } // ----------------------------------------------------------------------------- -BOOL SdOptionsGrid::operator==( const SdOptionsGrid& rOpt ) const +sal_Bool SdOptionsGrid::operator==( const SdOptionsGrid& rOpt ) const { return( GetFldDrawX() == rOpt.GetFldDrawX() && GetFldDivisionX() == rOpt.GetFldDivisionX() && @@ -1164,7 +1164,7 @@ BOOL SdOptionsGrid::operator==( const SdOptionsGrid& rOpt ) const // ----------------------------------------------------------------------------- -void SdOptionsGrid::GetPropNameArray( const char**& ppNames, ULONG& rCount ) const +void SdOptionsGrid::GetPropNameArray( const char**& ppNames, sal_uLong& rCount ) const { static const char* aPropNamesMetric[] = { @@ -1204,20 +1204,20 @@ void SdOptionsGrid::GetPropNameArray( const char**& ppNames, ULONG& rCount ) con // ----------------------------------------------------------------------------- -BOOL SdOptionsGrid::ReadData( const Any* pValues ) +sal_Bool SdOptionsGrid::ReadData( const Any* pValues ) { if( pValues[0].hasValue() ) SetFldDrawX( *(sal_Int32*) pValues[ 0 ].getValue() ); if( pValues[1].hasValue() ) SetFldDrawY( *(sal_Int32*) pValues[ 1 ].getValue() ); if( pValues[2].hasValue() ) { - const UINT32 nDivX = FRound( *(double*) pValues[ 2 ].getValue() ); + const sal_uInt32 nDivX = FRound( *(double*) pValues[ 2 ].getValue() ); SetFldDivisionX( SvxOptionsGrid::GetFldDrawX() / ( nDivX + 1 ) ); } if( pValues[3].hasValue() ) { - const UINT32 nDivY = FRound( *(double*) pValues[ 3 ].getValue() ); + const sal_uInt32 nDivY = FRound( *(double*) pValues[ 3 ].getValue() ); SetFldDivisionY( SvxOptionsGrid::GetFldDrawY() / ( nDivY + 1 ) ); } @@ -1228,12 +1228,12 @@ BOOL SdOptionsGrid::ReadData( const Any* pValues ) if( pValues[8].hasValue() ) SetGridVisible( *(sal_Bool*) pValues[ 8 ].getValue() ); if( pValues[9].hasValue() ) SetEqualGrid( *(sal_Bool*) pValues[ 9 ].getValue() ); - return TRUE; + return sal_True; } // ----------------------------------------------------------------------------- -BOOL SdOptionsGrid::WriteData( Any* pValues ) const +sal_Bool SdOptionsGrid::WriteData( Any* pValues ) const { pValues[ 0 ] <<= (sal_Int32) GetFldDrawX(); pValues[ 1 ] <<= (sal_Int32) GetFldDrawY(); @@ -1246,7 +1246,7 @@ BOOL SdOptionsGrid::WriteData( Any* pValues ) const pValues[ 8 ] <<= IsGridVisible(); pValues[ 9 ] <<= IsEqualGrid(); - return TRUE; + return sal_True; } /************************************************************************* @@ -1255,7 +1255,7 @@ BOOL SdOptionsGrid::WriteData( Any* pValues ) const |* \************************************************************************/ -SdOptionsGridItem::SdOptionsGridItem( USHORT _nWhich, SdOptions* pOpts, ::sd::FrameView* pView ) : +SdOptionsGridItem::SdOptionsGridItem( sal_uInt16 _nWhich, SdOptions* pOpts, ::sd::FrameView* pView ) : SvxGridItem( _nWhich ) { SetSynchronize( pOpts->IsSynchronize() ); @@ -1307,40 +1307,40 @@ void SdOptionsGridItem::SetOptions( SdOptions* pOpts ) const |* \************************************************************************/ -SdOptionsPrint::SdOptionsPrint( USHORT nConfigId, BOOL bUseConfig ) : +SdOptionsPrint::SdOptionsPrint( sal_uInt16 nConfigId, sal_Bool bUseConfig ) : SdOptionsGeneric( nConfigId, bUseConfig ? ( ( SDCFG_DRAW == nConfigId ) ? B2U( "Office.Draw/Print" ) : B2U( "Office.Impress/Print" ) ) : OUString() ), - bDraw( TRUE ), - bNotes( FALSE ), - bHandout( FALSE ), - bOutline( FALSE ), - bDate( FALSE ), - bTime( FALSE ), - bPagename( FALSE ), - bHiddenPages( TRUE ), - bPagesize( FALSE ), - bPagetile( FALSE ), - bWarningPrinter( TRUE ), - bWarningSize( FALSE ), - bWarningOrientation( FALSE ), - bBooklet( FALSE ), - bFront( TRUE ), - bBack( TRUE ), - bCutPage( FALSE ), - bPaperbin( FALSE ), - mbHandoutHorizontal( TRUE ), + bDraw( sal_True ), + bNotes( sal_False ), + bHandout( sal_False ), + bOutline( sal_False ), + bDate( sal_False ), + bTime( sal_False ), + bPagename( sal_False ), + bHiddenPages( sal_True ), + bPagesize( sal_False ), + bPagetile( sal_False ), + bWarningPrinter( sal_True ), + bWarningSize( sal_False ), + bWarningOrientation( sal_False ), + bBooklet( sal_False ), + bFront( sal_True ), + bBack( sal_True ), + bCutPage( sal_False ), + bPaperbin( sal_False ), + mbHandoutHorizontal( sal_True ), mnHandoutPages( 6 ), nQuality( 0 ) { - EnableModify( TRUE ); + EnableModify( sal_True ); } // ----------------------------------------------------------------------------- -BOOL SdOptionsPrint::operator==( const SdOptionsPrint& rOpt ) const +sal_Bool SdOptionsPrint::operator==( const SdOptionsPrint& rOpt ) const { return( IsDraw() == rOpt.IsDraw() && IsNotes() == rOpt.IsNotes() && @@ -1367,7 +1367,7 @@ BOOL SdOptionsPrint::operator==( const SdOptionsPrint& rOpt ) const // ----------------------------------------------------------------------------- -void SdOptionsPrint::GetPropNameArray( const char**& ppNames, ULONG& rCount ) const +void SdOptionsPrint::GetPropNameArray( const char**& ppNames, sal_uLong& rCount ) const { static const char* aDrawPropNames[] = { @@ -1427,7 +1427,7 @@ void SdOptionsPrint::GetPropNameArray( const char**& ppNames, ULONG& rCount ) co // ----------------------------------------------------------------------------- -BOOL SdOptionsPrint::ReadData( const Any* pValues ) +sal_Bool SdOptionsPrint::ReadData( const Any* pValues ) { if( pValues[0].hasValue() ) SetDate( *(sal_Bool*) pValues[ 0 ].getValue() ); if( pValues[1].hasValue() ) SetTime( *(sal_Bool*) pValues[ 1 ].getValue() ); @@ -1439,7 +1439,7 @@ BOOL SdOptionsPrint::ReadData( const Any* pValues ) if( pValues[7].hasValue() ) SetFrontPage( *(sal_Bool*) pValues[ 7 ].getValue() ); if( pValues[8].hasValue() ) SetBackPage( *(sal_Bool*) pValues[ 8 ].getValue() ); if( pValues[9].hasValue() ) SetPaperbin( *(sal_Bool*) pValues[ 9 ].getValue() ); - if( pValues[10].hasValue() ) SetOutputQuality( (UINT16) *(sal_Int32*) pValues[ 10 ].getValue() ); + if( pValues[10].hasValue() ) SetOutputQuality( (sal_uInt16) *(sal_Int32*) pValues[ 10 ].getValue() ); if( pValues[11].hasValue() ) SetDraw( *(sal_Bool*) pValues[ 11 ].getValue() ); // just for impress @@ -1449,15 +1449,15 @@ BOOL SdOptionsPrint::ReadData( const Any* pValues ) if( pValues[13].hasValue() ) SetHandout( *(sal_Bool*) pValues[ 13 ].getValue() ); if( pValues[14].hasValue() ) SetOutline( *(sal_Bool*) pValues[ 14 ].getValue() ); if( pValues[15].hasValue() ) SetHandoutHorizontal( *(sal_Bool*) pValues[15].getValue() ); - if( pValues[16].hasValue() ) SetHandoutPages( (UINT16)*(sal_Int32*) pValues[16].getValue() ); + if( pValues[16].hasValue() ) SetHandoutPages( (sal_uInt16)*(sal_Int32*) pValues[16].getValue() ); } - return TRUE; + return sal_True; } // ----------------------------------------------------------------------------- -BOOL SdOptionsPrint::WriteData( Any* pValues ) const +sal_Bool SdOptionsPrint::WriteData( Any* pValues ) const { pValues[ 0 ] <<= IsDate(); pValues[ 1 ] <<= IsTime(); @@ -1482,7 +1482,7 @@ BOOL SdOptionsPrint::WriteData( Any* pValues ) const pValues[ 16 ] <<= GetHandoutPages(); } - return TRUE; + return sal_True; } /************************************************************************* @@ -1491,17 +1491,17 @@ BOOL SdOptionsPrint::WriteData( Any* pValues ) const |* \************************************************************************/ -SdOptionsPrintItem::SdOptionsPrintItem( USHORT _nWhich ) +SdOptionsPrintItem::SdOptionsPrintItem( sal_uInt16 _nWhich ) : SfxPoolItem ( _nWhich ) -, maOptionsPrint ( 0, FALSE ) +, maOptionsPrint ( 0, sal_False ) { } // ---------------------------------------------------------------------- -SdOptionsPrintItem::SdOptionsPrintItem( USHORT _nWhich, SdOptions* pOpts, ::sd::FrameView* ) +SdOptionsPrintItem::SdOptionsPrintItem( sal_uInt16 _nWhich, SdOptions* pOpts, ::sd::FrameView* ) : SfxPoolItem ( _nWhich ) -, maOptionsPrint ( 0, FALSE ) +, maOptionsPrint ( 0, sal_False ) { if( pOpts ) { @@ -1577,14 +1577,14 @@ void SdOptionsPrintItem::SetOptions( SdOptions* pOpts ) const |* \************************************************************************/ -SdOptions::SdOptions( USHORT nConfigId ) : - SdOptionsLayout( nConfigId, TRUE ), - SdOptionsContents( nConfigId, TRUE ), - SdOptionsMisc( nConfigId, TRUE ), - SdOptionsSnap( nConfigId, TRUE ), - SdOptionsZoom( nConfigId, TRUE ), - SdOptionsGrid( nConfigId, TRUE ), - SdOptionsPrint( nConfigId, TRUE ) +SdOptions::SdOptions( sal_uInt16 nConfigId ) : + SdOptionsLayout( nConfigId, sal_True ), + SdOptionsContents( nConfigId, sal_True ), + SdOptionsMisc( nConfigId, sal_True ), + SdOptionsSnap( nConfigId, sal_True ), + SdOptionsZoom( nConfigId, sal_True ), + SdOptionsGrid( nConfigId, sal_True ), + SdOptionsPrint( nConfigId, sal_True ) { } @@ -1596,7 +1596,7 @@ SdOptions::~SdOptions() // ---------------------------------------------------------------------- -void SdOptions::StoreConfig( ULONG nOptionsRange ) +void SdOptions::StoreConfig( sal_uLong nOptionsRange ) { if( nOptionsRange & SD_OPTIONS_LAYOUT ) SdOptionsLayout::Store(); diff --git a/sd/source/ui/app/sdmod.cxx b/sd/source/ui/app/sdmod.cxx index c93460fc8b38..b479762b34a1 100755 --- a/sd/source/ui/app/sdmod.cxx +++ b/sd/source/ui/app/sdmod.cxx @@ -87,7 +87,7 @@ SFX_IMPL_INTERFACE(SdModule, SfxModule, SdResId(STR_APPLICATIONOBJECTBAR)) \************************************************************************/ SdModule::SdModule(SfxObjectFactory* pFact1, SfxObjectFactory* pFact2 ) -: SfxModule( SfxApplication::CreateResManager("sd"), FALSE, +: SfxModule( SfxApplication::CreateResManager("sd"), sal_False, pFact1, pFact2, NULL ), pTransferClip(NULL), pTransferDrag(NULL), @@ -96,7 +96,7 @@ SdModule::SdModule(SfxObjectFactory* pFact1, SfxObjectFactory* pFact2 ) pDrawOptions(NULL), pSearchItem(NULL), pNumberFormatter( NULL ), - bWaterCan(FALSE), + bWaterCan(sal_False), mpResourceContainer(new ::sd::SdGlobalResourceContainer()) { SetName( UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "StarDraw" ) ) ); // Nicht uebersetzen! @@ -198,7 +198,7 @@ SdOptions* SdModule::GetSdOptions(DocumentType eDocType) } if( pOptions ) { - UINT16 nMetric = pOptions->GetMetric(); + sal_uInt16 nMetric = pOptions->GetMetric(); ::sd::DrawDocShell* pDocSh = PTR_CAST(::sd::DrawDocShell, SfxObjectShell::Current() ); SdDrawDocument* pDoc = NULL; @@ -240,7 +240,7 @@ SvStorageStreamRef SdModule::GetOptionStream( const String& rOptionName, SvStream* pStm = ::utl::UcbStreamHelper::CreateStream( aURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_READWRITE ); if( pStm ) - xOptionStorage = new SvStorage( pStm, TRUE ); + xOptionStorage = new SvStorage( pStm, sal_True ); } if( DOCUMENT_TYPE_DRAW == eType ) diff --git a/sd/source/ui/app/sdmod1.cxx b/sd/source/ui/app/sdmod1.cxx index 3c1abc0c7d22..139af4b09915 100755 --- a/sd/source/ui/app/sdmod1.cxx +++ b/sd/source/ui/app/sdmod1.cxx @@ -116,7 +116,7 @@ private: void SdModule::Execute(SfxRequest& rReq) { const SfxItemSet* pSet = rReq.GetArgs(); - ULONG nSlotId = rReq.GetSlot(); + sal_uLong nSlotId = rReq.GetSlot(); switch ( nSlotId ) { @@ -131,9 +131,9 @@ void SdModule::Execute(SfxRequest& rReq) // automatische Rechtschreibpruefung const SfxPoolItem* pItem; if( pSet && SFX_ITEM_SET == pSet->GetItemState( - SID_AUTOSPELL_CHECK, FALSE, &pItem ) ) + SID_AUTOSPELL_CHECK, sal_False, &pItem ) ) { - BOOL bOnlineSpelling = ( (const SfxBoolItem*) pItem )->GetValue(); + sal_Bool bOnlineSpelling = ( (const SfxBoolItem*) pItem )->GetValue(); // am Dokument sichern: ::sd::DrawDocShell* pDocSh = PTR_CAST(::sd::DrawDocShell, SfxObjectShell::Current()); if( pDocSh ) @@ -148,7 +148,7 @@ void SdModule::Execute(SfxRequest& rReq) case SID_ATTR_METRIC: { const SfxPoolItem* pItem; - if ( pSet && SFX_ITEM_SET == pSet->GetItemState( SID_ATTR_METRIC, TRUE, &pItem ) ) + if ( pSet && SFX_ITEM_SET == pSet->GetItemState( SID_ATTR_METRIC, sal_True, &pItem ) ) { FieldUnit eUnit = (FieldUnit)((const SfxUInt16Item*)pItem)->GetValue(); switch( eUnit ) @@ -167,7 +167,7 @@ void SdModule::Execute(SfxRequest& rReq) PutItem( *pItem ); SdOptions* pOptions = GetSdOptions( eDocType ); if(pOptions) - pOptions->SetMetric( (UINT16)eUnit ); + pOptions->SetMetric( (sal_uInt16)eUnit ); rReq.Done(); } } @@ -187,9 +187,9 @@ void SdModule::Execute(SfxRequest& rReq) const SfxPoolItem* pItem; if( pSet && ( - SFX_ITEM_SET == pSet->GetItemState(SID_ATTR_LANGUAGE, FALSE, &pItem ) || - SFX_ITEM_SET == pSet->GetItemState(SID_ATTR_CHAR_CJK_LANGUAGE, FALSE, &pItem ) || - SFX_ITEM_SET == pSet->GetItemState(SID_ATTR_CHAR_CTL_LANGUAGE, FALSE, &pItem ) + SFX_ITEM_SET == pSet->GetItemState(SID_ATTR_LANGUAGE, sal_False, &pItem ) || + SFX_ITEM_SET == pSet->GetItemState(SID_ATTR_CHAR_CJK_LANGUAGE, sal_False, &pItem ) || + SFX_ITEM_SET == pSet->GetItemState(SID_ATTR_CHAR_CTL_LANGUAGE, sal_False, &pItem ) ) ) { @@ -231,7 +231,7 @@ void SdModule::Execute(SfxRequest& rReq) case SID_OPENHYPERLINK: case SID_OPENDOC: { - BOOL bIntercept = FALSE; + sal_Bool bIntercept = sal_False; ::sd::DrawDocShell* pDocShell = PTR_CAST(::sd::DrawDocShell, SfxObjectShell::Current()); if (pDocShell) { @@ -245,7 +245,7 @@ void SdModule::Execute(SfxRequest& rReq) // from a shape interaction. if (rReq.GetArgs() == NULL) { - bIntercept = TRUE; + bIntercept = sal_True; } } } @@ -259,7 +259,7 @@ void SdModule::Execute(SfxRequest& rReq) { ErrorBox(NULL, WB_OK, String(SdResId(STR_CANT_PERFORM_IN_LIVEMODE))).Execute(); - SFX_REQUEST_ARG( rReq, pLinkItem, SfxLinkItem, SID_DONELINK, FALSE ); + SFX_REQUEST_ARG( rReq, pLinkItem, SfxLinkItem, SID_DONELINK, sal_False ); if( pLinkItem ) pLinkItem->GetValue().Call( 0 ); } @@ -291,7 +291,7 @@ void SdModule::OutlineToImpress (SfxRequest& rRequest) SfxObjectShellLock xDocShell; ::sd::DrawDocShell* pDocSh; xDocShell = pDocSh = new ::sd::DrawDocShell( - SFX_CREATE_MODE_STANDARD, FALSE); + SFX_CREATE_MODE_STANDARD, sal_False); if(pDocSh) { pDocSh->DoInitNew(NULL); @@ -302,7 +302,7 @@ void SdModule::OutlineToImpress (SfxRequest& rRequest) pDoc->StopWorkStartupDelay(); } - SFX_REQUEST_ARG( rRequest, pFrmItem, SfxFrameItem, SID_DOCFRAME, FALSE); + SFX_REQUEST_ARG( rRequest, pFrmItem, SfxFrameItem, SID_DOCFRAME, sal_False); SfxViewFrame::LoadDocumentIntoFrame( *pDocSh, pFrmItem, ::sd::OUTLINE_FACTORY_ID ); ::sd::ViewShell* pViewSh = pDocSh->GetViewShell(); @@ -510,7 +510,7 @@ void SdModule::AddSummaryPage (SfxViewFrame* pViewFrame, SdDrawDocument* pDocume // The summary page, if it exists, is the last page. SdPage* pSummaryPage = pDocument->GetSdPage ( - (USHORT)nPageCount-1, PK_STANDARD); + (sal_uInt16)nPageCount-1, PK_STANDARD); OSL_ASSERT (pSummaryPage!=NULL); // Take the change mode of the template page as indication of the @@ -535,9 +535,9 @@ SfxFrame* SdModule::CreateFromTemplate( const String& rTemplatePath, const Refer SfxObjectShellLock xDocShell; SfxItemSet* pSet = new SfxAllItemSet( SFX_APP()->GetPool() ); - pSet->Put( SfxBoolItem( SID_TEMPLATE, TRUE ) ); + pSet->Put( SfxBoolItem( SID_TEMPLATE, sal_True ) ); - ULONG lErr = SFX_APP()->LoadTemplate( xDocShell, rTemplatePath, TRUE, pSet ); + sal_uLong lErr = SFX_APP()->LoadTemplate( xDocShell, rTemplatePath, sal_True, pSet ); SfxObjectShell* pDocShell = xDocShell; @@ -562,7 +562,7 @@ SfxFrame* SdModule::ExecuteNewDocument( SfxRequest& rReq ) if ( SvtModuleOptions().IsImpress() ) { Reference< XFrame > xTargetFrame; - SFX_REQUEST_ARG( rReq, pFrmItem, SfxUnoFrameItem, SID_FILLFRAME, FALSE); + SFX_REQUEST_ARG( rReq, pFrmItem, SfxUnoFrameItem, SID_FILLFRAME, sal_False); if ( pFrmItem ) xTargetFrame = pFrmItem->GetFrame(); @@ -605,9 +605,9 @@ SfxFrame* SdModule::ExecuteNewDocument( SfxRequest& rReq ) const sal_Bool bIsDocEmpty = pPilotDlg->IsDocEmpty(); // So that you can open the document without AutoLayout-Dialog - pOpt->SetStartWithTemplate(FALSE); + pOpt->SetStartWithTemplate(sal_False); if(bNewDocDirect && !pPilotDlg->GetStartWithFlag()) - bStartWithTemplate = FALSE; + bStartWithTemplate = sal_False; if( pPilotDlg->GetStartType() == ST_OPEN ) { @@ -658,7 +658,7 @@ SfxFrame* SdModule::ExecuteNewDocument( SfxRequest& rReq ) } catch (::com::sun::star::uno::Exception e) { - DBG_ASSERT (FALSE, "caught IllegalArgumentException while loading document from Impress autopilot"); + DBG_ASSERT (sal_False, "caught IllegalArgumentException while loading document from Impress autopilot"); } } } @@ -719,7 +719,7 @@ SfxFrame* SdModule::ExecuteNewDocument( SfxRequest& rReq ) if((aDocPath.Len() == 0) && pViewFrame && pViewFrame->GetDispatcher()) { SfxBoolItem aIsChangedItem(SID_MODIFYPAGE, !bIsDocEmpty); - SfxUInt32Item eAutoLayout( ID_VAL_WHATLAYOUT, (UINT32) AUTOLAYOUT_TITLE ); + SfxUInt32Item eAutoLayout( ID_VAL_WHATLAYOUT, (sal_uInt32) AUTOLAYOUT_TITLE ); pViewFrame->GetDispatcher()->Execute(SID_MODIFYPAGE, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, &aIsChangedItem, &eAutoLayout, 0L); } @@ -738,7 +738,7 @@ SfxFrame* SdModule::ExecuteNewDocument( SfxRequest& rReq ) pDoc->SetChanged(!bIsDocEmpty); - pDocShell->SetUseUserData(TRUE); + pDocShell->SetUseUserData(sal_True); // #94652# clear UNDO stack after autopilot pDocShell->ClearUndoBuffer(); @@ -772,7 +772,7 @@ SfxFrame* SdModule::CreateEmptyDocument( DocumentType eDocType, const Reference< SfxObjectShellLock xDocShell; ::sd::DrawDocShell* pNewDocSh; - xDocShell = pNewDocSh = new ::sd::DrawDocShell(SFX_CREATE_MODE_STANDARD,FALSE,eDocType); + xDocShell = pNewDocSh = new ::sd::DrawDocShell(SFX_CREATE_MODE_STANDARD,sal_False,eDocType); if(pNewDocSh) { pNewDocSh->DoInitNew(NULL); @@ -802,23 +802,23 @@ void SdModule::ChangeMedium( ::sd::DrawDocShell* pDocShell, SfxViewFrame* pViewF // settings for the Outputmedium Size aNewSize; - UINT32 nLeft = 0; - UINT32 nRight = 0; - UINT32 nLower = 0; - UINT32 nUpper = 0; + sal_uInt32 nLeft = 0; + sal_uInt32 nRight = 0; + sal_uInt32 nLower = 0; + sal_uInt32 nUpper = 0; switch(eMedium) { case OUTPUT_PAGE: case OUTPUT_OVERHEAD: { - SfxPrinter* pPrinter = pDocShell->GetPrinter(TRUE); + SfxPrinter* pPrinter = pDocShell->GetPrinter(sal_True); if( pPrinter && pPrinter->IsValid()) { // Der Printer gibt leider kein exaktes // Format (z.B. A4) zurueck Size aSize(pPrinter->GetPaperSize()); - Paper ePaper = SvxPaperInfo::GetSvxPaper( aSize, MAP_100TH_MM, TRUE); + Paper ePaper = SvxPaperInfo::GetSvxPaper( aSize, MAP_100TH_MM, sal_True); if (ePaper != PAPER_USER) { @@ -880,9 +880,9 @@ void SdModule::ChangeMedium( ::sd::DrawDocShell* pDocShell, SfxViewFrame* pViewF break; } - BOOL bScaleAll = TRUE; - USHORT nPageCnt = pDoc->GetMasterSdPageCount(PK_STANDARD); - USHORT i; + sal_Bool bScaleAll = sal_True; + sal_uInt16 nPageCnt = pDoc->GetMasterSdPageCount(PK_STANDARD); + sal_uInt16 i; SdPage* pPage; // master pages first @@ -930,7 +930,7 @@ void SdModule::ChangeMedium( ::sd::DrawDocShell* pDocShell, SfxViewFrame* pViewF } SdPage* pHandoutPage = pDoc->GetSdPage(0, PK_HANDOUT); - pHandoutPage->CreateTitleAndLayout(TRUE); + pHandoutPage->CreateTitleAndLayout(sal_True); if( (eMedium != OUTPUT_ORIGINAL) && pViewFrame && pViewFrame->GetDispatcher()) { @@ -1029,7 +1029,7 @@ void OutlineToImpressFinalizer::operator() (bool) sd::OutlineViewPageChangesGuard aGuard( pView ); // Remove the first empty pages - USHORT nPageCount = mrDocument.GetPageCount(); + sal_uInt16 nPageCount = mrDocument.GetPageCount(); mrDocument.RemovePage( --nPageCount ); // notes page mrDocument.RemovePage( --nPageCount ); // standard page */ @@ -1037,8 +1037,8 @@ void OutlineToImpressFinalizer::operator() (bool) // Call UpdatePreview once for every slide to resync the // document with the outliner of the OutlineViewShell. - USHORT nPageCount (mrDocument.GetSdPageCount(PK_STANDARD)); - for (USHORT nIndex=0; nIndex<nPageCount; nIndex++) + sal_uInt16 nPageCount (mrDocument.GetSdPageCount(PK_STANDARD)); + for (sal_uInt16 nIndex=0; nIndex<nPageCount; nIndex++) { SdPage* pPage = mrDocument.GetSdPage(nIndex, PK_STANDARD); // Make the page the actual page so that the diff --git a/sd/source/ui/app/sdmod2.cxx b/sd/source/ui/app/sdmod2.cxx index 58aba6823d3a..68f0499f72f6 100755 --- a/sd/source/ui/app/sdmod2.cxx +++ b/sd/source/ui/app/sdmod2.cxx @@ -114,7 +114,7 @@ static SdPage* GetCurrentPage( sd::ViewShell* pViewSh, EditFieldInfo* pInfo, boo int nPgNum = 0; Outliner* pOutl = pSdView->GetOutliner(); long nPos = pInfo->GetPara(); - ULONG nParaPos = 0; + sal_uLong nParaPos = 0; for( Paragraph* pPara = pOutl->GetParagraph( 0 ); pPara && nPos >= 0; pPara = pOutl->GetParagraph( ++nParaPos ), nPos-- ) { @@ -122,7 +122,7 @@ static SdPage* GetCurrentPage( sd::ViewShell* pViewSh, EditFieldInfo* pInfo, boo nPgNum++; } - pPage = pViewSh->GetDoc()->GetSdPage( (USHORT)nPgNum, PK_STANDARD ); + pPage = pViewSh->GetDoc()->GetSdPage( (sal_uInt16)nPgNum, PK_STANDARD ); } else { @@ -261,7 +261,7 @@ IMPL_LINK(SdModule, CalcFieldValueHdl, EditFieldInfo*, pInfo) { nPgNum = (pPage->GetPageNum() - 1) / 2 + 1; } - aRepresentation = pDoc->CreatePageNumValue((USHORT)nPgNum); + aRepresentation = pDoc->CreatePageNumValue((sal_uInt16)nPgNum); } else { @@ -289,7 +289,7 @@ IMPL_LINK(SdModule, CalcFieldValueHdl, EditFieldInfo*, pInfo) bool bMasterView; SdPage* pPage = GetCurrentPage( pViewSh, pInfo, bMasterView ); - USHORT nPageCount = 0; + sal_uInt16 nPageCount = 0; if( !bMasterView ) { @@ -299,7 +299,7 @@ IMPL_LINK(SdModule, CalcFieldValueHdl, EditFieldInfo*, pInfo) } else if( pDoc ) { - nPageCount = (USHORT)pDoc->GetSdPageCount(PK_STANDARD); + nPageCount = (sal_uInt16)pDoc->GetSdPageCount(PK_STANDARD); } } @@ -421,7 +421,7 @@ IMPL_LINK(SdModule, CalcFieldValueHdl, EditFieldInfo*, pInfo) |* virt. Methoden fuer Optionendialog |* \************************************************************************/ -SfxItemSet* SdModule::CreateItemSet( USHORT nSlot ) +SfxItemSet* SdModule::CreateItemSet( sal_uInt16 nSlot ) { ::sd::FrameView* pFrameView = NULL; ::sd::DrawDocShell* pDocSh = PTR_CAST(::sd::DrawDocShell, SfxObjectShell::Current() ); @@ -474,7 +474,7 @@ SfxItemSet* SdModule::CreateItemSet( USHORT nSlot ) // TP_OPTIONS_LAYOUT: pRet->Put( SdOptionsLayoutItem( ATTR_OPTIONS_LAYOUT, pOptions, pFrameView ) ); - UINT16 nDefTab = 0; + sal_uInt16 nDefTab = 0; if( pFrameView) nDefTab = pDoc->GetDefaultTabulator(); else @@ -490,7 +490,7 @@ SfxItemSet* SdModule::CreateItemSet( USHORT nSlot ) if( nMetric == (FieldUnit)0xffff ) nMetric = GetFieldUnit(); - pRet->Put( SfxUInt16Item( SID_ATTR_METRIC, (UINT16)nMetric ) ); + pRet->Put( SfxUInt16Item( SID_ATTR_METRIC, (sal_uInt16)nMetric ) ); // TP_OPTIONS_CONTENTS: pRet->Put( SdOptionsContentsItem( ATTR_OPTIONS_CONTENTS, pOptions, pFrameView ) ); @@ -501,7 +501,7 @@ SfxItemSet* SdModule::CreateItemSet( USHORT nSlot ) { aSdOptionsMiscItem.GetOptionsMisc().SetSummationOfParagraphs( pDoc->IsSummationOfParagraphs() ); aSdOptionsMiscItem.GetOptionsMisc().SetPrinterIndependentLayout ( - (USHORT)pDoc->GetPrinterIndependentLayout()); + (sal_uInt16)pDoc->GetPrinterIndependentLayout()); } pRet->Put( aSdOptionsMiscItem ); @@ -510,10 +510,10 @@ SfxItemSet* SdModule::CreateItemSet( USHORT nSlot ) pRet->Put( SdOptionsSnapItem( ATTR_OPTIONS_SNAP, pOptions, pFrameView ) ); // TP_SCALE: - UINT32 nW = 10L; - UINT32 nH = 10L; - INT32 nX; - INT32 nY; + sal_uInt32 nW = 10L; + sal_uInt32 nH = 10L; + sal_Int32 nX; + sal_Int32 nY; if( pDocSh ) { SdrPage* pPage = (SdrPage*) pDoc->GetSdPage(0, PK_STANDARD); @@ -548,12 +548,12 @@ SfxItemSet* SdModule::CreateItemSet( USHORT nSlot ) return pRet; } -void SdModule::ApplyItemSet( USHORT nSlot, const SfxItemSet& rSet ) +void SdModule::ApplyItemSet( sal_uInt16 nSlot, const SfxItemSet& rSet ) { const SfxPoolItem* pItem = NULL; - BOOL bNewDefTab = FALSE; - BOOL bNewPrintOptions = FALSE; - BOOL bMiscOptions = FALSE; + sal_Bool bNewDefTab = sal_False; + sal_Bool bNewPrintOptions = sal_False; + sal_Bool bMiscOptions = sal_False; ::sd::FrameView* pFrameView = NULL; ::sd::DrawDocShell* pDocSh = PTR_CAST(::sd::DrawDocShell, SfxObjectShell::Current() ); @@ -581,7 +581,7 @@ void SdModule::ApplyItemSet( USHORT nSlot, const SfxItemSet& rSet ) SdOptions* pOptions = GetSdOptions(eDocType); // Raster if( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_GRID_OPTIONS , - FALSE, (const SfxPoolItem**) &pItem )) + sal_False, (const SfxPoolItem**) &pItem )) { const SdOptionsGridItem* pGridItem = (SdOptionsGridItem*) pItem; pGridItem->SetOptions( pOptions ); @@ -590,35 +590,35 @@ void SdModule::ApplyItemSet( USHORT nSlot, const SfxItemSet& rSet ) // Layout const SdOptionsLayoutItem* pLayoutItem = NULL; if( SFX_ITEM_SET == rSet.GetItemState( ATTR_OPTIONS_LAYOUT, - FALSE, (const SfxPoolItem**) &pLayoutItem )) + sal_False, (const SfxPoolItem**) &pLayoutItem )) { pLayoutItem->SetOptions( pOptions ); } // Metric - if( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_METRIC, FALSE, &pItem ) ) + if( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_METRIC, sal_False, &pItem ) ) { if( pDoc && eDocType == pDoc->GetDocumentType() ) PutItem( *pItem ); pOptions->SetMetric( ( (SfxUInt16Item*) pItem )->GetValue() ); } - UINT16 nDefTab = pOptions->GetDefTab(); + sal_uInt16 nDefTab = pOptions->GetDefTab(); // Default-Tabulator - if( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_DEFTABSTOP, FALSE, &pItem ) ) + if( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_DEFTABSTOP, sal_False, &pItem ) ) { nDefTab = ( (SfxUInt16Item*) pItem )->GetValue(); pOptions->SetDefTab( nDefTab ); - bNewDefTab = TRUE; + bNewDefTab = sal_True; } // Massstab - if( SFX_ITEM_SET == rSet.GetItemState( ATTR_OPTIONS_SCALE_X, FALSE, &pItem ) ) + if( SFX_ITEM_SET == rSet.GetItemState( ATTR_OPTIONS_SCALE_X, sal_False, &pItem ) ) { - INT32 nX = ( (SfxInt32Item*) pItem )->GetValue(); - if( SFX_ITEM_SET == rSet.GetItemState( ATTR_OPTIONS_SCALE_Y, FALSE, &pItem ) ) + sal_Int32 nX = ( (SfxInt32Item*) pItem )->GetValue(); + if( SFX_ITEM_SET == rSet.GetItemState( ATTR_OPTIONS_SCALE_Y, sal_False, &pItem ) ) { - INT32 nY = ( (SfxInt32Item*) pItem )->GetValue(); + sal_Int32 nY = ( (SfxInt32Item*) pItem )->GetValue(); pOptions->SetScale( nX, nY ); // #92067# Apply to document only if doc type match @@ -634,7 +634,7 @@ void SdModule::ApplyItemSet( USHORT nSlot, const SfxItemSet& rSet ) // Contents (Inhalte) const SdOptionsContentsItem* pContentsItem = NULL; if( SFX_ITEM_SET == rSet.GetItemState( ATTR_OPTIONS_CONTENTS, - FALSE, (const SfxPoolItem**) &pContentsItem )) + sal_False, (const SfxPoolItem**) &pContentsItem )) { pContentsItem->SetOptions( pOptions ); } @@ -642,16 +642,16 @@ void SdModule::ApplyItemSet( USHORT nSlot, const SfxItemSet& rSet ) // Misc (Sonstiges) const SdOptionsMiscItem* pMiscItem = NULL; if( SFX_ITEM_SET == rSet.GetItemState( ATTR_OPTIONS_MISC, - FALSE, (const SfxPoolItem**) &pMiscItem )) + sal_False, (const SfxPoolItem**) &pMiscItem )) { pMiscItem->SetOptions( pOptions ); - bMiscOptions = TRUE; + bMiscOptions = sal_True; } // Fangen/Einrasten const SdOptionsSnapItem* pSnapItem = NULL; if( SFX_ITEM_SET == rSet.GetItemState( ATTR_OPTIONS_SNAP, - FALSE, (const SfxPoolItem**) &pSnapItem )) + sal_False, (const SfxPoolItem**) &pSnapItem )) { pSnapItem->SetOptions( pOptions ); } @@ -665,14 +665,14 @@ void SdModule::ApplyItemSet( USHORT nSlot, const SfxItemSet& rSet ) // Drucken const SdOptionsPrintItem* pPrintItem = NULL; if( SFX_ITEM_SET == rSet.GetItemState( ATTR_OPTIONS_PRINT, - FALSE, (const SfxPoolItem**) &pPrintItem )) + sal_False, (const SfxPoolItem**) &pPrintItem )) { pPrintItem->SetOptions( pOptions ); // PrintOptionsSet setzen SdOptionsPrintItem aPrintItem( ATTR_OPTIONS_PRINT, pOptions ); SfxFlagItem aFlagItem( SID_PRINTER_CHANGESTODOC ); - USHORT nFlags = 0; + sal_uInt16 nFlags = 0; nFlags = (aPrintItem.GetOptionsPrint().IsWarningSize() ? SFX_PRINTER_CHG_SIZE : 0) | (aPrintItem.GetOptionsPrint().IsWarningOrientation() ? SFX_PRINTER_CHG_ORIENTATION : 0); @@ -682,7 +682,7 @@ void SdModule::ApplyItemSet( USHORT nSlot, const SfxItemSet& rSet ) aPrintSet.Put( SfxBoolItem( SID_PRINTER_NOTFOUND_WARN, aPrintItem.GetOptionsPrint().IsWarningPrinter() ) ); aPrintSet.Put( aFlagItem ); - bNewPrintOptions = TRUE; + bNewPrintOptions = sal_True; } // Nur, wenn auch der Dokumenttyp uebereinstimmt... @@ -690,7 +690,7 @@ void SdModule::ApplyItemSet( USHORT nSlot, const SfxItemSet& rSet ) { if( bNewPrintOptions ) { - pDocSh->GetPrinter(TRUE)->SetOptions( aPrintSet ); + pDocSh->GetPrinter(sal_True)->SetOptions( aPrintSet ); } // Am Model den DefTab setzen @@ -699,11 +699,11 @@ void SdModule::ApplyItemSet( USHORT nSlot, const SfxItemSet& rSet ) SdDrawDocument* pDocument = pDocSh->GetDoc(); pDocument->SetDefaultTabulator( nDefTab ); - ::sd::Outliner* pOutl = pDocument->GetOutliner( FALSE ); + ::sd::Outliner* pOutl = pDocument->GetOutliner( sal_False ); if( pOutl ) pOutl->SetDefTab( nDefTab ); - ::sd::Outliner* pInternalOutl = pDocument->GetInternalOutliner( FALSE ); + ::sd::Outliner* pInternalOutl = pDocument->GetInternalOutliner( sal_False ); if( pInternalOutl ) pInternalOutl->SetDefTab( nDefTab ); } @@ -714,16 +714,16 @@ void SdModule::ApplyItemSet( USHORT nSlot, const SfxItemSet& rSet ) sal_uInt32 nCntrl; SdDrawDocument* pDocument = pDocSh->GetDoc(); - SdrOutliner& rOutl = pDocument->GetDrawOutliner( FALSE ); + SdrOutliner& rOutl = pDocument->GetDrawOutliner( sal_False ); nCntrl = rOutl.GetControlWord() &~ EE_CNTRL_ULSPACESUMMATION; rOutl.SetControlWord( nCntrl | nSum ); - ::sd::Outliner* pOutl = pDocument->GetOutliner( FALSE ); + ::sd::Outliner* pOutl = pDocument->GetOutliner( sal_False ); if( pOutl ) { nCntrl = pOutl->GetControlWord() &~ EE_CNTRL_ULSPACESUMMATION; pOutl->SetControlWord( nCntrl | nSum ); } - pOutl = pDocument->GetInternalOutliner( FALSE ); + pOutl = pDocument->GetInternalOutliner( sal_False ); if( pOutl ) { nCntrl = pOutl->GetControlWord() &~ EE_CNTRL_ULSPACESUMMATION; @@ -760,10 +760,10 @@ void SdModule::ApplyItemSet( USHORT nSlot, const SfxItemSet& rSet ) } if( pViewShell && pViewShell->GetViewFrame() ) - pViewShell->GetViewFrame()->GetBindings().InvalidateAll( TRUE ); + pViewShell->GetViewFrame()->GetBindings().InvalidateAll( sal_True ); } -SfxTabPage* SdModule::CreateTabPage( USHORT nId, Window* pParent, const SfxItemSet& rSet ) +SfxTabPage* SdModule::CreateTabPage( sal_uInt16 nId, Window* pParent, const SfxItemSet& rSet ) { SfxTabPage* pRet = NULL; SfxAllItemSet aSet(*(rSet.GetPool())); diff --git a/sd/source/ui/app/sdpopup.cxx b/sd/source/ui/app/sdpopup.cxx index 63d6fc0b195c..100632fc6766 100644..100755 --- a/sd/source/ui/app/sdpopup.cxx +++ b/sd/source/ui/app/sdpopup.cxx @@ -76,8 +76,8 @@ SdFieldPopup::~SdFieldPopup() void SdFieldPopup::Fill( LanguageType eLanguage ) { - USHORT nID = 1; - USHORT nStyle = MIB_RADIOCHECK | MIB_AUTOCHECK; + sal_uInt16 nID = 1; + sal_uInt16 nStyle = MIB_RADIOCHECK | MIB_AUTOCHECK; InsertItem( nID++, String( SdResId( STR_FIX ) ), nStyle ); InsertItem( nID++, String( SdResId( STR_VAR ) ), nStyle ); InsertSeparator(); @@ -112,7 +112,7 @@ void SdFieldPopup::Fill( LanguageType eLanguage ) aDateField.SetFormat( SVXDATEFORMAT_F ); // Dienstag, 13.Februar 1996 InsertItem( nID++, aDateField.GetFormatted( *pNumberFormatter, eLanguage ), nStyle ); - CheckItem( (USHORT) ( pDateField->GetFormat() ) + 1 ); // - 2 + 3 ! + CheckItem( (sal_uInt16) ( pDateField->GetFormat() ) + 1 ); // - 2 + 3 ! } else if( pField->ISA( SvxExtTimeField ) ) { @@ -146,7 +146,7 @@ void SdFieldPopup::Fill( LanguageType eLanguage ) //SVXTIMEFORMAT_AM_HMS, // 01:49:38 PM //SVXTIMEFORMAT_AM_HMSH // 01:49:38.78 PM - CheckItem( (USHORT) ( pTimeField->GetFormat() ) + 1 ); // - 2 + 3 ! + CheckItem( (sal_uInt16) ( pTimeField->GetFormat() ) + 1 ); // - 2 + 3 ! } else if( pField->ISA( SvxExtFileField ) ) { @@ -163,7 +163,7 @@ void SdFieldPopup::Fill( LanguageType eLanguage ) InsertItem( nID++, String( SdResId( STR_FILEFORMAT_PATH ) ), nStyle ); InsertItem( nID++, String( SdResId( STR_FILEFORMAT_NAME ) ), nStyle ); - CheckItem( (USHORT) ( pFileField->GetFormat() ) + 3 ); + CheckItem( (sal_uInt16) ( pFileField->GetFormat() ) + 3 ); } else if( pField->ISA( SvxAuthorField ) ) { @@ -175,12 +175,12 @@ void SdFieldPopup::Fill( LanguageType eLanguage ) else CheckItem( 2 ); - for( USHORT i = 0; i < 4; i++ ) + for( sal_uInt16 i = 0; i < 4; i++ ) { aAuthorField.SetFormat( (SvxAuthorFormat) i ); InsertItem( nID++, aAuthorField.GetFormatted(), nStyle ); } - CheckItem( (USHORT) ( pAuthorField->GetFormat() ) + 3 ); + CheckItem( (sal_uInt16) ( pAuthorField->GetFormat() ) + 3 ); } } @@ -194,14 +194,14 @@ void SdFieldPopup::Fill( LanguageType eLanguage ) SvxFieldData* SdFieldPopup::GetField() { SvxFieldData* pNewField = NULL; - USHORT nCount = GetItemCount(); + sal_uInt16 nCount = GetItemCount(); if( pField->ISA( SvxDateField ) ) { const SvxDateField* pDateField = (const SvxDateField*) pField; SvxDateType eType; SvxDateFormat eFormat; - USHORT i; + sal_uInt16 i; if( IsItemChecked( 1 ) ) eType = SVXDATETYPE_FIX; @@ -234,7 +234,7 @@ SvxFieldData* SdFieldPopup::GetField() const SvxExtTimeField* pTimeField = (const SvxExtTimeField*) pField; SvxTimeType eType; SvxTimeFormat eFormat; - USHORT i; + sal_uInt16 i; if( IsItemChecked( 1 ) ) eType = SVXTIMETYPE_FIX; @@ -268,7 +268,7 @@ SvxFieldData* SdFieldPopup::GetField() const SvxExtFileField* pFileField = (const SvxExtFileField*) pField; SvxFileType eType; SvxFileFormat eFormat; - USHORT i; + sal_uInt16 i; if( IsItemChecked( 1 ) ) eType = SVXFILETYPE_FIX; @@ -308,7 +308,7 @@ SvxFieldData* SdFieldPopup::GetField() const SvxAuthorField* pAuthorField = (const SvxAuthorField*) pField; SvxAuthorType eType; SvxAuthorFormat eFormat; - USHORT i; + sal_uInt16 i; if( IsItemChecked( 1 ) ) eType = SVXAUTHORTYPE_FIX; diff --git a/sd/source/ui/app/sdresid.cxx b/sd/source/ui/app/sdresid.cxx index cc32bcb7a8d5..daa450683110 100644..100755 --- a/sd/source/ui/app/sdresid.cxx +++ b/sd/source/ui/app/sdresid.cxx @@ -38,7 +38,7 @@ |* \************************************************************************/ -SdResId::SdResId(USHORT nId) : +SdResId::SdResId(sal_uInt16 nId) : ResId(nId, *SD_MOD()->GetResMgr()) { } diff --git a/sd/source/ui/app/sdxfer.cxx b/sd/source/ui/app/sdxfer.cxx index ddbc0698a341..48a1f35436e9 100644..100755 --- a/sd/source/ui/app/sdxfer.cxx +++ b/sd/source/ui/app/sdxfer.cxx @@ -103,7 +103,7 @@ using namespace ::com::sun::star::datatransfer::clipboard; // - SdTransferable - // ------------------ -SdTransferable::SdTransferable( SdDrawDocument* pSrcDoc, ::sd::View* pWorkView, BOOL bInitOnGetData ) +SdTransferable::SdTransferable( SdDrawDocument* pSrcDoc, ::sd::View* pWorkView, sal_Bool bInitOnGetData ) : mpPageDocShell( NULL ) , mpOLEDataHelper( NULL ) , mpObjDesc( NULL ) @@ -116,12 +116,12 @@ SdTransferable::SdTransferable( SdDrawDocument* pSrcDoc, ::sd::View* pWorkView, , mpBookmark( NULL ) , mpGraphic( NULL ) , mpImageMap( NULL ) -, mbInternalMove( FALSE ) -, mbOwnDocument( FALSE ) -, mbOwnView( FALSE ) +, mbInternalMove( sal_False ) +, mbOwnDocument( sal_False ) +, mbOwnView( sal_False ) , mbLateInit( bInitOnGetData ) -, mbPageTransferable( FALSE ) -, mbPageTransferablePersistent( FALSE ) +, mbPageTransferable( sal_False ) +, mbPageTransferablePersistent( sal_False ) , mbIsUnoObj( false ) { if( mpSourceDoc ) @@ -213,7 +213,7 @@ void SdTransferable::CreateObjectReplacement( SdrObject* pObj ) { mpGraphic = new Graphic( static_cast< SdrGrafObj* >( pObj )->GetTransformedGraphic() ); } - else if( pObj->IsUnoObj() && FmFormInventor == pObj->GetObjInventor() && ( pObj->GetObjIdentifier() == (UINT16) OBJ_FM_BUTTON ) ) + else if( pObj->IsUnoObj() && FmFormInventor == pObj->GetObjInventor() && ( pObj->GetObjIdentifier() == (sal_uInt16) OBJ_FM_BUTTON ) ) { SdrUnoObj* pUnoCtrl = static_cast< SdrUnoObj* >( pObj ); @@ -280,7 +280,7 @@ void SdTransferable::CreateData() { if( mpSdDrawDocument && !mpSdViewIntern ) { - mbOwnView = TRUE; + mbOwnView = sal_True; SdPage* pPage = mpSdDrawDocument->GetSdPage(0, PK_STANDARD); @@ -314,7 +314,7 @@ void SdTransferable::CreateData() if( !maDocShellRef.Is() ) { DBG_ERROR( "SdTransferable::CreateData(), failed to create a model with persist, clipboard operation will fail for OLE objects!" ); - mbOwnDocument = TRUE; + mbOwnDocument = sal_True; } // Groesse der Source-Seite uebernehmen @@ -348,7 +348,7 @@ void SdTransferable::CreateData() Point aOrigin( ( maVisArea = mpSdViewIntern->GetAllMarkedRect() ).TopLeft() ); Size aVector( -aOrigin.X(), -aOrigin.Y() ); - for( ULONG nObj = 0, nObjCount = pPage->GetObjCount(); nObj < nObjCount; nObj++ ) + for( sal_uLong nObj = 0, nObjCount = pPage->GetObjCount(); nObj < nObjCount; nObj++ ) { SdrObject* pObj = pPage->GetObj( nObj ); pObj->NbcMove( aVector ); @@ -364,9 +364,9 @@ void SdTransferable::CreateData() // ----------------------------------------------------------------------------- -BOOL lcl_HasOnlyControls( SdrModel* pModel ) +sal_Bool lcl_HasOnlyControls( SdrModel* pModel ) { - BOOL bOnlyControls = FALSE; // default if there are no objects + sal_Bool bOnlyControls = sal_False; // default if there are no objects if ( pModel ) { @@ -377,12 +377,12 @@ BOOL lcl_HasOnlyControls( SdrModel* pModel ) SdrObject* pObj = aIter.Next(); if ( pObj ) { - bOnlyControls = TRUE; // only set if there are any objects at all + bOnlyControls = sal_True; // only set if there are any objects at all while ( pObj ) { if (!pObj->ISA(SdrUnoObj)) { - bOnlyControls = FALSE; + bOnlyControls = sal_False; break; } pObj = aIter.Next(); @@ -492,7 +492,7 @@ sal_Bool SdTransferable::GetData( const DataFlavor& rFlavor ) } else if( mpOLEDataHelper && mpOLEDataHelper->HasFormat( rFlavor ) ) { - ULONG nOldSwapMode = 0; + sal_uLong nOldSwapMode = 0; if( mpSdDrawDocumentIntern ) { @@ -547,12 +547,12 @@ sal_Bool SdTransferable::GetData( const DataFlavor& rFlavor ) else if( nFormat == FORMAT_GDIMETAFILE ) { if( mpSdViewIntern ) - bOK = SetGDIMetaFile( mpSdViewIntern->GetAllMarkedMetaFile( TRUE ), rFlavor ); + bOK = SetGDIMetaFile( mpSdViewIntern->GetAllMarkedMetaFile( sal_True ), rFlavor ); } else if( nFormat == FORMAT_BITMAP ) { if( mpSdViewIntern ) - bOK = SetBitmap( mpSdViewIntern->GetAllMarkedBitmap( TRUE ), rFlavor ); + bOK = SetBitmap( mpSdViewIntern->GetAllMarkedBitmap( sal_True ), rFlavor ); } else if( ( nFormat == FORMAT_STRING ) && mpBookmark ) { @@ -572,7 +572,7 @@ sal_Bool SdTransferable::GetData( const DataFlavor& rFlavor ) } else if( nFormat == SOT_FORMATSTR_ID_EMBED_SOURCE ) { - ULONG nOldSwapMode = 0; + sal_uLong nOldSwapMode = 0; if( mpSdDrawDocumentIntern ) { @@ -585,9 +585,9 @@ sal_Bool SdTransferable::GetData( const DataFlavor& rFlavor ) maDocShellRef = new ::sd::DrawDocShell( mpSdDrawDocumentIntern, SFX_CREATE_MODE_EMBEDDED, - TRUE, + sal_True, mpSdDrawDocumentIntern->GetDocumentType()); - mbOwnDocument = FALSE; + mbOwnDocument = sal_False; maDocShellRef->DoInitNew( NULL ); } @@ -618,7 +618,7 @@ sal_Bool SdTransferable::WriteObject( SotStorageStreamRef& rxOStm, void* pObject { try { - static const BOOL bDontBurnInStyleSheet = ( getenv( "AVOID_BURN_IN_FOR_GALLERY_THEME" ) != NULL ); + static const sal_Bool bDontBurnInStyleSheet = ( getenv( "AVOID_BURN_IN_FOR_GALLERY_THEME" ) != NULL ); SdDrawDocument* pDoc = (SdDrawDocument*) pObject; if ( !bDontBurnInStyleSheet ) pDoc->BurnInStyleSheetAttributes(); @@ -636,7 +636,7 @@ sal_Bool SdTransferable::WriteObject( SotStorageStreamRef& rxOStm, void* pObject /* testcode { const rtl::OUString aURL( RTL_CONSTASCII_USTRINGPARAM( "file:///e:/test.xml" ) ); - SfxMedium aMedium( aURL, STREAM_WRITE | STREAM_TRUNC, TRUE ); + SfxMedium aMedium( aURL, STREAM_WRITE | STREAM_TRUNC, sal_True ); aMedium.IsRemote(); com::sun::star::uno::Reference<com::sun::star::io::XOutputStream> xDocOut( new utl::OOutputStreamWrapper( *aMedium.GetOutStream() ) ); if( SvxDrawingLayerExport( pDoc, xDocOut, xComponent, (pDoc->GetDocumentType() == DOCUMENT_TYPE_IMPRESS) ? "com.sun.star.comp.Impress.XMLClipboardExporter" : "com.sun.star.comp.DrawingLayer.XMLExporter" ) ) @@ -650,7 +650,7 @@ sal_Bool SdTransferable::WriteObject( SotStorageStreamRef& rxOStm, void* pObject catch( Exception& ) { DBG_ERROR( "sd::SdTransferable::WriteObject(), exception catched!" ); - bRet = FALSE; + bRet = sal_False; } } break; @@ -670,7 +670,7 @@ sal_Bool SdTransferable::WriteObject( SotStorageStreamRef& rxOStm, void* pObject pEmbObj->SetupStorage( xWorkStore, SOFFICE_FILEFORMAT_CURRENT, sal_False ); // mba: no relative ULRs for clipboard! SfxMedium aMedium( xWorkStore, String() ); - bRet = pEmbObj->DoSaveObjectAs( aMedium, FALSE ); + bRet = pEmbObj->DoSaveObjectAs( aMedium, sal_False ); pEmbObj->DoSaveCompleted(); uno::Reference< embed::XTransactedObject > xTransact( xWorkStore, uno::UNO_QUERY ); @@ -685,7 +685,7 @@ sal_Bool SdTransferable::WriteObject( SotStorageStreamRef& rxOStm, void* pObject delete pSrcStm; } - bRet = TRUE; + bRet = sal_True; rxOStm->Commit(); } catch ( Exception& ) @@ -734,7 +734,7 @@ void SdTransferable::SetObjectDescriptor( const TransferableObjectDescriptor& rO // ----------------------------------------------------------------------------- -void SdTransferable::SetPageBookmarks( const List& rPageBookmarks, BOOL bPersistent ) +void SdTransferable::SetPageBookmarks( const List& rPageBookmarks, sal_Bool bPersistent ) { if( mpSourceDoc ) { @@ -752,13 +752,13 @@ void SdTransferable::SetPageBookmarks( const List& rPageBookmarks, BOOL bPersist if( bPersistent ) { mpSdDrawDocument->CreateFirstPages(mpSourceDoc); - mpSdDrawDocument->InsertBookmarkAsPage( const_cast< List* >( &rPageBookmarks ), NULL, FALSE, TRUE, 1, TRUE, mpSourceDoc->GetDocSh(), TRUE, TRUE, FALSE ); + mpSdDrawDocument->InsertBookmarkAsPage( const_cast< List* >( &rPageBookmarks ), NULL, sal_False, sal_True, 1, sal_True, mpSourceDoc->GetDocSh(), sal_True, sal_True, sal_False ); } else { mpPageDocShell = mpSourceDoc->GetDocSh(); - for( ULONG i = 0; i < rPageBookmarks.Count(); i++ ) + for( sal_uLong i = 0; i < rPageBookmarks.Count(); i++ ) maPageBookmarks.Insert( new String( *static_cast< String* >( rPageBookmarks.GetObject( i ) ) ), LIST_APPEND ); } @@ -772,9 +772,9 @@ void SdTransferable::SetPageBookmarks( const List& rPageBookmarks, BOOL bPersist } } - // set flags for page transferable; if ( mbPageTransferablePersistent == FALSE ), + // set flags for page transferable; if ( mbPageTransferablePersistent == sal_False ), // don't offer any formats => it's just for internal puposes - mbPageTransferable = TRUE; + mbPageTransferable = sal_True; mbPageTransferablePersistent = bPersistent; } } diff --git a/sd/source/ui/app/tbxww.cxx b/sd/source/ui/app/tbxww.cxx index 80bd3a5ac8b9..06eb8f684711 100644..100755 --- a/sd/source/ui/app/tbxww.cxx +++ b/sd/source/ui/app/tbxww.cxx @@ -60,7 +60,7 @@ SFX_IMPL_TOOLBOX_CONTROL( SdTbxControl, TbxImageItem ) |* \************************************************************************/ /* -SdPopupWindowTbx::SdPopupWindowTbx( USHORT nId, WindowAlign eAlign, +SdPopupWindowTbx::SdPopupWindowTbx( sal_uInt16 nId, WindowAlign eAlign, SdResId aRIdWin, SdResId aRIdTbx, SfxBindings& rBindings ) : SfxPopupWindow ( nId, aRIdWin, rBindings ), @@ -99,10 +99,10 @@ void SdPopupWindowTbx::AdaptToCTL (void) // Iterate over all tool box items and remove those that are // specific to complex text layout. - USHORT i=0; + sal_uInt16 i=0; while (i < aToolBox.GetItemCount()) { - USHORT nIndex = aToolBox.GetItemId(i); + sal_uInt16 nIndex = aToolBox.GetItemId(i); switch (nIndex) { case 0: // Line break. @@ -121,7 +121,7 @@ void SdPopupWindowTbx::AdaptToCTL (void) aToolBox.RecalcItems(); // Why is this necessary? aToolBox.SetLineCount(1); - USHORT nLineCount = aToolBox.GetLineCount(); + sal_uInt16 nLineCount = aToolBox.GetLineCount(); aSize = aToolBox.CalcWindowSizePixel(nLineCount); } } @@ -194,7 +194,7 @@ IMPL_LINK( SdPopupWindowTbx, TbxSelectHdl, ToolBox*, pBox) |* \************************************************************************/ -SdTbxControl::SdTbxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ) : +SdTbxControl::SdTbxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) : SfxToolBoxControl( nSlotId, nId, rTbx ) { rTbx.SetItemBits( nId, TIB_DROPDOWN | rTbx.GetItemBits( nId ) ); @@ -281,7 +281,7 @@ SfxPopupWindow* SdTbxControl::CreatePopupWindow() /*-------------------------------------------------------------------------*/ -void SdTbxControl::StateChanged( USHORT nSId, +void SdTbxControl::StateChanged( sal_uInt16 nSId, SfxItemState eState, const SfxPoolItem* pState ) { SfxToolBoxControl::StateChanged( nSId, eState, pState ); @@ -295,11 +295,11 @@ void SdTbxControl::StateChanged( USHORT nSId, if( pItem ) { ToolBox& rTbx = GetToolBox(); - USHORT nImage = pItem->GetValue(); + sal_uInt16 nImage = pItem->GetValue(); if( nImage == 0 ) { if( rTbx.IsItemChecked( nSId ) ) - rTbx.CheckItem( nSId, FALSE ); + rTbx.CheckItem( nSId, sal_False ); } else { @@ -323,28 +323,28 @@ void SdTbxControl::StateChanged( USHORT nSId, { if( nSId != SID_OBJECT_CHOOSE_MODE && rTbx.IsItemChecked( SID_OBJECT_CHOOSE_MODE ) ) - rTbx.CheckItem( SID_OBJECT_CHOOSE_MODE, FALSE ); + rTbx.CheckItem( SID_OBJECT_CHOOSE_MODE, sal_False ); if( nSId != SID_DRAWTBX_TEXT && rTbx.IsItemChecked( SID_DRAWTBX_TEXT ) ) - rTbx.CheckItem( SID_DRAWTBX_TEXT, FALSE ); + rTbx.CheckItem( SID_DRAWTBX_TEXT, sal_False ); if( nSId != SID_DRAWTBX_RECTANGLES && rTbx.IsItemChecked( SID_DRAWTBX_RECTANGLES ) ) - rTbx.CheckItem( SID_DRAWTBX_RECTANGLES, FALSE ); + rTbx.CheckItem( SID_DRAWTBX_RECTANGLES, sal_False ); if( nSId != SID_DRAWTBX_ELLIPSES && rTbx.IsItemChecked( SID_DRAWTBX_ELLIPSES ) ) - rTbx.CheckItem( SID_DRAWTBX_ELLIPSES, FALSE ); + rTbx.CheckItem( SID_DRAWTBX_ELLIPSES, sal_False ); if( nSId != SID_DRAWTBX_LINES && rTbx.IsItemChecked( SID_DRAWTBX_LINES ) ) - rTbx.CheckItem( SID_DRAWTBX_LINES, FALSE ); + rTbx.CheckItem( SID_DRAWTBX_LINES, sal_False ); if( nSId != SID_DRAWTBX_ARROWS && rTbx.IsItemChecked( SID_DRAWTBX_ARROWS ) ) - rTbx.CheckItem( SID_DRAWTBX_ARROWS, FALSE ); + rTbx.CheckItem( SID_DRAWTBX_ARROWS, sal_False ); if( nSId != SID_DRAWTBX_3D_OBJECTS && rTbx.IsItemChecked( SID_DRAWTBX_3D_OBJECTS ) ) - rTbx.CheckItem( SID_DRAWTBX_3D_OBJECTS, FALSE ); + rTbx.CheckItem( SID_DRAWTBX_3D_OBJECTS, sal_False ); if( nSId != SID_DRAWTBX_CONNECTORS && rTbx.IsItemChecked( SID_DRAWTBX_CONNECTORS ) ) - rTbx.CheckItem( SID_DRAWTBX_CONNECTORS, FALSE ); + rTbx.CheckItem( SID_DRAWTBX_CONNECTORS, sal_False ); } } } @@ -354,7 +354,7 @@ void SdTbxControl::StateChanged( USHORT nSId, /*-------------------------------------------------------------------------*/ -BOOL SdTbxControl::IsCheckable( USHORT nSId ) +sal_Bool SdTbxControl::IsCheckable( sal_uInt16 nSId ) { switch( nSId ) { @@ -463,9 +463,9 @@ BOOL SdTbxControl::IsCheckable( USHORT nSId ) //case SID_ZOOM_OUT: - return( TRUE ); + return( sal_True ); } - return( FALSE ); + return( sal_False ); } diff --git a/sd/source/ui/app/tmplctrl.cxx b/sd/source/ui/app/tmplctrl.cxx index 039df4bbce3f..4d0b121f8f03 100644..100755 --- a/sd/source/ui/app/tmplctrl.cxx +++ b/sd/source/ui/app/tmplctrl.cxx @@ -52,10 +52,10 @@ class TemplatePopup_Impl : public PopupMenu public: TemplatePopup_Impl(); - USHORT GetCurId() const { return nCurId; } + sal_uInt16 GetCurId() const { return nCurId; } private: - USHORT nCurId; + sal_uInt16 nCurId; virtual void Select(); }; @@ -77,8 +77,8 @@ void TemplatePopup_Impl::Select() // class SdTemplateControl ------------------------------------------ -SdTemplateControl::SdTemplateControl( USHORT _nSlotId, - USHORT _nId, +SdTemplateControl::SdTemplateControl( sal_uInt16 _nSlotId, + sal_uInt16 _nId, StatusBar& rStb ) : SfxStatusBarControl( _nSlotId, _nId, rStb ) { @@ -93,7 +93,7 @@ SdTemplateControl::~SdTemplateControl() // ----------------------------------------------------------------------- void SdTemplateControl::StateChanged( - USHORT /*nSID*/, SfxItemState eState, const SfxPoolItem* pState ) + sal_uInt16 /*nSID*/, SfxItemState eState, const SfxPoolItem* pState ) { if( eState != SFX_ITEM_AVAILABLE || pState->ISA( SfxVoidItem ) ) GetStatusBar().SetItemText( GetId(), String() ); @@ -130,10 +130,10 @@ void SdTemplateControl::Command( const CommandEvent& rCEvt ) CaptureMouse(); TemplatePopup_Impl aPop; { - const USHORT nMasterCount = pDoc->GetMasterSdPageCount(PK_STANDARD); + const sal_uInt16 nMasterCount = pDoc->GetMasterSdPageCount(PK_STANDARD); - USHORT nCount = 0; - for( USHORT nPage = 0; nPage < nMasterCount; ++nPage ) + sal_uInt16 nCount = 0; + for( sal_uInt16 nPage = 0; nPage < nMasterCount; ++nPage ) { SdPage* pMaster = pDoc->GetMasterSdPage(nPage, PK_STANDARD); if( pMaster ) @@ -141,7 +141,7 @@ void SdTemplateControl::Command( const CommandEvent& rCEvt ) } aPop.Execute( &GetStatusBar(), rCEvt.GetMousePosPixel()); - USHORT nCurrId = aPop.GetCurId()-1; + sal_uInt16 nCurrId = aPop.GetCurId()-1; if( nCurrId < nMasterCount ) { SdPage* pMaster = pDoc->GetMasterSdPage(nCurrId, PK_STANDARD); diff --git a/sd/source/ui/controller/slidelayoutcontroller.cxx b/sd/source/ui/controller/slidelayoutcontroller.cxx index 1a9201af6555..cd09030f7d4c 100644 --- a/sd/source/ui/controller/slidelayoutcontroller.cxx +++ b/sd/source/ui/controller/slidelayoutcontroller.cxx @@ -101,9 +101,9 @@ private: struct snewfoil_value_info { - USHORT mnBmpResId; - USHORT mnHCBmpResId; - USHORT mnStrResId; + sal_uInt16 mnBmpResId; + sal_uInt16 mnHCBmpResId; + sal_uInt16 mnStrResId; WritingMode meWritingMode; AutoLayout maAutoLayout; }; @@ -169,7 +169,7 @@ static void fillLayoutValueSet( ValueSet* pValue, snewfoil_value_info* pInfo, co String aText( SdResId( pInfo->mnStrResId ) ); BitmapEx aBmp( SdResId( (bHighContrast ? pInfo->mnHCBmpResId : pInfo->mnBmpResId) ) ); - pValue->InsertItem( static_cast<USHORT>(pInfo->maAutoLayout)+1, aBmp, aText ); + pValue->InsertItem( static_cast<sal_uInt16>(pInfo->maAutoLayout)+1, aBmp, aText ); aLayoutItemSize.Width() = std::max( aLayoutItemSize.Width(), aBmp.GetSizePixel().Width() ); aLayoutItemSize.Height() = std::max( aLayoutItemSize.Height(), aBmp.GetSizePixel().Height() ); @@ -247,7 +247,7 @@ LayoutToolbarMenu::LayoutToolbarMenu( SlideLayoutController& rController, const mpLayoutSet2->SetSelectHdl( LINK( this, LayoutToolbarMenu, SelectHdl ) ); mpLayoutSet2->SetColCount( 4 ); - mpLayoutSet2->EnableFullItemMode( FALSE ); + mpLayoutSet2->EnableFullItemMode( sal_False ); mpLayoutSet2->SetColor( GetControlBackground() ); fillLayoutValueSet( mpLayoutSet2, &v_standard[0], bHighContrast ); @@ -273,7 +273,7 @@ LayoutToolbarMenu::LayoutToolbarMenu( SlideLayoutController& rController, const sSlotStr = OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:DuplicatePage" ) ); else sSlotStr = OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:Undo" ) ); - aSlotImage = ::GetImage( mxFrame, sSlotStr, FALSE, bHighContrast ); + aSlotImage = ::GetImage( mxFrame, sSlotStr, sal_False, bHighContrast ); String sSlotTitle; if( bInsertPage ) diff --git a/sd/source/ui/dlg/AnimationChildWindow.cxx b/sd/source/ui/dlg/AnimationChildWindow.cxx index fa62b21948a8..a666e298c819 100644..100755 --- a/sd/source/ui/dlg/AnimationChildWindow.cxx +++ b/sd/source/ui/dlg/AnimationChildWindow.cxx @@ -49,7 +49,7 @@ SFX_IMPL_DOCKINGWINDOW(AnimationChildWindow, SID_ANIMATION_OBJECTS) AnimationChildWindow::AnimationChildWindow( ::Window* _pParent, - USHORT nId, + sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo ) : SfxChildWindow( _pParent, nId ) @@ -75,7 +75,7 @@ AnimationChildWindow::AnimationChildWindow( pAnimWin->aFltWinSize = pWindow->GetSizePixel(); */ - SetHideNotDelete( TRUE ); + SetHideNotDelete( sal_True ); } } // end of namespace sd diff --git a/sd/source/ui/dlg/LayerDialogChildWindow.cxx b/sd/source/ui/dlg/LayerDialogChildWindow.cxx index 8725cfc594fd..ae5ccc8d71c6 100644..100755 --- a/sd/source/ui/dlg/LayerDialogChildWindow.cxx +++ b/sd/source/ui/dlg/LayerDialogChildWindow.cxx @@ -53,7 +53,7 @@ namespace sd { LayerDialogChildWindow::LayerDialogChildWindow ( ::Window* _pParent, - USHORT nId, + sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo) : SfxChildWindow (_pParent, nId) diff --git a/sd/source/ui/dlg/LayerDialogContent.cxx b/sd/source/ui/dlg/LayerDialogContent.cxx index 975d277c7dff..90d53674b905 100755 --- a/sd/source/ui/dlg/LayerDialogContent.cxx +++ b/sd/source/ui/dlg/LayerDialogContent.cxx @@ -86,7 +86,7 @@ LayerDialogContent::~LayerDialogContent (void) -BOOL LayerDialogContent::Close (void) +sal_Bool LayerDialogContent::Close (void) { return SfxDockingWindow::Close(); } diff --git a/sd/source/ui/dlg/LayerTabBar.cxx b/sd/source/ui/dlg/LayerTabBar.cxx index cd5977772bfe..c147d1e616b5 100755 --- a/sd/source/ui/dlg/LayerTabBar.cxx +++ b/sd/source/ui/dlg/LayerTabBar.cxx @@ -112,26 +112,26 @@ void LayerTabBar::Select() void LayerTabBar::MouseButtonDown(const MouseEvent& rMEvt) { - BOOL bSetPageID=FALSE; + sal_Bool bSetPageID=sal_False; if (rMEvt.IsLeft() && !rMEvt.IsMod1() && !rMEvt.IsMod2()) { Point aPosPixel = rMEvt.GetPosPixel(); - USHORT aLayerId = GetPageId( PixelToLogic(aPosPixel) ); + sal_uInt16 aLayerId = GetPageId( PixelToLogic(aPosPixel) ); if (aLayerId == 0) { SfxDispatcher* pDispatcher = pDrViewSh->GetViewFrame()->GetDispatcher(); pDispatcher->Execute(SID_INSERTLAYER, SFX_CALLMODE_SYNCHRON); - bSetPageID=TRUE; + bSetPageID=sal_True; } else if (rMEvt.IsShift()) { // Toggle zw. Layer sichtbar / unsichtbar String aName(GetPageText(aLayerId)); SdrPageView* pPV = pDrViewSh->GetView()->GetSdrPageView(); - BOOL bVisible = pPV->IsLayerVisible(aName); + sal_Bool bVisible = pPV->IsLayerVisible(aName); pPV->SetLayerVisible(aName, !bVisible); pDrViewSh->ResetActualLayer(); } @@ -172,9 +172,9 @@ sal_Int8 LayerTabBar::AcceptDrop( const AcceptDropEvent& rEvt ) if( !pDrViewSh->GetDocSh()->IsReadOnly() ) { - USHORT nPageId = SDRPAGE_NOTFOUND; + sal_uInt16 nPageId = SDRPAGE_NOTFOUND; Point aPos( PixelToLogic( rEvt.maPosPixel ) ); - USHORT nLayerId = pDrViewSh->GetView()->GetDoc()->GetLayerAdmin().GetLayerID( GetPageText( GetPageId( aPos ) ), FALSE ); + sal_uInt16 nLayerId = pDrViewSh->GetView()->GetDoc()->GetLayerAdmin().GetLayerID( GetPageText( GetPageId( aPos ) ), sal_False ); nRet = pDrViewSh->AcceptDrop( rEvt, *this, NULL, nPageId, nLayerId ); @@ -192,8 +192,8 @@ sal_Int8 LayerTabBar::AcceptDrop( const AcceptDropEvent& rEvt ) sal_Int8 LayerTabBar::ExecuteDrop( const ExecuteDropEvent& rEvt ) { - USHORT nPageId = SDRPAGE_NOTFOUND; - USHORT nLayerId = pDrViewSh->GetView()->GetDoc()->GetLayerAdmin().GetLayerID( GetPageText( GetPageId( PixelToLogic( rEvt.maPosPixel ) ) ), FALSE ); + sal_uInt16 nPageId = SDRPAGE_NOTFOUND; + sal_uInt16 nLayerId = pDrViewSh->GetView()->GetDoc()->GetLayerAdmin().GetLayerID( GetPageText( GetPageId( PixelToLogic( rEvt.maPosPixel ) ) ), sal_False ); sal_Int8 nRet = pDrViewSh->ExecuteDrop( rEvt, *this, NULL, nPageId, nLayerId ); EndSwitchPage(); @@ -221,7 +221,7 @@ void LayerTabBar::Command(const CommandEvent& rCEvt) \************************************************************************/ long LayerTabBar::StartRenaming() { - BOOL bOK = TRUE; + sal_Bool bOK = sal_True; String aLayerName = GetPageText( GetEditPageId() ); String aLayoutLayer ( SdResId(STR_LAYER_LAYOUT) ); String aControlsLayer ( SdResId(STR_LAYER_CONTROLS) ); @@ -234,7 +234,7 @@ long LayerTabBar::StartRenaming() aLayerName == aBackgroundLayer || aLayerName == aBackgroundObjLayer ) { // Diese Namen duerfen nicht veraendert werden - bOK = FALSE; + bOK = sal_False; } else { @@ -255,7 +255,7 @@ long LayerTabBar::StartRenaming() long LayerTabBar::AllowRenaming() { - BOOL bOK = TRUE; + sal_Bool bOK = sal_True; // Ueberpruefung auf schon vorhandene Namen ::sd::View* pView = pDrViewSh->GetView(); @@ -265,13 +265,13 @@ long LayerTabBar::AllowRenaming() String aNewName( GetEditText() ); if ( aNewName.Len() == 0 || - (rLayerAdmin.GetLayer( aNewName, FALSE ) && aLayerName != aNewName) ) + (rLayerAdmin.GetLayer( aNewName, sal_False ) && aLayerName != aNewName) ) { // Name ist schon vorhanden WarningBox aWarningBox( &pDrViewSh->GetViewFrame()->GetWindow(), WinBits( WB_OK ), String(SdResId( STR_WARN_NAME_DUPLICATE ) ) ); aWarningBox.Execute(); - bOK = FALSE; + bOK = sal_False; } if (bOK) @@ -287,7 +287,7 @@ long LayerTabBar::AllowRenaming() aNewName == aBackgroundLayer || aNewName == aBackgroundObjLayer ) { // Diese Namen duerfen nicht vergeben werden - bOK = FALSE; + bOK = sal_False; } } @@ -308,7 +308,7 @@ void LayerTabBar::EndRenaming() SdDrawDocument* pDoc = pView->GetDoc(); String aLayerName = pView->GetActiveLayer(); SdrLayerAdmin& rLayerAdmin = pDoc->GetLayerAdmin(); - SdrLayer* pLayer = rLayerAdmin.GetLayer(aLayerName, FALSE); + SdrLayer* pLayer = rLayerAdmin.GetLayer(aLayerName, sal_False); if (pLayer) { @@ -342,7 +342,7 @@ void LayerTabBar::EndRenaming() // schon bekannt sein muss. pView->SetActiveLayer(aNewName); pLayer->SetName(aNewName); - pDoc->SetChanged(TRUE); + pDoc->SetChanged(sal_True); } } } diff --git a/sd/source/ui/dlg/NavigatorChildWindow.cxx b/sd/source/ui/dlg/NavigatorChildWindow.cxx index a17a4064bf6e..e247847cefad 100644..100755 --- a/sd/source/ui/dlg/NavigatorChildWindow.cxx +++ b/sd/source/ui/dlg/NavigatorChildWindow.cxx @@ -40,7 +40,7 @@ SFX_IMPL_CHILDWINDOWCONTEXT(NavigatorChildWindow, SID_NAVIGATOR) NavigatorChildWindow::NavigatorChildWindow ( ::Window* pParent, - USHORT nId, + sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* ) : SfxChildWindowContext( nId ) diff --git a/sd/source/ui/dlg/PaneChildWindows.cxx b/sd/source/ui/dlg/PaneChildWindows.cxx index f9f181b0e44d..25e4a3e119b1 100755 --- a/sd/source/ui/dlg/PaneChildWindows.cxx +++ b/sd/source/ui/dlg/PaneChildWindows.cxx @@ -62,11 +62,11 @@ SFX_IMPL_DOCKINGWINDOW( ToolPanelChildWindow, SID_TASKPANE) PaneChildWindow::PaneChildWindow ( ::Window* pParentWindow, - USHORT nId, + sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo, - const USHORT nDockWinTitleResId, - const USHORT nTitleBarResId, + const sal_uInt16 nDockWinTitleResId, + const sal_uInt16 nTitleBarResId, SfxChildAlignment eAlignment) : SfxChildWindow (pParentWindow, nId) { @@ -78,7 +78,7 @@ PaneChildWindow::PaneChildWindow ( String( SdResId( nTitleBarResId ) ) ); eChildAlignment = eAlignment; static_cast<SfxDockingWindow*>(pWindow)->Initialize(pInfo); - SetHideNotDelete(TRUE); + SetHideNotDelete(sal_True); ViewShellBase* pBase = ViewShellBase::GetViewShellBase(pBindings->GetDispatcher()->GetFrame()); if (pBase != NULL) @@ -110,7 +110,7 @@ PaneChildWindow::~PaneChildWindow (void) LeftPaneImpressChildWindow::LeftPaneImpressChildWindow ( ::Window* pParentWindow, - USHORT nId, + sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo) : PaneChildWindow( @@ -131,7 +131,7 @@ LeftPaneImpressChildWindow::LeftPaneImpressChildWindow ( LeftPaneDrawChildWindow::LeftPaneDrawChildWindow ( ::Window* pParentWindow, - USHORT nId, + sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo) : PaneChildWindow( @@ -152,7 +152,7 @@ LeftPaneDrawChildWindow::LeftPaneDrawChildWindow ( //= ToolPanelChildWindow //====================================================================================================================== //---------------------------------------------------------------------------------------------------------------------- -ToolPanelChildWindow::ToolPanelChildWindow( ::Window* i_pParentWindow, USHORT i_nId, SfxBindings* i_pBindings, +ToolPanelChildWindow::ToolPanelChildWindow( ::Window* i_pParentWindow, sal_uInt16 i_nId, SfxBindings* i_pBindings, SfxChildWinInfo* i_pChildWindowInfo ) :PaneChildWindow( i_pParentWindow, i_nId, i_pBindings, i_pChildWindowInfo, FLT_TOOL_PANEL_DOCKING_WINDOW, STR_RIGHT_PANE_TITLE, SFX_ALIGN_RIGHT ) diff --git a/sd/source/ui/dlg/PaneDockingWindow.cxx b/sd/source/ui/dlg/PaneDockingWindow.cxx index bcf58c38c0b1..77cc8679968f 100644 --- a/sd/source/ui/dlg/PaneDockingWindow.cxx +++ b/sd/source/ui/dlg/PaneDockingWindow.cxx @@ -114,8 +114,8 @@ void PaneDockingWindow::SetValidSizeRange (const Range aValidSizeRange) SplitWindow* pSplitWindow = dynamic_cast<SplitWindow*>(GetParent()); if (pSplitWindow != NULL) { - const USHORT nId (pSplitWindow->GetItemId(static_cast< ::Window*>(this))); - const USHORT nSetId (pSplitWindow->GetSet(nId)); + const sal_uInt16 nId (pSplitWindow->GetItemId(static_cast< ::Window*>(this))); + const sal_uInt16 nSetId (pSplitWindow->GetSet(nId)); // Because the PaneDockingWindow paints its own decoration, we have // to compensate the valid size range for that. const SvBorder aBorder (GetDecorationBorder()); diff --git a/sd/source/ui/dlg/SpellDialogChildWindow.cxx b/sd/source/ui/dlg/SpellDialogChildWindow.cxx index 7aee12f23bbd..aa93635c4032 100755 --- a/sd/source/ui/dlg/SpellDialogChildWindow.cxx +++ b/sd/source/ui/dlg/SpellDialogChildWindow.cxx @@ -51,7 +51,7 @@ namespace sd { SpellDialogChildWindow::SpellDialogChildWindow ( ::Window* _pParent, - USHORT nId, + sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo) : ::svx::SpellDialogChildWindow (_pParent, nId, pBindings, pInfo), @@ -110,7 +110,7 @@ void SpellDialogChildWindow::InvalidateSpellDialog (void) // check. if (aResult.size() == 0) { - SfxBoolItem aItem (SID_SPELL_DIALOG, FALSE); + SfxBoolItem aItem (SID_SPELL_DIALOG, sal_False); GetBindings().GetDispatcher()->Execute( SID_SPELL_DIALOG, SFX_CALLMODE_ASYNCHRON, diff --git a/sd/source/ui/dlg/animobjs.cxx b/sd/source/ui/dlg/animobjs.cxx index e179a0ba9f86..e5e27928f520 100755 --- a/sd/source/ui/dlg/animobjs.cxx +++ b/sd/source/ui/dlg/animobjs.cxx @@ -176,8 +176,8 @@ AnimationWindow::AnimationWindow( SfxBindings* pInBindings, pWin ( pParent ), pBitmapEx ( NULL ), - bMovie ( FALSE ), - bAllObjects ( FALSE ), + bMovie ( sal_False ), + bAllObjects ( sal_False ), pBindings ( pInBindings ) { @@ -190,7 +190,7 @@ AnimationWindow::AnimationWindow( SfxBindings* pInBindings, // neues Dokument mit Seite erzeugen pMyDoc = new SdDrawDocument(DOCUMENT_TYPE_IMPRESS, NULL); - SdPage* pPage = (SdPage*) pMyDoc->AllocPage(FALSE); + SdPage* pPage = (SdPage*) pMyDoc->AllocPage(sal_False); pMyDoc->InsertPage(pPage); pControllerItem = new AnimationControllerItem( SID_ANIMATOR_STATE, this, pBindings ); @@ -232,7 +232,7 @@ AnimationWindow::AnimationWindow( SfxBindings* pInBindings, AnimationWindow::~AnimationWindow() { - ULONG i, nCount; + sal_uLong i, nCount; delete pControllerItem; @@ -265,7 +265,7 @@ IMPL_LINK( AnimationWindow, ClickFirstHdl, void *, EMPTYARG ) IMPL_LINK( AnimationWindow, ClickStopHdl, void *, EMPTYARG ) { - bMovie = FALSE; + bMovie = sal_False; return( 0L ); } @@ -275,22 +275,22 @@ IMPL_LINK( AnimationWindow, ClickPlayHdl, void *, p ) { ScopeLockGuard aGuard( maPlayLock ); - bMovie = TRUE; - BOOL bDisableCtrls = FALSE; - ULONG nCount = aBmpExList.Count(); - BOOL bReverse = p == &aBtnReverse; + bMovie = sal_True; + sal_Bool bDisableCtrls = sal_False; + sal_uLong nCount = aBmpExList.Count(); + sal_Bool bReverse = p == &aBtnReverse; // Kann spaeter schwer ermittelt werden - BOOL bRbtGroupEnabled = aRbtGroup.IsEnabled(); - BOOL bBtnGetAllObjectsEnabled = aBtnGetAllObjects.IsEnabled(); - BOOL bBtnGetOneObjectEnabled = aBtnGetOneObject.IsEnabled(); + sal_Bool bRbtGroupEnabled = aRbtGroup.IsEnabled(); + sal_Bool bBtnGetAllObjectsEnabled = aBtnGetAllObjects.IsEnabled(); + sal_Bool bBtnGetOneObjectEnabled = aBtnGetOneObject.IsEnabled(); // Gesamtzeit ermitteln Time aTime( 0 ); long nFullTime; if( aRbtBitmap.IsChecked() ) { - for( ULONG i = 0; i < nCount; i++ ) + for( sal_uLong i = 0; i < nCount; i++ ) aTime += *static_cast< Time* >( aTimeList.GetObject( i ) ); nFullTime = aTime.GetMSFromTime(); } @@ -304,16 +304,16 @@ IMPL_LINK( AnimationWindow, ClickPlayHdl, void *, p ) SfxProgress* pProgress = NULL; if( nFullTime >= 1000 ) { - bDisableCtrls = TRUE; + bDisableCtrls = sal_True; aBtnStop.Enable(); aBtnStop.Update(); String aStr( RTL_CONSTASCII_USTRINGPARAM( "Animator:" ) ); // Hier sollte man sich noch etwas gescheites ausdenken! pProgress = new SfxProgress( NULL, aStr, nFullTime ); } - ULONG nTmpTime = 0; + sal_uLong nTmpTime = 0; long i = 0; - BOOL bCount = i < (long) nCount; + sal_Bool bCount = i < (long) nCount; if( bReverse ) { i = nCount - 1; @@ -333,7 +333,7 @@ IMPL_LINK( AnimationWindow, ClickPlayHdl, void *, p ) DBG_ASSERT( pTime, "Keine Zeit gefunden!" ); aTimeField.SetTime( *pTime ); - ULONG nTime = pTime->GetMSFromTime(); + sal_uLong nTime = pTime->GetMSFromTime(); WaitInEffect( nTime, nTmpTime, pProgress ); nTmpTime += nTime; @@ -368,7 +368,7 @@ IMPL_LINK( AnimationWindow, ClickPlayHdl, void *, p ) } // Um die Controls wieder zu enablen - bMovie = FALSE; + bMovie = sal_False; if (nCount > 0) UpdateControl(i); @@ -403,12 +403,12 @@ IMPL_LINK( AnimationWindow, ClickRbtHdl, void *, p ) if( !pBitmapEx || p == &aRbtGroup || aRbtGroup.IsChecked() ) { aTimeField.SetText( String() ); - aTimeField.Enable( FALSE ); - aLbLoopCount.Enable( FALSE ); + aTimeField.Enable( sal_False ); + aLbLoopCount.Enable( sal_False ); } else if( p == &aRbtBitmap || aRbtBitmap.IsChecked() ) { - ULONG n = static_cast<ULONG>(aNumFldBitmap.GetValue()); + sal_uLong n = static_cast<sal_uLong>(aNumFldBitmap.GetValue()); if( n > 0 ) { Time* pTime = static_cast< Time* >( aTimeList.GetObject( n - 1 ) ); @@ -429,7 +429,7 @@ IMPL_LINK( AnimationWindow, ClickGetObjectHdl, void *, pBtn ) bAllObjects = pBtn == &aBtnGetAllObjects; // Code jetzt in AddObj() - SfxBoolItem aItem( SID_ANIMATOR_ADD, TRUE ); + SfxBoolItem aItem( SID_ANIMATOR_ADD, sal_True ); GetBindings().GetDispatcher()->Execute( SID_ANIMATOR_ADD, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD, &aItem, 0L ); @@ -445,7 +445,7 @@ IMPL_LINK( AnimationWindow, ClickRemoveBitmapHdl, void *, pBtn ) if( pBtn == &aBtnRemoveBitmap ) { - ULONG nPos = aBmpExList.GetCurPos(); + sal_uLong nPos = aBmpExList.GetCurPos(); pBitmapEx = static_cast< BitmapEx* >( aBmpExList.GetCurObject() ); if( pBitmapEx ) { @@ -533,7 +533,7 @@ IMPL_LINK( AnimationWindow, ClickRemoveBitmapHdl, void *, pBtn ) IMPL_LINK( AnimationWindow, ClickCreateGroupHdl, void *, EMPTYARG ) { // Code jetzt in CreatePresObj() - SfxBoolItem aItem( SID_ANIMATOR_CREATE, TRUE ); + SfxBoolItem aItem( SID_ANIMATOR_CREATE, sal_True ); GetBindings().GetDispatcher()->Execute( SID_ANIMATOR_CREATE, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD, &aItem, 0L ); @@ -544,7 +544,7 @@ IMPL_LINK( AnimationWindow, ClickCreateGroupHdl, void *, EMPTYARG ) IMPL_LINK( AnimationWindow, ModifyBitmapHdl, void *, EMPTYARG ) { - ULONG nBmp = static_cast<ULONG>(aNumFldBitmap.GetValue()); + sal_uLong nBmp = static_cast<sal_uLong>(aNumFldBitmap.GetValue()); if( nBmp > aBmpExList.Count() ) nBmp = aBmpExList.Count(); @@ -563,7 +563,7 @@ IMPL_LINK( AnimationWindow, ModifyBitmapHdl, void *, EMPTYARG ) IMPL_LINK( AnimationWindow, ModifyTimeHdl, void *, EMPTYARG ) { - ULONG nPos = static_cast<ULONG>(aNumFldBitmap.GetValue() - 1); + sal_uLong nPos = static_cast<sal_uLong>(aNumFldBitmap.GetValue() - 1); Time* pTime = static_cast< Time* >( aTimeList.GetObject( nPos ) ); DBG_ASSERT( pTime, "Zeit nicht gefunden!" ); @@ -575,7 +575,7 @@ IMPL_LINK( AnimationWindow, ModifyTimeHdl, void *, EMPTYARG ) // ----------------------------------------------------------------------- -void AnimationWindow::UpdateControl( ULONG nListPos, BOOL bDisableCtrls ) +void AnimationWindow::UpdateControl( sal_uLong nListPos, sal_Bool bDisableCtrls ) { String aString; @@ -584,7 +584,7 @@ void AnimationWindow::UpdateControl( ULONG nListPos, BOOL bDisableCtrls ) BitmapEx aBmp( *pBitmapEx ); SdPage* pPage = pMyDoc->GetSdPage(0, PK_STANDARD); - SdrObject* pObject = (SdrObject*) pPage->GetObj( (ULONG) nListPos ); + SdrObject* pObject = (SdrObject*) pPage->GetObj( (sal_uLong) nListPos ); if( pObject ) { VirtualDevice aVD; @@ -638,15 +638,15 @@ void AnimationWindow::UpdateControl( ULONG nListPos, BOOL bDisableCtrls ) //aFiCount.SetText( String( SdResId( STR_NULL ) ) ); // Wenn kein Objekt in der Liste ist - aBtnFirst.Enable( FALSE ); - aBtnReverse.Enable( FALSE ); - aBtnPlay.Enable( FALSE ); - aBtnLast.Enable( FALSE ); - aNumFldBitmap.Enable( FALSE ); - aTimeField.Enable( FALSE ); - aLbLoopCount.Enable( FALSE ); - aBtnRemoveBitmap.Enable( FALSE ); - aBtnRemoveAll.Enable( FALSE ); + aBtnFirst.Enable( sal_False ); + aBtnReverse.Enable( sal_False ); + aBtnPlay.Enable( sal_False ); + aBtnLast.Enable( sal_False ); + aNumFldBitmap.Enable( sal_False ); + aTimeField.Enable( sal_False ); + aLbLoopCount.Enable( sal_False ); + aBtnRemoveBitmap.Enable( sal_False ); + aBtnRemoveAll.Enable( sal_False ); //aFtAdjustment.Enable(); //aLbAdjustment.Enable(); @@ -654,13 +654,13 @@ void AnimationWindow::UpdateControl( ULONG nListPos, BOOL bDisableCtrls ) if( bMovie && bDisableCtrls ) { - aBtnGetOneObject.Enable( FALSE ); - aBtnGetAllObjects.Enable( FALSE ); - aRbtGroup.Enable( FALSE ); - aRbtBitmap.Enable( FALSE ); - aBtnCreateGroup.Enable( FALSE ); - aFtAdjustment.Enable( FALSE ); - aLbAdjustment.Enable( FALSE ); + aBtnGetOneObject.Enable( sal_False ); + aBtnGetAllObjects.Enable( sal_False ); + aRbtGroup.Enable( sal_False ); + aRbtBitmap.Enable( sal_False ); + aBtnCreateGroup.Enable( sal_False ); + aFtAdjustment.Enable( sal_False ); + aLbAdjustment.Enable( sal_False ); } else { @@ -670,8 +670,8 @@ void AnimationWindow::UpdateControl( ULONG nListPos, BOOL bDisableCtrls ) aRbtBitmap.Enable(); aBtnCreateGroup.Enable(aBmpExList.Count() != 0); - aFtAdjustment.Enable( TRUE ); - aLbAdjustment.Enable( TRUE ); + aFtAdjustment.Enable( sal_True ); + aLbAdjustment.Enable( sal_True ); } ClickRbtHdl( NULL ); @@ -691,7 +691,7 @@ void AnimationWindow::ResetAttrs() // ----------------------------------------------------------------------- -void AnimationWindow::WaitInEffect( ULONG nMilliSeconds, ULONG nTime, +void AnimationWindow::WaitInEffect( sal_uLong nMilliSeconds, sal_uLong nTime, SfxProgress* pProgress ) const { clock_t aEnd = Time::GetSystemTicks() + nMilliSeconds; @@ -715,13 +715,13 @@ void AnimationWindow::WaitInEffect( ULONG nMilliSeconds, ULONG nTime, Fraction AnimationWindow::GetScale() { Fraction aFrac; - ULONG nPos = aBmpExList.GetCurPos(); - ULONG nCount = aBmpExList.Count(); + sal_uLong nPos = aBmpExList.GetCurPos(); + sal_uLong nCount = aBmpExList.Count(); if( nCount > 0 ) { aBmpSize.Width() = 0; aBmpSize.Height() = 0; - for( ULONG i = 0; i < nCount; i++ ) + for( sal_uLong i = 0; i < nCount; i++ ) { pBitmapEx = static_cast< BitmapEx* >( aBmpExList.GetObject( i ) ); Size aTempSize( pBitmapEx->GetBitmap().GetSizePixel() ); @@ -846,22 +846,22 @@ void AnimationWindow::Resize() // ----------------------------------------------------------------------- -BOOL AnimationWindow::Close() +sal_Bool AnimationWindow::Close() { if( maPlayLock.isLocked() ) { - return FALSE; + return sal_False; } else { - SfxBoolItem aItem( SID_ANIMATION_OBJECTS, FALSE ); + SfxBoolItem aItem( SID_ANIMATION_OBJECTS, sal_False ); GetBindings().GetDispatcher()->Execute( SID_ANIMATION_OBJECTS, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, &aItem, 0L ); SfxDockingWindow::Close(); - return TRUE; + return sal_True; } } @@ -883,30 +883,30 @@ void AnimationWindow::AddObj (::sd::View& rView ) // Objekt(e) clonen und den/die Clone(s) in die Liste stellen const SdrMarkList& rMarkList = rView.GetMarkedObjectList(); - ULONG nMarkCount = rMarkList.GetMarkCount(); + sal_uLong nMarkCount = rMarkList.GetMarkCount(); SdPage* pPage = pMyDoc->GetSdPage(0, PK_STANDARD); - ULONG nCloneCount = pPage->GetObjCount(); + sal_uLong nCloneCount = pPage->GetObjCount(); if (nMarkCount > 0) { // Wenn es sich um EIN Animationsobjekt oder ein Gruppenobjekt // handelt, das 'einzeln uebernommen' wurde, // werden die einzelnen Objekte eingefuegt - BOOL bAnimObj = FALSE; + sal_Bool bAnimObj = sal_False; if( nMarkCount == 1 ) { SdrMark* pMark = rMarkList.GetMark(0); SdrObject* pObject = pMark->GetMarkedSdrObj(); SdAnimationInfo* pAnimInfo = rView.GetDoc()->GetAnimationInfo( pObject ); - UINT32 nInv = pObject->GetObjInventor(); - UINT16 nId = pObject->GetObjIdentifier(); + sal_uInt32 nInv = pObject->GetObjInventor(); + sal_uInt16 nId = pObject->GetObjIdentifier(); // Animated Bitmap (GIF) if( nInv == SdrInventor && nId == OBJ_GRAF && ( (SdrGrafObj*) pObject )->IsAnimated() ) { const SdrGrafObj* pGrafObj = (SdrGrafObj*) pObject; Graphic aGraphic( pGrafObj->GetTransformedGraphic() ); - USHORT nCount = 0; + sal_uInt16 nCount = 0; if( aGraphic.IsAnimated() ) nCount = aGraphic.GetAnimation().Count(); @@ -915,7 +915,7 @@ void AnimationWindow::AddObj (::sd::View& rView ) { const Animation aAnimation( aGraphic.GetAnimation() ); - for( USHORT i = 0; i < nCount; i++ ) + for( sal_uInt16 i = 0; i < nCount; i++ ) { const AnimationBitmap& rAnimBmp = aAnimation.Get( i ); @@ -943,8 +943,8 @@ void AnimationWindow::AddObj (::sd::View& rView ) } // Nachdem ein animated GIF uebernommen wurde, kann auch nur ein solches erstellt werden aRbtBitmap.Check(); - aRbtGroup.Enable( FALSE ); - bAnimObj = TRUE; + aRbtGroup.Enable( sal_False ); + bAnimObj = sal_True; } } else if( bAllObjects || ( pAnimInfo && pAnimInfo->mbIsMovie ) ) @@ -952,9 +952,9 @@ void AnimationWindow::AddObj (::sd::View& rView ) // Mehrere Objekte SdrObjList* pObjList = ((SdrObjGroup*)pObject)->GetSubList(); - for( USHORT nObject = 0; nObject < pObjList->GetObjCount(); nObject++ ) + for( sal_uInt16 nObject = 0; nObject < pObjList->GetObjCount(); nObject++ ) { - SdrObject* pSnapShot = (SdrObject*) pObjList->GetObj( (ULONG) nObject ); + SdrObject* pSnapShot = (SdrObject*) pObjList->GetObj( (sal_uLong) nObject ); pBitmapEx = new BitmapEx( SdrExchangeView::GetObjGraphic( pSnapShot->GetModel(), pSnapShot ).GetBitmapEx() ); aBmpExList.Insert( pBitmapEx, aBmpExList.GetCurPos() + 1 ); @@ -969,7 +969,7 @@ void AnimationWindow::AddObj (::sd::View& rView ) // Weiterschalten der BitmapListe aBmpExList.Next(); } - bAnimObj = TRUE; + bAnimObj = sal_True; } } // Auch ein einzelnes animiertes Objekt @@ -998,7 +998,7 @@ void AnimationWindow::AddObj (::sd::View& rView ) // Objekte einzeln uebernehmen if( bAllObjects ) { - for( ULONG nObject= 0; nObject < nMarkCount; nObject++ ) + for( sal_uLong nObject= 0; nObject < nMarkCount; nObject++ ) { // Clone SdrObject* pObject = rMarkList.GetMark( nObject )->GetMarkedSdrObj(); @@ -1014,14 +1014,14 @@ void AnimationWindow::AddObj (::sd::View& rView ) aBmpExList.Next(); } - bAnimObj = TRUE; // damit nicht nochmal weitergeschaltet wird + bAnimObj = sal_True; // damit nicht nochmal weitergeschaltet wird } else { SdrObjGroup* pCloneGroup = new SdrObjGroup; SdrObjList* pObjList = pCloneGroup->GetSubList(); - for (ULONG nObject= 0; nObject < nMarkCount; nObject++) + for (sal_uLong nObject= 0; nObject < nMarkCount; nObject++) pObjList->InsertObject(rMarkList.GetMark(nObject)->GetMarkedSdrObj()->Clone(), LIST_APPEND); pPage->InsertObject(pCloneGroup, aBmpExList.GetCurPos() + 1); @@ -1058,9 +1058,9 @@ void AnimationWindow::CreateAnimObj (::sd::View& rView ) Size aTemp( pOutWin->GetOutputSizePixel() ); const Point aWindowCenter( pOutWin->PixelToLogic( Point( aTemp.Width() >> 1, aTemp.Height() >> 1 ) ) ); const OutputDevice* pDefDev = Application::GetDefaultDevice(); - const ULONG nCount = aBmpExList.Count(); + const sal_uLong nCount = aBmpExList.Count(); BitmapAdjustment eBA = (BitmapAdjustment) aLbAdjustment.GetSelectEntryPos(); - ULONG i; + sal_uLong i; // Groesste Bitmap ermitteln for( i = 0; i < nCount; i++ ) @@ -1147,7 +1147,7 @@ void AnimationWindow::CreateAnimObj (::sd::View& rView ) // LoopCount (Anzahl der Durchlaeufe) ermitteln AnimationBitmap aAnimBmp; long nLoopCount = 0L; - USHORT nPos = aLbLoopCount.GetSelectEntryPos(); + sal_uInt16 nPos = aLbLoopCount.GetSelectEntryPos(); if( nPos != LISTBOX_ENTRY_NOTFOUND && nPos != aLbLoopCount.GetEntryCount() - 1 ) // unendlich nLoopCount = (long) aLbLoopCount.GetSelectEntry().ToInt32(); @@ -1157,7 +1157,7 @@ void AnimationWindow::CreateAnimObj (::sd::View& rView ) aAnimBmp.aSizePix = aBitmapSize; aAnimBmp.nWait = nTime; aAnimBmp.eDisposal = DISPOSE_BACK; - aAnimBmp.bUserInput = FALSE; + aAnimBmp.bUserInput = sal_False; aAnimation.Insert( aAnimBmp ); aAnimation.SetDisplaySizePixel( aMaxSizePix ); @@ -1257,8 +1257,8 @@ void AnimationWindow::CreateAnimObj (::sd::View& rView ) SdAnimationInfo* pInfo = SdDrawDocument::GetShapeUserData(*pGroup,true); pInfo->meEffect = presentation::AnimationEffect_NONE; pInfo->meSpeed = presentation::AnimationSpeed_MEDIUM; - pInfo->mbActive = TRUE; - pInfo->mbIsMovie = TRUE; + pInfo->mbActive = sal_True; + pInfo->mbIsMovie = sal_True; pInfo->maBlueScreen = COL_WHITE; rView.InsertObjectAtView( pGroup, *pPV, SDRINSERT_SETDEFLAYER); @@ -1284,7 +1284,7 @@ void AnimationWindow::DataChanged( const DataChangedEvent& rDCEvt ) \************************************************************************/ AnimationControllerItem::AnimationControllerItem( - USHORT _nId, + sal_uInt16 _nId, AnimationWindow* pAnimWin, SfxBindings* _pBindings) : SfxControllerItem( _nId, *_pBindings ), @@ -1294,14 +1294,14 @@ AnimationControllerItem::AnimationControllerItem( // ----------------------------------------------------------------------- -void AnimationControllerItem::StateChanged( USHORT nSId, +void AnimationControllerItem::StateChanged( sal_uInt16 nSId, SfxItemState eState, const SfxPoolItem* pItem ) { if( eState >= SFX_ITEM_AVAILABLE && nSId == SID_ANIMATOR_STATE ) { const SfxUInt16Item* pStateItem = PTR_CAST( SfxUInt16Item, pItem ); DBG_ASSERT( pStateItem, "SfxUInt16Item erwartet"); - UINT16 nState = pStateItem->GetValue(); + sal_uInt16 nState = pStateItem->GetValue(); pAnimationWin->aBtnGetOneObject.Enable( nState & 1 ); pAnimationWin->aBtnGetAllObjects.Enable( nState & 2 ); diff --git a/sd/source/ui/dlg/assclass.cxx b/sd/source/ui/dlg/assclass.cxx index 1df116f52625..36c30247e6c0 100644..100755 --- a/sd/source/ui/dlg/assclass.cxx +++ b/sd/source/ui/dlg/assclass.cxx @@ -46,10 +46,10 @@ Assistent::Assistent(int nNoOfPages) mpPageStatus = new bool[mnPages]; - for(UINT8 i=0;i<mnPages;i++) + for(sal_uInt8 i=0;i<mnPages;i++) { mpPages[i]=new List(); - mpPageStatus[i] = TRUE; + mpPageStatus[i] = sal_True; } mnCurrentPage=1; } diff --git a/sd/source/ui/dlg/brkdlg.cxx b/sd/source/ui/dlg/brkdlg.cxx index f2c69231d79e..fc95bfc2e285 100644..100755 --- a/sd/source/ui/dlg/brkdlg.cxx +++ b/sd/source/ui/dlg/brkdlg.cxx @@ -60,8 +60,8 @@ BreakDlg::BreakDlg( ::Window* pWindow, DrawView* _pDrView, DrawDocShell* pShell, - ULONG nSumActionCount, - ULONG nObjCount ) + sal_uLong nSumActionCount, + sal_uLong nObjCount ) : SfxModalDialog ( pWindow, SdResId( DLG_BREAK ) ), aFtObjInfo ( this, SdResId( FT_OBJ_INFO ) ), aFtActInfo ( this, SdResId( FT_ACT_INFO ) ), @@ -82,7 +82,7 @@ BreakDlg::BreakDlg( pProgrInfo->Init( nSumActionCount*3, nObjCount ); pDrView = _pDrView; - bCancel = FALSE; + bCancel = sal_False; FreeResource(); } @@ -99,7 +99,7 @@ BreakDlg::~BreakDlg() // Control-Handler fuer den Abbruch Button IMPL_LINK( BreakDlg, CancelButtonHdl, void *, EMPTYARG ) { - bCancel = TRUE; + bCancel = sal_True; aBtnCancel.Disable(); return( 0L ); } @@ -180,7 +180,7 @@ short BreakDlg::Execute() IMPL_LINK( BreakDlg, InitialUpdate, Timer*, EMPTYARG ) { pDrView->DoImportMarkedMtf(pProgrInfo); - EndDialog(TRUE); + EndDialog(sal_True); return 0L; } diff --git a/sd/source/ui/dlg/celltempl.cxx b/sd/source/ui/dlg/celltempl.cxx index 4938263b97d7..bdc280b6a6bc 100644..100755 --- a/sd/source/ui/dlg/celltempl.cxx +++ b/sd/source/ui/dlg/celltempl.cxx @@ -56,7 +56,7 @@ \************************************************************************/ SdPresCellTemplateDlg::SdPresCellTemplateDlg( SdrModel* pModel, Window* pParent, SfxStyleSheetBase& rStyleBase ) -: SfxStyleDialog( pParent, SdResId(TAB_CELL_TEMPLATE), rStyleBase, FALSE ) +: SfxStyleDialog( pParent, SdResId(TAB_CELL_TEMPLATE), rStyleBase, sal_False ) , mpColorTab( pModel->GetColorTable() ) , mpGradientList( pModel->GetGradientList() ) , mpHatchingList( pModel->GetHatchList() ) @@ -78,7 +78,7 @@ SdPresCellTemplateDlg::~SdPresCellTemplateDlg() // ----------------------------------------------------------------------- -void SdPresCellTemplateDlg::PageCreated( USHORT nId, SfxTabPage &rPage ) +void SdPresCellTemplateDlg::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) { switch( nId ) { diff --git a/sd/source/ui/dlg/copydlg.cxx b/sd/source/ui/dlg/copydlg.cxx index 6b3c04346f31..c32083d71dfe 100644..100755 --- a/sd/source/ui/dlg/copydlg.cxx +++ b/sd/source/ui/dlg/copydlg.cxx @@ -116,10 +116,10 @@ CopyDlg::CopyDlg( FieldUnit eFUnit( SfxModule::GetCurrentFieldUnit() ); - SetFieldUnit( maMtrFldMoveX, eFUnit, TRUE ); - SetFieldUnit( maMtrFldMoveY, eFUnit, TRUE ); - SetFieldUnit( maMtrFldWidth, eFUnit, TRUE ); - SetFieldUnit( maMtrFldHeight, eFUnit, TRUE ); + SetFieldUnit( maMtrFldMoveX, eFUnit, sal_True ); + SetFieldUnit( maMtrFldMoveY, eFUnit, sal_True ); + SetFieldUnit( maMtrFldWidth, eFUnit, sal_True ); + SetFieldUnit( maMtrFldHeight, eFUnit, sal_True ); Reset(0L); } @@ -171,37 +171,37 @@ IMPL_LINK( CopyDlg, Reset, void*, EMPTYARG ) if( aStr.GetTokenCount( TOKEN ) < 8 ) { - if( SFX_ITEM_SET == mrOutAttrs.GetItemState( ATTR_COPY_NUMBER, TRUE, &pPoolItem ) ) + if( SFX_ITEM_SET == mrOutAttrs.GetItemState( ATTR_COPY_NUMBER, sal_True, &pPoolItem ) ) maNumFldCopies.SetValue( ( ( const SfxUInt16Item* ) pPoolItem )->GetValue() ); else maNumFldCopies.SetValue( 1L ); long nMoveX = 500L; - if( SFX_ITEM_SET == mrOutAttrs.GetItemState( ATTR_COPY_MOVE_X, TRUE, &pPoolItem ) ) + if( SFX_ITEM_SET == mrOutAttrs.GetItemState( ATTR_COPY_MOVE_X, sal_True, &pPoolItem ) ) nMoveX = ( ( ( const SfxInt32Item* ) pPoolItem )->GetValue() ); SetMetricValue( maMtrFldMoveX, Fraction(nMoveX) / maUIScale, SFX_MAPUNIT_100TH_MM); long nMoveY = 500L; - if( SFX_ITEM_SET == mrOutAttrs.GetItemState( ATTR_COPY_MOVE_Y, TRUE, &pPoolItem ) ) + if( SFX_ITEM_SET == mrOutAttrs.GetItemState( ATTR_COPY_MOVE_Y, sal_True, &pPoolItem ) ) nMoveY = ( ( ( const SfxInt32Item* ) pPoolItem )->GetValue() ); SetMetricValue( maMtrFldMoveY, Fraction(nMoveY) / maUIScale, SFX_MAPUNIT_100TH_MM); - if( SFX_ITEM_SET == mrOutAttrs.GetItemState( ATTR_COPY_ANGLE, TRUE, &pPoolItem ) ) + if( SFX_ITEM_SET == mrOutAttrs.GetItemState( ATTR_COPY_ANGLE, sal_True, &pPoolItem ) ) maMtrFldAngle.SetValue( ( ( const SfxInt32Item* ) pPoolItem )->GetValue() ); else maMtrFldAngle.SetValue( 0L ); long nWidth = 0L; - if( SFX_ITEM_SET == mrOutAttrs.GetItemState( ATTR_COPY_WIDTH, TRUE, &pPoolItem ) ) + if( SFX_ITEM_SET == mrOutAttrs.GetItemState( ATTR_COPY_WIDTH, sal_True, &pPoolItem ) ) nWidth = ( ( ( const SfxInt32Item* ) pPoolItem )->GetValue() ); SetMetricValue( maMtrFldWidth, Fraction(nWidth) / maUIScale, SFX_MAPUNIT_100TH_MM); long nHeight = 0L; - if( SFX_ITEM_SET == mrOutAttrs.GetItemState( ATTR_COPY_HEIGHT, TRUE, &pPoolItem ) ) + if( SFX_ITEM_SET == mrOutAttrs.GetItemState( ATTR_COPY_HEIGHT, sal_True, &pPoolItem ) ) nHeight = ( ( ( const SfxInt32Item* ) pPoolItem )->GetValue() ); SetMetricValue( maMtrFldHeight, Fraction(nHeight) / maUIScale, SFX_MAPUNIT_100TH_MM); - if( SFX_ITEM_SET == mrOutAttrs.GetItemState( ATTR_COPY_START_COLOR, TRUE, &pPoolItem ) ) + if( SFX_ITEM_SET == mrOutAttrs.GetItemState( ATTR_COPY_START_COLOR, sal_True, &pPoolItem ) ) { Color aColor = ( ( const XColorItem* ) pPoolItem )->GetColorValue(); maLbStartColor.SelectEntry( aColor ); @@ -259,10 +259,10 @@ void CopyDlg::GetAttr( SfxItemSet& rOutAttrs ) long nHeight = Fraction( GetCoreValue( maMtrFldHeight, SFX_MAPUNIT_100TH_MM) ) * maUIScale; long nWidth = Fraction( GetCoreValue( maMtrFldWidth, SFX_MAPUNIT_100TH_MM) ) * maUIScale; - rOutAttrs.Put( SfxUInt16Item( ATTR_COPY_NUMBER, (UINT16) maNumFldCopies.GetValue() ) ); + rOutAttrs.Put( SfxUInt16Item( ATTR_COPY_NUMBER, (sal_uInt16) maNumFldCopies.GetValue() ) ); rOutAttrs.Put( SfxInt32Item( ATTR_COPY_MOVE_X, nMoveX ) ); rOutAttrs.Put( SfxInt32Item( ATTR_COPY_MOVE_Y, nMoveY ) ); - rOutAttrs.Put( SfxInt32Item( ATTR_COPY_ANGLE, static_cast<INT32>(maMtrFldAngle.GetValue()) ) ); + rOutAttrs.Put( SfxInt32Item( ATTR_COPY_ANGLE, static_cast<sal_Int32>(maMtrFldAngle.GetValue()) ) ); rOutAttrs.Put( SfxInt32Item( ATTR_COPY_WIDTH, nWidth ) ); rOutAttrs.Put( SfxInt32Item( ATTR_COPY_HEIGHT, nHeight ) ); @@ -288,7 +288,7 @@ void CopyDlg::GetAttr( SfxItemSet& rOutAttrs ) IMPL_LINK( CopyDlg, SelectColorHdl, void *, EMPTYARG ) { - USHORT nPos = maLbStartColor.GetSelectEntryPos(); + sal_uInt16 nPos = maLbStartColor.GetSelectEntryPos(); if( nPos != LISTBOX_ENTRY_NOTFOUND && !maLbEndColor.IsEnabled() ) @@ -315,7 +315,7 @@ IMPL_LINK( CopyDlg, SetViewData, void*, EMPTYARG ) // Farb-Attribut setzen const SfxPoolItem* pPoolItem = NULL; - if( SFX_ITEM_SET == mrOutAttrs.GetItemState( ATTR_COPY_START_COLOR, TRUE, &pPoolItem ) ) + if( SFX_ITEM_SET == mrOutAttrs.GetItemState( ATTR_COPY_START_COLOR, sal_True, &pPoolItem ) ) { Color aColor = ( ( const XColorItem* ) pPoolItem )->GetColorValue(); maLbStartColor.SelectEntry( aColor ); @@ -343,7 +343,7 @@ IMPL_LINK( CopyDlg, SetDefault, void*, EMPTYARG ) // Farb-Attribut setzen const SfxPoolItem* pPoolItem = NULL; - if( SFX_ITEM_SET == mrOutAttrs.GetItemState( ATTR_COPY_START_COLOR, TRUE, &pPoolItem ) ) + if( SFX_ITEM_SET == mrOutAttrs.GetItemState( ATTR_COPY_START_COLOR, sal_True, &pPoolItem ) ) { Color aColor = ( ( const XColorItem* ) pPoolItem )->GetColorValue(); maLbStartColor.SelectEntry( aColor ); diff --git a/sd/source/ui/dlg/custsdlg.cxx b/sd/source/ui/dlg/custsdlg.cxx index b8c92dee3a6e..3e788303ccea 100755 --- a/sd/source/ui/dlg/custsdlg.cxx +++ b/sd/source/ui/dlg/custsdlg.cxx @@ -70,7 +70,7 @@ SdCustomShowDlg::SdCustomShowDlg( Window* pWindow, rDoc ( rDrawDoc ), pCustomShowList ( NULL ), pCustomShow ( NULL ), - bModified ( FALSE ) + bModified ( sal_False ) { FreeResource(); @@ -96,7 +96,7 @@ SdCustomShowDlg::SdCustomShowDlg( Window* pWindow, { aLbCustomShows.InsertEntry( pCustomShow->GetName() ); } - aLbCustomShows.SelectEntryPos( (USHORT)nPosToSelect ); + aLbCustomShows.SelectEntryPos( (sal_uInt16)nPosToSelect ); pCustomShowList->Seek( nPosToSelect ); } @@ -117,9 +117,9 @@ SdCustomShowDlg::~SdCustomShowDlg() \************************************************************************/ void SdCustomShowDlg::CheckState() { - USHORT nPos = aLbCustomShows.GetSelectEntryPos(); + sal_uInt16 nPos = aLbCustomShows.GetSelectEntryPos(); - BOOL bEnable = nPos != LISTBOX_ENTRY_NOTFOUND; + sal_Bool bEnable = nPos != LISTBOX_ENTRY_NOTFOUND; aBtnEdit.Enable( bEnable ); aBtnRemove.Enable( bEnable ); aBtnCopy.Enable( bEnable ); @@ -145,7 +145,7 @@ IMPL_LINK( SdCustomShowDlg, ClickButtonHdl, void *, p ) if( pCustomShow ) { if( !pCustomShowList ) - pCustomShowList = rDoc.GetCustomShowList( TRUE ); + pCustomShowList = rDoc.GetCustomShowList( sal_True ); pCustomShowList->Insert( pCustomShow, LIST_APPEND ); pCustomShowList->Last(); @@ -154,7 +154,7 @@ IMPL_LINK( SdCustomShowDlg, ClickButtonHdl, void *, p ) } if( aDlg.IsModified() ) - bModified = TRUE; + bModified = sal_True; } else if( pCustomShow ) DELETEZ( pCustomShow ); @@ -162,7 +162,7 @@ IMPL_LINK( SdCustomShowDlg, ClickButtonHdl, void *, p ) // CustomShow bearbeiten else if( p == &aBtnEdit ) { - USHORT nPos = aLbCustomShows.GetSelectEntryPos(); + sal_uInt16 nPos = aLbCustomShows.GetSelectEntryPos(); if( nPos != LISTBOX_ENTRY_NOTFOUND ) { DBG_ASSERT( pCustomShowList, "pCustomShowList existiert nicht" ); @@ -180,34 +180,34 @@ IMPL_LINK( SdCustomShowDlg, ClickButtonHdl, void *, p ) aLbCustomShows.SelectEntryPos( nPos ); } if( aDlg.IsModified() ) - bModified = TRUE; + bModified = sal_True; } } } // CustomShow loeschen else if( p == &aBtnRemove ) { - USHORT nPos = aLbCustomShows.GetSelectEntryPos(); + sal_uInt16 nPos = aLbCustomShows.GetSelectEntryPos(); if( nPos != LISTBOX_ENTRY_NOTFOUND ) { delete (SdCustomShow*) pCustomShowList->Remove( nPos ); aLbCustomShows.RemoveEntry( nPos ); aLbCustomShows.SelectEntryPos( nPos == 0 ? nPos : nPos - 1 ); - bModified = TRUE; + bModified = sal_True; } } // CustomShow kopieren else if( p == &aBtnCopy ) { - USHORT nPos = aLbCustomShows.GetSelectEntryPos(); + sal_uInt16 nPos = aLbCustomShows.GetSelectEntryPos(); if( nPos != LISTBOX_ENTRY_NOTFOUND ) { SdCustomShow* pShow = new SdCustomShow( *(SdCustomShow*) pCustomShowList->GetObject( nPos ) ); String aStr( pShow->GetName() ); String aStrCopy( SdResId( STR_COPY_CUSTOMSHOW ) ); - USHORT nStrPos = aStr.Search( aStrCopy ); - USHORT nNum = 1; + sal_uInt16 nStrPos = aStr.Search( aStrCopy ); + sal_uInt16 nNum = 1; if( nStrPos == STRING_NOTFOUND ) { aStr.AppendAscii( RTL_CONSTASCII_STRINGPARAM( " (" ) ); @@ -216,7 +216,7 @@ IMPL_LINK( SdCustomShowDlg, ClickButtonHdl, void *, p ) aStr.Append( sal_Unicode(')') ); nStrPos = aStr.Search( aStrCopy ); } - nStrPos = nStrPos + (USHORT)aStrCopy.Len(); + nStrPos = nStrPos + (sal_uInt16)aStrCopy.Len(); // Um nicht ins Nirvana zu greifen (--> Endlosschleife) if( nStrPos >= aStr.Len() ) { @@ -225,17 +225,17 @@ IMPL_LINK( SdCustomShowDlg, ClickButtonHdl, void *, p ) } // Name ueberpruefen... - BOOL bDifferent = FALSE; + sal_Bool bDifferent = sal_False; //long nPosToSelect = pCustomShowList->GetCurPos(); while( !bDifferent ) { - bDifferent = TRUE; + bDifferent = sal_True; for( pCustomShow = (SdCustomShow*) pCustomShowList->First(); pCustomShow != NULL && bDifferent; pCustomShow = (SdCustomShow*) pCustomShowList->Next() ) { if( aStr == pCustomShow->GetName() ) - bDifferent = FALSE; + bDifferent = sal_False; } if( !bDifferent ) { @@ -257,20 +257,20 @@ IMPL_LINK( SdCustomShowDlg, ClickButtonHdl, void *, p ) aLbCustomShows.SelectEntry( pShow->GetName() ); - bModified = TRUE; + bModified = sal_True; } } else if( p == &aLbCustomShows ) { - USHORT nPos = aLbCustomShows.GetSelectEntryPos(); + sal_uInt16 nPos = aLbCustomShows.GetSelectEntryPos(); if( nPos != LISTBOX_ENTRY_NOTFOUND ) pCustomShowList->Seek( nPos ); - bModified = TRUE; + bModified = sal_True; } else if( p == &aCbxUseCustomShow ) { - bModified = TRUE; + bModified = sal_True; } CheckState(); @@ -291,7 +291,7 @@ IMPL_LINK( SdCustomShowDlg, StartShowHdl, Button *, EMPTYARG ) /************************************************************************* |* CheckState \************************************************************************/ -BOOL SdCustomShowDlg::IsCustomShow() const +sal_Bool SdCustomShowDlg::IsCustomShow() const { return( aCbxUseCustomShow.IsEnabled() && aCbxUseCustomShow.IsChecked() ); } @@ -326,7 +326,7 @@ SdDefineCustomShowDlg::SdDefineCustomShowDlg( Window* pWindow, rDoc ( rDrawDoc ), rpCustomShow ( rpCS ), - bModified ( FALSE ) + bModified ( sal_False ) { FreeResource(); @@ -345,7 +345,7 @@ SdDefineCustomShowDlg::SdDefineCustomShowDlg( Window* pWindow, nPage < rDoc.GetSdPageCount( PK_STANDARD ); nPage++ ) { - pPage = rDoc.GetSdPage( (USHORT) nPage, PK_STANDARD ); + pPage = rDoc.GetSdPage( (sal_uInt16) nPage, PK_STANDARD ); String aStr( pPage->GetName() ); aLbPages.InsertEntry( aStr ); } @@ -376,7 +376,7 @@ SdDefineCustomShowDlg::SdDefineCustomShowDlg( Window* pWindow, aLbCustomPages.SetDragDropMode( SV_DRAGDROP_CTRL_MOVE ); aLbCustomPages.SetHighlightRange(); - aBtnOK.Enable( FALSE ); + aBtnOK.Enable( sal_False ); CheckState(); } @@ -394,10 +394,10 @@ SdDefineCustomShowDlg::~SdDefineCustomShowDlg() \************************************************************************/ void SdDefineCustomShowDlg::CheckState() { - BOOL bPages = aLbPages.GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND; - //BOOL bCSPages = aLbCustomPages.GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND; - BOOL bCSPages = aLbCustomPages.FirstSelected() != NULL; - BOOL bCount = aLbCustomPages.GetEntryCount() > 0; + sal_Bool bPages = aLbPages.GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND; + //sal_Bool bCSPages = aLbCustomPages.GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND; + sal_Bool bCSPages = aLbCustomPages.FirstSelected() != NULL; + sal_Bool bCount = aLbCustomPages.GetEntryCount() > 0; aBtnOK.Enable( bCount ); aBtnAdd.Enable( bPages ); @@ -411,50 +411,50 @@ IMPL_LINK( SdDefineCustomShowDlg, ClickButtonHdl, void *, p ) { if( p == &aBtnAdd ) { - USHORT nCount = aLbPages.GetSelectEntryCount(); + sal_uInt16 nCount = aLbPages.GetSelectEntryCount(); if( nCount > 0 ) { - ULONG nPosCP = LIST_APPEND; + sal_uLong nPosCP = LIST_APPEND; SvLBoxEntry* pEntry = aLbCustomPages.FirstSelected(); if( pEntry ) nPosCP = aLbCustomPages.GetModel()->GetAbsPos( pEntry ) + 1L; - for( USHORT i = 0; i < nCount; i++ ) + for( sal_uInt16 i = 0; i < nCount; i++ ) { String aStr = aLbPages.GetSelectEntry( i ); pEntry = aLbCustomPages.InsertEntry( aStr, - 0, FALSE, nPosCP ); + 0, sal_False, nPosCP ); aLbCustomPages.Select( pEntry ); - SdPage* pPage = rDoc.GetSdPage( (USHORT) aLbPages. + SdPage* pPage = rDoc.GetSdPage( (sal_uInt16) aLbPages. GetSelectEntryPos( i ), PK_STANDARD ); pEntry->SetUserData( pPage ); if( nPosCP != LIST_APPEND ) nPosCP++; } - bModified = TRUE; + bModified = sal_True; } } else if( p == &aBtnRemove ) { - //USHORT nPos = aLbCustomPages.GetSelectEntryPos(); + //sal_uInt16 nPos = aLbCustomPages.GetSelectEntryPos(); SvLBoxEntry* pEntry = aLbCustomPages.FirstSelected(); if( pEntry ) { - ULONG nPos = aLbCustomPages.GetModel()->GetAbsPos( pEntry ); + sal_uLong nPos = aLbCustomPages.GetModel()->GetAbsPos( pEntry ); //rpCustomShow->Remove( nPos ); //aLbCustomPages.RemoveEntry( nPos ); aLbCustomPages.GetModel()->Remove( aLbCustomPages.GetModel()->GetEntryAtAbsPos( nPos ) ); - bModified = TRUE; + bModified = sal_True; } } else if( p == &aEdtName ) { //rpCustomShow->SetName( aEdtName.GetText() ); - bModified = TRUE; + bModified = sal_True; } CheckState(); @@ -469,7 +469,7 @@ IMPL_LINK( SdDefineCustomShowDlg, ClickButtonHdl, void *, p ) \************************************************************************/ void SdDefineCustomShowDlg::CheckCustomShow() { - BOOL bDifferent = FALSE; + sal_Bool bDifferent = sal_False; SdPage* pPage = NULL; SvLBoxEntry* pEntry = NULL; @@ -477,7 +477,7 @@ void SdDefineCustomShowDlg::CheckCustomShow() if( rpCustomShow->Count() != aLbCustomPages.GetEntryCount() ) { rpCustomShow->Clear(); - bDifferent = TRUE; + bDifferent = sal_True; } // Seiten-Pointer vergleichen @@ -490,7 +490,7 @@ void SdDefineCustomShowDlg::CheckCustomShow() if( pPage != pEntry->GetUserData() ) { rpCustomShow->Clear(); - bDifferent = TRUE; + bDifferent = sal_True; } } } @@ -505,7 +505,7 @@ void SdDefineCustomShowDlg::CheckCustomShow() pPage = (SdPage*) pEntry->GetUserData(); rpCustomShow->Insert( pPage, LIST_APPEND ); } - bModified = TRUE; + bModified = sal_True; } // Name vergleichen und ggfs. setzen @@ -513,7 +513,7 @@ void SdDefineCustomShowDlg::CheckCustomShow() if( rpCustomShow->GetName() != aStr ) { rpCustomShow->SetName( aStr ); - bModified = TRUE; + bModified = sal_True; } } @@ -523,7 +523,7 @@ void SdDefineCustomShowDlg::CheckCustomShow() IMPL_LINK( SdDefineCustomShowDlg, OKHdl, Button *, EMPTYARG ) { // Name ueberpruefen... - BOOL bDifferent = TRUE; + sal_Bool bDifferent = sal_True; List* pCustomShowList = rDoc.GetCustomShowList(); if( pCustomShowList ) { @@ -536,7 +536,7 @@ IMPL_LINK( SdDefineCustomShowDlg, OKHdl, Button *, EMPTYARG ) pCustomShow = (SdCustomShow*) pCustomShowList->Next() ) { if( aName == pCustomShow->GetName() && aName != aOldName ) - bDifferent = FALSE; + bDifferent = sal_False; } pCustomShowList->Seek( nPosToSelect ); } diff --git a/sd/source/ui/dlg/diactrl.cxx b/sd/source/ui/dlg/diactrl.cxx index 7725dc97f1e0..65613b545f52 100644..100755 --- a/sd/source/ui/dlg/diactrl.cxx +++ b/sd/source/ui/dlg/diactrl.cxx @@ -107,7 +107,7 @@ void SdPagesField::UpdatePagesField( const SfxUInt16Item* pItem ) void SdPagesField::Modify() { - SfxUInt16Item aItem( SID_PAGES_PER_ROW, (UINT16) GetValue() ); + SfxUInt16Item aItem( SID_PAGES_PER_ROW, (sal_uInt16) GetValue() ); ::uno::Any a; ::uno::Sequence< ::beans::PropertyValue > aArgs( 1 ); @@ -129,7 +129,7 @@ void SdPagesField::Modify() |* \************************************************************************/ -SdTbxCtlDiaPages::SdTbxCtlDiaPages( USHORT nSlotId, USHORT nId, ToolBox& rTbx ) : +SdTbxCtlDiaPages::SdTbxCtlDiaPages( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) : SfxToolBoxControl( nSlotId, nId, rTbx ) { } @@ -142,7 +142,7 @@ SdTbxCtlDiaPages::~SdTbxCtlDiaPages() //======================================================================== -void SdTbxCtlDiaPages::StateChanged( USHORT, +void SdTbxCtlDiaPages::StateChanged( sal_uInt16, SfxItemState eState, const SfxPoolItem* pState ) { SdPagesField* pFld = (SdPagesField*) GetToolBox().GetItemWindow( GetId() ); diff --git a/sd/source/ui/dlg/dlgass.cxx b/sd/source/ui/dlg/dlgass.cxx index 4645b3540f04..074ab49d97bb 100755 --- a/sd/source/ui/dlg/dlgass.cxx +++ b/sd/source/ui/dlg/dlgass.cxx @@ -153,7 +153,7 @@ private: class AssistentDlgImpl : public SfxListener { public: - AssistentDlgImpl( ::Window* pWindow, const Link& rFinishLink, BOOL bAutoPilot ); + AssistentDlgImpl( ::Window* pWindow, const Link& rFinishLink, sal_Bool bAutoPilot ); ~AssistentDlgImpl(); /// Local mutex used to serialize concurrent method calls. @@ -168,10 +168,10 @@ public: files and insert them into a listbox. */ void ScanDocmenu (void); - /** Flag that is set to TRUE after the recently used files have been + /** Flag that is set to sal_True after the recently used files have been scanned. */ - BOOL mbRecentDocumentsReady; + sal_Bool mbRecentDocumentsReady; /** When the list of templates has not been scanned already this is done when this method is called. That includes requesting the whole list @@ -193,16 +193,16 @@ public: */ void TemplateScanDone (std::vector<TemplateDir*>& rTemplateFolders); - /** Flag that is set to TRUE after the impress templates have been + /** Flag that is set to sal_True after the impress templates have been scanned. */ - BOOL mbTemplatesReady; + sal_Bool mbTemplatesReady; /** Flag used to prevent nested or concurrent calls to the <member>UpdatePreview</memember> method. A <TRUE/> value indicates that a preview update is currently active. */ - BOOL mbPreviewUpdating; + sal_Bool mbPreviewUpdating; ::Window* mpWindow; @@ -232,7 +232,7 @@ public: TemplateDir* mpLayoutRegion; // preview - BOOL mbUserDataDirty; + sal_Bool mbUserDataDirty; Timer maPrevTimer; Timer maEffectPrevTimer; Timer maUpdatePageListTimer; @@ -242,19 +242,19 @@ public: ::std::auto_ptr<WindowUpdater> mpWindowUpdater; - BOOL mbPreview; - USHORT mnShowPage; - BOOL mbDocPreview; + sal_Bool mbPreview; + sal_uInt16 mnShowPage; + sal_Bool mbDocPreview; - ULONG mnTemplate; + sal_uLong mnTemplate; String maPageListFile; - void UpdatePreview( BOOL bDocPreview ); + void UpdatePreview( sal_Bool bDocPreview ); void UpdatePageList(); void UpdateUserData(); - BOOL IsOwnFormat( const String& rPath ); + sal_Bool IsOwnFormat( const String& rPath ); // dlg status void EndDialog( long nResult = 0 ); @@ -365,15 +365,15 @@ public: // ==================================================================== -AssistentDlgImpl::AssistentDlgImpl( ::Window* pWindow, const Link& rFinishLink, BOOL bAutoPilot ) : +AssistentDlgImpl::AssistentDlgImpl( ::Window* pWindow, const Link& rFinishLink, sal_Bool bAutoPilot ) : mpTemplateRegion(NULL), mpLayoutRegion(NULL), - mbUserDataDirty(FALSE), + mbUserDataDirty(sal_False), xDocShell (NULL), mpWindowUpdater (new WindowUpdater()), - mbPreview(TRUE), + mbPreview(sal_True), mnShowPage(0), - mbDocPreview(FALSE), + mbDocPreview(sal_False), maAssistentFunc(5), maPreviewFlag(pWindow,SdResId(CB_PREVIEW)), maStartWithFlag(pWindow,SdResId(CB_STARTWITH)), @@ -387,9 +387,9 @@ AssistentDlgImpl::AssistentDlgImpl( ::Window* pWindow, const Link& rFinishLink, maOpenStr(SdResId(STR_OPEN)) { maPageListFile += sal_Unicode('?'), - mbRecentDocumentsReady = FALSE; - mbTemplatesReady = FALSE; - mbPreviewUpdating = FALSE; + mbRecentDocumentsReady = sal_False; + mbTemplatesReady = sal_False; + mbPreviewUpdating = sal_False; mpWindow = pWindow; @@ -448,8 +448,8 @@ AssistentDlgImpl::AssistentDlgImpl( ::Window* pWindow, const Link& rFinishLink, mpPage1OpenPB->SetModeImage( GetUiIconForCommand(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:Open"))), BMP_COLOR_NORMAL); - mpPage1OpenPB->EnableImageDisplay(TRUE); - mpPage1OpenPB->EnableTextDisplay(TRUE); + mpPage1OpenPB->EnableImageDisplay(sal_True); + mpPage1OpenPB->EnableTextDisplay(sal_True); mpPage1OpenPB->SetImageAlign(IMAGEALIGN_LEFT); mpPage1OpenPB->SetStyle(mpPage1OpenPB->GetStyle() | WB_CENTER); } @@ -630,7 +630,7 @@ AssistentDlgImpl::AssistentDlgImpl( ::Window* pWindow, const Link& rFinishLink, mpWindowUpdater->RegisterWindow (&maPreview); - UpdatePreview( TRUE ); + UpdatePreview( sal_True ); //check wether we should start with a template document initialy and preselect it const ::rtl::OUString aServiceName( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.presentation.PresentationDocument" ) ); @@ -852,10 +852,10 @@ void AssistentDlgImpl::ScanDocmenu (void) } } } - mbRecentDocumentsReady = TRUE; + mbRecentDocumentsReady = sal_True; try { - UpdatePreview(TRUE); + UpdatePreview(sal_True); } catch (uno::RuntimeException& ) { @@ -875,7 +875,7 @@ void AssistentDlgImpl::ProvideTemplates (void) try { - UpdatePreview(TRUE); + UpdatePreview(sal_True); } catch (uno::RuntimeException& e) { @@ -917,7 +917,7 @@ void AssistentDlgImpl::TemplateScanDone ( mpPage1RegionLB->InsertEntry (pDir->msRegion); } - mpPage1RegionLB->SelectEntryPos ((USHORT)nFirstEntry); + mpPage1RegionLB->SelectEntryPos ((sal_uInt16)nFirstEntry); mpPage1RegionLB->Update(); SelectTemplateRegion (mpPage1RegionLB->GetSelectEntry()); @@ -942,12 +942,12 @@ void AssistentDlgImpl::TemplateScanDone ( mpPage2RegionLB->InsertEntry (pDir->msRegion); } - mpPage2RegionLB->SelectEntryPos ((USHORT)nFirstEntry); + mpPage2RegionLB->SelectEntryPos ((sal_uInt16)nFirstEntry); mpPage2RegionLB->Update(); SelectLayoutRegion (mpPage2RegionLB->GetSelectEntry()); // Make the changes visible. - mbTemplatesReady = TRUE; + mbTemplatesReady = sal_True; if (mpWindow) UpdatePage(); } @@ -993,7 +993,7 @@ String AssistentDlgImpl::GetDocFileName() if(mpWindow) { aTitle = mpWindow->GetText(); - USHORT nPos = aTitle.Search(sal_Unicode('(')); + sal_uInt16 nPos = aTitle.Search(sal_Unicode('(')); if(nPos != STRING_NOTFOUND) aTitle.Erase( nPos-1 ); } @@ -1001,9 +1001,9 @@ String AssistentDlgImpl::GetDocFileName() String aDocFile; if( GetStartType() == ST_TEMPLATE ) { - const USHORT nEntry = mpPage1TemplateLB->GetSelectEntryPos(); + const sal_uInt16 nEntry = mpPage1TemplateLB->GetSelectEntryPos(); TemplateEntry* pEntry = NULL; - if(nEntry != (USHORT)-1) + if(nEntry != (sal_uInt16)-1) pEntry = mpTemplateRegion->maEntries[nEntry]; if(pEntry) @@ -1017,8 +1017,8 @@ String AssistentDlgImpl::GetDocFileName() } else if( GetStartType() == ST_OPEN ) { - const USHORT nEntry = mpPage1OpenLB->GetSelectEntryPos(); - if(nEntry != (USHORT)-1 ) + const sal_uInt16 nEntry = mpPage1OpenLB->GetSelectEntryPos(); + if(nEntry != (sal_uInt16)-1 ) aDocFile = *maOpenFilesList[nEntry]; } @@ -1031,9 +1031,9 @@ String AssistentDlgImpl::GetDocFileName() String AssistentDlgImpl::GetLayoutFileName() { String aFile; - const USHORT nEntry = mpPage2LayoutLB->GetSelectEntryPos(); + const sal_uInt16 nEntry = mpPage2LayoutLB->GetSelectEntryPos(); TemplateEntry* pEntry = NULL; - if(nEntry != (USHORT)-1 && nEntry > 0) + if(nEntry != (sal_uInt16)-1 && nEntry > 0) pEntry = mpLayoutRegion->maEntries[nEntry-1]; if(pEntry) @@ -1044,8 +1044,8 @@ String AssistentDlgImpl::GetLayoutFileName() SfxObjectShellLock AssistentDlgImpl::GetDocument() { -// mbPreview = FALSE; // Document nicht anzeigen - UpdatePreview(FALSE); // aber komplett laden +// mbPreview = sal_False; // Document nicht anzeigen + UpdatePreview(sal_False); // aber komplett laden UpdatePageList(); SfxObjectShell* pShell = xDocShell; @@ -1054,9 +1054,9 @@ SfxObjectShellLock AssistentDlgImpl::GetDocument() if(pDoc) { - const USHORT nPageCount = pDoc->GetSdPageCount(PK_STANDARD); - BOOL bKiosk = mpPage3PresTypeKioskRB->IsChecked(); - UINT32 nNewTime = (UINT32)mpPage3PresTimeTMF->GetTime().GetMSFromTime() / 1000; + const sal_uInt16 nPageCount = pDoc->GetSdPageCount(PK_STANDARD); + sal_Bool bKiosk = mpPage3PresTypeKioskRB->IsChecked(); + sal_uInt32 nNewTime = (sal_uInt32)mpPage3PresTimeTMF->GetTime().GetMSFromTime() / 1000; if(bKiosk) { PresentationSettings& rSettings = pDoc->getPresentationSettings(); @@ -1065,8 +1065,8 @@ SfxObjectShellLock AssistentDlgImpl::GetDocument() rSettings.mbShowPauseLogo = mpPage3LogoCB->IsChecked(); } - USHORT nPgAbsNum = 0; - USHORT nPgRelNum = 0; + sal_uInt16 nPgAbsNum = 0; + sal_uInt16 nPgRelNum = 0; while( nPgAbsNum < nPageCount ) { SdPage* pPage = pDoc->GetSdPage( nPgRelNum, PK_STANDARD ); @@ -1116,7 +1116,7 @@ void AssistentDlgImpl::ChangePage() maNextPageButton.Enable(!maAssistentFunc.IsLastPage()); maLastPageButton.Enable(!maAssistentFunc.IsFirstPage()); - USHORT nPage = (USHORT)maAssistentFunc.GetCurrentPage(); + sal_uInt16 nPage = (sal_uInt16)maAssistentFunc.GetCurrentPage(); if( mpWindow ) { @@ -1135,7 +1135,7 @@ void AssistentDlgImpl::ChangePage() void AssistentDlgImpl::UpdatePage() { - USHORT nPage = (USHORT)maAssistentFunc.GetCurrentPage(); + sal_uInt16 nPage = (sal_uInt16)maAssistentFunc.GetCurrentPage(); switch(nPage) { @@ -1143,7 +1143,7 @@ void AssistentDlgImpl::UpdatePage() { // Elemente auf der ersten Seite abhaengig vom Starttype Zeigen SetStartType( GetStartType() ); - mpPage1TemplateRB->Enable(TRUE /*mbTemplatesReady*/); + mpPage1TemplateRB->Enable(sal_True /*mbTemplatesReady*/); break; } @@ -1154,11 +1154,11 @@ void AssistentDlgImpl::UpdatePage() if( GetStartType() != ST_EMPTY ) { - mpPage2Medium5RB->Enable( TRUE ); + mpPage2Medium5RB->Enable( sal_True ); } else { - mpPage2Medium5RB->Enable( FALSE ); + mpPage2Medium5RB->Enable( sal_False ); if(mpPage2Medium5RB->IsChecked()) mpPage2Medium1RB->Check(); } @@ -1179,7 +1179,7 @@ void AssistentDlgImpl::UpdatePage() if(GetStartType() != ST_TEMPLATE) maNextPageButton.Enable(false); - BOOL bKiosk = mpPage3PresTypeKioskRB->IsChecked(); + sal_Bool bKiosk = mpPage3PresTypeKioskRB->IsChecked(); mpPage3PresTimeFT->Enable(bKiosk); mpPage3BreakFT->Enable(bKiosk); mpPage3PresTimeTMF->Enable(bKiosk); @@ -1250,7 +1250,7 @@ IMPL_LINK( AssistentDlgImpl, PreviewFlagHdl, CheckBox *, EMPTYARG ) if( maPreviewFlag.IsChecked() != mbPreview ) { mbPreview = maPreviewFlag.IsChecked(); - UpdatePreview(TRUE); + UpdatePreview(sal_True); } return 0; } @@ -1279,11 +1279,11 @@ IMPL_LINK( AssistentDlgImpl, SelectFileHdl, ListBox *, EMPTYARG ) IMPL_LINK( AssistentDlgImpl, PageSelectHdl, Control *, EMPTYARG ) { - USHORT nPage = mpPage5PageListCT->GetSelectedPage(); + sal_uInt16 nPage = mpPage5PageListCT->GetSelectedPage(); if( mnShowPage != nPage ) { mnShowPage = nPage; - UpdatePreview(FALSE); + UpdatePreview(sal_False); } return 0; @@ -1297,7 +1297,7 @@ IMPL_LINK( AssistentDlgImpl, UpdatePageListHdl, void *, EMPTYARG ) IMPL_LINK( AssistentDlgImpl, UpdatePreviewHdl, void *, EMPTYARG ) { - UpdatePreview( TRUE ); + UpdatePreview( sal_True ); return 0; } @@ -1354,7 +1354,7 @@ IMPL_LINK( AssistentDlgImpl, PresTypeHdl, RadioButton*, EMPTYARG ) maNextPageButton.Enable(false); } - BOOL bKiosk = mpPage3PresTypeKioskRB->IsChecked(); + sal_Bool bKiosk = mpPage3PresTypeKioskRB->IsChecked(); mpPage3PresTimeFT->Enable(bKiosk); mpPage3BreakFT->Enable(bKiosk); mpPage3PresTimeTMF->Enable(bKiosk); @@ -1365,7 +1365,7 @@ IMPL_LINK( AssistentDlgImpl, PresTypeHdl, RadioButton*, EMPTYARG ) IMPL_LINK( AssistentDlgImpl, UpdateUserDataHdl, Edit*, EMPTYARG ) { - mbUserDataDirty = TRUE; + mbUserDataDirty = sal_True; String aTopic = mpPage4AskTopicEDT->GetText(); String aName = mpPage4AskNameEDT->GetText(); String aInfo = mpPage4AskInfoEDT->GetText(); @@ -1438,7 +1438,7 @@ void AssistentDlgImpl::UpdateUserData() if(pPage && ( aTopic.Len() != 0 || aName.Len() != 0 || aInfo.Len() != 0 ) ) { if( pPage->GetAutoLayout() == AUTOLAYOUT_NONE ) - pPage->SetAutoLayout(AUTOLAYOUT_TITLE, TRUE); + pPage->SetAutoLayout(AUTOLAYOUT_TITLE, sal_True); SdrTextObj* pObj; String aEmptyString; @@ -1449,8 +1449,8 @@ void AssistentDlgImpl::UpdateUserData() if( pObj ) { pPage->SetObjText( pObj, NULL, PRESOBJ_TITLE, aTopic ); - pObj->NbcSetStyleSheet( pPage->GetStyleSheetForPresObj( PRESOBJ_TITLE ), TRUE ); - pObj->SetEmptyPresObj(FALSE); + pObj->NbcSetStyleSheet( pPage->GetStyleSheetForPresObj( PRESOBJ_TITLE ), sal_True ); + pObj->SetEmptyPresObj(sal_False); } } @@ -1466,8 +1466,8 @@ void AssistentDlgImpl::UpdateUserData() if( pObj ) { pPage->SetObjText( pObj, NULL, PRESOBJ_OUTLINE, aStrTmp ); - pObj->NbcSetStyleSheet( pPage->GetStyleSheetForPresObj( PRESOBJ_OUTLINE ), TRUE ); - pObj->SetEmptyPresObj(FALSE); + pObj->NbcSetStyleSheet( pPage->GetStyleSheetForPresObj( PRESOBJ_OUTLINE ), sal_True ); + pObj->SetEmptyPresObj(sal_False); } else { @@ -1475,20 +1475,20 @@ void AssistentDlgImpl::UpdateUserData() if( pObj ) { pPage->SetObjText( pObj, NULL, PRESOBJ_TEXT, aStrTmp ); - pObj->NbcSetStyleSheet( pPage->GetStyleSheetForPresObj( PRESOBJ_TEXT ), TRUE ); - pObj->SetEmptyPresObj(FALSE); + pObj->NbcSetStyleSheet( pPage->GetStyleSheetForPresObj( PRESOBJ_TEXT ), sal_True ); + pObj->SetEmptyPresObj(sal_False); } } } } - mbUserDataDirty = FALSE; + mbUserDataDirty = sal_False; } void AssistentDlgImpl::UpdatePageList() { if(mbDocPreview || !mbPreview) - UpdatePreview(FALSE); + UpdatePreview(sal_False); else if(maPageListFile == maDocFile) return; @@ -1504,20 +1504,20 @@ void AssistentDlgImpl::UpdatePageList() mpPage5PageListCT->Fill(pDoc); } -void AssistentDlgImpl::UpdatePreview( BOOL bDocPreview ) +void AssistentDlgImpl::UpdatePreview( sal_Bool bDocPreview ) { // Guard against multiple concurrent execution to this method caused either // by calls from different threads or recursion. ::osl::MutexGuard aGuard (maMutex); if (mbPreviewUpdating) return; - mbPreviewUpdating = TRUE; + mbPreviewUpdating = sal_True; if(!mbPreview && bDocPreview) { maPreview.Invalidate(); maPreview.SetObjectShell(0); - mbPreviewUpdating = FALSE; + mbPreviewUpdating = sal_False; return; } @@ -1526,8 +1526,8 @@ void AssistentDlgImpl::UpdatePreview( BOOL bDocPreview ) String aEmptyStr; SfxApplication *pSfxApp = SFX_APP(); - ULONG lErr; - BOOL bChangeMaster = aLayoutFile.Len() != 0; + sal_uLong lErr; + sal_Bool bChangeMaster = aLayoutFile.Len() != 0; if( aDocFile.Len() == 0 ) { @@ -1537,15 +1537,15 @@ void AssistentDlgImpl::UpdatePreview( BOOL bDocPreview ) CloseDocShell(); DrawDocShell* pNewDocSh; - xDocShell = pNewDocSh = new DrawDocShell(SFX_CREATE_MODE_STANDARD, FALSE); + xDocShell = pNewDocSh = new DrawDocShell(SFX_CREATE_MODE_STANDARD, sal_False); pNewDocSh->DoInitNew(NULL); SdDrawDocument* pDoc = pNewDocSh->GetDoc(); pDoc->CreateFirstPages(); pDoc->StopWorkStartupDelay(); - mbDocPreview = FALSE; + mbDocPreview = sal_False; maDocFile = aDocFile; - mbUserDataDirty = TRUE; + mbUserDataDirty = sal_True; } else bChangeMaster = (aLayoutFile.Len() != 0) && (maLayoutFile != aLayoutFile); @@ -1559,10 +1559,10 @@ void AssistentDlgImpl::UpdatePreview( BOOL bDocPreview ) ::svl::IUndoManager* pUndoMgr = pDocShell?pDocShell->GetUndoManager():NULL; if(pUndoMgr) pUndoMgr->Undo(); - mbUserDataDirty = TRUE; + mbUserDataDirty = sal_True; } else - bChangeMaster = FALSE; + bChangeMaster = sal_False; } else { @@ -1576,11 +1576,11 @@ void AssistentDlgImpl::UpdatePreview( BOOL bDocPreview ) SfxItemSet* pSet = new SfxAllItemSet( pSfxApp->GetPool() ); if(IsOwnFormat(aDocFile)) { - pSet->Put( SfxBoolItem( SID_TEMPLATE, TRUE ) ); + pSet->Put( SfxBoolItem( SID_TEMPLATE, sal_True ) ); if(bDocPreview) - pSet->Put( SfxBoolItem( SID_PREVIEW, TRUE ) ); + pSet->Put( SfxBoolItem( SID_PREVIEW, sal_True ) ); RestorePassword( pSet, aDocFile ); - if( (lErr = pSfxApp->LoadTemplate( xDocShell, aDocFile, TRUE, pSet )) != 0 ) + if( (lErr = pSfxApp->LoadTemplate( xDocShell, aDocFile, sal_True, pSet )) != 0 ) ErrorHandler::HandleError(lErr); else SavePassword( xDocShell, aDocFile ); @@ -1593,7 +1593,7 @@ void AssistentDlgImpl::UpdatePreview( BOOL bDocPreview ) aReq.AppendItem( SfxStringItem( SID_FILE_NAME, aDocFile )); aReq.AppendItem( SfxStringItem( SID_REFERER, aEmptyStr ) ); aReq.AppendItem( SfxStringItem( SID_TARGETNAME, aTargetStr ) ); - aReq.AppendItem( SfxBoolItem( SID_HIDDEN, TRUE ) ); + aReq.AppendItem( SfxBoolItem( SID_HIDDEN, sal_True ) ); aReq.AppendItem( SfxBoolItem( SID_PREVIEW, bDocPreview ) ); const SfxViewFrameItem* pRet = PTR_CAST( SfxViewFrameItem, SFX_APP()->ExecuteSlot( aReq ) ); @@ -1608,7 +1608,7 @@ void AssistentDlgImpl::UpdatePreview( BOOL bDocPreview ) mnShowPage = 0; mbDocPreview = bDocPreview; maDocFile = aDocFile; - mbUserDataDirty = TRUE; + mbUserDataDirty = sal_True; } if(bChangeMaster && (aLayoutFile != maDocFile)) @@ -1623,11 +1623,11 @@ void AssistentDlgImpl::UpdatePreview( BOOL bDocPreview ) if(IsOwnFormat(aLayoutFile)) { - pSet->Put( SfxBoolItem( SID_TEMPLATE, TRUE ) ); - pSet->Put( SfxBoolItem( SID_PREVIEW, TRUE ) ); + pSet->Put( SfxBoolItem( SID_TEMPLATE, sal_True ) ); + pSet->Put( SfxBoolItem( SID_PREVIEW, sal_True ) ); RestorePassword( pSet, aLayoutFile ); - if( (lErr = pSfxApp->LoadTemplate( xLayoutDocShell, aLayoutFile, TRUE, pSet )) != 0 ) + if( (lErr = pSfxApp->LoadTemplate( xLayoutDocShell, aLayoutFile, sal_True, pSet )) != 0 ) ErrorHandler::HandleError(lErr); SavePassword( xLayoutDocShell, aLayoutFile ); } @@ -1645,14 +1645,14 @@ void AssistentDlgImpl::UpdatePreview( BOOL bDocPreview ) if( pDoc && pLayoutDoc ) { - pDoc->SetMasterPage(0, aEmptyStr, pLayoutDoc, TRUE, FALSE ); + pDoc->SetMasterPage(0, aEmptyStr, pLayoutDoc, sal_True, sal_False ); } else { DBG_ERROR("sd::AssistentDlgImpl::UpdatePreview(), no document for preview?"); } - mbUserDataDirty = TRUE; + mbUserDataDirty = sal_True; } maLayoutFile = aLayoutFile; @@ -1666,7 +1666,7 @@ void AssistentDlgImpl::UpdatePreview( BOOL bDocPreview ) maPreview.SetObjectShell( xDocShell, mnShowPage ); } - mbPreviewUpdating = FALSE; + mbPreviewUpdating = sal_False; } void AssistentDlgImpl::SavePassword( SfxObjectShellLock xDoc, const String& rPath ) @@ -1678,7 +1678,7 @@ void AssistentDlgImpl::SavePassword( SfxObjectShellLock xDoc, const String& rPat { SfxItemSet * pSet = pMedium->GetItemSet(); const SfxPoolItem *pItem = 0; - if( pSet->GetItemState(SID_PASSWORD, TRUE, &pItem) == SFX_ITEM_SET ) + if( pSet->GetItemState(SID_PASSWORD, sal_True, &pItem) == SFX_ITEM_SET ) { //TODO/MBA: testing String aPass( ((const SfxStringItem*)pItem)->GetValue()); @@ -1741,7 +1741,7 @@ void AssistentDlgImpl::DeletePassords() } } -BOOL AssistentDlgImpl::IsOwnFormat( const String& rPath ) +sal_Bool AssistentDlgImpl::IsOwnFormat( const String& rPath ) { INetURLObject aURL( rPath ); String aExt( aURL.GetFileExtension() ); @@ -1873,7 +1873,7 @@ Image AssistentDlgImpl::GetUiIconForCommand (const ::rtl::OUString& sCommandURL) ////////////////////////////////////////////// -AssistentDlg::AssistentDlg(Window* pParent, BOOL bAutoPilot) : +AssistentDlg::AssistentDlg(Window* pParent, sal_Bool bAutoPilot) : ModalDialog(pParent,SdResId(DLG_ASS)) { Link aFinishLink = LINK(this,AssistentDlg, FinishHdl); @@ -1907,7 +1907,7 @@ IMPL_LINK( AssistentDlg, FinishHdl, OKButton *, EMPTYARG ) INetURLObject aURL; aURL.SetSmartURL(aFileToOpen); mpImpl->maOpenFilesList.push_back (new String (aURL.GetMainURL( INetURLObject::NO_DECODE ))); - USHORT nNewPos = mpImpl->mpPage1OpenLB->InsertEntry(aURL.getName()); + sal_uInt16 nNewPos = mpImpl->mpPage1OpenLB->InsertEntry(aURL.getName()); mpImpl->mpPage1OpenLB->SelectEntryPos(nNewPos); } } @@ -1944,7 +1944,7 @@ OutputType AssistentDlg::GetOutputMedium() const return OUTPUT_ORIGINAL; } -BOOL AssistentDlg::IsSummary() const +sal_Bool AssistentDlg::IsSummary() const { return mpImpl->mpPage5SummaryCB->IsChecked(); } @@ -1959,12 +1959,12 @@ String AssistentDlg::GetDocPath() const return mpImpl->GetDocFileName(); } -BOOL AssistentDlg::GetStartWithFlag() const +sal_Bool AssistentDlg::GetStartWithFlag() const { return !mpImpl->maStartWithFlag.IsChecked(); } -BOOL AssistentDlg::IsDocEmpty() const +sal_Bool AssistentDlg::IsDocEmpty() const { return mpImpl->GetDocFileName().Len() == 0 && mpImpl->GetLayoutFileName().Len() == 0; diff --git a/sd/source/ui/dlg/dlgassim.cxx b/sd/source/ui/dlg/dlgassim.cxx index aa2e234b0868..6c8d220157ae 100755 --- a/sd/source/ui/dlg/dlgassim.cxx +++ b/sd/source/ui/dlg/dlgassim.cxx @@ -116,8 +116,8 @@ void SdPageListControl::Fill( SdDrawDocument* pDoc ) { Outliner* pOutliner = pDoc->GetInternalOutliner(); - USHORT nPage = 0; - const USHORT nMaxPages = pDoc->GetPageCount(); + sal_uInt16 nPage = 0; + const sal_uInt16 nMaxPages = pDoc->GetPageCount(); while( nPage < nMaxPages ) { SdPage* pPage = (SdPage*) pDoc->GetPage( nPage ); @@ -130,8 +130,8 @@ void SdPageListControl::Fill( SdDrawDocument* pDoc ) if(!pTO) { // Ermittelt das SdrTextObject mit dem Layout Text dieser Seite - const ULONG nObjectCount = pPage->GetObjCount(); - for (ULONG nObject = 0; nObject < nObjectCount; nObject++) + const sal_uLong nObjectCount = pPage->GetObjCount(); + for (sal_uLong nObject = 0; nObject < nObjectCount; nObject++) { SdrObject* pObject = pPage->GetObj(nObject); if (pObject->GetObjInventor() == SdrInventor && pObject->GetObjIdentifier() == OBJ_OUTLINETEXT) @@ -150,14 +150,14 @@ void SdPageListControl::Fill( SdDrawDocument* pDoc ) pOutliner->Clear(); pOutliner->SetText( *pOPO ); - ULONG nCount = pOutliner->GetParagraphCount(); + sal_uLong nCount = pOutliner->GetParagraphCount(); Paragraph* pPara = NULL; - for (ULONG nPara = 0; nPara < nCount; nPara++) + for (sal_uLong nPara = 0; nPara < nCount; nPara++) { pPara = pOutliner->GetParagraph(nPara); - if(pPara && pOutliner->GetDepth( (USHORT) nPara ) == 0 ) + if(pPara && pOutliner->GetDepth( (sal_uInt16) nPara ) == 0 ) { String aParaText = pOutliner->GetText(pPara); if(aParaText.Len() != 0) @@ -173,10 +173,10 @@ void SdPageListControl::Fill( SdDrawDocument* pDoc ) pOutliner->Clear(); } -USHORT SdPageListControl::GetSelectedPage() +sal_uInt16 SdPageListControl::GetSelectedPage() { SvLBoxEntry* pSelEntry = GetCurEntry(); - USHORT nPage = 0; + sal_uInt16 nPage = 0; if ( pSelEntry ) { @@ -196,10 +196,10 @@ USHORT SdPageListControl::GetSelectedPage() return nPage; } -BOOL SdPageListControl::IsPageChecked( USHORT nPage ) +sal_Bool SdPageListControl::IsPageChecked( sal_uInt16 nPage ) { SvLBoxEntry* pEntry = GetModel()->GetEntry(nPage); - return pEntry?(BOOL)(GetCheckButtonState( pEntry ) == SV_BUTTON_CHECKED): FALSE; + return pEntry?(sal_Bool)(GetCheckButtonState( pEntry ) == SV_BUTTON_CHECKED): sal_False; } void SdPageListControl::DataChanged( const DataChangedEvent& rDCEvt ) diff --git a/sd/source/ui/dlg/dlgassim.hxx b/sd/source/ui/dlg/dlgassim.hxx index 35bbd41de448..76bdbafac115 100755 --- a/sd/source/ui/dlg/dlgassim.hxx +++ b/sd/source/ui/dlg/dlgassim.hxx @@ -47,8 +47,8 @@ public: void Fill( SdDrawDocument* pDoc ); void Clear(); - USHORT GetSelectedPage(); - BOOL IsPageChecked( USHORT nPage ); + sal_uInt16 GetSelectedPage(); + sal_Bool IsPageChecked( sal_uInt16 nPage ); DECL_LINK( CheckButtonClickHdl, SvLBoxButtonData * ); diff --git a/sd/source/ui/dlg/dlgchar.cxx b/sd/source/ui/dlg/dlgchar.cxx index d0c412ca6f10..a46ac2bd833c 100644..100755 --- a/sd/source/ui/dlg/dlgchar.cxx +++ b/sd/source/ui/dlg/dlgchar.cxx @@ -64,7 +64,7 @@ SdCharDlg::SdCharDlg( Window* pParent, const SfxItemSet* pAttr, // ----------------------------------------------------------------------- -void SdCharDlg::PageCreated( USHORT nId, SfxTabPage &rPage ) +void SdCharDlg::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) { SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool())); switch( nId ) diff --git a/sd/source/ui/dlg/dlgctrls.cxx b/sd/source/ui/dlg/dlgctrls.cxx index 1a5a612d37ad..8da21b313027 100755 --- a/sd/source/ui/dlg/dlgctrls.cxx +++ b/sd/source/ui/dlg/dlgctrls.cxx @@ -84,14 +84,14 @@ void FadeEffectLB::Fill() /* void FadeEffectLB::SelectEffect( presentation::FadeEffect eFE ) { - BOOL bFound = FALSE; + sal_Bool bFound = sal_False; for( long i = 0, nCount = sizeof( aEffects ) / sizeof( FadeEffectPair ); ( i < nCount ) && !bFound; i++ ) { if( aEffects[ i ].meFE == eFE ) { - SelectEntryPos( (USHORT) i ); - bFound = TRUE; + SelectEntryPos( (sal_uInt16) i ); + bFound = sal_True; } } } @@ -101,7 +101,7 @@ void FadeEffectLB::SelectEffect( presentation::FadeEffect eFE ) void FadeEffectLB::applySelected( SdPage* pSlide ) const { - const USHORT nPos = GetSelectEntryPos(); + const sal_uInt16 nPos = GetSelectEntryPos(); if( pSlide && (nPos < mpImpl->maPresets.size() ) ) { diff --git a/sd/source/ui/dlg/dlgfield.cxx b/sd/source/ui/dlg/dlgfield.cxx index 6778f073aaa9..5316d5a87ede 100644..100755 --- a/sd/source/ui/dlg/dlgfield.cxx +++ b/sd/source/ui/dlg/dlgfield.cxx @@ -219,7 +219,7 @@ void SdModifyFieldDlg::FillFormatList() aDateField.SetFormat( SVXDATEFORMAT_F ); // Dienstag, 13.Februar 1996 aLbFormat.InsertEntry( aDateField.GetFormatted( *pNumberFormatter, eLangType ) ); - aLbFormat.SelectEntryPos( (USHORT) ( pDateField->GetFormat() - 2 ) ); + aLbFormat.SelectEntryPos( (sal_uInt16) ( pDateField->GetFormat() - 2 ) ); } else if( pField->ISA( SvxExtTimeField ) ) { @@ -247,7 +247,7 @@ void SdModifyFieldDlg::FillFormatList() //SVXTIMEFORMAT_AM_HMS, // 01:49:38 PM //SVXTIMEFORMAT_AM_HMSH // 01:49:38.78 PM - aLbFormat.SelectEntryPos( (USHORT) ( pTimeField->GetFormat() - 2 ) ); + aLbFormat.SelectEntryPos( (sal_uInt16) ( pTimeField->GetFormat() - 2 ) ); } else if( pField->ISA( SvxExtFileField ) ) { @@ -259,20 +259,20 @@ void SdModifyFieldDlg::FillFormatList() aLbFormat.InsertEntry( String( SdResId( STR_FILEFORMAT_PATH ) ) ); aLbFormat.InsertEntry( String( SdResId( STR_FILEFORMAT_NAME ) ) ); - aLbFormat.SelectEntryPos( (USHORT) ( pFileField->GetFormat() ) ); + aLbFormat.SelectEntryPos( (sal_uInt16) ( pFileField->GetFormat() ) ); } else if( pField->ISA( SvxAuthorField ) ) { const SvxAuthorField* pAuthorField = (const SvxAuthorField*) pField; SvxAuthorField aAuthorField( *pAuthorField ); - for( USHORT i = 0; i < 4; i++ ) + for( sal_uInt16 i = 0; i < 4; i++ ) { aAuthorField.SetFormat( (SvxAuthorFormat) i ); aLbFormat.InsertEntry( aAuthorField.GetFormatted() ); } - aLbFormat.SelectEntryPos( (USHORT) ( pAuthorField->GetFormat() ) ); + aLbFormat.SelectEntryPos( (sal_uInt16) ( pAuthorField->GetFormat() ) ); } @@ -327,7 +327,7 @@ void SdModifyFieldDlg::FillControls() aRbtVar.SaveValue(); const SfxPoolItem* pItem; - if( SFX_ITEM_SET == maInputSet.GetItemState(EE_CHAR_LANGUAGE, TRUE, &pItem ) ) + if( SFX_ITEM_SET == maInputSet.GetItemState(EE_CHAR_LANGUAGE, sal_True, &pItem ) ) maLbLanguage.SelectLanguage( static_cast<const SvxLanguageItem*>(pItem)->GetLanguage() ); maLbLanguage.SaveValue(); diff --git a/sd/source/ui/dlg/dlgolbul.cxx b/sd/source/ui/dlg/dlgolbul.cxx index bbd32f6bd807..cb5e4a89dffb 100644..100755 --- a/sd/source/ui/dlg/dlgolbul.cxx +++ b/sd/source/ui/dlg/dlgolbul.cxx @@ -77,7 +77,7 @@ OutlineBulletDlg::OutlineBulletDlg( ::sd::View* pView ) : SfxTabDialog ( pParent, SdResId(TAB_OUTLINEBULLET) ), aInputSet ( *pAttr ), - bTitle ( FALSE ), + bTitle ( sal_False ), pSdView ( pView ) { FreeResource(); @@ -88,14 +88,14 @@ OutlineBulletDlg::OutlineBulletDlg( pOutputSet = new SfxItemSet( *pAttr ); pOutputSet->ClearItem(); - BOOL bOutliner = FALSE; + sal_Bool bOutliner = sal_False; // Sonderbehandlung wenn eine Title Objekt selektiert wurde if( pView ) { const SdrMarkList& rMarkList = pView->GetMarkedObjectList(); - const ULONG nCount = rMarkList.GetMarkCount(); - for(ULONG nNum = 0; nNum < nCount; nNum++) + const sal_uLong nCount = rMarkList.GetMarkCount(); + for(sal_uLong nNum = 0; nNum < nCount; nNum++) { SdrObject* pObj = rMarkList.GetMark(nNum)->GetMarkedSdrObj(); if( pObj->GetObjInventor() == SdrInventor ) @@ -104,10 +104,10 @@ OutlineBulletDlg::OutlineBulletDlg( switch(pObj->GetObjIdentifier()) { case OBJ_TITLETEXT: - bTitle = TRUE; + bTitle = sal_True; break; case OBJ_OUTLINETEXT: - bOutliner = TRUE; + bOutliner = sal_True; break; } } @@ -124,7 +124,7 @@ OutlineBulletDlg::OutlineBulletDlg( aStyleName.AppendAscii( RTL_CONSTASCII_STRINGPARAM( " 1" ) ); SfxStyleSheetBase* pFirstStyleSheet = pSSPool->Find( aStyleName, SD_STYLE_FAMILY_PSEUDO); if( pFirstStyleSheet ) - pFirstStyleSheet->GetItemSet().GetItemState(EE_PARA_NUMBULLET, FALSE, (const SfxPoolItem**)&pItem); + pFirstStyleSheet->GetItemSet().GetItemState(EE_PARA_NUMBULLET, sal_False, (const SfxPoolItem**)&pItem); } if( pItem == NULL ) @@ -136,7 +136,7 @@ OutlineBulletDlg::OutlineBulletDlg( } /* debug - if( SFX_ITEM_SET == aInputSet.GetItemState(EE_PARA_NUMBULLET, FALSE, &pItem )) + if( SFX_ITEM_SET == aInputSet.GetItemState(EE_PARA_NUMBULLET, sal_False, &pItem )) { SvxNumRule& rItem = *((SvxNumBulletItem*)pItem)->GetNumRule(); for( int i = 0; i < 9; i++ ) @@ -146,14 +146,14 @@ OutlineBulletDlg::OutlineBulletDlg( } */ - if(bTitle && aInputSet.GetItemState(EE_PARA_NUMBULLET,TRUE) == SFX_ITEM_ON ) + if(bTitle && aInputSet.GetItemState(EE_PARA_NUMBULLET,sal_True) == SFX_ITEM_ON ) { - SvxNumBulletItem* pItem = (SvxNumBulletItem*)aInputSet.GetItem(EE_PARA_NUMBULLET,TRUE); + SvxNumBulletItem* pItem = (SvxNumBulletItem*)aInputSet.GetItem(EE_PARA_NUMBULLET,sal_True); SvxNumRule* pRule = pItem->GetNumRule(); if(pRule) { SvxNumRule aNewRule( *pRule ); - aNewRule.SetFeatureFlag( NUM_NO_NUMBERS, TRUE ); + aNewRule.SetFeatureFlag( NUM_NO_NUMBERS, sal_True ); SvxNumBulletItem aNewItem( aNewRule, EE_PARA_NUMBULLET ); aInputSet.Put(aNewItem); @@ -179,7 +179,7 @@ OutlineBulletDlg::~OutlineBulletDlg() delete pOutputSet; } -void OutlineBulletDlg::PageCreated( USHORT nId, SfxTabPage &rPage ) +void OutlineBulletDlg::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) { switch ( nId ) { @@ -189,7 +189,7 @@ void OutlineBulletDlg::PageCreated( USHORT nId, SfxTabPage &rPage ) { FieldUnit eMetric = pSdView->GetDoc()->GetUIUnit(); SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool())); - aSet.Put ( SfxAllEnumItem(SID_METRIC_ITEM,(USHORT)eMetric)); + aSet.Put ( SfxAllEnumItem(SID_METRIC_ITEM,(sal_uInt16)eMetric)); rPage.PageCreated(aSet); } } @@ -200,7 +200,7 @@ void OutlineBulletDlg::PageCreated( USHORT nId, SfxTabPage &rPage ) { FieldUnit eMetric = pSdView->GetDoc()->GetUIUnit(); SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool())); - aSet.Put ( SfxAllEnumItem(SID_METRIC_ITEM,(USHORT)eMetric)); + aSet.Put ( SfxAllEnumItem(SID_METRIC_ITEM,(sal_uInt16)eMetric)); rPage.PageCreated(aSet); } } @@ -214,7 +214,7 @@ const SfxItemSet* OutlineBulletDlg::GetOutputItemSet() const pOutputSet->Put( aSet ); const SfxPoolItem *pItem = NULL; - if( SFX_ITEM_SET == pOutputSet->GetItemState(pOutputSet->GetPool()->GetWhich(SID_ATTR_NUMBERING_RULE), FALSE, &pItem )) + if( SFX_ITEM_SET == pOutputSet->GetItemState(pOutputSet->GetPool()->GetWhich(SID_ATTR_NUMBERING_RULE), sal_False, &pItem )) { SdBulletMapper::MapFontsInNumRule( *((SvxNumBulletItem*)pItem)->GetNumRule(), *pOutputSet ); @@ -228,12 +228,12 @@ const SfxItemSet* OutlineBulletDlg::GetOutputItemSet() const SdBulletMapper::PostMapNumBulletForDialog( *pOutputSet ); */ - if(bTitle && pOutputSet->GetItemState(EE_PARA_NUMBULLET,TRUE) == SFX_ITEM_ON ) + if(bTitle && pOutputSet->GetItemState(EE_PARA_NUMBULLET,sal_True) == SFX_ITEM_ON ) { - SvxNumBulletItem* pBulletItem = (SvxNumBulletItem*)pOutputSet->GetItem(EE_PARA_NUMBULLET,TRUE); + SvxNumBulletItem* pBulletItem = (SvxNumBulletItem*)pOutputSet->GetItem(EE_PARA_NUMBULLET,sal_True); SvxNumRule* pRule = pBulletItem->GetNumRule(); if(pRule) - pRule->SetFeatureFlag( NUM_NO_NUMBERS, FALSE ); + pRule->SetFeatureFlag( NUM_NO_NUMBERS, sal_False ); } return pOutputSet; diff --git a/sd/source/ui/dlg/dlgpage.cxx b/sd/source/ui/dlg/dlgpage.cxx index f2dea0f67e2f..aff87536c222 100644..100755 --- a/sd/source/ui/dlg/dlgpage.cxx +++ b/sd/source/ui/dlg/dlgpage.cxx @@ -55,7 +55,7 @@ |* \************************************************************************/ -SdPageDlg::SdPageDlg( SfxObjectShell* pDocSh, Window* pParent, const SfxItemSet* pAttr, BOOL bAreaPage ) : +SdPageDlg::SdPageDlg( SfxObjectShell* pDocSh, Window* pParent, const SfxItemSet* pAttr, sal_Bool bAreaPage ) : SfxTabDialog ( pParent, SdResId( TAB_PAGE ), pAttr ), mrOutAttrs ( *pAttr ), mpDocShell ( pDocSh ) @@ -90,15 +90,15 @@ SdPageDlg::SdPageDlg( SfxObjectShell* pDocSh, Window* pParent, const SfxItemSet* |* \************************************************************************/ -void SdPageDlg::PageCreated(USHORT nId, SfxTabPage& rPage) +void SdPageDlg::PageCreated(sal_uInt16 nId, SfxTabPage& rPage) { SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool())); switch(nId) { case RID_SVXPAGE_PAGE: - aSet.Put (SfxAllEnumItem((const USHORT)SID_ENUM_PAGE_MODE, SVX_PAGE_MODE_PRESENTATION)); - aSet.Put (SfxAllEnumItem((const USHORT)SID_PAPER_START, PAPER_A0)); - aSet.Put (SfxAllEnumItem((const USHORT)SID_PAPER_END, PAPER_E)); + aSet.Put (SfxAllEnumItem((const sal_uInt16)SID_ENUM_PAGE_MODE, SVX_PAGE_MODE_PRESENTATION)); + aSet.Put (SfxAllEnumItem((const sal_uInt16)SID_PAPER_START, PAPER_A0)); + aSet.Put (SfxAllEnumItem((const sal_uInt16)SID_PAPER_END, PAPER_E)); rPage.PageCreated(aSet); break; case RID_SVXPAGE_AREA: diff --git a/sd/source/ui/dlg/dlgsnap.cxx b/sd/source/ui/dlg/dlgsnap.cxx index 6cd220d5a5bc..cc8d9dd996b9 100755 --- a/sd/source/ui/dlg/dlgsnap.cxx +++ b/sd/source/ui/dlg/dlgsnap.cxx @@ -85,8 +85,8 @@ SdSnapLineDlg::SdSnapLineDlg( aBtnDelete.SetClickHdl(LINK(this, SdSnapLineDlg, ClickHdl)); - SetFieldUnit( aMtrFldX, eUIUnit, TRUE ); - SetFieldUnit( aMtrFldY, eUIUnit, TRUE ); + SetFieldUnit( aMtrFldX, eUIUnit, sal_True ); + SetFieldUnit( aMtrFldY, eUIUnit, sal_True ); // WorkArea holen Rectangle aWorkArea = pView->GetWorkArea(); @@ -149,9 +149,9 @@ SdSnapLineDlg::SdSnapLineDlg( IMPL_LINK( SdSnapLineDlg, ClickHdl, Button *, pBtn ) { - if ( pBtn == &aRbPoint ) SetInputFields(TRUE, TRUE); - else if ( pBtn == &aRbHorz ) SetInputFields(FALSE, TRUE); - else if ( pBtn == &aRbVert ) SetInputFields(TRUE, FALSE); + if ( pBtn == &aRbPoint ) SetInputFields(sal_True, sal_True); + else if ( pBtn == &aRbHorz ) SetInputFields(sal_False, sal_True); + else if ( pBtn == &aRbVert ) SetInputFields(sal_True, sal_False); else if ( pBtn == &aBtnDelete ) EndDialog(RET_SNAP_DELETE); return 0; @@ -174,7 +174,7 @@ void SdSnapLineDlg::GetAttr(SfxItemSet& rOutAttrs) nXValue = Fraction( GetCoreValue( aMtrFldX, SFX_MAPUNIT_100TH_MM) ) * aUIScale; nYValue = Fraction( GetCoreValue( aMtrFldY, SFX_MAPUNIT_100TH_MM) ) * aUIScale; - rOutAttrs.Put(SfxAllEnumItem(ATTR_SNAPLINE_KIND, (USHORT)eKind)); + rOutAttrs.Put(SfxAllEnumItem(ATTR_SNAPLINE_KIND, (sal_uInt16)eKind)); rOutAttrs.Put(SfxUInt32Item(ATTR_SNAPLINE_X, nXValue)); rOutAttrs.Put(SfxUInt32Item(ATTR_SNAPLINE_Y, nYValue)); } @@ -199,7 +199,7 @@ void SdSnapLineDlg::HideRadioGroup() |* \************************************************************************/ -void SdSnapLineDlg::SetInputFields(BOOL bEnableX, BOOL bEnableY) +void SdSnapLineDlg::SetInputFields(sal_Bool bEnableX, sal_Bool bEnableY) { if ( bEnableX ) { diff --git a/sd/source/ui/dlg/docprev.cxx b/sd/source/ui/dlg/docprev.cxx index a42ce43a2c6d..ffac8d56d1fd 100755 --- a/sd/source/ui/dlg/docprev.cxx +++ b/sd/source/ui/dlg/docprev.cxx @@ -72,7 +72,7 @@ void SdDocPreviewWin::SetObjectShell( SfxObjectShell* pObj, sal_uInt16 nShowPage } SdDocPreviewWin::SdDocPreviewWin( Window* pParent, const ResId& rResId ) -: Control(pParent, rResId), pMetaFile( 0 ), bInEffect(FALSE), mpObj(NULL), mnShowPage(0) +: Control(pParent, rResId), pMetaFile( 0 ), bInEffect(sal_False), mpObj(NULL), mnShowPage(0) { SetBorderStyle( WINDOW_BORDER_MONO ); svtools::ColorConfig aColorConfig; @@ -105,13 +105,13 @@ void SdDocPreviewWin::CalcSizeAndPos( GDIMetaFile* pFile, Size& rSize, Point& rP if (dRatio>dRatioPreV) { - rSize=Size(nWidth, (USHORT)(nWidth/dRatio)); - rPoint=Point( 0, (USHORT)((nHeight-rSize.Height())/2)); + rSize=Size(nWidth, (sal_uInt16)(nWidth/dRatio)); + rPoint=Point( 0, (sal_uInt16)((nHeight-rSize.Height())/2)); } else { - rSize=Size((USHORT)(nHeight*dRatio), nHeight); - rPoint=Point((USHORT)((nWidth-rSize.Width())/2),0); + rSize=Size((sal_uInt16)(nHeight*dRatio), nHeight); + rPoint=Point((sal_uInt16)((nWidth-rSize.Width())/2),0); } } @@ -238,7 +238,7 @@ void SdDocPreviewWin::updateViewSettings() aVDev.SetMapMode( aMap ); // #109058# Disable output, as we only want to record a metafile - aVDev.EnableOutput( FALSE ); + aVDev.EnableOutput( sal_False ); pMtf->Record( &aVDev ); @@ -247,8 +247,8 @@ void SdDocPreviewWin::updateViewSettings() const Size aSize( pPage->GetSize() ); - pView->SetBordVisible( FALSE ); - pView->SetPageVisible( FALSE ); + pView->SetBordVisible( sal_False ); + pView->SetPageVisible( sal_False ); pView->ShowSdrPage( pPage ); const Point aNewOrg( pPage->GetLftBorder(), pPage->GetUppBorder() ); diff --git a/sd/source/ui/dlg/filedlg.cxx b/sd/source/ui/dlg/filedlg.cxx index 71fad02f24a7..ac4682e42561 100755 --- a/sd/source/ui/dlg/filedlg.cxx +++ b/sd/source/ui/dlg/filedlg.cxx @@ -74,9 +74,9 @@ private: css::uno::Reference< css::ui::dialogs::XFilePickerControlAccess > mxControlAccess; css::uno::Reference< css::media::XPlayer > mxPlayer; - ULONG mnPlaySoundEvent; - BOOL mbUsableSelection; - BOOL mbLabelPlaying; + sal_uLong mnPlaySoundEvent; + sal_Bool mbUsableSelection; + sal_Bool mbLabelPlaying; void CheckSelectionState(); @@ -139,7 +139,7 @@ IMPL_LINK( SdFileDialog_Imp, PlayMusicHdl, void *, EMPTYARG ) mxControlAccess->setLabel( css::ui::dialogs::ExtendedFilePickerElementIds::PUSHBUTTON_PLAY, String( SdResId( STR_PLAY ) ) ); - mbLabelPlaying = FALSE; + mbLabelPlaying = sal_False; } catch( css::lang::IllegalArgumentException ) { @@ -173,7 +173,7 @@ IMPL_LINK( SdFileDialog_Imp, PlayMusicHdl, void *, EMPTYARG ) mxControlAccess->setLabel( css::ui::dialogs::ExtendedFilePickerElementIds::PUSHBUTTON_PLAY, String( SdResId( STR_STOP ) ) ); - mbLabelPlaying = TRUE; + mbLabelPlaying = sal_True; } catch( css::lang::IllegalArgumentException ) { @@ -209,7 +209,7 @@ IMPL_LINK( SdFileDialog_Imp, IsMusicStoppedHdl, void *, EMPTYARG ) { mxControlAccess->setLabel( css::ui::dialogs::ExtendedFilePickerElementIds::PUSHBUTTON_PLAY, String( SdResId( STR_PLAY ) ) ); - mbLabelPlaying = FALSE; + mbLabelPlaying = sal_False; } catch( css::lang::IllegalArgumentException ) { @@ -232,9 +232,9 @@ void SdFileDialog_Imp::CheckSelectionState() try { if( !aCurrFilter.Len() || ( aCurrFilter == String( SdResId( STR_EXPORT_HTML_NAME ) ) ) ) - mxControlAccess->enableControl( css::ui::dialogs::ExtendedFilePickerElementIds::CHECKBOX_SELECTION, FALSE ); + mxControlAccess->enableControl( css::ui::dialogs::ExtendedFilePickerElementIds::CHECKBOX_SELECTION, sal_False ); else - mxControlAccess->enableControl( css::ui::dialogs::ExtendedFilePickerElementIds::CHECKBOX_SELECTION, TRUE ); + mxControlAccess->enableControl( css::ui::dialogs::ExtendedFilePickerElementIds::CHECKBOX_SELECTION, sal_True ); } catch( css::lang::IllegalArgumentException ) { @@ -251,7 +251,7 @@ SdFileDialog_Imp::SdFileDialog_Imp( const short nDialogType, FileDialogHelper( nDialogType, 0 ), mnPlaySoundEvent( 0 ), mbUsableSelection( bUsableSelection ), - mbLabelPlaying(FALSE) + mbLabelPlaying(sal_False) { maUpdateTimer.SetTimeoutHdl(LINK(this, SdFileDialog_Imp, IsMusicStoppedHdl)); @@ -281,7 +281,7 @@ SdFileDialog_Imp::SdFileDialog_Imp( const short nDialogType, { try { - mxControlAccess->enableControl( css::ui::dialogs::ExtendedFilePickerElementIds::CHECKBOX_SELECTION, FALSE ); + mxControlAccess->enableControl( css::ui::dialogs::ExtendedFilePickerElementIds::CHECKBOX_SELECTION, sal_False ); } catch( css::lang::IllegalArgumentException ) { diff --git a/sd/source/ui/dlg/gluectrl.cxx b/sd/source/ui/dlg/gluectrl.cxx index 5a23262c57c0..0f326975cbf6 100644..100755 --- a/sd/source/ui/dlg/gluectrl.cxx +++ b/sd/source/ui/dlg/gluectrl.cxx @@ -50,7 +50,7 @@ using namespace ::com::sun::star::frame; // z.Z. werden von Joe nur die u.a. Moeglichkeiten unterstuetzt #define ESCDIR_COUNT 5 -static UINT16 aEscDirArray[] = +static sal_uInt16 aEscDirArray[] = { SDRESC_SMART, SDRESC_LEFT, @@ -107,7 +107,7 @@ GlueEscDirLB::~GlueEscDirLB() void GlueEscDirLB::Select() { - UINT16 nPos = GetSelectEntryPos(); + sal_uInt16 nPos = GetSelectEntryPos(); SfxUInt16Item aItem( SID_GLUE_ESCDIR, aEscDirArray[ nPos ] ); if ( m_xFrame.is() ) @@ -158,7 +158,7 @@ void GlueEscDirLB::Fill() \************************************************************************/ SdTbxCtlGlueEscDir::SdTbxCtlGlueEscDir( - USHORT nSlotId, USHORT nId, ToolBox& rTbx ) : + sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) : SfxToolBoxControl( nSlotId, nId, rTbx ) { } @@ -169,7 +169,7 @@ SdTbxCtlGlueEscDir::SdTbxCtlGlueEscDir( |* \************************************************************************/ -void SdTbxCtlGlueEscDir::StateChanged( USHORT nSId, +void SdTbxCtlGlueEscDir::StateChanged( sal_uInt16 nSId, SfxItemState eState, const SfxPoolItem* pState ) { if( eState == SFX_ITEM_AVAILABLE ) @@ -187,7 +187,7 @@ void SdTbxCtlGlueEscDir::StateChanged( USHORT nSId, } else { - UINT16 nEscDir = ( (const SfxUInt16Item*) pState )->GetValue(); + sal_uInt16 nEscDir = ( (const SfxUInt16Item*) pState )->GetValue(); pGlueEscDirLB->SelectEntryPos( GetEscDirPos( nEscDir ) ); } } @@ -225,9 +225,9 @@ Window* SdTbxCtlGlueEscDir::CreateItemWindow( Window *pParent ) |* \************************************************************************/ -UINT16 SdTbxCtlGlueEscDir::GetEscDirPos( UINT16 nEscDir ) +sal_uInt16 SdTbxCtlGlueEscDir::GetEscDirPos( sal_uInt16 nEscDir ) { - for( UINT16 i = 0; i < ESCDIR_COUNT; i++ ) + for( sal_uInt16 i = 0; i < ESCDIR_COUNT; i++ ) { if( aEscDirArray[ i ] == nEscDir ) return( i ); diff --git a/sd/source/ui/dlg/headerfooterdlg.cxx b/sd/source/ui/dlg/headerfooterdlg.cxx index b48a1682bba6..9707ecb2c300 100755 --- a/sd/source/ui/dlg/headerfooterdlg.cxx +++ b/sd/source/ui/dlg/headerfooterdlg.cxx @@ -192,7 +192,7 @@ public: ~HeaderFooterTabPage(); static SfxTabPage* Create( ::Window*, const SfxItemSet& ); - static USHORT* GetRanges(); + static sal_uInt16* GetRanges(); void init( const HeaderFooterSettings& rSettings, bool bNotOnTitle, bool bHasApply ); void getData( HeaderFooterSettings& rSettings, bool& rNotOnTitle ); @@ -293,7 +293,7 @@ HeaderFooterDialog::~HeaderFooterDialog() IMPL_LINK( HeaderFooterDialog, ActivatePageHdl, TabControl *, pTabCtrl ) { - const USHORT nId = pTabCtrl->GetCurPageId(); + const sal_uInt16 nId = pTabCtrl->GetCurPageId(); TabPage* pTabPage = pTabCtrl->GetTabPage( nId ); pTabPage->Show(); @@ -304,14 +304,14 @@ IMPL_LINK( HeaderFooterDialog, ActivatePageHdl, TabControl *, pTabCtrl ) IMPL_LINK( HeaderFooterDialog, DeactivatePageHdl, TabControl *, EMPTYARG ) { - return TRUE; + return sal_True; } // ----------------------------------------------------------------------- short HeaderFooterDialog::Execute() { - USHORT nRet = TabDialog::Execute(); + sal_uInt16 nRet = TabDialog::Execute(); if( nRet ) mpViewShell->GetDocSh()->SetModified(); return nRet; @@ -366,7 +366,7 @@ void HeaderFooterDialog::apply( bool bToAll, bool bForceSlides ) int nPage; for( nPage = 0; nPage < nPageCount; nPage++ ) { - SdPage* pPage = mpDoc->GetSdPage( (USHORT)nPage, PK_STANDARD ); + SdPage* pPage = mpDoc->GetSdPage( (sal_uInt16)nPage, PK_STANDARD ); change( pUndoGroup, pPage, aNewSettings ); } } @@ -407,7 +407,7 @@ void HeaderFooterDialog::apply( bool bToAll, bool bForceSlides ) int nPage; for( nPage = 0; nPage < nPageCount; nPage++ ) { - SdPage* pPage = mpDoc->GetSdPage( (USHORT)nPage, PK_NOTES ); + SdPage* pPage = mpDoc->GetSdPage( (sal_uInt16)nPage, PK_NOTES ); change( pUndoGroup, pPage, aNewSettings ); } @@ -576,7 +576,7 @@ void HeaderFooterTabPage::FillFormatList( int eFormat ) for( nFormat = 0; nFormat < nDateTimeFormatsCount; nFormat++ ) { String aStr( SvxDateTimeField::GetFormatted( aDate, aTime, nDateTimeFormats[nFormat], *(SD_MOD()->GetNumberFormatter()), eLanguage ) ); - USHORT nEntry = maCBDateTimeFormat.InsertEntry( aStr ); + sal_uInt16 nEntry = maCBDateTimeFormat.InsertEntry( aStr ); maCBDateTimeFormat.SetEntryData( nEntry, (void*)nDateTimeFormats[nFormat] ); if( nDateTimeFormats[nFormat] == eFormat ) { @@ -608,7 +608,7 @@ void HeaderFooterTabPage::init( const HeaderFooterSettings& rSettings, bool bNot maCBDateTimeLanguage.SelectLanguage( meOldLanguage ); - USHORT nPos; + sal_uInt16 nPos; for( nPos = 0; nPos < maCBDateTimeFormat.GetEntryCount(); nPos++ ) { int nFormat = (int)(sal_IntPtr)maCBDateTimeFormat.GetEntryData( nPos ); @@ -711,8 +711,8 @@ void HeaderFooterTabPage::GetOrSetDateTimeLanguage( LanguageType &rLanguage, boo // if set, set it on all notes master pages if( bSet ) { - USHORT nPageCount = mpDoc->GetMasterSdPageCount( PK_NOTES ); - USHORT nPage; + sal_uInt16 nPageCount = mpDoc->GetMasterSdPageCount( PK_NOTES ); + sal_uInt16 nPage; for( nPage = 0; nPage < nPageCount; nPage++ ) { GetOrSetDateTimeLanguage( rLanguage, bSet, mpDoc->GetMasterSdPage( nPage, PK_NOTES ) ); @@ -726,8 +726,8 @@ void HeaderFooterTabPage::GetOrSetDateTimeLanguage( LanguageType &rLanguage, boo { // get the language from the first master page // or set it to all master pages - USHORT nPageCount = bSet ? mpDoc->GetMasterSdPageCount( PK_NOTES ) : 1; - USHORT nPage; + sal_uInt16 nPageCount = bSet ? mpDoc->GetMasterSdPageCount( PK_NOTES ) : 1; + sal_uInt16 nPage; for( nPage = 0; nPage < nPageCount; nPage++ ) { GetOrSetDateTimeLanguage( rLanguage, bSet, mpDoc->GetMasterSdPage( nPage, PK_STANDARD ) ); @@ -746,7 +746,7 @@ void HeaderFooterTabPage::GetOrSetDateTimeLanguage( LanguageType &rLanguage, boo { Outliner* pOutl = mpDoc->GetInternalOutliner(); pOutl->Init( OUTLINERMODE_TEXTOBJECT ); - USHORT nOutlMode = pOutl->GetMode(); + sal_uInt16 nOutlMode = pOutl->GetMode(); EditEngine* pEdit = const_cast< EditEngine* >(&pOutl->GetEditEngine()); @@ -757,12 +757,12 @@ void HeaderFooterTabPage::GetOrSetDateTimeLanguage( LanguageType &rLanguage, boo EFieldInfo aFieldInfo; aFieldInfo.pFieldItem = NULL; - USHORT nParaCount = pEdit->GetParagraphCount(); - USHORT nPara; + sal_uInt16 nParaCount = pEdit->GetParagraphCount(); + sal_uInt16 nPara; for( nPara = 0; (nPara < nParaCount) && (aFieldInfo.pFieldItem == NULL); nPara++ ) { - USHORT nFieldCount = pEdit->GetFieldCount( nPara ); - USHORT nField; + sal_uInt16 nFieldCount = pEdit->GetFieldCount( nPara ); + sal_uInt16 nField; for( nField = 0; (nField < nFieldCount) && (aFieldInfo.pFieldItem == NULL); nField++ ) { aFieldInfo = pEdit->GetFieldInfo( nPara, nField ); diff --git a/sd/source/ui/dlg/ins_paste.cxx b/sd/source/ui/dlg/ins_paste.cxx index c0079d5eee77..38107bb5639f 100644..100755 --- a/sd/source/ui/dlg/ins_paste.cxx +++ b/sd/source/ui/dlg/ins_paste.cxx @@ -49,7 +49,7 @@ SdInsertPasteDlg::SdInsertPasteDlg( Window* pWindow ) : aBtnHelp( this, SdResId( BTN_HELP ) ) { FreeResource(); - aRbAfter.Check( TRUE ); + aRbAfter.Check( sal_True ); } // ----------------------------------------------------------------------------- @@ -60,7 +60,7 @@ SdInsertPasteDlg::~SdInsertPasteDlg() // ----------------------------------------------------------------------------- -BOOL SdInsertPasteDlg::IsInsertBefore() const +sal_Bool SdInsertPasteDlg::IsInsertBefore() const { return( aRbBefore.IsChecked() ); } diff --git a/sd/source/ui/dlg/inspagob.cxx b/sd/source/ui/dlg/inspagob.cxx index 5d260367f383..94cc2846aa11 100755 --- a/sd/source/ui/dlg/inspagob.cxx +++ b/sd/source/ui/dlg/inspagob.cxx @@ -117,7 +117,7 @@ void SdInsertPagesObjsDlg::Reset() aLbTree.SetCollapsedEntryBmp( pEntry, aImgTextH, BMP_COLOR_HIGHCONTRAST ); } - aCbxMasters.Check( TRUE ); + aCbxMasters.Check( sal_True ); } /************************************************************************* @@ -128,7 +128,7 @@ void SdInsertPagesObjsDlg::Reset() |* \************************************************************************/ -List* SdInsertPagesObjsDlg::GetList( USHORT nType ) +List* SdInsertPagesObjsDlg::GetList( sal_uInt16 nType ) { // Bei Draw-Dokumenten muss bei der Selektion des Dokumentes NULL // zurueckgegeben werden @@ -153,7 +153,7 @@ List* SdInsertPagesObjsDlg::GetList( USHORT nType ) |* \************************************************************************/ -BOOL SdInsertPagesObjsDlg::IsLink() +sal_Bool SdInsertPagesObjsDlg::IsLink() { return( aCbxLink.IsChecked() ); } @@ -164,7 +164,7 @@ BOOL SdInsertPagesObjsDlg::IsLink() |* \************************************************************************/ -BOOL SdInsertPagesObjsDlg::IsRemoveUnnessesaryMasterPages() const +sal_Bool SdInsertPagesObjsDlg::IsRemoveUnnessesaryMasterPages() const { return( aCbxMasters.IsChecked() ); } diff --git a/sd/source/ui/dlg/masterlayoutdlg.cxx b/sd/source/ui/dlg/masterlayoutdlg.cxx index 601b1d1cf72c..8732a1b6ac15 100644..100755 --- a/sd/source/ui/dlg/masterlayoutdlg.cxx +++ b/sd/source/ui/dlg/masterlayoutdlg.cxx @@ -76,7 +76,7 @@ MasterLayoutDialog::MasterLayoutDialog( Window* pParent, SdDrawDocument* pDoc, S case PK_STANDARD: { // aTitle = String( SdResId( STR_MASTER_LAYOUT_TITLE ) ); - maCBHeader.Enable( FALSE ); + maCBHeader.Enable( sal_False ); String aSlideNumberStr( SdResId( STR_SLIDE_NUMBER ) ); maCBPageNumber.SetText( aSlideNumberStr ); break; @@ -170,7 +170,7 @@ void MasterLayoutDialog::remove( PresObjKind eKind ) if( bUndo ) mpDoc->AddUndo(mpDoc->GetSdrUndoFactory().CreateUndoDeleteObject(*pObject)); SdrObjList* pOL =pObject->GetObjList(); - UINT32 nOrdNum=pObject->GetOrdNumDirect(); + sal_uInt32 nOrdNum=pObject->GetOrdNumDirect(); pOL->RemoveObject(nOrdNum); if( !bUndo ) diff --git a/sd/source/ui/dlg/morphdlg.cxx b/sd/source/ui/dlg/morphdlg.cxx index 47780b0f8233..c6abe9584ed5 100644..100755 --- a/sd/source/ui/dlg/morphdlg.cxx +++ b/sd/source/ui/dlg/morphdlg.cxx @@ -125,8 +125,8 @@ void MorphDlg::LoadSettings() SvStorageStreamRef xIStm( SD_MOD()->GetOptionStream( UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( SD_OPTION_MORPHING ) ), SD_OPTION_LOAD ) ); - UINT16 nSteps; - BOOL bOrient, bAttrib; + sal_uInt16 nSteps; + sal_Bool bOrient, bAttrib; if( xIStm.Is() ) { @@ -137,7 +137,7 @@ void MorphDlg::LoadSettings() else { nSteps = 16; - bOrient = bAttrib = TRUE; + bOrient = bAttrib = sal_True; } aMtfSteps.SetValue( nSteps ); @@ -157,7 +157,7 @@ void MorphDlg::SaveSettings() const { SdIOCompat aCompat( *xOStm, STREAM_WRITE, 1 ); - *xOStm << (UINT16) aMtfSteps.GetValue() + *xOStm << (sal_uInt16) aMtfSteps.GetValue() << aCbxOrientation.IsChecked() << aCbxAttributes.IsChecked(); } diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx index 488737fa6b56..3248504a61ab 100755 --- a/sd/source/ui/dlg/navigatr.cxx +++ b/sd/source/ui/dlg/navigatr.cxx @@ -82,7 +82,7 @@ SdNavigatorWin::SdNavigatorWin( , maTlbObjects( this, SdResId( TLB_OBJECTS ) ) , maLbDocs ( this, SdResId( LB_DOCS ) ) , mpChildWinContext( pChWinCtxt ) -, mbDocImported ( FALSE ) +, mbDocImported ( sal_False ) // Bei Aenderung des DragTypes: SelectionMode der TLB anpassen! , meDragType ( NAVIGATOR_DRAGTYPE_EMBEDDED ) , mpBindings ( pInBindings ) @@ -142,7 +142,7 @@ SdNavigatorWin::SdNavigatorWin( ((SfxDockingWindow*)GetParent())->SetMinOutputSizePixel( maMinSize ); // InitTlb; Wird ueber Slot initiiert - SfxBoolItem aItem( SID_NAVIGATOR_INIT, TRUE ); + SfxBoolItem aItem( SID_NAVIGATOR_INIT, sal_True ); mpBindings->GetDispatcher()->Execute( SID_NAVIGATOR_INIT, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, &aItem, 0L ); @@ -158,7 +158,7 @@ SdNavigatorWin::~SdNavigatorWin() // Liste der DocInfos loeschen long nCount = mpDocList->Count(); while( nCount-- ) - delete (NavDocInfo*) mpDocList->Remove( (ULONG)0 ); + delete (NavDocInfo*) mpDocList->Remove( (sal_uLong)0 ); delete mpDocList; } @@ -184,7 +184,7 @@ void SdNavigatorWin::InitTreeLB( const SdDrawDocument* pDoc ) // Disable the shape filter drop down menu when there is a running slide // show. if (pViewShell!=NULL && sd::SlideShow::IsRunning( pViewShell->GetViewShellBase() )) - maToolbox.EnableItem(TBI_SHAPE_FILTER, FALSE); + maToolbox.EnableItem(TBI_SHAPE_FILTER, sal_False); else maToolbox.EnableItem(TBI_SHAPE_FILTER); @@ -192,7 +192,7 @@ void SdNavigatorWin::InitTreeLB( const SdDrawDocument* pDoc ) { String aDocName = pDocShell->GetMedium()->GetName(); maTlbObjects.Clear(); - maTlbObjects.Fill( pDoc, (BOOL) FALSE, aDocName ); // Nur normale Seiten + maTlbObjects.Fill( pDoc, (sal_Bool) sal_False, aDocName ); // Nur normale Seiten RefreshDocumentLB(); maLbDocs.SelectEntry( aDocShName ); @@ -212,7 +212,7 @@ void SdNavigatorWin::InitTreeLB( const SdDrawDocument* pDoc ) SfxViewFrame* pViewFrame = ( ( pViewShell && pViewShell->GetViewFrame() ) ? pViewShell->GetViewFrame() : SfxViewFrame::Current() ); if( pViewFrame ) - pViewFrame->GetBindings().Invalidate(SID_NAVIGATOR_PAGENAME, TRUE, TRUE); + pViewFrame->GetBindings().Invalidate(SID_NAVIGATOR_PAGENAME, sal_True, sal_True); } /************************************************************************* @@ -239,8 +239,8 @@ NavigatorDragType SdNavigatorWin::GetNavigatorDragType() IMPL_LINK( SdNavigatorWin, SelectToolboxHdl, void *, EMPTYARG ) { - USHORT nId = maToolbox.GetCurItemId(); - USHORT nSId = 0; + sal_uInt16 nId = maToolbox.GetCurItemId(); + sal_uInt16 nSId = 0; PageJump ePage = PAGE_NONE; switch( nId ) @@ -254,7 +254,7 @@ IMPL_LINK( SdNavigatorWin, SelectToolboxHdl, void *, EMPTYARG ) if( nSId > 0 ) { - SfxBoolItem aItem( nSId, TRUE ); + SfxBoolItem aItem( nSId, sal_True ); mpBindings->GetDispatcher()->Execute( nSId, SFX_CALLMODE_SLOT |SFX_CALLMODE_RECORD, &aItem, 0L ); } @@ -277,7 +277,7 @@ IMPL_LINK( SdNavigatorWin, SelectToolboxHdl, void *, EMPTYARG ) if( ePage != PAGE_NONE ) { - SfxUInt16Item aItem( SID_NAVIGATOR_PAGE, (UINT16)ePage ); + SfxUInt16Item aItem( SID_NAVIGATOR_PAGE, (sal_uInt16)ePage ); mpBindings->GetDispatcher()->Execute( SID_NAVIGATOR_PAGE, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD, &aItem, 0L ); } @@ -299,7 +299,7 @@ IMPL_LINK( SdNavigatorWin, ClickToolboxHdl, ToolBox*, EMPTYARG ) IMPL_LINK( SdNavigatorWin, DropdownClickToolBoxHdl, ToolBox*, pBox ) { - USHORT nId = maToolbox.GetCurItemId(); + sal_uInt16 nId = maToolbox.GetCurItemId(); switch( nId ) { @@ -317,11 +317,11 @@ IMPL_LINK( SdNavigatorWin, DropdownClickToolBoxHdl, ToolBox*, pBox ) 0 }; - for( USHORT nID = NAVIGATOR_DRAGTYPE_URL; + for( sal_uInt16 nID = NAVIGATOR_DRAGTYPE_URL; nID < NAVIGATOR_DRAGTYPE_COUNT; nID++ ) { - USHORT nRId = GetDragTypeSdResId( (NavigatorDragType)nID ); + sal_uInt16 nRId = GetDragTypeSdResId( (NavigatorDragType)nID ); if( nRId > 0 ) { DBG_ASSERT(aHIDs[nID-NAVIGATOR_DRAGTYPE_URL],"HelpId not added!"); @@ -334,12 +334,12 @@ IMPL_LINK( SdNavigatorWin, DropdownClickToolBoxHdl, ToolBox*, pBox ) if( ( pInfo && !pInfo->HasName() ) || !maTlbObjects.IsLinkableSelected() ) { - pMenu->EnableItem( NAVIGATOR_DRAGTYPE_LINK, FALSE ); - pMenu->EnableItem( NAVIGATOR_DRAGTYPE_URL, FALSE ); + pMenu->EnableItem( NAVIGATOR_DRAGTYPE_LINK, sal_False ); + pMenu->EnableItem( NAVIGATOR_DRAGTYPE_URL, sal_False ); meDragType = NAVIGATOR_DRAGTYPE_EMBEDDED; } - pMenu->CheckItem( (UINT16)meDragType ); + pMenu->CheckItem( (sal_uInt16)meDragType ); pMenu->SetSelectHdl( LINK( this, SdNavigatorWin, MenuSelectHdl ) ); pMenu->Execute( this, maToolbox.GetItemRect( nId ), POPUPMENU_EXECUTE_DOWN ); @@ -417,7 +417,7 @@ IMPL_LINK( SdNavigatorWin, SelectDocumentHdl, void *, EMPTYARG ) { String aStrLb = maLbDocs.GetSelectEntry(); long nPos = maLbDocs.GetSelectEntryPos(); - BOOL bFound = FALSE; + sal_Bool bFound = sal_False; ::sd::DrawDocShell* pDocShell = NULL; NavDocInfo* pInfo = GetDocInfo(); @@ -431,7 +431,7 @@ IMPL_LINK( SdNavigatorWin, SelectDocumentHdl, void *, EMPTYARG ) { pDocShell = pInfo->mpDocShell; - bFound = TRUE; + bFound = sal_True; } if( bFound ) @@ -443,7 +443,7 @@ IMPL_LINK( SdNavigatorWin, SelectDocumentHdl, void *, EMPTYARG ) ::sd::DrawDocShell* pNCDocShell = pNonConstDoc->GetDocSh(); String aDocName = pNCDocShell->GetMedium()->GetName(); maTlbObjects.Clear(); - maTlbObjects.Fill( pDoc, (BOOL) FALSE, aDocName ); // Nur normale Seiten + maTlbObjects.Fill( pDoc, (sal_Bool) sal_False, aDocName ); // Nur normale Seiten } } @@ -466,7 +466,7 @@ IMPL_LINK( SdNavigatorWin, SelectDocumentHdl, void *, EMPTYARG ) IMPL_LINK( SdNavigatorWin, MenuSelectHdl, Menu *, pMenu ) { - USHORT nMenuId; + sal_uInt16 nMenuId; if( pMenu ) nMenuId = pMenu->GetCurItemId(); else @@ -484,7 +484,7 @@ IMPL_LINK( SdNavigatorWin, MenuSelectHdl, Menu *, pMenu ) { // Fix, um Endlosschleife zu unterbinden if( maTlbObjects.GetSelectionCount() > 1 ) - maTlbObjects.SelectAll( FALSE ); + maTlbObjects.SelectAll( sal_False ); maTlbObjects.SetSelectionMode( SINGLE_SELECTION ); } @@ -503,7 +503,7 @@ IMPL_LINK( SdNavigatorWin, ShapeFilterCallback, Menu *, pMenu ) if (pMenu != NULL) { bool bShowAllShapes (maTlbObjects.GetShowAllShapes()); - USHORT nMenuId (pMenu->GetCurItemId()); + sal_uInt16 nMenuId (pMenu->GetCurItemId()); switch (nMenuId) { case nShowNamedShapesFilter: @@ -585,10 +585,10 @@ void SdNavigatorWin::Resize() // ----------------------------------------------------------------------- -BOOL SdNavigatorWin::InsertFile(const String& rFileName) +sal_Bool SdNavigatorWin::InsertFile(const String& rFileName) { INetURLObject aURL( rFileName ); - BOOL bReturn = TRUE; + sal_Bool bReturn = sal_True; if( aURL.GetProtocol() == INET_PROT_NOT_VALID ) { @@ -617,9 +617,9 @@ BOOL SdNavigatorWin::InsertFile(const String& rFileName) if (aFileName != maDropFileName) { - SfxMedium aMed(aFileName, (STREAM_READ | STREAM_SHARE_DENYNONE), FALSE); + SfxMedium aMed(aFileName, (STREAM_READ | STREAM_SHARE_DENYNONE), sal_False); SfxFilterMatcher aMatch( String::CreateFromAscii("simpress") ); - aMed.UseInteractionHandler( TRUE ); + aMed.UseInteractionHandler( sal_True ); nErr = aMatch.GuessFilter(aMed, &pFilter); } @@ -629,7 +629,7 @@ BOOL SdNavigatorWin::InsertFile(const String& rFileName) // ersteinmal nachgeschaut, ob es einen Storage enthaelt SfxMedium* pMedium = new SfxMedium( aFileName, STREAM_READ | STREAM_NOCREATE, - TRUE); // Download + sal_True); // Download if (pMedium->IsStorage()) { @@ -646,20 +646,20 @@ BOOL SdNavigatorWin::InsertFile(const String& rFileName) if( !maTlbObjects.IsEqualToDoc( pDropDoc ) ) { // Nur normale Seiten - maTlbObjects.Fill(pDropDoc, (BOOL) FALSE, maDropFileName); + maTlbObjects.Fill(pDropDoc, (sal_Bool) sal_False, maDropFileName); RefreshDocumentLB( &maDropFileName ); } } } else { - bReturn = FALSE; + bReturn = sal_False; delete pMedium; } } else { - bReturn = FALSE; + bReturn = sal_False; } } @@ -670,7 +670,7 @@ BOOL SdNavigatorWin::InsertFile(const String& rFileName) void SdNavigatorWin::RefreshDocumentLB( const String* pDocName ) { - USHORT nPos = 0; + sal_uInt16 nPos = 0; if( pDocName ) { @@ -678,7 +678,7 @@ void SdNavigatorWin::RefreshDocumentLB( const String* pDocName ) maLbDocs.RemoveEntry( 0 ); maLbDocs.InsertEntry( *pDocName, 0 ); - mbDocImported = TRUE; + mbDocImported = sal_True; } else { @@ -695,14 +695,14 @@ void SdNavigatorWin::RefreshDocumentLB( const String* pDocName ) // Liste der DocInfos loeschen long nCount = mpDocList->Count(); while( nCount-- ) - delete (NavDocInfo*) mpDocList->Remove( (ULONG)0 ); + delete (NavDocInfo*) mpDocList->Remove( (sal_uLong)0 ); if( mbDocImported ) maLbDocs.InsertEntry( aStr, 0 ); ::sd::DrawDocShell* pCurrentDocShell = PTR_CAST(::sd::DrawDocShell, SfxObjectShell::Current() ); - SfxObjectShell* pSfxDocShell = SfxObjectShell::GetFirst(0, FALSE); + SfxObjectShell* pSfxDocShell = SfxObjectShell::GetFirst(0, sal_False); while( pSfxDocShell ) { ::sd::DrawDocShell* pDocShell = PTR_CAST(::sd::DrawDocShell, pSfxDocShell ); @@ -715,7 +715,7 @@ void SdNavigatorWin::RefreshDocumentLB( const String* pDocName ) if( aStr.Len() ) pInfo->SetName(); else - pInfo->SetName( FALSE ); + pInfo->SetName( sal_False ); // z.Z. wird wieder der Name der Shell genommen (also ohne Pfad) // da Koose es als Fehler ansieht, wenn er Pfad in URL-Notation // angezeigt wird! @@ -727,11 +727,11 @@ void SdNavigatorWin::RefreshDocumentLB( const String* pDocName ) if( pDocShell == pCurrentDocShell ) pInfo->SetActive(); else - pInfo->SetActive( FALSE ); + pInfo->SetActive( sal_False ); mpDocList->Insert( pInfo, LIST_APPEND ); } - pSfxDocShell = SfxObjectShell::GetNext( *pSfxDocShell, 0 , FALSE ); + pSfxDocShell = SfxObjectShell::GetNext( *pSfxDocShell, 0 , sal_False ); } } maLbDocs.SelectEntryPos( nPos ); @@ -739,7 +739,7 @@ void SdNavigatorWin::RefreshDocumentLB( const String* pDocName ) //------------------------------------------------------------------------ -USHORT SdNavigatorWin::GetDragTypeSdResId( NavigatorDragType eDT, BOOL bImage ) +sal_uInt16 SdNavigatorWin::GetDragTypeSdResId( NavigatorDragType eDT, sal_Bool bImage ) { switch( eDT ) { @@ -785,7 +785,7 @@ NavDocInfo* SdNavigatorWin::GetDocInfo() long SdNavigatorWin::Notify(NotifyEvent& rNEvt) { const KeyEvent* pKEvt = rNEvt.GetKeyEvent(); - long nOK = FALSE; + long nOK = sal_False; if( pKEvt ) { @@ -794,7 +794,7 @@ long SdNavigatorWin::Notify(NotifyEvent& rNEvt) if( SdPageObjsTLB::IsInDrag() ) { // during drag'n'drop we just stop the drag but do not close the navigator - nOK = TRUE; + nOK = sal_True; } else { @@ -806,7 +806,7 @@ long SdNavigatorWin::Notify(NotifyEvent& rNEvt) // deletion of the navigator window. Calling the // parents Notify after this is unsafe. Therefore we // return now. - return TRUE; + return sal_True; } } } @@ -827,14 +827,14 @@ long SdNavigatorWin::Notify(NotifyEvent& rNEvt) void SdNavigatorWin::KeyInput( const KeyEvent& rKEvt ) { - long nOK = FALSE; + long nOK = sal_False; if (rKEvt.GetKeyCode().GetCode() == KEY_ESCAPE) { if( SdPageObjsTLB::IsInDrag() ) { // during drag'n'drop we just stop the drag but do not close the navigator - nOK = TRUE; + nOK = sal_True; } else { @@ -862,7 +862,7 @@ void SdNavigatorWin::DataChanged( const DataChangedEvent& rDCEvt ) void SdNavigatorWin::SetDragImage() { - maToolbox.SetItemImage( TBI_DRAGTYPE, maToolbox.GetImageList().GetImage( GetDragTypeSdResId( meDragType, TRUE ) ) ); + maToolbox.SetItemImage( TBI_DRAGTYPE, maToolbox.GetImageList().GetImage( GetDragTypeSdResId( meDragType, sal_True ) ) ); } void SdNavigatorWin::ApplyImageList() @@ -884,7 +884,7 @@ void SdNavigatorWin::ApplyImageList() |* \************************************************************************/ -SdNavigatorControllerItem::SdNavigatorControllerItem( USHORT _nId, +SdNavigatorControllerItem::SdNavigatorControllerItem( sal_uInt16 _nId, SdNavigatorWin* pNavWin, SfxBindings* _pBindings) : SfxControllerItem( _nId, *_pBindings ), @@ -894,14 +894,14 @@ SdNavigatorControllerItem::SdNavigatorControllerItem( USHORT _nId, // ----------------------------------------------------------------------- -void SdNavigatorControllerItem::StateChanged( USHORT nSId, +void SdNavigatorControllerItem::StateChanged( sal_uInt16 nSId, SfxItemState eState, const SfxPoolItem* pItem ) { if( eState >= SFX_ITEM_AVAILABLE && nSId == SID_NAVIGATOR_STATE ) { const SfxUInt32Item* pStateItem = PTR_CAST( SfxUInt32Item, pItem ); DBG_ASSERT( pStateItem, "SfxUInt16Item erwartet"); - UINT32 nState = pStateItem->GetValue(); + sal_uInt32 nState = pStateItem->GetValue(); // Stift if( nState & NAVBTN_PEN_ENABLED && @@ -909,13 +909,13 @@ void SdNavigatorControllerItem::StateChanged( USHORT nSId, pNavigatorWin->maToolbox.EnableItem( TBI_PEN ); if( nState & NAVBTN_PEN_DISABLED && pNavigatorWin->maToolbox.IsItemEnabled( TBI_PEN ) ) - pNavigatorWin->maToolbox.EnableItem( TBI_PEN, FALSE ); + pNavigatorWin->maToolbox.EnableItem( TBI_PEN, sal_False ); if( nState & NAVBTN_PEN_CHECKED && !pNavigatorWin->maToolbox.IsItemChecked( TBI_PEN ) ) pNavigatorWin->maToolbox.CheckItem( TBI_PEN ); if( nState & NAVBTN_PEN_UNCHECKED && pNavigatorWin->maToolbox.IsItemChecked( TBI_PEN ) ) - pNavigatorWin->maToolbox.CheckItem( TBI_PEN, FALSE ); + pNavigatorWin->maToolbox.CheckItem( TBI_PEN, sal_False ); // Nur wenn Doc in LB das Aktive ist NavDocInfo* pInfo = pNavigatorWin->GetDocInfo(); @@ -927,7 +927,7 @@ void SdNavigatorControllerItem::StateChanged( USHORT nSId, pNavigatorWin->maToolbox.EnableItem( TBI_FIRST ); if( nState & NAVBTN_FIRST_DISABLED && pNavigatorWin->maToolbox.IsItemEnabled( TBI_FIRST ) ) - pNavigatorWin->maToolbox.EnableItem( TBI_FIRST, FALSE ); + pNavigatorWin->maToolbox.EnableItem( TBI_FIRST, sal_False ); // Prev if( nState & NAVBTN_PREV_ENABLED && @@ -935,7 +935,7 @@ void SdNavigatorControllerItem::StateChanged( USHORT nSId, pNavigatorWin->maToolbox.EnableItem( TBI_PREVIOUS ); if( nState & NAVBTN_PREV_DISABLED && pNavigatorWin->maToolbox.IsItemEnabled( TBI_PREVIOUS ) ) - pNavigatorWin->maToolbox.EnableItem( TBI_PREVIOUS, FALSE ); + pNavigatorWin->maToolbox.EnableItem( TBI_PREVIOUS, sal_False ); // Last if( nState & NAVBTN_LAST_ENABLED && @@ -943,7 +943,7 @@ void SdNavigatorControllerItem::StateChanged( USHORT nSId, pNavigatorWin->maToolbox.EnableItem( TBI_LAST ); if( nState & NAVBTN_LAST_DISABLED && pNavigatorWin->maToolbox.IsItemEnabled( TBI_LAST ) ) - pNavigatorWin->maToolbox.EnableItem( TBI_LAST, FALSE ); + pNavigatorWin->maToolbox.EnableItem( TBI_LAST, sal_False ); // Next if( nState & NAVBTN_NEXT_ENABLED && @@ -951,12 +951,12 @@ void SdNavigatorControllerItem::StateChanged( USHORT nSId, pNavigatorWin->maToolbox.EnableItem( TBI_NEXT ); if( nState & NAVBTN_NEXT_DISABLED && pNavigatorWin->maToolbox.IsItemEnabled( TBI_NEXT ) ) - pNavigatorWin->maToolbox.EnableItem( TBI_NEXT, FALSE ); + pNavigatorWin->maToolbox.EnableItem( TBI_NEXT, sal_False ); if( nState & NAVTLB_UPDATE ) { // InitTlb; Wird ueber Slot initiiert - SfxBoolItem aItem( SID_NAVIGATOR_INIT, TRUE ); + SfxBoolItem aItem( SID_NAVIGATOR_INIT, sal_True ); GetBindings().GetDispatcher()->Execute( SID_NAVIGATOR_INIT, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, &aItem, 0L ); } @@ -970,7 +970,7 @@ void SdNavigatorControllerItem::StateChanged( USHORT nSId, |* \************************************************************************/ -SdPageNameControllerItem::SdPageNameControllerItem( USHORT _nId, +SdPageNameControllerItem::SdPageNameControllerItem( sal_uInt16 _nId, SdNavigatorWin* pNavWin, SfxBindings* _pBindings) : SfxControllerItem( _nId, *_pBindings ), @@ -980,7 +980,7 @@ SdPageNameControllerItem::SdPageNameControllerItem( USHORT _nId, // ----------------------------------------------------------------------- -void SdPageNameControllerItem::StateChanged( USHORT nSId, +void SdPageNameControllerItem::StateChanged( sal_uInt16 nSId, SfxItemState eState, const SfxPoolItem* pItem ) { if( eState >= SFX_ITEM_AVAILABLE && nSId == SID_NAVIGATOR_PAGENAME ) @@ -998,7 +998,7 @@ void SdPageNameControllerItem::StateChanged( USHORT nSId, if( pNavigatorWin->maTlbObjects.GetSelectionMode() == MULTIPLE_SELECTION ) { // Weil sonst immer dazuselektiert wird - pNavigatorWin->maTlbObjects.SelectAll( FALSE ); + pNavigatorWin->maTlbObjects.SelectAll( sal_False ); } pNavigatorWin->maTlbObjects.SelectEntry( aPageName ); } diff --git a/sd/source/ui/dlg/paragr.cxx b/sd/source/ui/dlg/paragr.cxx index e407efc5d443..c868e874a57b 100644..100755 --- a/sd/source/ui/dlg/paragr.cxx +++ b/sd/source/ui/dlg/paragr.cxx @@ -56,9 +56,9 @@ public: ~SdParagraphNumTabPage(); static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet ); - static USHORT* GetRanges(); + static sal_uInt16* GetRanges(); - virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual sal_Bool FillItemSet( SfxItemSet& rSet ); virtual void Reset( const SfxItemSet& rSet ); private: @@ -92,9 +92,9 @@ SfxTabPage* SdParagraphNumTabPage::Create(Window *pParent, const SfxItemSet & rA return new SdParagraphNumTabPage( pParent, rAttrSet ); } -USHORT* SdParagraphNumTabPage::GetRanges() +sal_uInt16* SdParagraphNumTabPage::GetRanges() { - static USHORT __FAR_DATA aRange[] = + static sal_uInt16 __FAR_DATA aRange[] = { ATTR_PARANUMBERING_START, ATTR_PARANUMBERING_END, 0 @@ -103,15 +103,15 @@ USHORT* SdParagraphNumTabPage::GetRanges() return aRange; } -BOOL SdParagraphNumTabPage::FillItemSet( SfxItemSet& rSet ) +sal_Bool SdParagraphNumTabPage::FillItemSet( SfxItemSet& rSet ) { if(maNewStartCB.GetState() != maNewStartCB.GetSavedValue() || maNewStartNumberCB.GetState() != maNewStartNumberCB.GetSavedValue()|| maNewStartNF.GetText() != maNewStartNF.GetSavedValue()) { mbModified = true; - BOOL bNewStartChecked = STATE_CHECK == maNewStartCB.GetState(); - BOOL bNumberNewStartChecked = STATE_CHECK == maNewStartNumberCB.GetState(); + sal_Bool bNewStartChecked = STATE_CHECK == maNewStartCB.GetState(); + sal_Bool bNumberNewStartChecked = STATE_CHECK == maNewStartNumberCB.GetState(); rSet.Put(SfxBoolItem(ATTR_NUMBER_NEWSTART, bNewStartChecked)); const sal_Int16 nStartAt = (sal_Int16)maNewStartNF.GetValue(); @@ -128,7 +128,7 @@ void SdParagraphNumTabPage::Reset( const SfxItemSet& rSet ) { const SfxBoolItem& rStart = (const SfxBoolItem&)rSet.Get(ATTR_NUMBER_NEWSTART); maNewStartCB.SetState( rStart.GetValue() ? STATE_CHECK : STATE_NOCHECK ); - maNewStartCB.EnableTriState(FALSE); + maNewStartCB.EnableTriState(sal_False); } else { @@ -146,7 +146,7 @@ void SdParagraphNumTabPage::Reset( const SfxItemSet& rSet ) nNewStart = 1; maNewStartNF.SetValue(nNewStart); - maNewStartNumberCB.EnableTriState(FALSE); + maNewStartNumberCB.EnableTriState(sal_False); } else { @@ -155,12 +155,12 @@ void SdParagraphNumTabPage::Reset( const SfxItemSet& rSet ) ImplNewStartHdl(&maNewStartCB); maNewStartNF.SaveValue(); maNewStartNumberCB.SaveValue(); - mbModified = FALSE; + mbModified = sal_False; } IMPL_LINK( SdParagraphNumTabPage, ImplNewStartHdl, CheckBox*, EMPTYARG ) { - BOOL bEnable = maNewStartCB.IsChecked(); + sal_Bool bEnable = maNewStartCB.IsChecked(); maNewStartNumberCB.Enable(bEnable); maNewStartNF.Enable(bEnable && maNewStartNumberCB.IsChecked()); return 0; @@ -182,7 +182,7 @@ SdParagraphDlg::SdParagraphDlg( Window* pParent, const SfxItemSet* pAttr ) AddTabPage( RID_SVXPAGE_ALIGN_PARAGRAPH ); - static const BOOL bShowParaNumbering = ( getenv( "SD_SHOW_NUMBERING_PAGE" ) != NULL ); + static const sal_Bool bShowParaNumbering = ( getenv( "SD_SHOW_NUMBERING_PAGE" ) != NULL ); if( bShowParaNumbering ) AddTabPage( RID_TABPAGE_PARA_NUMBERING, SdParagraphNumTabPage::Create, SdParagraphNumTabPage::GetRanges ); else diff --git a/sd/source/ui/dlg/present.cxx b/sd/source/ui/dlg/present.cxx index 473d2f4b452b..1ad9e29d4662 100644..100755 --- a/sd/source/ui/dlg/present.cxx +++ b/sd/source/ui/dlg/present.cxx @@ -113,7 +113,7 @@ SdStartPresentationDlg::SdStartPresentationDlg( Window* pWindow, // Listbox mit Seitennamen fuellen rPageNames.First(); - for( UINT16 i = 0; + for( sal_uInt16 i = 0; i < rPageNames.Count(); i++ ) { @@ -123,7 +123,7 @@ SdStartPresentationDlg::SdStartPresentationDlg( Window* pWindow, if( pCustomShowList ) { - USHORT nPosToSelect = (USHORT) pCustomShowList->GetCurPos(); + sal_uInt16 nPosToSelect = (sal_uInt16) pCustomShowList->GetCurPos(); SdCustomShow* pCustomShow; // Listbox mit CustomShows fuellen for( pCustomShow = (SdCustomShow*) pCustomShowList->First(); @@ -154,8 +154,8 @@ SdStartPresentationDlg::SdStartPresentationDlg( Window* pWindow, aCbxChangePage.Check( ( ( const SfxBoolItem& ) rOutAttrs.Get( ATTR_PRESENT_CHANGE_PAGE ) ).GetValue() ); aCbxAlwaysOnTop.Check( ( ( const SfxBoolItem& ) rOutAttrs.Get( ATTR_PRESENT_ALWAYS_ON_TOP ) ).GetValue() ); - const BOOL bEndless = ( ( const SfxBoolItem& ) rOutAttrs.Get( ATTR_PRESENT_ENDLESS ) ).GetValue(); - const BOOL bWindow = !( ( const SfxBoolItem& ) rOutAttrs.Get( ATTR_PRESENT_FULLSCREEN ) ).GetValue(); + const sal_Bool bEndless = ( ( const SfxBoolItem& ) rOutAttrs.Get( ATTR_PRESENT_ENDLESS ) ).GetValue(); + const sal_Bool bWindow = !( ( const SfxBoolItem& ) rOutAttrs.Get( ATTR_PRESENT_FULLSCREEN ) ).GetValue(); const long nPause = ( ( const SfxUInt32Item& ) rOutAttrs.Get( ATTR_PRESENT_PAUSE_TIMEOUT ) ).GetValue(); aTmfPause.SetTime( Time( 0, 0, nPause ) ); @@ -167,11 +167,11 @@ SdStartPresentationDlg::SdStartPresentationDlg( Window* pWindow, aCbxAutoLogo.Check( ( ( const SfxBoolItem& ) rOutAttrs.Get( ATTR_PRESENT_SHOW_PAUSELOGO ) ).GetValue() ); if( bWindow ) - aRbtWindow.Check( TRUE ); + aRbtWindow.Check( sal_True ); else if( bEndless ) - aRbtAuto.Check( TRUE ); + aRbtAuto.Check( sal_True ); else - aRbtStandard.Check( TRUE ); + aRbtStandard.Check( sal_True ); InitMonitorSettings(); @@ -232,7 +232,7 @@ void SdStartPresentationDlg::InitMonitorSettings() else nSelected--; - maLBMonitor.SelectEntryPos( (USHORT)nSelected ); + maLBMonitor.SelectEntryPos( (sal_uInt16)nSelected ); } } catch( Exception& ) @@ -260,7 +260,7 @@ void SdStartPresentationDlg::GetAttr( SfxItemSet& rAttr ) rAttr.Put( SfxUInt32Item ( ATTR_PRESENT_PAUSE_TIMEOUT, aTmfPause.GetTime().GetMSFromTime() / 1000 ) ); rAttr.Put( SfxBoolItem ( ATTR_PRESENT_SHOW_PAUSELOGO, aCbxAutoLogo.IsChecked() ) ); - USHORT nPos = maLBMonitor.GetSelectEntryPos(); + sal_uInt16 nPos = maLBMonitor.GetSelectEntryPos(); if( nPos != LISTBOX_ENTRY_NOTFOUND ) rAttr.Put( SfxInt32Item ( ATTR_PRESENT_DISPLAY, nPos + 1 ) ); @@ -298,8 +298,8 @@ IMPL_LINK( SdStartPresentationDlg, ClickWindowPresentationHdl, void *, EMPTYARG if( bWindow ) { - aCbxAlwaysOnTop.Enable( FALSE ); - aCbxAlwaysOnTop.Check( FALSE ); + aCbxAlwaysOnTop.Enable( sal_False ); + aCbxAlwaysOnTop.Check( sal_False ); } else aCbxAlwaysOnTop.Enable(); diff --git a/sd/source/ui/dlg/prltempl.cxx b/sd/source/ui/dlg/prltempl.cxx index 98667c3362cf..b9e48dab4a6f 100644..100755 --- a/sd/source/ui/dlg/prltempl.cxx +++ b/sd/source/ui/dlg/prltempl.cxx @@ -84,8 +84,8 @@ SdPresLayoutTemplateDlg::SdPresLayoutTemplateDlg( SfxObjectShell* pDocSh, if( IS_OUTLINE(ePO)) { // Leider sind die Itemsets unserer Stylesheets nicht discret.. - const USHORT* pPtr = pOrgSet->GetRanges(); - USHORT p1, p2; + const sal_uInt16* pPtr = pOrgSet->GetRanges(); + sal_uInt16 p1, p2; while( *pPtr ) { p1 = pPtr[0]; @@ -115,14 +115,14 @@ SdPresLayoutTemplateDlg::SdPresLayoutTemplateDlg( SfxObjectShell* pDocSh, // Fals in diesem Stylesheet kein Bullet Item ist, holen wir uns // das aus dem 'Outline 1' Stylesheet. - if( SFX_ITEM_SET != aInputSet.GetItemState(EE_PARA_NUMBULLET, FALSE, &pItem )) + if( SFX_ITEM_SET != aInputSet.GetItemState(EE_PARA_NUMBULLET, sal_False, &pItem )) { String aStyleName((SdResId(STR_PSEUDOSHEET_OUTLINE))); aStyleName.AppendAscii( RTL_CONSTASCII_STRINGPARAM( " 1" ) ); SfxStyleSheetBase* pFirstStyleSheet = pSSPool->Find( aStyleName, SD_STYLE_FAMILY_PSEUDO); if(pFirstStyleSheet) - if( SFX_ITEM_SET == pFirstStyleSheet->GetItemSet().GetItemState(EE_PARA_NUMBULLET, FALSE, &pItem) ) + if( SFX_ITEM_SET == pFirstStyleSheet->GetItemSet().GetItemState(EE_PARA_NUMBULLET, sal_False, &pItem) ) aInputSet.Put( *pItem ); } @@ -255,7 +255,7 @@ SdPresLayoutTemplateDlg::~SdPresLayoutTemplateDlg() // ----------------------------------------------------------------------- -void SdPresLayoutTemplateDlg::PageCreated( USHORT nId, SfxTabPage &rPage ) +void SdPresLayoutTemplateDlg::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) { SfxAllItemSet aSet(*(aInputSet.GetPool())); switch( nId ) { @@ -324,7 +324,7 @@ const SfxItemSet* SdPresLayoutTemplateDlg::GetOutputItemSet() const pOutSet->Put( *SfxTabDialog::GetOutputItemSet() ); const SvxNumBulletItem *pSvxNumBulletItem = NULL; - if( SFX_ITEM_SET == pOutSet->GetItemState(EE_PARA_NUMBULLET, FALSE, (const SfxPoolItem**)&pSvxNumBulletItem )) + if( SFX_ITEM_SET == pOutSet->GetItemState(EE_PARA_NUMBULLET, sal_False, (const SfxPoolItem**)&pSvxNumBulletItem )) SdBulletMapper::MapFontsInNumRule( *pSvxNumBulletItem->GetNumRule(), *pOutSet ); return pOutSet; } @@ -334,7 +334,7 @@ const SfxItemSet* SdPresLayoutTemplateDlg::GetOutputItemSet() const // --------------------------------------------------------------------- // --------------------------------------------------------------------- -USHORT SdPresLayoutTemplateDlg::GetOutlineLevel() const +sal_uInt16 SdPresLayoutTemplateDlg::GetOutlineLevel() const { switch( ePO ) { @@ -348,7 +348,7 @@ USHORT SdPresLayoutTemplateDlg::GetOutlineLevel() const case PO_OUTLINE_8: return 7; case PO_OUTLINE_9: return 8; default: - DBG_ASSERT( FALSE, "Falscher Po! [CL]"); + DBG_ASSERT( sal_False, "Falscher Po! [CL]"); } return 0; } diff --git a/sd/source/ui/dlg/prntopts.cxx b/sd/source/ui/dlg/prntopts.cxx index 3c9aad38c332..c792b1554e5b 100755 --- a/sd/source/ui/dlg/prntopts.cxx +++ b/sd/source/ui/dlg/prntopts.cxx @@ -109,7 +109,7 @@ SdPrintOptions::~SdPrintOptions() // ----------------------------------------------------------------------- -BOOL SdPrintOptions::FillItemSet( SfxItemSet& rAttrs ) +sal_Bool SdPrintOptions::FillItemSet( SfxItemSet& rAttrs ) { if( aCbxDraw.GetSavedValue() != aCbxDraw.IsChecked() || aCbxNotes.GetSavedValue() != aCbxNotes.IsChecked() || @@ -146,7 +146,7 @@ BOOL SdPrintOptions::FillItemSet( SfxItemSet& rAttrs ) aOptions.GetOptionsPrint().SetBackPage( aCbxBack.IsChecked() ); aOptions.GetOptionsPrint().SetPaperbin( aCbxPaperbin.IsChecked() ); - UINT16 nQuality = 0; // Standard, also Color + sal_uInt16 nQuality = 0; // Standard, also Color if( aRbtGrayscale.IsChecked() ) nQuality = 1; if( aRbtBlackWhite.IsChecked() ) @@ -155,9 +155,9 @@ BOOL SdPrintOptions::FillItemSet( SfxItemSet& rAttrs ) rAttrs.Put( aOptions ); - return( TRUE ); + return( sal_True ); } - return( FALSE ); + return( sal_False ); } // ----------------------------------------------------------------------- @@ -165,7 +165,7 @@ BOOL SdPrintOptions::FillItemSet( SfxItemSet& rAttrs ) void SdPrintOptions::Reset( const SfxItemSet& rAttrs ) { const SdOptionsPrintItem* pPrintOpts = NULL; - if( SFX_ITEM_SET == rAttrs.GetItemState( ATTR_OPTIONS_PRINT, FALSE, + if( SFX_ITEM_SET == rAttrs.GetItemState( ATTR_OPTIONS_PRINT, sal_False, (const SfxPoolItem**) &pPrintOpts ) ) { aCbxDraw.Check( pPrintOpts->GetOptionsPrint().IsDraw() ); @@ -190,7 +190,7 @@ void SdPrintOptions::Reset( const SfxItemSet& rAttrs ) aRbtDefault.Check(); } - UINT16 nQuality = pPrintOpts->GetOptionsPrint().GetOutputQuality(); + sal_uInt16 nQuality = pPrintOpts->GetOptionsPrint().GetOutputQuality(); if( nQuality == 0 ) aRbtColor.Check(); else if( nQuality == 1 ) @@ -300,7 +300,7 @@ void SdPrintOptions::PageCreated (SfxAllItemSet SFX_ITEMSET_ARG (&aSet,pFlagItem,SfxUInt32Item,SID_SDMODE_FLAG,sal_False); if (pFlagItem) { - UINT32 nFlags=pFlagItem->GetValue(); + sal_uInt32 nFlags=pFlagItem->GetValue(); if ( ( nFlags & SD_DRAW_MODE ) == SD_DRAW_MODE ) SetDrawMode(); } diff --git a/sd/source/ui/dlg/sddlgfact.cxx b/sd/source/ui/dlg/sddlgfact.cxx index 9feb7507bd3f..0314697a3778 100755 --- a/sd/source/ui/dlg/sddlgfact.cxx +++ b/sd/source/ui/dlg/sddlgfact.cxx @@ -90,18 +90,18 @@ void AbstractCopyDlg_Impl::GetAttr( SfxItemSet& rOutAttrs ) // AbstractCopyDlg_Impl end //AbstractSdCustomShowDlg_Impl begin -BOOL AbstractSdCustomShowDlg_Impl::IsModified() const +sal_Bool AbstractSdCustomShowDlg_Impl::IsModified() const { return pDlg->IsModified(); } -BOOL AbstractSdCustomShowDlg_Impl::IsCustomShow() const +sal_Bool AbstractSdCustomShowDlg_Impl::IsCustomShow() const { return pDlg->IsCustomShow(); } // AbstractSdCustomShowDlg_Impl end // AbstractTabDialog_Impl begin -void AbstractTabDialog_Impl::SetCurPageId( USHORT nId ) +void AbstractTabDialog_Impl::SetCurPageId( sal_uInt16 nId ) { pDlg->SetCurPageId( nId ); } @@ -109,7 +109,7 @@ const SfxItemSet* AbstractTabDialog_Impl::GetOutputItemSet() const { return pDlg->GetOutputItemSet(); } -const USHORT* AbstractTabDialog_Impl::GetInputRanges(const SfxItemPool& pItem ) +const sal_uInt16* AbstractTabDialog_Impl::GetInputRanges(const SfxItemPool& pItem ) { return pDlg->GetInputRanges( pItem ); } @@ -131,7 +131,7 @@ String AbstractTabDialog_Impl::GetText() const // -------------------------------------------------------------------- // AbstractBulletDialog_Impl begin -void AbstractBulletDialog_Impl::SetCurPageId( USHORT nId ) +void AbstractBulletDialog_Impl::SetCurPageId( sal_uInt16 nId ) { static_cast< ::sd::OutlineBulletDlg*>(pDlg)->SetCurPageId( nId ); } @@ -139,7 +139,7 @@ const SfxItemSet* AbstractBulletDialog_Impl::GetOutputItemSet() const { return static_cast< ::sd::OutlineBulletDlg*>(pDlg)->GetOutputItemSet(); } -const USHORT* AbstractBulletDialog_Impl::GetInputRanges(const SfxItemPool& pItem ) +const sal_uInt16* AbstractBulletDialog_Impl::GetInputRanges(const SfxItemPool& pItem ) { return static_cast< ::sd::OutlineBulletDlg*>(pDlg)->GetInputRanges( pItem ); } @@ -160,7 +160,7 @@ String AbstractBulletDialog_Impl::GetText() const // -------------------------------------------------------------------- -void SdPresLayoutTemplateDlg_Impl::SetCurPageId( USHORT nId ) +void SdPresLayoutTemplateDlg_Impl::SetCurPageId( sal_uInt16 nId ) { pDlg->SetCurPageId( nId ); } @@ -170,7 +170,7 @@ const SfxItemSet* SdPresLayoutTemplateDlg_Impl::GetOutputItemSet() const return pDlg->GetOutputItemSet(); } -const USHORT* SdPresLayoutTemplateDlg_Impl::GetInputRanges(const SfxItemPool& pItem ) +const sal_uInt16* SdPresLayoutTemplateDlg_Impl::GetInputRanges(const SfxItemPool& pItem ) { return pDlg->GetInputRanges( pItem ); } @@ -201,7 +201,7 @@ OutputType AbstractAssistentDlg_Impl::GetOutputMedium() const { return pDlg->GetOutputMedium(); } -BOOL AbstractAssistentDlg_Impl::IsSummary() const +sal_Bool AbstractAssistentDlg_Impl::IsSummary() const { return pDlg->IsSummary(); } @@ -213,11 +213,11 @@ String AbstractAssistentDlg_Impl::GetDocPath() const { return pDlg->GetDocPath(); } -BOOL AbstractAssistentDlg_Impl::GetStartWithFlag() const +sal_Bool AbstractAssistentDlg_Impl::GetStartWithFlag() const { return pDlg->GetStartWithFlag(); } -BOOL AbstractAssistentDlg_Impl::IsDocEmpty() const +sal_Bool AbstractAssistentDlg_Impl::IsDocEmpty() const { return pDlg->IsDocEmpty(); } @@ -251,7 +251,7 @@ void AbstractSdSnapLineDlg_Impl::HideDeleteBtn() { pDlg->HideDeleteBtn(); } -void AbstractSdSnapLineDlg_Impl::SetInputFields(BOOL bEnableX, BOOL bEnableY) +void AbstractSdSnapLineDlg_Impl::SetInputFields(sal_Bool bEnableX, sal_Bool bEnableY) { pDlg->SetInputFields(bEnableX, bEnableY); } @@ -273,7 +273,7 @@ void AbstractSdInsertLayerDlg_Impl::SetHelpId( const rtl::OString& rHelpId ) // AbstractSdInsertLayerDlg_Impl end //AbstractSdInsertPasteDlg_Impl begin -BOOL AbstractSdInsertPasteDlg_Impl::IsInsertBefore() const +sal_Bool AbstractSdInsertPasteDlg_Impl::IsInsertBefore() const { return pDlg->IsInsertBefore(); } @@ -284,15 +284,15 @@ BOOL AbstractSdInsertPasteDlg_Impl::IsInsertBefore() const { return (::Window*)pDlg; } -List* AbstractSdInsertPagesObjsDlg_Impl::GetList( USHORT nType ) +List* AbstractSdInsertPagesObjsDlg_Impl::GetList( sal_uInt16 nType ) { return pDlg->GetList( nType ); } -BOOL AbstractSdInsertPagesObjsDlg_Impl::IsLink() +sal_Bool AbstractSdInsertPagesObjsDlg_Impl::IsLink() { return pDlg->IsLink(); } -BOOL AbstractSdInsertPagesObjsDlg_Impl::IsRemoveUnnessesaryMasterPages() const +sal_Bool AbstractSdInsertPagesObjsDlg_Impl::IsRemoveUnnessesaryMasterPages() const { return pDlg->IsRemoveUnnessesaryMasterPages(); } @@ -303,15 +303,15 @@ void AbstractMorphDlg_Impl::SaveSettings() const { pDlg->SaveSettings(); } -USHORT AbstractMorphDlg_Impl::GetFadeSteps() const +sal_uInt16 AbstractMorphDlg_Impl::GetFadeSteps() const { return pDlg->GetFadeSteps(); } -BOOL AbstractMorphDlg_Impl::IsAttributeFade() const +sal_Bool AbstractMorphDlg_Impl::IsAttributeFade() const { return pDlg->IsAttributeFade(); } -BOOL AbstractMorphDlg_Impl::IsOrientationFade() const +sal_Bool AbstractMorphDlg_Impl::IsOrientationFade() const { return pDlg->IsOrientationFade(); } @@ -385,8 +385,8 @@ VclAbstractDialog * SdAbstractDialogFactory_Impl::CreateBreakDlg( ::Window* pWindow, ::sd::DrawView* pDrView, ::sd::DrawDocShell* pShell, - ULONG nSumActionCount, - ULONG nObjCount ) //add for BreakDlg + sal_uLong nSumActionCount, + sal_uLong nObjCount ) //add for BreakDlg { return new VclAbstractDialog_Impl( new ::sd::BreakDlg( pWindow, pDrView, pShell, nSumActionCount, nObjCount ) ); } @@ -415,14 +415,14 @@ SfxAbstractTabDialog * SdAbstractDialogFactory_Impl::CreateSdTabCharDialog( ::W } -SfxAbstractTabDialog * SdAbstractDialogFactory_Impl::CreateSdTabPageDialog( ::Window* pParent, const SfxItemSet* pAttr, SfxObjectShell* pDocShell, BOOL bAreaPage ) +SfxAbstractTabDialog * SdAbstractDialogFactory_Impl::CreateSdTabPageDialog( ::Window* pParent, const SfxItemSet* pAttr, SfxObjectShell* pDocShell, sal_Bool bAreaPage ) { return new AbstractTabDialog_Impl( new SdPageDlg( pDocShell, pParent, pAttr, bAreaPage ) ); } // add for SdCharDlg end //add for AssistentDlg begin -AbstractAssistentDlg * SdAbstractDialogFactory_Impl::CreateAssistentDlg( ::Window* pParent, BOOL bAutoPilot) +AbstractAssistentDlg * SdAbstractDialogFactory_Impl::CreateAssistentDlg( ::Window* pParent, sal_Bool bAutoPilot) { return new AbstractAssistentDlg_Impl( new AssistentDlg( pParent, bAutoPilot ) ); } diff --git a/sd/source/ui/dlg/sddlgfact.hxx b/sd/source/ui/dlg/sddlgfact.hxx index a8c1de96de62..71ddee16d759 100755 --- a/sd/source/ui/dlg/sddlgfact.hxx +++ b/sd/source/ui/dlg/sddlgfact.hxx @@ -77,8 +77,8 @@ class SdCustomShowDlg; class AbstractSdCustomShowDlg_Impl : public AbstractSdCustomShowDlg { DECL_ABSTDLG_BASE(AbstractSdCustomShowDlg_Impl,SdCustomShowDlg) - virtual BOOL IsModified() const ; - virtual BOOL IsCustomShow() const ; + virtual sal_Bool IsModified() const ; + virtual sal_Bool IsCustomShow() const ; }; //add for SdCharDlg begin @@ -86,9 +86,9 @@ class SfxTabDialog; class AbstractTabDialog_Impl : public SfxAbstractTabDialog { DECL_ABSTDLG_BASE( AbstractTabDialog_Impl,SfxTabDialog ) - virtual void SetCurPageId( USHORT nId ); + virtual void SetCurPageId( sal_uInt16 nId ); virtual const SfxItemSet* GetOutputItemSet() const; - virtual const USHORT* GetInputRanges( const SfxItemPool& pItem ); + virtual const sal_uInt16* GetInputRanges( const SfxItemPool& pItem ); virtual void SetInputSet( const SfxItemSet* pInSet ); //From class Window. virtual void SetText( const XubString& rStr ); @@ -102,9 +102,9 @@ class SfxTabDialog; class AbstractBulletDialog_Impl : public SfxAbstractTabDialog { DECL_ABSTDLG_BASE( AbstractBulletDialog_Impl,SfxTabDialog ) - virtual void SetCurPageId( USHORT nId ); + virtual void SetCurPageId( sal_uInt16 nId ); virtual const SfxItemSet* GetOutputItemSet() const; - virtual const USHORT* GetInputRanges( const SfxItemPool& pItem ); + virtual const sal_uInt16* GetInputRanges( const SfxItemPool& pItem ); virtual void SetInputSet( const SfxItemSet* pInSet ); //From class Window. virtual void SetText( const XubString& rStr ); @@ -116,9 +116,9 @@ class SdPresLayoutTemplateDlg; class SdPresLayoutTemplateDlg_Impl : public SfxAbstractTabDialog { DECL_ABSTDLG_BASE( SdPresLayoutTemplateDlg_Impl,SdPresLayoutTemplateDlg ) - virtual void SetCurPageId( USHORT nId ); + virtual void SetCurPageId( sal_uInt16 nId ); virtual const SfxItemSet* GetOutputItemSet() const; - virtual const USHORT* GetInputRanges( const SfxItemPool& pItem ); + virtual const sal_uInt16* GetInputRanges( const SfxItemPool& pItem ); virtual void SetInputSet( const SfxItemSet* pInSet ); //From class Window. virtual void SetText( const XubString& rStr ); @@ -132,11 +132,11 @@ class AbstractAssistentDlg_Impl : public AbstractAssistentDlg DECL_ABSTDLG_BASE(AbstractAssistentDlg_Impl,AssistentDlg) virtual SfxObjectShellLock GetDocument(); virtual OutputType GetOutputMedium() const; - virtual BOOL IsSummary() const; + virtual sal_Bool IsSummary() const; virtual StartType GetStartType() const; virtual String GetDocPath() const; - virtual BOOL GetStartWithFlag() const; - virtual BOOL IsDocEmpty() const; + virtual sal_Bool GetStartWithFlag() const; + virtual sal_Bool IsDocEmpty() const; virtual String GetPassword(); }; @@ -157,7 +157,7 @@ class AbstractSdSnapLineDlg_Impl : public AbstractSdSnapLineDlg virtual void GetAttr(SfxItemSet& rOutAttrs); virtual void HideRadioGroup(); virtual void HideDeleteBtn(); - virtual void SetInputFields(BOOL bEnableX, BOOL bEnableY); + virtual void SetInputFields(sal_Bool bEnableX, sal_Bool bEnableY); //from class Window virtual void SetText( const XubString& rStr ); }; @@ -177,7 +177,7 @@ class SdInsertPasteDlg; class AbstractSdInsertPasteDlg_Impl : public AbstractSdInsertPasteDlg { DECL_ABSTDLG_BASE(AbstractSdInsertPasteDlg_Impl,SdInsertPasteDlg) - virtual BOOL IsInsertBefore() const; + virtual sal_Bool IsInsertBefore() const; }; // add for SdInsertPagesObjsDlg @@ -186,9 +186,9 @@ class AbstractSdInsertPagesObjsDlg_Impl : public AbstractSdInsertPagesObjsDlg { DECL_ABSTDLG_BASE(AbstractSdInsertPagesObjsDlg_Impl,SdInsertPagesObjsDlg) virtual ::Window * GetWindow(); //this method is added for return a Window type pointer - virtual List* GetList( USHORT nType ); - virtual BOOL IsLink(); - virtual BOOL IsRemoveUnnessesaryMasterPages() const; + virtual List* GetList( sal_uInt16 nType ); + virtual sal_Bool IsLink(); + virtual sal_Bool IsRemoveUnnessesaryMasterPages() const; }; // add for MorphDlg @@ -196,9 +196,9 @@ class AbstractMorphDlg_Impl : public AbstractMorphDlg { DECL_ABSTDLG_BASE(AbstractMorphDlg_Impl,::sd::MorphDlg) virtual void SaveSettings() const; - virtual USHORT GetFadeSteps() const; - virtual BOOL IsAttributeFade() const ; - virtual BOOL IsOrientationFade() const ; + virtual sal_uInt16 GetFadeSteps() const; + virtual sal_Bool IsAttributeFade() const ; + virtual sal_Bool IsOrientationFade() const ; }; // add for SdStartPresentationDlg @@ -258,12 +258,12 @@ class SdAbstractDialogFactory_Impl : public SdAbstractDialogFactory { public: - virtual VclAbstractDialog* CreateBreakDlg(::Window* pWindow, ::sd::DrawView* pDrView, ::sd::DrawDocShell* pShell, ULONG nSumActionCount, ULONG nObjCount ); + virtual VclAbstractDialog* CreateBreakDlg(::Window* pWindow, ::sd::DrawView* pDrView, ::sd::DrawDocShell* pShell, sal_uLong nSumActionCount, sal_uLong nObjCount ); virtual AbstractCopyDlg* CreateCopyDlg( ::Window* pWindow, const SfxItemSet& rInAttrs, XColorTable* pColTab, ::sd::View* pView ); virtual AbstractSdCustomShowDlg* CreateSdCustomShowDlg( ::Window* pWindow, SdDrawDocument& rDrawDoc ); virtual SfxAbstractTabDialog* CreateSdTabCharDialog( ::Window* pParent, const SfxItemSet* pAttr, SfxObjectShell* pDocShell ); - virtual SfxAbstractTabDialog* CreateSdTabPageDialog( ::Window* pParent, const SfxItemSet* pAttr, SfxObjectShell* pDocShell, BOOL bAreaPage = TRUE ); - virtual AbstractAssistentDlg* CreateAssistentDlg( ::Window* pParent, BOOL bAutoPilot); + virtual SfxAbstractTabDialog* CreateSdTabPageDialog( ::Window* pParent, const SfxItemSet* pAttr, SfxObjectShell* pDocShell, sal_Bool bAreaPage = sal_True ); + virtual AbstractAssistentDlg* CreateAssistentDlg( ::Window* pParent, sal_Bool bAutoPilot); virtual AbstractSdModifyFieldDlg* CreateSdModifyFieldDlg( ::Window* pWindow, const SvxFieldData* pInField, const SfxItemSet& rSet ); virtual AbstractSdSnapLineDlg* CreateSdSnapLineDlg( ::Window* pWindow, const SfxItemSet& rInAttrs, ::sd::View* pView); virtual AbstractSdInsertLayerDlg* CreateSdInsertLayerDlg( ::Window* pWindow, const SfxItemSet& rInAttrs, bool bDeletable, String aStr ); diff --git a/sd/source/ui/dlg/sdpreslt.cxx b/sd/source/ui/dlg/sdpreslt.cxx index c1d81bc073b9..2a4f05c72848 100644..100755 --- a/sd/source/ui/dlg/sdpreslt.cxx +++ b/sd/source/ui/dlg/sdpreslt.cxx @@ -115,17 +115,17 @@ void SdPresLayoutDlg::Reset() long nName; // MasterPage austauschen - if( mrOutAttrs.GetItemState( ATTR_PRESLAYOUT_MASTER_PAGE, FALSE, &pPoolItem ) == SFX_ITEM_SET ) + if( mrOutAttrs.GetItemState( ATTR_PRESLAYOUT_MASTER_PAGE, sal_False, &pPoolItem ) == SFX_ITEM_SET ) { - BOOL bMasterPage = ( (const SfxBoolItem*) pPoolItem)->GetValue(); + sal_Bool bMasterPage = ( (const SfxBoolItem*) pPoolItem)->GetValue(); maCbxMasterPage.Enable( !bMasterPage ); maCbxMasterPage.Check( bMasterPage ); } // Nicht verwendete MasterPages entfernen - maCbxCheckMasters.Check(FALSE); + maCbxCheckMasters.Check(sal_False); - if(mrOutAttrs.GetItemState(ATTR_PRESLAYOUT_NAME, TRUE, &pPoolItem) == SFX_ITEM_SET) + if(mrOutAttrs.GetItemState(ATTR_PRESLAYOUT_NAME, sal_True, &pPoolItem) == SFX_ITEM_SET) maName = ((const SfxStringItem*)pPoolItem)->GetValue(); else maName.Erase(); @@ -140,7 +140,7 @@ void SdPresLayoutDlg::Reset() } DBG_ASSERT(nName < mnLayoutCount, "Layout nicht gefunden"); - maVS.SelectItem((USHORT)nName + 1); // Inizes des ValueSets beginnen bei 1 + maVS.SelectItem((sal_uInt16)nName + 1); // Inizes des ValueSets beginnen bei 1 } @@ -153,7 +153,7 @@ void SdPresLayoutDlg::Reset() void SdPresLayoutDlg::GetAttr(SfxItemSet& rOutAttrs) { short nId = maVS.GetSelectItemId(); - BOOL bLoad = nId > mnLayoutCount; + sal_Bool bLoad = nId > mnLayoutCount; rOutAttrs.Put( SfxBoolItem( ATTR_PRESLAYOUT_LOAD, bLoad ) ); String aLayoutName; @@ -194,9 +194,9 @@ void SdPresLayoutDlg::FillValueSet() SdDrawDocument* pDoc = mpDocSh->GetDoc(); - USHORT nCount = pDoc->GetMasterPageCount(); + sal_uInt16 nCount = pDoc->GetMasterPageCount(); - for (USHORT nLayout = 0; nLayout < nCount; nLayout++) + for (sal_uInt16 nLayout = 0; nLayout < nCount; nLayout++) { SdPage* pMaster = (SdPage*)pDoc->GetMasterPage(nLayout); if (pMaster->GetPageKind() == PK_STANDARD) @@ -206,7 +206,7 @@ void SdPresLayoutDlg::FillValueSet() mpLayoutNames->Insert(new String(aLayoutName), LIST_APPEND); Bitmap aBitmap(mpDocSh->GetPagePreviewBitmap(pMaster, 90)); - maVS.InsertItem((USHORT)mpLayoutNames->Count(), aBitmap, aLayoutName); + maVS.InsertItem((sal_uInt16)mpLayoutNames->Count(), aBitmap, aLayoutName); } } @@ -243,12 +243,12 @@ IMPL_LINK(SdPresLayoutDlg, ClickLoadHdl, void *, EMPTYARG) return 0; } - USHORT nResult = pDlg->Execute(); + sal_uInt16 nResult = pDlg->Execute(); // #96072# OJ: Inserted update to force repaint Update(); String aFile; - BOOL bCancel = FALSE; + sal_Bool bCancel = sal_False; switch (nResult) { @@ -267,7 +267,7 @@ IMPL_LINK(SdPresLayoutDlg, ClickLoadHdl, void *, EMPTYARG) break; default: - bCancel = TRUE; + bCancel = sal_True; } delete pDlg; @@ -277,7 +277,7 @@ IMPL_LINK(SdPresLayoutDlg, ClickLoadHdl, void *, EMPTYARG) if( !bCancel ) { // Pruefen, ob Vorlage schon vorhanden - BOOL bExists = FALSE; + sal_Bool bExists = sal_False; String* pName = (String*)mpLayoutNames->First(); String aCompareStr( maName ); if( maName.Len() == 0 ) @@ -287,9 +287,9 @@ IMPL_LINK(SdPresLayoutDlg, ClickLoadHdl, void *, EMPTYARG) { if( aCompareStr == *pName ) { - bExists = TRUE; + bExists = sal_True; // Vorlage selektieren - USHORT nId = (USHORT) mpLayoutNames->GetCurPos() + 1; + sal_uInt16 nId = (sal_uInt16) mpLayoutNames->GetCurPos() + 1; maVS.SelectItem( nId ); } pName = (String*)mpLayoutNames->Next(); @@ -312,11 +312,11 @@ IMPL_LINK(SdPresLayoutDlg, ClickLoadHdl, void *, EMPTYARG) mpLayoutNames->Insert( new String( maName ), LIST_APPEND ); Bitmap aBitmap( pTemplDocSh->GetPagePreviewBitmap( pMaster, 90 ) ); - maVS.InsertItem( (USHORT) mpLayoutNames->Count(), aBitmap, maName); + maVS.InsertItem( (sal_uInt16) mpLayoutNames->Count(), aBitmap, maName); */ - USHORT nCount = pTemplDoc->GetMasterPageCount(); + sal_uInt16 nCount = pTemplDoc->GetMasterPageCount(); - for (USHORT nLayout = 0; nLayout < nCount; nLayout++) + for (sal_uInt16 nLayout = 0; nLayout < nCount; nLayout++) { SdPage* pMaster = (SdPage*) pTemplDoc->GetMasterPage(nLayout); if (pMaster->GetPageKind() == PK_STANDARD) @@ -326,13 +326,13 @@ IMPL_LINK(SdPresLayoutDlg, ClickLoadHdl, void *, EMPTYARG) mpLayoutNames->Insert(new String(aLayoutName), LIST_APPEND); Bitmap aBitmap(pTemplDocSh->GetPagePreviewBitmap(pMaster, 90)); - maVS.InsertItem((USHORT)mpLayoutNames->Count(), aBitmap, aLayoutName); + maVS.InsertItem((sal_uInt16)mpLayoutNames->Count(), aBitmap, aLayoutName); } } } else { - bCancel = TRUE; + bCancel = sal_True; } pDoc->CloseBookmarkDoc(); @@ -341,14 +341,14 @@ IMPL_LINK(SdPresLayoutDlg, ClickLoadHdl, void *, EMPTYARG) { // leeres Layout mpLayoutNames->Insert( new String( maStrNone ), LIST_APPEND ); - maVS.InsertItem( (USHORT) mpLayoutNames->Count(), + maVS.InsertItem( (sal_uInt16) mpLayoutNames->Count(), Bitmap( SdResId( BMP_FOIL_NONE ) ), maStrNone ); } if (!bCancel) { // Vorlage selektieren - maVS.SelectItem( (USHORT) mpLayoutNames->Count() ); + maVS.SelectItem( (sal_uInt16) mpLayoutNames->Count() ); } } } diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx index c0a72d539add..263f221332d6 100755 --- a/sd/source/ui/dlg/sdtreelb.cxx +++ b/sd/source/ui/dlg/sdtreelb.cxx @@ -84,9 +84,9 @@ public: }; -BOOL SD_DLLPRIVATE SdPageObjsTLB::bIsInDrag = FALSE; +sal_Bool SD_DLLPRIVATE SdPageObjsTLB::bIsInDrag = sal_False; -BOOL SdPageObjsTLB::IsInDrag() +sal_Bool SdPageObjsTLB::IsInDrag() { return bIsInDrag; } @@ -103,7 +103,7 @@ SdPageObjsTLB::SdPageObjsTransferable::SdPageObjsTransferable( ::sd::DrawDocShell& rDocShell, NavigatorDragType eDragType, const ::com::sun::star::uno::Any& rTreeListBoxData ) - : SdTransferable(rDocShell.GetDoc(), NULL, TRUE), + : SdTransferable(rDocShell.GetDoc(), NULL, sal_True), mrParent( rParent ), maBookmark( rBookmark ), mrDocShell( rDocShell ), @@ -132,7 +132,7 @@ void SdPageObjsTLB::SdPageObjsTransferable::AddSupportedFormats() sal_Bool SdPageObjsTLB::SdPageObjsTransferable::GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) { - ULONG nFormatId = SotExchange::GetFormat( rFlavor ); + sal_uLong nFormatId = SotExchange::GetFormat( rFlavor ); switch (nFormatId) { case SOT_FORMATSTR_ID_NETSCAPE_BOOKMARK: @@ -251,7 +251,7 @@ SdPageObjsTLB::SdPageObjsTLB( Window* pParentWin, const SdResId& rSdResId ) , maImgGraphic ( BitmapEx( SdResId( BMP_GRAPHIC ) ) ) , maImgOleH ( BitmapEx( SdResId( BMP_OLE_H ) ) ) , maImgGraphicH ( BitmapEx( SdResId( BMP_GRAPHIC_H ) ) ) -, mbLinkableSelected ( FALSE ) +, mbLinkableSelected ( sal_False ) , mpDropNavWin ( NULL ) , mbShowAllShapes ( false ) , mbShowAllPages ( false ) @@ -328,9 +328,9 @@ String SdPageObjsTLB::GetObjectName( |* \************************************************************************/ -BOOL SdPageObjsTLB::SelectEntry( const String& rName ) +sal_Bool SdPageObjsTLB::SelectEntry( const String& rName ) { - BOOL bFound = FALSE; + sal_Bool bFound = sal_False; if( rName.Len() ) { @@ -342,7 +342,7 @@ BOOL SdPageObjsTLB::SelectEntry( const String& rName ) aTmp = GetEntryText( pEntry ); if( aTmp == rName ) { - bFound = TRUE; + bFound = sal_True; SetCurEntry( pEntry ); } } @@ -356,10 +356,10 @@ BOOL SdPageObjsTLB::SelectEntry( const String& rName ) |* \************************************************************************/ -BOOL SdPageObjsTLB::HasSelectedChilds( const String& rName ) +sal_Bool SdPageObjsTLB::HasSelectedChilds( const String& rName ) { - BOOL bFound = FALSE; - BOOL bChilds = FALSE; + sal_Bool bFound = sal_False; + sal_Bool bChilds = sal_False; if( rName.Len() ) { @@ -371,11 +371,11 @@ BOOL SdPageObjsTLB::HasSelectedChilds( const String& rName ) aTmp = GetEntryText( pEntry ); if( aTmp == rName ) { - bFound = TRUE; - BOOL bExpanded = IsExpanded( pEntry ); + bFound = sal_True; + sal_Bool bExpanded = IsExpanded( pEntry ); long nCount = GetChildSelectionCount( pEntry ); if( bExpanded && nCount > 0 ) - bChilds = TRUE; + bChilds = sal_True; } } } @@ -389,7 +389,7 @@ BOOL SdPageObjsTLB::HasSelectedChilds( const String& rName ) |* \************************************************************************/ -void SdPageObjsTLB::Fill( const SdDrawDocument* pInDoc, BOOL bAllPages, +void SdPageObjsTLB::Fill( const SdDrawDocument* pInDoc, sal_Bool bAllPages, const String& rDocName) { String aSelection; @@ -401,7 +401,7 @@ void SdPageObjsTLB::Fill( const SdDrawDocument* pInDoc, BOOL bAllPages, mpDoc = pInDoc; maDocName = rDocName; - mbShowAllPages = (bAllPages == TRUE); + mbShowAllPages = (bAllPages == sal_True); mpMedium = NULL; SdPage* pPage = NULL; @@ -409,8 +409,8 @@ void SdPageObjsTLB::Fill( const SdDrawDocument* pInDoc, BOOL bAllPages, IconProvider aIconProvider; // first insert all pages including objects - USHORT nPage = 0; - const USHORT nMaxPages = mpDoc->GetPageCount(); + sal_uInt16 nPage = 0; + const sal_uInt16 nMaxPages = mpDoc->GetPageCount(); while( nPage < nMaxPages ) { @@ -418,7 +418,7 @@ void SdPageObjsTLB::Fill( const SdDrawDocument* pInDoc, BOOL bAllPages, if( (mbShowAllPages || pPage->GetPageKind() == PK_STANDARD) && !(pPage->GetPageKind()==PK_HANDOUT) ) //#94954# never list the normal handout page ( handout-masterpage is used instead ) { - BOOL bPageExluded = pPage->IsExcluded(); + sal_Bool bPageExluded = pPage->IsExcluded(); bool bPageBelongsToShow = PageBelongsToCurrentShow (pPage); bPageExluded |= !bPageBelongsToShow; @@ -432,7 +432,7 @@ void SdPageObjsTLB::Fill( const SdDrawDocument* pInDoc, BOOL bAllPages, if( mbShowAllPages ) { nPage = 0; - const USHORT nMaxMasterPages = mpDoc->GetMasterPageCount(); + const sal_uInt16 nMaxMasterPages = mpDoc->GetMasterPageCount(); while( nPage < nMaxMasterPages ) { @@ -470,7 +470,7 @@ void SdPageObjsTLB::Fill( const SdDrawDocument* pInDoc, SfxMedium* pInMedium, aImgDocOpen, aImgDocClosed, NULL, - TRUE, + sal_True, LIST_APPEND, reinterpret_cast< void* >( 1 ) ); @@ -504,7 +504,7 @@ void SdPageObjsTLB::AddShapeList ( aIcon, aIcon, pParentEntry, - FALSE, + sal_False, LIST_APPEND, pUserData); @@ -521,7 +521,7 @@ void SdPageObjsTLB::AddShapeList ( rList, !rList.HasObjectNavigationOrder() /* use navigation order, if available */, IM_FLAT, - FALSE /*not reverse*/); + sal_False /*not reverse*/); while( aIter.IsMore() ) { @@ -536,7 +536,7 @@ void SdPageObjsTLB::AddShapeList ( if( pObj->GetObjInventor() == SdrInventor && pObj->GetObjIdentifier() == OBJ_OLE2 ) { SvLBoxEntry* pNewEntry = InsertEntry( aStr, maImgOle, maImgOle, pEntry, - FALSE, LIST_APPEND, pObj); + sal_False, LIST_APPEND, pObj); SetExpandedEntryBmp( pNewEntry, maImgOleH, BMP_COLOR_HIGHCONTRAST ); SetCollapsedEntryBmp( pNewEntry, maImgOleH, BMP_COLOR_HIGHCONTRAST ); @@ -544,7 +544,7 @@ void SdPageObjsTLB::AddShapeList ( else if( pObj->GetObjInventor() == SdrInventor && pObj->GetObjIdentifier() == OBJ_GRAF ) { SvLBoxEntry* pNewEntry = InsertEntry( aStr, maImgGraphic, maImgGraphic, pEntry, - FALSE, LIST_APPEND, pObj ); + sal_False, LIST_APPEND, pObj ); SetExpandedEntryBmp( pNewEntry, maImgGraphicH, BMP_COLOR_HIGHCONTRAST ); SetCollapsedEntryBmp( pNewEntry, maImgGraphicH, BMP_COLOR_HIGHCONTRAST ); @@ -562,7 +562,7 @@ void SdPageObjsTLB::AddShapeList ( else { SvLBoxEntry* pNewEntry = InsertEntry( aStr, rIconProvider.maImgObjects, rIconProvider.maImgObjects, pEntry, - FALSE, LIST_APPEND, pObj ); + sal_False, LIST_APPEND, pObj ); SetExpandedEntryBmp( pNewEntry, rIconProvider.maImgObjectsH, BMP_COLOR_HIGHCONTRAST ); SetCollapsedEntryBmp( pNewEntry, rIconProvider.maImgObjectsH, BMP_COLOR_HIGHCONTRAST ); @@ -626,13 +626,13 @@ bool SdPageObjsTLB::GetShowAllShapes (void) const |* \************************************************************************/ -BOOL SdPageObjsTLB::IsEqualToDoc( const SdDrawDocument* pInDoc ) +sal_Bool SdPageObjsTLB::IsEqualToDoc( const SdDrawDocument* pInDoc ) { if( pInDoc ) mpDoc = pInDoc; if( !mpDoc ) - return( FALSE ); + return( sal_False ); SdrObject* pObj = NULL; SdPage* pPage = NULL; @@ -640,8 +640,8 @@ BOOL SdPageObjsTLB::IsEqualToDoc( const SdDrawDocument* pInDoc ) String aName; // Alle Pages incl. Objekte vergleichen - USHORT nPage = 0; - const USHORT nMaxPages = mpDoc->GetPageCount(); + sal_uInt16 nPage = 0; + const sal_uInt16 nMaxPages = mpDoc->GetPageCount(); while( nPage < nMaxPages ) { @@ -649,11 +649,11 @@ BOOL SdPageObjsTLB::IsEqualToDoc( const SdDrawDocument* pInDoc ) if( pPage->GetPageKind() == PK_STANDARD ) { if( !pEntry ) - return( FALSE ); + return( sal_False ); aName = GetEntryText( pEntry ); if( pPage->GetName() != aName ) - return( FALSE ); + return( sal_False ); pEntry = Next( pEntry ); @@ -671,12 +671,12 @@ BOOL SdPageObjsTLB::IsEqualToDoc( const SdDrawDocument* pInDoc ) if( aObjectName.Len() ) { if( !pEntry ) - return( FALSE ); + return( sal_False ); aName = GetEntryText( pEntry ); if( aObjectName != aName ) - return( FALSE ); + return( sal_False ); pEntry = Next( pEntry ); } @@ -708,14 +708,14 @@ String SdPageObjsTLB::GetSelectEntry() |* \************************************************************************/ -List* SdPageObjsTLB::GetSelectEntryList( USHORT nDepth ) +List* SdPageObjsTLB::GetSelectEntryList( sal_uInt16 nDepth ) { List* pList = NULL; SvLBoxEntry* pEntry = FirstSelected(); while( pEntry ) { - USHORT nListDepth = GetModel()->GetDepth( pEntry ); + sal_uInt16 nListDepth = GetModel()->GetDepth( pEntry ); if( nListDepth == nDepth ) { if( !pList ) @@ -756,8 +756,8 @@ void SdPageObjsTLB::RequestingChilds( SvLBoxEntry* pFileEntry ) // document name already inserted // only insert all "normal" ? slides with objects - USHORT nPage = 0; - const USHORT nMaxPages = mpBookmarkDoc->GetPageCount(); + sal_uInt16 nPage = 0; + const sal_uInt16 nMaxPages = mpBookmarkDoc->GetPageCount(); while( nPage < nMaxPages ) { @@ -768,7 +768,7 @@ void SdPageObjsTLB::RequestingChilds( SvLBoxEntry* pFileEntry ) aImgPage, aImgPage, pFileEntry, - FALSE, + sal_False, LIST_APPEND, reinterpret_cast< void* >( 1 ) ); @@ -859,7 +859,7 @@ SdDrawDocument* SdPageObjsTLB::GetBookmarkDoc(SfxMedium* pMed) if( pMed ) { // in this mode the document is also owned and controlled by this instance - mxBookmarkDocShRef = new ::sd::DrawDocShell(SFX_CREATE_MODE_STANDARD, TRUE); + mxBookmarkDocShRef = new ::sd::DrawDocShell(SFX_CREATE_MODE_STANDARD, sal_True); if (mxBookmarkDocShRef->DoLoad(pMed)) mpBookmarkDoc = mxBookmarkDocShRef->GetDoc(); else @@ -928,12 +928,12 @@ void SdPageObjsTLB::SelectHdl() { SvLBoxEntry* pEntry = FirstSelected(); - mbLinkableSelected = TRUE; + mbLinkableSelected = sal_True; while( pEntry && mbLinkableSelected ) { if( NULL == pEntry->GetUserData() ) - mbLinkableSelected = FALSE; + mbLinkableSelected = sal_False; pEntry = NextSelected( pEntry ); } @@ -994,26 +994,26 @@ void SdPageObjsTLB::StartDrag( sal_Int8 nAction, const Point& rPosPixel) // Select all entries and disable them as drop targets. SetSelectionMode(MULTIPLE_SELECTION); - SetCursor(NULL, FALSE); - SelectAll(TRUE, FALSE); - EnableSelectionAsDropTarget(FALSE, TRUE); + SetCursor(NULL, sal_False); + SelectAll(sal_True, sal_False); + EnableSelectionAsDropTarget(sal_False, sal_True); // Enable only the entries as drop targets that are children of the // page under the mouse. SvLBoxEntry* pParent = GetRootLevelParent(pEntry); if (pParent != NULL) { - SelectAll(FALSE, FALSE); - Select(pParent, TRUE); + SelectAll(sal_False, sal_False); + Select(pParent, sal_True); // for (SvLBoxEntry*pChild=FirstChild(pParent); pChild!=NULL; pChild=NextSibling(pChild)) - // Select(pChild, TRUE); - EnableSelectionAsDropTarget(TRUE, TRUE);//FALSE); + // Select(pChild, sal_True); + EnableSelectionAsDropTarget(sal_True, sal_True);//sal_False); } // Set selection back to the entry under the mouse. - SelectAll(FALSE,FALSE); + SelectAll(sal_False,sal_False); SetSelectionMode(SINGLE_SELECTION); - Select(pEntry, TRUE); + Select(pEntry, sal_True); // Aus dem ExecuteDrag heraus kann der Navigator geloescht werden // (beim Umschalten auf einen anderen Dokument-Typ), das wuerde aber @@ -1052,7 +1052,7 @@ void SdPageObjsTLB::DoDrag() SvTreeListBox::ReleaseMouse(); - bIsInDrag = TRUE; + bIsInDrag = sal_True; SvLBoxDDInfo aDDInfo; memset(&aDDInfo,0,sizeof(SvLBoxDDInfo)); @@ -1131,7 +1131,7 @@ void SdPageObjsTLB::OnDragFinished( sal_uInt8 ) } mpDropNavWin = NULL; - bIsInDrag = FALSE; + bIsInDrag = sal_False; } /************************************************************************* @@ -1153,7 +1153,7 @@ sal_Int8 SdPageObjsTLB::AcceptDrop (const AcceptDropEvent& rEvent) SvLBoxEntry* pEntry = GetDropTarget(rEvent.maPosPixel); if (rEvent.mbLeaving || !CheckDragAndDropMode( this, rEvent.mnAction )) { - ImplShowTargetEmphasis( pTargetEntry, FALSE ); + ImplShowTargetEmphasis( pTargetEntry, sal_False ); } else if( !nDragDropMode ) { @@ -1166,16 +1166,16 @@ sal_Int8 SdPageObjsTLB::AcceptDrop (const AcceptDropEvent& rEvent) // Draw emphasis. if (pEntry != pTargetEntry || !(nImpFlags & SVLBOX_TARGEMPH_VIS)) { - ImplShowTargetEmphasis( pTargetEntry, FALSE ); + ImplShowTargetEmphasis( pTargetEntry, sal_False ); pTargetEntry = pEntry; - ImplShowTargetEmphasis( pTargetEntry, TRUE ); + ImplShowTargetEmphasis( pTargetEntry, sal_True ); } } } // Hide emphasis when there is no valid drop action. if (nResult == DND_ACTION_NONE) - ImplShowTargetEmphasis(pTargetEntry, FALSE); + ImplShowTargetEmphasis(pTargetEntry, sal_False); return nResult; } @@ -1195,7 +1195,7 @@ sal_Int8 SdPageObjsTLB::ExecuteDrop( const ExecuteDropEvent& rEvt ) if( !bIsInDrag ) { SdNavigatorWin* pNavWin = NULL; - USHORT nId = SID_NAVIGATOR; + sal_uInt16 nId = SID_NAVIGATOR; if( mpFrame->HasChildWindow( nId ) ) pNavWin = (SdNavigatorWin*)( mpFrame->GetChildWindow( nId )->GetContextWindow( SD_MOD() ) ); @@ -1253,7 +1253,7 @@ bool SdPageObjsTLB::PageBelongsToCurrentShow (const SdPage* pPage) const List* pShowList = const_cast<SdDrawDocument*>(mpDoc)->GetCustomShowList(); if (pShowList != NULL) { - ULONG nCurrentShowIndex = pShowList->GetCurPos(); + sal_uLong nCurrentShowIndex = pShowList->GetCurPos(); void* pObject = pShowList->GetObject(nCurrentShowIndex); pCustomShow = static_cast<SdCustomShow*>(pObject); } @@ -1262,8 +1262,8 @@ bool SdPageObjsTLB::PageBelongsToCurrentShow (const SdPage* pPage) const if (pCustomShow != NULL) { bBelongsToShow = false; - ULONG nPageCount = pCustomShow->Count(); - for (USHORT i=0; i<nPageCount && !bBelongsToShow; i++) + sal_uLong nPageCount = pCustomShow->Count(); + for (sal_uInt16 i=0; i<nPageCount && !bBelongsToShow; i++) if (pPage == static_cast<SdPage*>(pCustomShow->GetObject (i))) bBelongsToShow = true; } @@ -1275,11 +1275,11 @@ bool SdPageObjsTLB::PageBelongsToCurrentShow (const SdPage* pPage) const -BOOL SdPageObjsTLB::NotifyMoving( +sal_Bool SdPageObjsTLB::NotifyMoving( SvLBoxEntry* pTarget, SvLBoxEntry* pEntry, SvLBoxEntry*& rpNewParent, - ULONG& rNewChildPos) + sal_uLong& rNewChildPos) { SvLBoxEntry* pDestination = pTarget; while (GetParent(pDestination) != NULL && GetParent(GetParent(pDestination)) != NULL) @@ -1308,7 +1308,7 @@ BOOL SdPageObjsTLB::NotifyMoving( { rpNewParent = 0; rNewChildPos = 0; - return TRUE; + return sal_True; } else if (GetParent(pDestination) == NULL) { @@ -1322,10 +1322,10 @@ BOOL SdPageObjsTLB::NotifyMoving( rNewChildPos += nCurEntrySelPos; nCurEntrySelPos++; } - return TRUE; + return sal_True; } else - return FALSE; + return sal_False; } @@ -1432,7 +1432,7 @@ void SdPageObjsTLB::AddShapeToTransferable ( aObjectDescriptor.maDisplayName = pDocShell->GetMedium()->GetURLObject().GetURLNoPass(); else aObjectDescriptor.maDisplayName = String(); - aObjectDescriptor.mbCanLink = FALSE; + aObjectDescriptor.mbCanLink = sal_False; rTransferable.SetStartPos(aDragPos); rTransferable.SetObjectDescriptor( aObjectDescriptor ); diff --git a/sd/source/ui/dlg/tabtempl.cxx b/sd/source/ui/dlg/tabtempl.cxx index 5fd9af68eee0..5d8dda204abd 100644..100755 --- a/sd/source/ui/dlg/tabtempl.cxx +++ b/sd/source/ui/dlg/tabtempl.cxx @@ -70,7 +70,7 @@ SdTabTemplateDlg::SdTabTemplateDlg( Window* pParent, SfxStyleSheetBase& rStyleBase, SdrModel* pModel, SdrView* pView ) : - SfxStyleDialog ( pParent, SdResId( TAB_TEMPLATE ), rStyleBase, FALSE ), + SfxStyleDialog ( pParent, SdResId( TAB_TEMPLATE ), rStyleBase, sal_False ), rDocShell ( *pDocShell ), pSdrView ( pView ), pColorTab ( pModel->GetColorTable() ), @@ -121,7 +121,7 @@ SdTabTemplateDlg::~SdTabTemplateDlg() // ----------------------------------------------------------------------- -void SdTabTemplateDlg::PageCreated( USHORT nId, SfxTabPage &rPage ) +void SdTabTemplateDlg::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) { SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool())); switch( nId ) diff --git a/sd/source/ui/dlg/tpaction.cxx b/sd/source/ui/dlg/tpaction.cxx index c7404b820ed7..6ed87ba105ea 100755 --- a/sd/source/ui/dlg/tpaction.cxx +++ b/sd/source/ui/dlg/tpaction.cxx @@ -142,7 +142,7 @@ SdTPAction::SdTPAction( Window* pWindow, const SfxItemSet& rInAttrs ) : rOutAttrs ( rInAttrs ), mpView ( NULL ), mpDoc ( NULL ), - bTreeUpdated ( FALSE ) + bTreeUpdated ( sal_False ) { FreeResource(); @@ -203,7 +203,7 @@ void SdTPAction::Construct() // OLE-Actionlistbox auffuellen SdrOle2Obj* pOleObj = NULL; SdrGrafObj* pGrafObj = NULL; - BOOL bOLEAction = FALSE; + sal_Bool bOLEAction = sal_False; if ( mpView->AreObjectsMarked() ) { @@ -215,8 +215,8 @@ void SdTPAction::Construct() SdrMark* pMark = rMarkList.GetMark(0); pObj = pMark->GetMarkedSdrObj(); - UINT32 nInv = pObj->GetObjInventor(); - UINT16 nSdrObjKind = pObj->GetObjIdentifier(); + sal_uInt32 nInv = pObj->GetObjInventor(); + sal_uInt16 nSdrObjKind = pObj->GetObjIdentifier(); if (nInv == SdrInventor && nSdrObjKind == OBJ_OLE2) { @@ -229,13 +229,13 @@ void SdTPAction::Construct() // // VCXControl ? // else if( pObj->IsA( TYPE( VCSbxDrawObject ) ) ) // { -// bDisableAll = TRUE; +// bDisableAll = sal_True; // } } } if( pGrafObj ) { - bOLEAction = TRUE; + bOLEAction = sal_True; aVerbVector.push_back( 0 ); aLbOLEAction.InsertEntry( MnemonicGenerator::EraseAllMnemonicChars( String( SdResId( STR_EDIT_OBJ ) ) ) ); @@ -245,7 +245,7 @@ void SdTPAction::Construct() uno::Reference < embed::XEmbeddedObject > xObj = pOleObj->GetObjRef(); if ( xObj.is() ) { - bOLEAction = TRUE; + bOLEAction = sal_True; uno::Sequence < embed::VerbDescriptor > aVerbs; try { @@ -271,24 +271,24 @@ void SdTPAction::Construct() } pCurrentActions = new List; - pCurrentActions->Insert((void*)(ULONG)presentation::ClickAction_NONE, LIST_APPEND); - pCurrentActions->Insert((void*)(ULONG)presentation::ClickAction_PREVPAGE, LIST_APPEND); - pCurrentActions->Insert((void*)(ULONG)presentation::ClickAction_NEXTPAGE, LIST_APPEND); - pCurrentActions->Insert((void*)(ULONG)presentation::ClickAction_FIRSTPAGE, LIST_APPEND); - pCurrentActions->Insert((void*)(ULONG)presentation::ClickAction_LASTPAGE, LIST_APPEND); - pCurrentActions->Insert((void*)(ULONG)presentation::ClickAction_BOOKMARK, LIST_APPEND); - pCurrentActions->Insert((void*)(ULONG)presentation::ClickAction_DOCUMENT, LIST_APPEND); - pCurrentActions->Insert((void*)(ULONG)presentation::ClickAction_SOUND, LIST_APPEND); + pCurrentActions->Insert((void*)(sal_uIntPtr)presentation::ClickAction_NONE, LIST_APPEND); + pCurrentActions->Insert((void*)(sal_uIntPtr)presentation::ClickAction_PREVPAGE, LIST_APPEND); + pCurrentActions->Insert((void*)(sal_uIntPtr)presentation::ClickAction_NEXTPAGE, LIST_APPEND); + pCurrentActions->Insert((void*)(sal_uIntPtr)presentation::ClickAction_FIRSTPAGE, LIST_APPEND); + pCurrentActions->Insert((void*)(sal_uIntPtr)presentation::ClickAction_LASTPAGE, LIST_APPEND); + pCurrentActions->Insert((void*)(sal_uIntPtr)presentation::ClickAction_BOOKMARK, LIST_APPEND); + pCurrentActions->Insert((void*)(sal_uIntPtr)presentation::ClickAction_DOCUMENT, LIST_APPEND); + pCurrentActions->Insert((void*)(sal_uIntPtr)presentation::ClickAction_SOUND, LIST_APPEND); if( bOLEAction && aLbOLEAction.GetEntryCount() ) - pCurrentActions->Insert((void*)(ULONG)presentation::ClickAction_VERB, LIST_APPEND ); - pCurrentActions->Insert((void*)(ULONG)presentation::ClickAction_PROGRAM, LIST_APPEND); - pCurrentActions->Insert((void*)(ULONG)presentation::ClickAction_MACRO, LIST_APPEND); - pCurrentActions->Insert((void*)(ULONG)presentation::ClickAction_STOPPRESENTATION, LIST_APPEND); + pCurrentActions->Insert((void*)(sal_uIntPtr)presentation::ClickAction_VERB, LIST_APPEND ); + pCurrentActions->Insert((void*)(sal_uIntPtr)presentation::ClickAction_PROGRAM, LIST_APPEND); + pCurrentActions->Insert((void*)(sal_uIntPtr)presentation::ClickAction_MACRO, LIST_APPEND); + pCurrentActions->Insert((void*)(sal_uIntPtr)presentation::ClickAction_STOPPRESENTATION, LIST_APPEND); // Action-Listbox fuellen - for (ULONG nAction = 0; nAction < pCurrentActions->Count(); nAction++) + for (sal_uLong nAction = 0; nAction < pCurrentActions->Count(); nAction++) { - USHORT nRId = GetClickActionSdResId((presentation::ClickAction)(ULONG)pCurrentActions->GetObject(nAction)); + sal_uInt16 nRId = GetClickActionSdResId((presentation::ClickAction)(sal_uLong)pCurrentActions->GetObject(nAction)); aLbAction.InsertEntry( String( SdResId( nRId ) ) ); } @@ -296,9 +296,9 @@ void SdTPAction::Construct() // ----------------------------------------------------------------------- -BOOL SdTPAction::FillItemSet( SfxItemSet& rAttrs ) +sal_Bool SdTPAction::FillItemSet( SfxItemSet& rAttrs ) { - BOOL bModified = FALSE; + sal_Bool bModified = sal_False; presentation::ClickAction eCA = presentation::ClickAction_NONE; if( aLbAction.GetSelectEntryCount() ) @@ -306,13 +306,13 @@ BOOL SdTPAction::FillItemSet( SfxItemSet& rAttrs ) if( aLbAction.GetSavedValue() != aLbAction.GetSelectEntryPos() ) { - rAttrs.Put( SfxAllEnumItem( ATTR_ACTION, (USHORT)eCA ) ); - bModified = TRUE; + rAttrs.Put( SfxAllEnumItem( ATTR_ACTION, (sal_uInt16)eCA ) ); + bModified = sal_True; } else rAttrs.InvalidateItem( ATTR_ACTION ); - String aFileName = GetEditText( TRUE ); + String aFileName = GetEditText( sal_True ); if( aFileName.Len() == 0 ) rAttrs.InvalidateItem( ATTR_ACTION_FILENAME ); else @@ -328,7 +328,7 @@ BOOL SdTPAction::FillItemSet( SfxItemSet& rAttrs ) INetURLObject::DECODE_UNAMBIGUOUS ); rAttrs.Put( SfxStringItem( ATTR_ACTION_FILENAME, aFileName ) ); - bModified = TRUE; + bModified = sal_True; } else { @@ -368,7 +368,7 @@ void SdTPAction::Reset( const SfxItemSet& rAttrs ) case presentation::ClickAction_BOOKMARK: { if( !aLbTree.SelectEntry( aFileName ) ) - aLbTree.SelectAll( FALSE ); + aLbTree.SelectAll( sal_False ); } break; @@ -419,8 +419,8 @@ void SdTPAction::UpdateTree() if( !bTreeUpdated && mpDoc && mpDoc->GetDocSh() && mpDoc->GetDocSh()->GetMedium() ) { //aLbTree.Clear(); - aLbTree.Fill( mpDoc, TRUE, mpDoc->GetDocSh()->GetMedium()->GetName() ); - bTreeUpdated = TRUE; + aLbTree.Fill( mpDoc, sal_True, mpDoc->GetDocSh()->GetMedium()->GetName() ); + bTreeUpdated = sal_True; } } @@ -430,11 +430,11 @@ void SdTPAction::OpenFileDialog() { // Soundpreview nur fuer Interaktionen mit Sound presentation::ClickAction eCA = GetActualClickAction(); - BOOL bSound = ( eCA == presentation::ClickAction_SOUND ); - BOOL bPage = ( eCA == presentation::ClickAction_BOOKMARK ); - BOOL bDocument = ( eCA == presentation::ClickAction_DOCUMENT || + sal_Bool bSound = ( eCA == presentation::ClickAction_SOUND ); + sal_Bool bPage = ( eCA == presentation::ClickAction_BOOKMARK ); + sal_Bool bDocument = ( eCA == presentation::ClickAction_DOCUMENT || eCA == presentation::ClickAction_PROGRAM ); - BOOL bMacro = ( eCA == presentation::ClickAction_MACRO ); + sal_Bool bMacro = ( eCA == presentation::ClickAction_MACRO ); if( bPage ) { @@ -709,7 +709,7 @@ IMPL_LINK( SdTPAction, CheckFileHdl, void *, EMPTYARG ) // Ueberpruefen, ob es eine gueltige Draw-Datei ist SfxMedium aMedium( aFile, STREAM_READ | STREAM_NOCREATE, - TRUE ); // Download + sal_True ); // Download if( aMedium.IsStorage() ) { @@ -731,7 +731,7 @@ IMPL_LINK( SdTPAction, CheckFileHdl, void *, EMPTYARG ) aLastFile = aFile; aLbTreeDocument.Clear(); - aLbTreeDocument.Fill( pBookmarkDoc, TRUE, aFile ); + aLbTreeDocument.Fill( pBookmarkDoc, sal_True, aFile ); mpDoc->CloseBookmarkDoc(); aLbTreeDocument.Show(); } @@ -754,10 +754,10 @@ IMPL_LINK( SdTPAction, CheckFileHdl, void *, EMPTYARG ) presentation::ClickAction SdTPAction::GetActualClickAction() { presentation::ClickAction eCA = presentation::ClickAction_NONE; - USHORT nPos = aLbAction.GetSelectEntryPos(); + sal_uInt16 nPos = aLbAction.GetSelectEntryPos(); if (nPos != LISTBOX_ENTRY_NOTFOUND) - eCA = (presentation::ClickAction)(ULONG)pCurrentActions->GetObject((ULONG)nPos); + eCA = (presentation::ClickAction)(sal_uLong)pCurrentActions->GetObject((sal_uLong)nPos); return( eCA ); } @@ -765,7 +765,7 @@ presentation::ClickAction SdTPAction::GetActualClickAction() void SdTPAction::SetActualClickAction( presentation::ClickAction eCA ) { - USHORT nPos = (USHORT)pCurrentActions->GetPos((void*)(ULONG)eCA); + sal_uInt16 nPos = (sal_uInt16)pCurrentActions->GetPos((void*)(sal_uLong)eCA); DBG_ASSERT(nPos != 0xffff, "unbekannte Interaktion"); aLbAction.SelectEntryPos(nPos); } @@ -835,7 +835,7 @@ void SdTPAction::SetEditText( String const & rStr ) //------------------------------------------------------------------------ -String SdTPAction::GetEditText( BOOL bFullDocDestination ) +String SdTPAction::GetEditText( sal_Bool bFullDocDestination ) { String aStr; presentation::ClickAction eCA = GetActualClickAction(); @@ -847,7 +847,7 @@ String SdTPAction::GetEditText( BOOL bFullDocDestination ) break; case presentation::ClickAction_VERB: { - const USHORT nPos = aLbOLEAction.GetSelectEntryPos(); + const sal_uInt16 nPos = aLbOLEAction.GetSelectEntryPos(); if( nPos < aVerbVector.size() ) aStr = UniString::CreateFromInt32( aVerbVector[ nPos ] ); return aStr; @@ -902,7 +902,7 @@ String SdTPAction::GetEditText( BOOL bFullDocDestination ) //------------------------------------------------------------------------ -USHORT SdTPAction::GetClickActionSdResId( presentation::ClickAction eCA ) +sal_uInt16 SdTPAction::GetClickActionSdResId( presentation::ClickAction eCA ) { switch( eCA ) { diff --git a/sd/source/ui/dlg/tpoption.cxx b/sd/source/ui/dlg/tpoption.cxx index bdb4cc230537..b78978aed227 100644..100755 --- a/sd/source/ui/dlg/tpoption.cxx +++ b/sd/source/ui/dlg/tpoption.cxx @@ -96,12 +96,12 @@ SdTpOptionsSnap::~SdTpOptionsSnap() // ----------------------------------------------------------------------- -BOOL SdTpOptionsSnap::FillItemSet( SfxItemSet& rAttrs ) +sal_Bool SdTpOptionsSnap::FillItemSet( SfxItemSet& rAttrs ) { SvxGridTabPage::FillItemSet(rAttrs); SdOptionsSnapItem* pOptsItem = NULL; -// if(SFX_ITEM_SET != rAttrs.GetItemState( ATTR_OPTIONS_SNAP, FALSE, (const SfxPoolItem**)&pOptsItem )) -// pExampleSet->GetItemState( ATTR_OPTIONS_SNAP, FALSE, (const SfxPoolItem**)&pOptsItem ); +// if(SFX_ITEM_SET != rAttrs.GetItemState( ATTR_OPTIONS_SNAP, sal_False, (const SfxPoolItem**)&pOptsItem )) +// pExampleSet->GetItemState( ATTR_OPTIONS_SNAP, sal_False, (const SfxPoolItem**)&pOptsItem ); SdOptionsSnapItem aOptsItem( ATTR_OPTIONS_SNAP ); @@ -112,16 +112,16 @@ BOOL SdTpOptionsSnap::FillItemSet( SfxItemSet& rAttrs ) aOptsItem.GetOptionsSnap().SetOrtho( aCbxOrtho.IsChecked() ); aOptsItem.GetOptionsSnap().SetBigOrtho( aCbxBigOrtho.IsChecked() ); aOptsItem.GetOptionsSnap().SetRotate( aCbxRotate.IsChecked() ); - aOptsItem.GetOptionsSnap().SetSnapArea( (INT16) aMtrFldSnapArea.GetValue() ); - aOptsItem.GetOptionsSnap().SetAngle( (INT16) aMtrFldAngle.GetValue() ); - aOptsItem.GetOptionsSnap().SetEliminatePolyPointLimitAngle( (INT16) aMtrFldBezAngle.GetValue() ); + aOptsItem.GetOptionsSnap().SetSnapArea( (sal_Int16) aMtrFldSnapArea.GetValue() ); + aOptsItem.GetOptionsSnap().SetAngle( (sal_Int16) aMtrFldAngle.GetValue() ); + aOptsItem.GetOptionsSnap().SetEliminatePolyPointLimitAngle( (sal_Int16) aMtrFldBezAngle.GetValue() ); if( pOptsItem == NULL || !(aOptsItem == *pOptsItem) ) rAttrs.Put( aOptsItem ); // Evtl. vorhandenes GridItem wird geholt, um nicht versehentlich // irgendwelche Standardwerte einzustellen - return( TRUE ); + return( sal_True ); } // ----------------------------------------------------------------------- @@ -180,9 +180,9 @@ SdTpOptionsContents::~SdTpOptionsContents() // ----------------------------------------------------------------------- -BOOL SdTpOptionsContents::FillItemSet( SfxItemSet& rAttrs ) +sal_Bool SdTpOptionsContents::FillItemSet( SfxItemSet& rAttrs ) { - BOOL bModified = FALSE; + sal_Bool bModified = sal_False; if( aCbxRuler.GetSavedValue() != aCbxRuler.IsChecked() || aCbxMoveOutline.GetSavedValue() != aCbxMoveOutline.IsChecked() || @@ -199,7 +199,7 @@ BOOL SdTpOptionsContents::FillItemSet( SfxItemSet& rAttrs ) //aOptsItem.GetOptionsLayout().SetHelplines( aCbxHelplines.IsChecked() ); rAttrs.Put( aOptsItem ); - bModified = TRUE; + bModified = sal_True; } return( bModified ); } @@ -289,7 +289,7 @@ SdTpOptionsMisc::SdTpOptionsMisc( Window* pParent, const SfxItemSet& rInAttrs ) // Metrik einstellen FieldUnit eFUnit; - USHORT nWhich = GetWhich( SID_ATTR_METRIC ); + sal_uInt16 nWhich = GetWhich( SID_ATTR_METRIC ); if ( rInAttrs.GetItemState( nWhich ) >= SFX_ITEM_AVAILABLE ) { const SfxUInt16Item& rItem = (SfxUInt16Item&)rInAttrs.Get( nWhich ); @@ -302,13 +302,13 @@ SdTpOptionsMisc::SdTpOptionsMisc( Window* pParent, const SfxItemSet& rInAttrs ) // ListBox mit Metriken f"ullen SvxStringArray aMetricArr( RID_SVXSTR_FIELDUNIT_TABLE ); - USHORT i; + sal_uInt16 i; for ( i = 0; i < aMetricArr.Count(); ++i ) { String sMetric = aMetricArr.GetStringByPos( i ); long nFieldUnit = aMetricArr.GetValue( i ); - USHORT nPos = aLbMetric.InsertEntry( sMetric ); + sal_uInt16 nPos = aLbMetric.InsertEntry( sMetric ); aLbMetric.SetEntryData( nPos, (void*)nFieldUnit ); } aLbMetric.SetSelectHdl( LINK( this, SdTpOptionsMisc, SelectMetricHdl_Impl ) ); @@ -334,7 +334,7 @@ SdTpOptionsMisc::SdTpOptionsMisc( Window* pParent, const SfxItemSet& rInAttrs ) ePoolUnit = pPool->GetMetric( SID_ATTR_FILL_HATCH ); // Fuellen der CB - USHORT aTable[ TABLE_COUNT ] = + sal_uInt16 aTable[ TABLE_COUNT ] = { 1, 2, 4, 5, 8, 10, 16, 20, 30, 40, 50, 100 }; for( i = 0; i < TABLE_COUNT; i++ ) @@ -357,7 +357,7 @@ void SdTpOptionsMisc::ActivatePage( const SfxItemSet& rSet ) // Metrik ggfs. aendern (da TabPage im Dialog liegt, // wo die Metrik eingestellt werden kann const SfxPoolItem* pAttr = NULL; - if( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_METRIC , FALSE, + if( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_METRIC , sal_False, (const SfxPoolItem**)&pAttr )) { const SfxUInt16Item* pItem = (SfxUInt16Item*) pAttr; @@ -368,11 +368,11 @@ void SdTpOptionsMisc::ActivatePage( const SfxItemSet& rSet ) { // Metriken einstellen sal_Int64 nVal = aMtrFldOriginalWidth.Denormalize( aMtrFldOriginalWidth.GetValue( FUNIT_TWIP ) ); - SetFieldUnit( aMtrFldOriginalWidth, eFUnit, TRUE ); + SetFieldUnit( aMtrFldOriginalWidth, eFUnit, sal_True ); aMtrFldOriginalWidth.SetValue( aMtrFldOriginalWidth.Normalize( nVal ), FUNIT_TWIP ); nVal = aMtrFldOriginalHeight.Denormalize( aMtrFldOriginalHeight.GetValue( FUNIT_TWIP ) ); - SetFieldUnit( aMtrFldOriginalHeight, eFUnit, TRUE ); + SetFieldUnit( aMtrFldOriginalHeight, eFUnit, sal_True ); aMtrFldOriginalHeight.SetValue( aMtrFldOriginalHeight.Normalize( nVal ), FUNIT_TWIP ); @@ -398,7 +398,7 @@ void SdTpOptionsMisc::ActivatePage( const SfxItemSet& rSet ) int SdTpOptionsMisc::DeactivatePage( SfxItemSet* pActiveSet ) { // Parsercheck - INT32 nX, nY; + sal_Int32 nX, nY; if( SetScale( aCbScale.GetText(), nX, nY ) ) { if( pActiveSet ) @@ -419,9 +419,9 @@ int SdTpOptionsMisc::DeactivatePage( SfxItemSet* pActiveSet ) // ----------------------------------------------------------------------- -BOOL SdTpOptionsMisc::FillItemSet( SfxItemSet& rAttrs ) +sal_Bool SdTpOptionsMisc::FillItemSet( SfxItemSet& rAttrs ) { - BOOL bModified = FALSE; + sal_Bool bModified = sal_False; if( aCbxStartWithTemplate.GetSavedValue() != aCbxStartWithTemplate.IsChecked() || aCbxMarkedHitMovesAlways.GetSavedValue()!= aCbxMarkedHitMovesAlways.IsChecked() || @@ -451,36 +451,36 @@ BOOL SdTpOptionsMisc::FillItemSet( SfxItemSet& rAttrs ) : ::com::sun::star::document::PrinterIndependentLayout::ENABLED); rAttrs.Put( aOptsItem ); - bModified = TRUE; + bModified = sal_True; } // Metrik - const USHORT nMPos = aLbMetric.GetSelectEntryPos(); + const sal_uInt16 nMPos = aLbMetric.GetSelectEntryPos(); if ( nMPos != aLbMetric.GetSavedValue() ) { - USHORT nFieldUnit = (USHORT)(long)aLbMetric.GetEntryData( nMPos ); + sal_uInt16 nFieldUnit = (sal_uInt16)(long)aLbMetric.GetEntryData( nMPos ); rAttrs.Put( SfxUInt16Item( GetWhich( SID_ATTR_METRIC ), - (UINT16)nFieldUnit ) ); - bModified |= TRUE; + (sal_uInt16)nFieldUnit ) ); + bModified |= sal_True; } // Tabulatorabstand if( aMtrFldTabstop.GetText() != aMtrFldTabstop.GetSavedValue() ) { - USHORT nWh = GetWhich( SID_ATTR_DEFTABSTOP ); + sal_uInt16 nWh = GetWhich( SID_ATTR_DEFTABSTOP ); SfxMapUnit eUnit = rAttrs.GetPool()->GetMetric( nWh ); - SfxUInt16Item aDef( nWh,(USHORT)GetCoreValue( aMtrFldTabstop, eUnit ) ); + SfxUInt16Item aDef( nWh,(sal_uInt16)GetCoreValue( aMtrFldTabstop, eUnit ) ); rAttrs.Put( aDef ); - bModified |= TRUE; + bModified |= sal_True; } - INT32 nX, nY; + sal_Int32 nX, nY; if( SetScale( aCbScale.GetText(), nX, nY ) ) { rAttrs.Put( SfxInt32Item( ATTR_OPTIONS_SCALE_X, nX ) ); rAttrs.Put( SfxInt32Item( ATTR_OPTIONS_SCALE_Y, nY ) ); - bModified = TRUE; + bModified = sal_True; } return( bModified ); @@ -516,7 +516,7 @@ void SdTpOptionsMisc::Reset( const SfxItemSet& rAttrs ) aCbxUsePrinterMetrics.SaveValue(); // Metrik - USHORT nWhich = GetWhich( SID_ATTR_METRIC ); + sal_uInt16 nWhich = GetWhich( SID_ATTR_METRIC ); aLbMetric.SetNoSelection(); if ( rAttrs.GetItemState( nWhich ) >= SFX_ITEM_AVAILABLE ) @@ -524,7 +524,7 @@ void SdTpOptionsMisc::Reset( const SfxItemSet& rAttrs ) const SfxUInt16Item& rItem = (SfxUInt16Item&)rAttrs.Get( nWhich ); long nFieldUnit = (long)rItem.GetValue(); - for ( USHORT i = 0; i < aLbMetric.GetEntryCount(); ++i ) + for ( sal_uInt16 i = 0; i < aLbMetric.GetEntryCount(); ++i ) { if ( (long)aLbMetric.GetEntryData( i ) == nFieldUnit ) { @@ -545,9 +545,9 @@ void SdTpOptionsMisc::Reset( const SfxItemSet& rAttrs ) aLbMetric.SaveValue(); aMtrFldTabstop.SaveValue(); //Scale - INT32 nX = ( (const SfxInt32Item&) rAttrs. + sal_Int32 nX = ( (const SfxInt32Item&) rAttrs. Get( ATTR_OPTIONS_SCALE_X ) ).GetValue(); - INT32 nY = ( (const SfxInt32Item&) rAttrs. + sal_Int32 nY = ( (const SfxInt32Item&) rAttrs. Get( ATTR_OPTIONS_SCALE_Y ) ).GetValue(); nWidth = ( (const SfxUInt32Item&) rAttrs. Get( ATTR_OPTIONS_SCALE_WIDTH ) ).GetValue(); @@ -582,7 +582,7 @@ SfxTabPage* SdTpOptionsMisc::Create( Window* pWindow, IMPL_LINK( SdTpOptionsMisc, SelectMetricHdl_Impl, ListBox *, EMPTYARG ) { - USHORT nPos = aLbMetric.GetSelectEntryPos(); + sal_uInt16 nPos = aLbMetric.GetSelectEntryPos(); if( nPos != LISTBOX_ENTRY_NOTFOUND ) { @@ -695,11 +695,11 @@ void SdTpOptionsMisc::SetDrawMode() IMPL_LINK( SdTpOptionsMisc, ModifyScaleHdl, void *, EMPTYARG ) { // Originalgroesse berechnen - INT32 nX, nY; + sal_Int32 nX, nY; if( SetScale( aCbScale.GetText(), nX, nY ) ) { - INT32 nW = nWidth * nY / nX; - INT32 nH = nHeight * nY / nX; + sal_Int32 nW = nWidth * nY / nX; + sal_Int32 nH = nHeight * nY / nX; SetMetricValue( aMtrFldOriginalWidth, nW, ePoolUnit ); SetMetricValue( aMtrFldOriginalHeight, nH, ePoolUnit ); @@ -749,7 +749,7 @@ IMPL_LINK( SdTpOptionsMisc, ModifyOriginalScaleHdl, void *, EMPTYARG ) // ----------------------------------------------------------------------- -String SdTpOptionsMisc::GetScale( INT32 nX, INT32 nY ) +String SdTpOptionsMisc::GetScale( sal_Int32 nX, sal_Int32 nY ) { String aScale( UniString::CreateFromInt32( nX ) ); aScale.Append( TOKEN ); @@ -760,28 +760,28 @@ String SdTpOptionsMisc::GetScale( INT32 nX, INT32 nY ) // ----------------------------------------------------------------------- -BOOL SdTpOptionsMisc::SetScale( const String& aScale, INT32& rX, INT32& rY ) +sal_Bool SdTpOptionsMisc::SetScale( const String& aScale, sal_Int32& rX, sal_Int32& rY ) { if( aScale.GetTokenCount( TOKEN ) != 2 ) - return( FALSE ); + return( sal_False ); ByteString aTmp( aScale.GetToken( 0, TOKEN ), RTL_TEXTENCODING_ASCII_US ); if( !aTmp.IsNumericAscii() ) - return( FALSE ); + return( sal_False ); rX = (long) aTmp.ToInt32(); if( rX == 0 ) - return( FALSE ); + return( sal_False ); aTmp = ByteString( aScale.GetToken( 1, TOKEN ), RTL_TEXTENCODING_ASCII_US ); if( !aTmp.IsNumericAscii() ) - return( FALSE ); + return( sal_False ); rY = (long) aTmp.ToInt32(); if( rY == 0 ) - return( FALSE ); + return( sal_False ); - return( TRUE ); + return( sal_True ); } @@ -848,7 +848,7 @@ void SdTpOptionsMisc::PageCreated (SfxAllItemSet aSet) SFX_ITEMSET_ARG (&aSet,pFlagItem,SfxUInt32Item,SID_SDMODE_FLAG,sal_False); if (pFlagItem) { - UINT32 nFlags=pFlagItem->GetValue(); + sal_uInt32 nFlags=pFlagItem->GetValue(); if ( ( nFlags & SD_DRAW_MODE ) == SD_DRAW_MODE ) SetDrawMode(); if ( ( nFlags & SD_IMPRESS_MODE ) == SD_IMPRESS_MODE ) diff --git a/sd/source/ui/dlg/unchss.cxx b/sd/source/ui/dlg/unchss.cxx index e04b4547fc66..82593e31c851 100644..100755 --- a/sd/source/ui/dlg/unchss.cxx +++ b/sd/source/ui/dlg/unchss.cxx @@ -75,7 +75,7 @@ StyleSheetUndoAction::StyleSheetUndoAction(SdDrawDocument* pTheDoc, // Layoutnamen und Separator loeschen String aSep( RTL_CONSTASCII_USTRINGPARAM( SD_LT_SEPARATOR ) ); - USHORT nPos = aName.Search(aSep); + sal_uInt16 nPos = aName.Search(aSep); if( nPos != STRING_NOTFOUND ) aName.Erase(0, nPos + aSep.Len()); diff --git a/sd/source/ui/dlg/vectdlg.cxx b/sd/source/ui/dlg/vectdlg.cxx index 7cd0be451c4b..0eb30d78e45f 100644..100755 --- a/sd/source/ui/dlg/vectdlg.cxx +++ b/sd/source/ui/dlg/vectdlg.cxx @@ -166,7 +166,7 @@ Bitmap SdVectorizeDlg::GetPreparedBitmap( Bitmap& rBmp, Fraction& rScale ) else rScale = Fraction( 1, 1 ); - aNew.ReduceColors( (USHORT) aNmLayers.GetValue(), BMP_REDUCE_SIMPLE ); + aNew.ReduceColors( (sal_uInt16) aNmLayers.GetValue(), BMP_REDUCE_SIMPLE ); return aNew; } @@ -175,7 +175,7 @@ Bitmap SdVectorizeDlg::GetPreparedBitmap( Bitmap& rBmp, Fraction& rScale ) void SdVectorizeDlg::Calculate( Bitmap& rBmp, GDIMetaFile& rMtf ) { - mpDocSh->SetWaitCursor( TRUE ); + mpDocSh->SetWaitCursor( sal_True ); aPrgs.SetValue( 0 ); Fraction aScale; @@ -184,7 +184,7 @@ void SdVectorizeDlg::Calculate( Bitmap& rBmp, GDIMetaFile& rMtf ) if( !!aTmp ) { const Link aPrgsHdl( LINK( this, SdVectorizeDlg, ProgressHdl ) ); - aTmp.Vectorize( rMtf, (BYTE) aMtReduce.GetValue(), BMP_VECTORIZE_OUTER | BMP_VECTORIZE_REDUCE_EDGES, &aPrgsHdl ); + aTmp.Vectorize( rMtf, (sal_uInt8) aMtReduce.GetValue(), BMP_VECTORIZE_OUTER | BMP_VECTORIZE_REDUCE_EDGES, &aPrgsHdl ); if( aCbFillHoles.IsChecked() ) { @@ -231,7 +231,7 @@ void SdVectorizeDlg::Calculate( Bitmap& rBmp, GDIMetaFile& rMtf ) aTmp.ReleaseAccess( pRAcc ); - for( ULONG n = 0UL, nCount = rMtf.GetActionCount(); n < nCount; n++ ) + for( sal_uLong n = 0UL, nCount = rMtf.GetActionCount(); n < nCount; n++ ) aNewMtf.AddAction( rMtf.GetAction( n )->Clone() ); aMap.SetScaleX( aMap.GetScaleX() * aScale ); @@ -243,7 +243,7 @@ void SdVectorizeDlg::Calculate( Bitmap& rBmp, GDIMetaFile& rMtf ) } aPrgs.SetValue( 0 ); - mpDocSh->SetWaitCursor( FALSE ); + mpDocSh->SetWaitCursor( sal_False ); } // ----------------------------------------------------------------------------- @@ -251,7 +251,7 @@ void SdVectorizeDlg::Calculate( Bitmap& rBmp, GDIMetaFile& rMtf ) void SdVectorizeDlg::AddTile( BitmapReadAccess* pRAcc, GDIMetaFile& rMtf, long nPosX, long nPosY, long nWidth, long nHeight ) { - ULONG nSumR = 0UL, nSumG = 0UL, nSumB = 0UL; + sal_uLong nSumR = 0UL, nSumG = 0UL, nSumB = 0UL; const long nRight = nPosX + nWidth - 1L; const long nBottom = nPosY + nHeight - 1L; const double fMult = 1.0 / ( nWidth * nHeight ); @@ -268,9 +268,9 @@ void SdVectorizeDlg::AddTile( BitmapReadAccess* pRAcc, GDIMetaFile& rMtf, } } - const Color aColor( (BYTE) FRound( nSumR * fMult ), - (BYTE) FRound( nSumG * fMult ), - (BYTE) FRound( nSumB * fMult ) ); + const Color aColor( (sal_uInt8) FRound( nSumR * fMult ), + (sal_uInt8) FRound( nSumG * fMult ), + (sal_uInt8) FRound( nSumB * fMult ) ); Rectangle aRect( Point( nPosX, nPosY ), Size( nWidth + 1, nHeight + 1 ) ); const Size& rMaxSize = rMtf.GetPrefSize(); @@ -283,8 +283,8 @@ void SdVectorizeDlg::AddTile( BitmapReadAccess* pRAcc, GDIMetaFile& rMtf, if( aRect.Bottom() > ( rMaxSize.Height() - 1L ) ) aRect.Bottom() = rMaxSize.Height() - 1L; - rMtf.AddAction( new MetaLineColorAction( aColor, TRUE ) ); - rMtf.AddAction( new MetaFillColorAction( aColor, TRUE ) ); + rMtf.AddAction( new MetaLineColorAction( aColor, sal_True ) ); + rMtf.AddAction( new MetaFillColorAction( aColor, sal_True ) ); rMtf.AddAction( new MetaRectAction( aRect ) ); } @@ -292,7 +292,7 @@ void SdVectorizeDlg::AddTile( BitmapReadAccess* pRAcc, GDIMetaFile& rMtf, IMPL_LINK( SdVectorizeDlg, ProgressHdl, void*, pData ) { - aPrgs.SetValue( (USHORT)(ULONG) pData ); + aPrgs.SetValue( (sal_uInt16)(sal_uLong) pData ); return 0L; } @@ -356,10 +356,10 @@ void SdVectorizeDlg::LoadSettings() UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( SD_OPTION_VECTORIZE ) ), SD_OPTION_LOAD ) ); - UINT16 nLayers; - UINT16 nReduce; - UINT16 nFillHoles; - BOOL bFillHoles; + sal_uInt16 nLayers; + sal_uInt16 nReduce; + sal_uInt16 nFillHoles; + sal_Bool bFillHoles; if( xIStm.Is() ) { @@ -371,7 +371,7 @@ void SdVectorizeDlg::LoadSettings() nLayers = 8; nReduce = 0; nFillHoles = 32; - bFillHoles = FALSE; + bFillHoles = sal_False; } aNmLayers.SetValue( nLayers ); @@ -394,7 +394,7 @@ void SdVectorizeDlg::SaveSettings() const if( xOStm.Is() ) { SdIOCompat aCompat( *xOStm, STREAM_WRITE, 1 ); - *xOStm << (UINT16) aNmLayers.GetValue() << (UINT16) aMtReduce.GetValue(); - *xOStm << (UINT16) aMtFillHoles.GetValue() << aCbFillHoles.IsChecked(); + *xOStm << (sal_uInt16) aNmLayers.GetValue() << (sal_uInt16) aMtReduce.GetValue(); + *xOStm << (sal_uInt16) aMtFillHoles.GetValue() << aCbFillHoles.IsChecked(); } } diff --git a/sd/source/ui/docshell/docshel2.cxx b/sd/source/ui/docshell/docshel2.cxx index 841018aa9444..adfee3aea781 100644..100755 --- a/sd/source/ui/docshell/docshel2.cxx +++ b/sd/source/ui/docshell/docshel2.cxx @@ -63,7 +63,7 @@ namespace sd { |* \************************************************************************/ -void DrawDocShell::Draw(OutputDevice* pOut, const JobSetup&, USHORT nAspect) +void DrawDocShell::Draw(OutputDevice* pOut, const JobSetup&, sal_uInt16 nAspect) { if (nAspect == ASPECT_THUMBNAIL) { @@ -74,11 +74,11 @@ void DrawDocShell::Draw(OutputDevice* pOut, const JobSetup&, USHORT nAspect) ClientView* pView = new ClientView(this, pOut, NULL); - pView->SetHlplVisible(FALSE); - pView->SetGridVisible(FALSE); - pView->SetBordVisible(FALSE); - pView->SetPageVisible(FALSE); - pView->SetGlueVisible(FALSE); + pView->SetHlplVisible(sal_False); + pView->SetGridVisible(sal_False); + pView->SetBordVisible(sal_False); + pView->SetPageVisible(sal_False); + pView->SetGlueVisible(sal_False); SdPage* pSelectedPage = NULL; @@ -88,7 +88,7 @@ void DrawDocShell::Draw(OutputDevice* pOut, const JobSetup&, USHORT nAspect) FrameView* pFrameView = (FrameView*)pFrameViewList->GetObject(0); if( pFrameView && pFrameView->GetPageKind() == PK_STANDARD ) { - USHORT nSelectedPage = pFrameView->GetSelectedPage(); + sal_uInt16 nSelectedPage = pFrameView->GetSelectedPage(); pSelectedPage = mpDoc->GetSdPage(nSelectedPage, PK_STANDARD); } } @@ -96,10 +96,10 @@ void DrawDocShell::Draw(OutputDevice* pOut, const JobSetup&, USHORT nAspect) if( NULL == pSelectedPage ) { SdPage* pPage = NULL; - USHORT nSelectedPage = 0; - USHORT nPageCnt = (USHORT) mpDoc->GetSdPageCount(PK_STANDARD); + sal_uInt16 nSelectedPage = 0; + sal_uInt16 nPageCnt = (sal_uInt16) mpDoc->GetSdPageCount(PK_STANDARD); - for (USHORT i = 0; i < nPageCnt; i++) + for (sal_uInt16 i = 0; i < nPageCnt; i++) { pPage = mpDoc->GetSdPage(i, PK_STANDARD); @@ -170,7 +170,7 @@ void DrawDocShell::Draw(OutputDevice* pOut, const JobSetup&, USHORT nAspect) |* \************************************************************************/ -Rectangle DrawDocShell::GetVisArea(USHORT nAspect) const +Rectangle DrawDocShell::GetVisArea(sal_uInt16 nAspect) const { Rectangle aVisArea; @@ -263,7 +263,7 @@ Size DrawDocShell::GetFirstPageSize() |* \************************************************************************/ -Bitmap DrawDocShell::GetPagePreviewBitmap(SdPage* pPage, USHORT nMaxEdgePixel) +Bitmap DrawDocShell::GetPagePreviewBitmap(SdPage* pPage, sal_uInt16 nMaxEdgePixel) { MapMode aMapMode( MAP_100TH_MM ); const Size aSize( pPage->GetSize() ); @@ -273,7 +273,7 @@ Bitmap DrawDocShell::GetPagePreviewBitmap(SdPage* pPage, USHORT nMaxEdgePixel) aVDev.SetMapMode( aMapMode ); const Size aPixSize( aVDev.LogicToPixel( aSize ) ); - const ULONG nMaxEdgePix = Max( aPixSize.Width(), aPixSize.Height() ); + const sal_uLong nMaxEdgePix = Max( aPixSize.Width(), aPixSize.Height() ); Fraction aFrac( nMaxEdgePixel, nMaxEdgePix ); aMapMode.SetScaleX( aFrac ); @@ -357,12 +357,12 @@ Bitmap DrawDocShell::GetPagePreviewBitmap(SdPage* pPage, USHORT nMaxEdgePixel) /************************************************************************* |* |* Pruefen, ob die Seite vorhanden ist und dann den Anwender zwingen einen -|* noch nicht vorhandenen Namen einzugeben. Wird FALSE zurueckgegeben, +|* noch nicht vorhandenen Namen einzugeben. Wird sal_False zurueckgegeben, |* wurde die Aktion vom Anwender abgebrochen. |* \************************************************************************/ -BOOL DrawDocShell::CheckPageName (::Window* pWin, String& rName ) +sal_Bool DrawDocShell::CheckPageName (::Window* pWin, String& rName ) { const String aStrForDlg( rName ); bool bIsNameValid = IsNewPageNameValid( rName, true ); @@ -392,7 +392,7 @@ BOOL DrawDocShell::CheckPageName (::Window* pWin, String& rName ) } } - return ( bIsNameValid ? TRUE : FALSE ); + return ( bIsNameValid ? sal_True : sal_False ); } bool DrawDocShell::IsNewPageNameValid( String & rInOutPageName, bool bResetStringIfStandardName /* = false */ ) @@ -485,8 +485,8 @@ bool DrawDocShell::IsNewPageNameValid( String & rInOutPageName, bool bResetStrin { if( rInOutPageName.Len() > 0 ) { - BOOL bOutDummy; - USHORT nExistingPageNum = mpDoc->GetPageByName( rInOutPageName, bOutDummy ); + sal_Bool bOutDummy; + sal_uInt16 nExistingPageNum = mpDoc->GetPageByName( rInOutPageName, bOutDummy ); bCanUseNewName = ( nExistingPageNum == SDRPAGE_NOTFOUND ); } else diff --git a/sd/source/ui/docshell/docshel3.cxx b/sd/source/ui/docshell/docshel3.cxx index 6bcdbe76accf..eb0fe9bc8266 100644..100755 --- a/sd/source/ui/docshell/docshel3.cxx +++ b/sd/source/ui/docshell/docshel3.cxx @@ -75,9 +75,9 @@ using namespace ::com::sun::star::uno; namespace sd { -#define POOL_BUFFER_SIZE (USHORT)32768 -#define BASIC_BUFFER_SIZE (USHORT)8192 -#define DOCUMENT_BUFFER_SIZE (USHORT)32768 +#define POOL_BUFFER_SIZE (sal_uInt16)32768 +#define BASIC_BUFFER_SIZE (sal_uInt16)8192 +#define DOCUMENT_BUFFER_SIZE (sal_uInt16)32768 /************************************************************************* |* @@ -203,7 +203,7 @@ void DrawDocShell::Execute( SfxRequest& rReq ) case SID_VERSION: { - const ULONG nOldSwapMode = mpDoc->GetSwapGraphicsMode(); + const sal_uLong nOldSwapMode = mpDoc->GetSwapGraphicsMode(); mpDoc->SetSwapGraphicsMode( SDR_SWAPGRAPHICSMODE_TEMP ); ExecuteSlot( rReq, SfxObjectShell::GetStaticInterface() ); diff --git a/sd/source/ui/docshell/docshel4.cxx b/sd/source/ui/docshell/docshel4.cxx index a033661e7c85..f1e77526d7e3 100755 --- a/sd/source/ui/docshell/docshel4.cxx +++ b/sd/source/ui/docshell/docshel4.cxx @@ -110,7 +110,7 @@ namespace sd { |* \************************************************************************/ -SfxPrinter* DrawDocShell::GetPrinter(BOOL bCreate) +SfxPrinter* DrawDocShell::GetPrinter(sal_Bool bCreate) { if (bCreate && !mpPrinter) { @@ -124,7 +124,7 @@ SfxPrinter* DrawDocShell::GetPrinter(BOOL bCreate) SdOptionsPrintItem aPrintItem( ATTR_OPTIONS_PRINT, SD_MOD()->GetSdOptions(mpDoc->GetDocumentType())); SfxFlagItem aFlagItem( SID_PRINTER_CHANGESTODOC ); - USHORT nFlags = 0; + sal_uInt16 nFlags = 0; nFlags = (aPrintItem.GetOptionsPrint().IsWarningSize() ? SFX_PRINTER_CHG_SIZE : 0) | (aPrintItem.GetOptionsPrint().IsWarningOrientation() ? SFX_PRINTER_CHG_ORIENTATION : 0); @@ -135,12 +135,12 @@ SfxPrinter* DrawDocShell::GetPrinter(BOOL bCreate) pSet->Put( aFlagItem ); mpPrinter = new SfxPrinter(pSet); - mbOwnPrinter = TRUE; + mbOwnPrinter = sal_True; // Ausgabequalitaet setzen - UINT16 nQuality = aPrintItem.GetOptionsPrint().GetOutputQuality(); + sal_uInt16 nQuality = aPrintItem.GetOptionsPrint().GetOutputQuality(); - ULONG nMode = DRAWMODE_DEFAULT; + sal_uLong nMode = DRAWMODE_DEFAULT; if( nQuality == 1 ) nMode = DRAWMODE_GRAYLINE | DRAWMODE_GRAYFILL | DRAWMODE_BLACKTEXT | DRAWMODE_GRAYBITMAP | DRAWMODE_GRAYGRADIENT; @@ -178,7 +178,7 @@ void DrawDocShell::SetPrinter(SfxPrinter *pNewPrinter) } mpPrinter = pNewPrinter; - mbOwnPrinter = TRUE; + mbOwnPrinter = sal_True; if ( mpDoc->GetPrinterIndependentLayout() == ::com::sun::star::document::PrinterIndependentLayout::DISABLED ) UpdateFontList(); UpdateRefDevice(); @@ -189,10 +189,10 @@ void DrawDocShell::UpdateFontList() delete mpFontList; OutputDevice* pRefDevice = NULL; if ( mpDoc->GetPrinterIndependentLayout() == ::com::sun::star::document::PrinterIndependentLayout::DISABLED ) - pRefDevice = GetPrinter(TRUE); + pRefDevice = GetPrinter(sal_True); else pRefDevice = SD_MOD()->GetVirtualRefDevice(); - mpFontList = new FontList( pRefDevice, NULL, FALSE ); + mpFontList = new FontList( pRefDevice, NULL, sal_False ); SvxFontListItem aFontListItem( mpFontList, SID_ATTR_CHAR_FONTLIST ); PutItem( aFontListItem ); } @@ -204,7 +204,7 @@ void DrawDocShell::UpdateFontList() \************************************************************************/ Printer* DrawDocShell::GetDocumentPrinter() { - return GetPrinter(FALSE); + return GetPrinter(sal_False); } /************************************************************************* @@ -233,7 +233,7 @@ void DrawDocShell::OnDocumentPrinterChanged(Printer* pNewPrinter) SetPrinter((SfxPrinter*) pNewPrinter); // Printer gehoert dem Container - mbOwnPrinter = FALSE; + mbOwnPrinter = sal_False; } } @@ -269,12 +269,12 @@ void DrawDocShell::UpdateRefDevice() } mpDoc->SetRefDevice( pRefDevice ); - ::sd::Outliner* pOutl = mpDoc->GetOutliner( FALSE ); + ::sd::Outliner* pOutl = mpDoc->GetOutliner( sal_False ); if( pOutl ) pOutl->SetRefDevice( pRefDevice ); - ::sd::Outliner* pInternalOutl = mpDoc->GetInternalOutliner( FALSE ); + ::sd::Outliner* pInternalOutl = mpDoc->GetInternalOutliner( sal_False ); if( pInternalOutl ) pInternalOutl->SetRefDevice( pRefDevice ); @@ -287,9 +287,9 @@ void DrawDocShell::UpdateRefDevice() |* \************************************************************************/ -BOOL DrawDocShell::InitNew( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage ) +sal_Bool DrawDocShell::InitNew( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage ) { - BOOL bRet = FALSE; + sal_Bool bRet = sal_False; bRet = SfxObjectShell::InitNew( xStorage ); @@ -312,11 +312,11 @@ BOOL DrawDocShell::InitNew( const ::com::sun::star::uno::Reference< ::com::sun:: |* \************************************************************************/ -BOOL DrawDocShell::Load( SfxMedium& rMedium ) +sal_Bool DrawDocShell::Load( SfxMedium& rMedium ) { mbNewDocument = sal_False; - BOOL bRet = FALSE; + sal_Bool bRet = sal_False; bool bStartPresentation = false; ErrCode nError = ERRCODE_NONE; @@ -327,7 +327,7 @@ BOOL DrawDocShell::Load( SfxMedium& rMedium ) { if( ( SFX_ITEM_SET == pSet->GetItemState(SID_PREVIEW ) ) && ( (SfxBoolItem&) ( pSet->Get( SID_PREVIEW ) ) ).GetValue() ) { - mpDoc->SetStarDrawPreviewMode( TRUE ); + mpDoc->SetStarDrawPreviewMode( sal_True ); } if( SFX_ITEM_SET == pSet->GetItemState(SID_DOC_STARTPRESENTATION)&& @@ -394,7 +394,7 @@ BOOL DrawDocShell::Load( SfxMedium& rMedium ) |* \************************************************************************/ -BOOL DrawDocShell::LoadFrom( SfxMedium& rMedium ) +sal_Bool DrawDocShell::LoadFrom( SfxMedium& rMedium ) { mbNewDocument = sal_False; @@ -402,7 +402,7 @@ BOOL DrawDocShell::LoadFrom( SfxMedium& rMedium ) if( mpViewShell ) pWait = new WaitObject( (Window*) mpViewShell->GetActiveWindow() ); - BOOL bRet = FALSE; + sal_Bool bRet = sal_False; /* // #90691# return to old behaviour (before #80365#): construct own medium @@ -458,22 +458,22 @@ BOOL DrawDocShell::LoadFrom( SfxMedium& rMedium ) |* \************************************************************************/ -BOOL DrawDocShell::ConvertFrom( SfxMedium& rMedium ) +sal_Bool DrawDocShell::ConvertFrom( SfxMedium& rMedium ) { mbNewDocument = sal_False; const String aFilterName( rMedium.GetFilter()->GetFilterName() ); - BOOL bRet = FALSE; + sal_Bool bRet = sal_False; bool bStartPresentation = false; - SetWaitCursor( TRUE ); + SetWaitCursor( sal_True ); SfxItemSet* pSet = rMedium.GetItemSet(); if( pSet ) { if( ( SFX_ITEM_SET == pSet->GetItemState(SID_PREVIEW ) ) && ( (SfxBoolItem&) ( pSet->Get( SID_PREVIEW ) ) ).GetValue() ) { - mpDoc->SetStarDrawPreviewMode( TRUE ); + mpDoc->SetStarDrawPreviewMode( sal_True ); } if( SFX_ITEM_SET == pSet->GetItemState(SID_DOC_STARTPRESENTATION)&& @@ -530,7 +530,7 @@ BOOL DrawDocShell::ConvertFrom( SfxMedium& rMedium ) if( pMediumSet ) pMediumSet->Put( SfxUInt16Item( SID_VIEW_ID, 5 ) ); } - SetWaitCursor( FALSE ); + SetWaitCursor( sal_False ); // tell SFX to change viewshell when in preview mode if( IsPreview() || bStartPresentation ) @@ -549,7 +549,7 @@ BOOL DrawDocShell::ConvertFrom( SfxMedium& rMedium ) |* \************************************************************************/ -BOOL DrawDocShell::Save() +sal_Bool DrawDocShell::Save() { mpDoc->StopWorkStartupDelay(); @@ -557,7 +557,7 @@ BOOL DrawDocShell::Save() if( GetCreateMode() == SFX_CREATE_MODE_STANDARD ) SfxObjectShell::SetVisArea( Rectangle() ); - BOOL bRet = SfxObjectShell::Save(); + sal_Bool bRet = SfxObjectShell::Save(); if( bRet ) { @@ -576,7 +576,7 @@ BOOL DrawDocShell::Save() |* \************************************************************************/ -BOOL DrawDocShell::SaveAs( SfxMedium& rMedium ) +sal_Bool DrawDocShell::SaveAs( SfxMedium& rMedium ) { mpDoc->StopWorkStartupDelay(); @@ -584,8 +584,8 @@ BOOL DrawDocShell::SaveAs( SfxMedium& rMedium ) if( GetCreateMode() == SFX_CREATE_MODE_STANDARD ) SfxObjectShell::SetVisArea( Rectangle() ); - UINT32 nVBWarning = ERRCODE_NONE; - BOOL bRet = SfxObjectShell::SaveAs( rMedium ); + sal_uInt32 nVBWarning = ERRCODE_NONE; + sal_Bool bRet = SfxObjectShell::SaveAs( rMedium ); if( bRet ) { @@ -606,9 +606,9 @@ BOOL DrawDocShell::SaveAs( SfxMedium& rMedium ) |* \************************************************************************/ -BOOL DrawDocShell::ConvertTo( SfxMedium& rMedium ) +sal_Bool DrawDocShell::ConvertTo( SfxMedium& rMedium ) { - BOOL bRet = FALSE; + sal_Bool bRet = sal_False; if( mpDoc->GetPageCount() ) { @@ -648,7 +648,7 @@ BOOL DrawDocShell::ConvertTo( SfxMedium& rMedium ) if( pFilter ) { - const ULONG nOldSwapMode = mpDoc->GetSwapGraphicsMode(); + const sal_uLong nOldSwapMode = mpDoc->GetSwapGraphicsMode(); mpDoc->SetSwapGraphicsMode( SDR_SWAPGRAPHICSMODE_TEMP ); @@ -670,13 +670,13 @@ BOOL DrawDocShell::ConvertTo( SfxMedium& rMedium ) |* \************************************************************************/ -BOOL DrawDocShell::SaveCompleted( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage ) +sal_Bool DrawDocShell::SaveCompleted( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage ) { - BOOL bRet = FALSE; + sal_Bool bRet = sal_False; if( SfxObjectShell::SaveCompleted(xStorage) ) { - mpDoc->NbcSetChanged( FALSE ); + mpDoc->NbcSetChanged( sal_False ); if( mpViewShell ) { @@ -695,14 +695,14 @@ BOOL DrawDocShell::SaveCompleted( const ::com::sun::star::uno::Reference< ::com: } } - bRet = TRUE; + bRet = sal_True; SfxViewFrame* pFrame = ( mpViewShell && mpViewShell->GetViewFrame() ) ? mpViewShell->GetViewFrame() : SfxViewFrame::Current(); if( pFrame ) - pFrame->GetBindings().Invalidate( SID_NAVIGATOR_STATE, TRUE, FALSE ); + pFrame->GetBindings().Invalidate( SID_NAVIGATOR_STATE, sal_True, sal_False ); } return bRet; } @@ -735,17 +735,17 @@ SfxStyleSheetBasePool* DrawDocShell::GetStyleSheetPool() |* \************************************************************************/ -BOOL DrawDocShell::GotoBookmark(const String& rBookmark) +sal_Bool DrawDocShell::GotoBookmark(const String& rBookmark) { - BOOL bFound = FALSE; + sal_Bool bFound = sal_False; if (mpViewShell && mpViewShell->ISA(DrawViewShell)) { DrawViewShell* pDrawViewShell = static_cast<DrawViewShell*>(mpViewShell); ViewShellBase& rBase (mpViewShell->GetViewShellBase()); - BOOL bIsMasterPage = sal_False; - USHORT nPageNumber = SDRPAGE_NOTFOUND; + sal_Bool bIsMasterPage = sal_False; + sal_uInt16 nPageNumber = SDRPAGE_NOTFOUND; SdrObject* pObj = NULL; rtl::OUString sBookmark( rBookmark ); @@ -801,7 +801,7 @@ BOOL DrawDocShell::GotoBookmark(const String& rBookmark) { // Jump to the bookmarked page. This is done in three steps. - bFound = TRUE; + bFound = sal_True; SdPage* pPage; if (bIsMasterPage) pPage = (SdPage*) mpDoc->GetMasterPage(nPageNumber); @@ -813,7 +813,7 @@ BOOL DrawDocShell::GotoBookmark(const String& rBookmark) PageKind eNewPageKind = pPage->GetPageKind(); if( (eNewPageKind != PK_STANDARD) && (mpDoc->GetDocumentType() == DOCUMENT_TYPE_DRAW) ) - return FALSE; + return sal_False; if (eNewPageKind != pDrawViewShell->GetPageKind()) { @@ -866,14 +866,14 @@ BOOL DrawDocShell::GotoBookmark(const String& rBookmark) if (eNewEditMode != pDrawViewShell->GetEditMode()) { // EditMode setzen - pDrawViewShell->ChangeEditMode(eNewEditMode, FALSE); + pDrawViewShell->ChangeEditMode(eNewEditMode, sal_False); } // Make the bookmarked page the current page. This is done // by using the API because this takes care of all the // little things to be done. Especially writing the view // data to the frame view (see bug #107803#). - USHORT nSdPgNum = (nPageNumber - 1) / 2; + sal_uInt16 nSdPgNum = (nPageNumber - 1) / 2; Reference<drawing::XDrawView> xController (rBase.GetController(), UNO_QUERY); if (xController.is()) { @@ -896,7 +896,7 @@ BOOL DrawDocShell::GotoBookmark(const String& rBookmark) pDrawViewShell->GetView()->UnmarkAll(); pDrawViewShell->GetView()->MarkObj( pObj, - pDrawViewShell->GetView()->GetSdrPageView(), FALSE); + pDrawViewShell->GetView()->GetSdrPageView(), sal_False); } } } @@ -905,7 +905,7 @@ BOOL DrawDocShell::GotoBookmark(const String& rBookmark) ? pDrawViewShell->GetViewFrame() : SfxViewFrame::Current() )->GetBindings(); - rBindings.Invalidate(SID_NAVIGATOR_STATE, TRUE, FALSE); + rBindings.Invalidate(SID_NAVIGATOR_STATE, sal_True, sal_False); rBindings.Invalidate(SID_NAVIGATOR_PAGENAME); } @@ -919,7 +919,7 @@ BOOL DrawDocShell::GotoBookmark(const String& rBookmark) \************************************************************************/ #include <tools/urlobj.hxx> -BOOL DrawDocShell::SaveAsOwnFormat( SfxMedium& rMedium ) +sal_Bool DrawDocShell::SaveAsOwnFormat( SfxMedium& rMedium ) { const SfxFilter* pFilter = rMedium.GetFilter(); @@ -936,7 +936,7 @@ BOOL DrawDocShell::SaveAsOwnFormat( SfxMedium& rMedium ) String aLayoutName; SfxStringItem* pLayoutItem; - if( rMedium.GetItemSet()->GetItemState(SID_TEMPLATE_NAME, FALSE, (const SfxPoolItem**) & pLayoutItem ) == SFX_ITEM_SET ) + if( rMedium.GetItemSet()->GetItemState(SID_TEMPLATE_NAME, sal_False, (const SfxPoolItem**) & pLayoutItem ) == SFX_ITEM_SET ) { aLayoutName = pLayoutItem->GetValue(); } diff --git a/sd/source/ui/docshell/docshell.cxx b/sd/source/ui/docshell/docshell.cxx index 9714d8599374..7a0c203a1e7a 100755 --- a/sd/source/ui/docshell/docshell.cxx +++ b/sd/source/ui/docshell/docshell.cxx @@ -106,9 +106,9 @@ SFX_IMPL_INTERFACE(DrawDocShell, SfxObjectShell, SdResId(0)) namespace sd { -#define POOL_BUFFER_SIZE (USHORT)32768 -#define BASIC_BUFFER_SIZE (USHORT)8192 -#define DOCUMENT_BUFFER_SIZE (USHORT)32768 +#define POOL_BUFFER_SIZE (sal_uInt16)32768 +#define BASIC_BUFFER_SIZE (sal_uInt16)8192 +#define DOCUMENT_BUFFER_SIZE (sal_uInt16)32768 GraphicFilter* GetGrfFilter(); @@ -134,7 +134,7 @@ SFX_IMPL_OBJECTFACTORY( void DrawDocShell::Construct( bool bClipboard ) { - mbInDestruction = FALSE; + mbInDestruction = sal_False; SetSlotFilter(); // setzt Filter zurueck mbOwnDocument = mpDoc == 0; @@ -161,7 +161,7 @@ void DrawDocShell::Construct( bool bClipboard ) \************************************************************************/ DrawDocShell::DrawDocShell(SfxObjectCreateMode eMode, - BOOL bDataObject, + sal_Bool bDataObject, DocumentType eDocumentType) : SfxObjectShell( eMode == SFX_CREATE_MODE_INTERNAL ? SFX_CREATE_MODE_EMBEDDED : eMode), mpDoc(NULL), @@ -172,7 +172,7 @@ DrawDocShell::DrawDocShell(SfxObjectCreateMode eMode, meDocType(eDocumentType), mpFilterSIDs(0), mbSdDataObj(bDataObject), - mbOwnPrinter(FALSE), + mbOwnPrinter(sal_False), mbNewDocument( sal_True ) { Construct( eMode == SFX_CREATE_MODE_INTERNAL ); @@ -184,7 +184,7 @@ DrawDocShell::DrawDocShell(SfxObjectCreateMode eMode, |* \************************************************************************/ -DrawDocShell::DrawDocShell( const sal_uInt64 nModelCreationFlags, BOOL bDataObject, DocumentType eDocumentType ) : +DrawDocShell::DrawDocShell( const sal_uInt64 nModelCreationFlags, sal_Bool bDataObject, DocumentType eDocumentType ) : SfxObjectShell( nModelCreationFlags ), mpDoc(NULL), mpUndoManager(NULL), @@ -194,10 +194,10 @@ DrawDocShell::DrawDocShell( const sal_uInt64 nModelCreationFlags, BOOL bDataObje meDocType(eDocumentType), mpFilterSIDs(0), mbSdDataObj(bDataObject), - mbOwnPrinter(FALSE), + mbOwnPrinter(sal_False), mbNewDocument( sal_True ) { - Construct( FALSE ); + Construct( sal_False ); } /************************************************************************* @@ -207,7 +207,7 @@ DrawDocShell::DrawDocShell( const sal_uInt64 nModelCreationFlags, BOOL bDataObje \************************************************************************/ DrawDocShell::DrawDocShell(SdDrawDocument* pDoc, SfxObjectCreateMode eMode, - BOOL bDataObject, + sal_Bool bDataObject, DocumentType eDocumentType) : SfxObjectShell(eMode == SFX_CREATE_MODE_INTERNAL ? SFX_CREATE_MODE_EMBEDDED : eMode), mpDoc(pDoc), @@ -218,7 +218,7 @@ DrawDocShell::DrawDocShell(SdDrawDocument* pDoc, SfxObjectCreateMode eMode, meDocType(eDocumentType), mpFilterSIDs(0), mbSdDataObj(bDataObject), - mbOwnPrinter(FALSE), + mbOwnPrinter(sal_False), mbNewDocument( sal_True ) { Construct( eMode == SFX_CREATE_MODE_INTERNAL ); @@ -238,7 +238,7 @@ DrawDocShell::~DrawDocShell() // may be usefull in other places as well. Broadcast(SfxSimpleHint(SFX_HINT_DYING)); - mbInDestruction = TRUE; + mbInDestruction = sal_True; SetDocShellFunction(0); @@ -255,7 +255,7 @@ DrawDocShell::~DrawDocShell() delete mpDoc; // damit der Navigator das Verschwinden des Dokuments mitbekommt - SfxBoolItem aItem(SID_NAVIGATOR_INIT, TRUE); + SfxBoolItem aItem(SID_NAVIGATOR_INIT, sal_True); SfxViewFrame* pFrame = mpViewShell ? mpViewShell->GetFrame() : GetFrame(); if( !pFrame ) @@ -276,11 +276,11 @@ void DrawDocShell::GetState(SfxItemSet &rSet) { SfxWhichIter aIter( rSet ); - USHORT nWhich = aIter.FirstWhich(); + sal_uInt16 nWhich = aIter.FirstWhich(); while ( nWhich ) { - USHORT nSlotId = SfxItemPool::IsWhich(nWhich) + sal_uInt16 nSlotId = SfxItemPool::IsWhich(nWhich) ? GetPool().GetSlotId(nWhich) : nWhich; @@ -294,7 +294,7 @@ void DrawDocShell::GetState(SfxItemSet &rSet) case SID_CLOSEDOC: { - BOOL bDisabled = FALSE; + sal_Bool bDisabled = sal_False; if (bDisabled) { rSet.DisableItem(SID_CLOSEDOC); @@ -308,7 +308,7 @@ void DrawDocShell::GetState(SfxItemSet &rSet) case SID_SEARCH_OPTIONS: { - UINT16 nOpt = SEARCH_OPTIONS_SEARCH | + sal_uInt16 nOpt = SEARCH_OPTIONS_SEARCH | SEARCH_OPTIONS_WHOLE_WORDS | SEARCH_OPTIONS_BACKWARDS | SEARCH_OPTIONS_REG_EXP | @@ -357,7 +357,7 @@ void DrawDocShell::GetState(SfxItemSet &rSet) } } -void DrawDocShell::InPlaceActivate( BOOL bActive ) +void DrawDocShell::InPlaceActivate( sal_Bool bActive ) { if( !bActive ) { @@ -437,7 +437,7 @@ void DrawDocShell::InPlaceActivate( BOOL bActive ) |* \************************************************************************/ -void DrawDocShell::Activate( BOOL bMDI) +void DrawDocShell::Activate( sal_Bool bMDI) { if (bMDI) { @@ -452,7 +452,7 @@ void DrawDocShell::Activate( BOOL bMDI) |* \************************************************************************/ -void DrawDocShell::Deactivate( BOOL ) +void DrawDocShell::Deactivate( sal_Bool ) { } @@ -526,14 +526,14 @@ void DrawDocShell::ApplySlotFilter() const pDispatcher->SetSlotFilter(); if( pDispatcher->GetBindings() ) - pDispatcher->GetBindings()->InvalidateAll( TRUE ); + pDispatcher->GetBindings()->InvalidateAll( sal_True ); } pTestViewShell = SfxViewShell::GetNext( *pTestViewShell ); } } -void DrawDocShell::SetModified( BOOL bSet /* = TRUE */ ) +void DrawDocShell::SetModified( sal_Bool bSet /* = sal_True */ ) { SfxObjectShell::SetModified( bSet ); diff --git a/sd/source/ui/docshell/grdocsh.cxx b/sd/source/ui/docshell/grdocsh.cxx index d5e7315144c0..ee236a3597d4 100644..100755 --- a/sd/source/ui/docshell/grdocsh.cxx +++ b/sd/source/ui/docshell/grdocsh.cxx @@ -67,7 +67,7 @@ SFX_IMPL_INTERFACE(GraphicDocShell, SfxObjectShell, SdResId(0)) SFX_IMPL_OBJECTFACTORY( GraphicDocShell, SvGlobalName(SO3_SDRAW_CLASSID_60), SFXOBJECTSHELL_STD_NORMAL, "sdraw" ) GraphicDocShell::GraphicDocShell(SfxObjectCreateMode eMode, - BOOL bDataObject, + sal_Bool bDataObject, DocumentType eDocType) : DrawDocShell(eMode, bDataObject, eDocType) { @@ -75,7 +75,7 @@ GraphicDocShell::GraphicDocShell(SfxObjectCreateMode eMode, } GraphicDocShell::GraphicDocShell(const sal_uInt64 nModelCreationFlags, - BOOL bDataObject, + sal_Bool bDataObject, DocumentType eDocType) : DrawDocShell(nModelCreationFlags, bDataObject, eDocType) { diff --git a/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.hxx b/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.hxx index 3d144bb08cda..3dd151ae3d29 100644..100755 --- a/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.hxx +++ b/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.hxx @@ -80,7 +80,7 @@ public: void AddRequest (const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::framework::XConfigurationChangeRequest>& rxRequest); - /** Returns </TRUE> when the queue is empty. + /** Returns </sal_True> when the queue is empty. */ bool IsEmpty (void) const; diff --git a/sd/source/ui/framework/configuration/ConfigurationClassifier.hxx b/sd/source/ui/framework/configuration/ConfigurationClassifier.hxx index b19f8c1459a5..b19f8c1459a5 100644..100755 --- a/sd/source/ui/framework/configuration/ConfigurationClassifier.hxx +++ b/sd/source/ui/framework/configuration/ConfigurationClassifier.hxx diff --git a/sd/source/ui/framework/configuration/ConfigurationUpdater.hxx b/sd/source/ui/framework/configuration/ConfigurationUpdater.hxx index a9f3e09f2a64..8e59c3ec8585 100755 --- a/sd/source/ui/framework/configuration/ConfigurationUpdater.hxx +++ b/sd/source/ui/framework/configuration/ConfigurationUpdater.hxx @@ -115,15 +115,15 @@ private: css::uno::Reference< css::drawing::framework::XConfiguration> mxRequestedConfiguration; - /** This flag is set to </TRUE> when an update of the current + /** This flag is set to </sal_True> when an update of the current configurtion was requested (because the last request in the queue was processed) but could not be exected because the ConfigurationController was locked. A call to UpdateConfiguration() - resets the flag to </FALSE>. + resets the flag to </sal_False>. */ bool mbUpdatePending; - /** This flag is set to </TRUE> while the UpdateConfiguration() method + /** This flag is set to </sal_True> while the UpdateConfiguration() method is running. It is used to prevent reentrance problems with this method. */ diff --git a/sd/source/ui/framework/factories/BasicPaneFactory.cxx b/sd/source/ui/framework/factories/BasicPaneFactory.cxx index f406501bd114..ed528be01a24 100755 --- a/sd/source/ui/framework/factories/BasicPaneFactory.cxx +++ b/sd/source/ui/framework/factories/BasicPaneFactory.cxx @@ -514,7 +514,7 @@ Reference<XResource> BasicPaneFactory::CreateChildWindowPane ( if (mpViewShellBase != NULL) { // Create the corresponding shell and determine the id of the child window. - USHORT nChildWindowId = 0; + sal_uInt16 nChildWindowId = 0; ::std::auto_ptr<SfxShell> pShell; switch (rDescriptor.mePaneId) { diff --git a/sd/source/ui/framework/factories/BasicViewFactory.cxx b/sd/source/ui/framework/factories/BasicViewFactory.cxx index 2dd7689f2b39..902c6f48a9a7 100755 --- a/sd/source/ui/framework/factories/BasicViewFactory.cxx +++ b/sd/source/ui/framework/factories/BasicViewFactory.cxx @@ -607,7 +607,7 @@ void BasicViewFactory::ActivateCenterView ( // have to request a resize now. rpDescriptor->mpViewShell->UIFeatureChanged(); if (mpBase->GetDocShell()->IsInPlaceActive()) - mpBase->GetViewFrame()->Resize(TRUE); + mpBase->GetViewFrame()->Resize(sal_True); mpBase->GetDrawController().SetSubController( rpDescriptor->mpViewShell->CreateSubController()); diff --git a/sd/source/ui/framework/factories/ChildWindowPane.cxx b/sd/source/ui/framework/factories/ChildWindowPane.cxx index 5e4e6df987f0..982f96e5e050 100755 --- a/sd/source/ui/framework/factories/ChildWindowPane.cxx +++ b/sd/source/ui/framework/factories/ChildWindowPane.cxx @@ -45,7 +45,7 @@ namespace sd { namespace framework { ChildWindowPane::ChildWindowPane ( const Reference<XResourceId>& rxPaneId, - USHORT nChildWindowId, + sal_uInt16 nChildWindowId, ViewShellBase& rViewShellBase, ::std::auto_ptr<SfxShell> pShell) : ChildWindowPaneInterfaceBase(rxPaneId,(::Window*)NULL), @@ -67,7 +67,7 @@ ChildWindowPane::ChildWindowPane ( { // The ViewShellBase has already been activated. Make // the child window visible as soon as possible. - pViewFrame->SetChildWindow(mnChildWindowId, TRUE); + pViewFrame->SetChildWindow(mnChildWindowId, sal_True); OSL_TRACE("ChildWindowPane:activating now"); } else @@ -89,7 +89,7 @@ ChildWindowPane::ChildWindowPane ( // The ViewShellBase has not yet been activated. Hide the // window and wait a little before it is made visible. See // comments in the GetWindow() method for an explanation. - pViewFrame->SetChildWindow(mnChildWindowId, FALSE); + pViewFrame->SetChildWindow(mnChildWindowId, sal_False); OSL_TRACE("ChildWindowPane:base not active"); } } @@ -111,7 +111,7 @@ void ChildWindowPane::Hide (void) if (pViewFrame != NULL) if (pViewFrame->KnowsChildWindow(mnChildWindowId)) if (pViewFrame->HasChildWindow(mnChildWindowId)) - pViewFrame->SetChildWindow(mnChildWindowId, FALSE); + pViewFrame->SetChildWindow(mnChildWindowId, sal_False); // Release the window because when the child window is shown again it // may use a different window. @@ -167,7 +167,7 @@ void SAL_CALL ChildWindowPane::disposing (void) if ( ! pViewFrame->KnowsChildWindow(mnChildWindowId)) break; - pViewFrame->SetChildWindow(mnChildWindowId, TRUE); + pViewFrame->SetChildWindow(mnChildWindowId, sal_True); SfxChildWindow* pChildWindow = pViewFrame->GetChildWindow(mnChildWindowId); if (pChildWindow == NULL) if (pViewFrame->HasChildWindow(mnChildWindowId)) @@ -175,7 +175,7 @@ void SAL_CALL ChildWindowPane::disposing (void) // The child window is not yet visible. Ask the view frame // to show it and try again to get access to the child // window. - pViewFrame->ShowChildWindow(mnChildWindowId, TRUE); + pViewFrame->ShowChildWindow(mnChildWindowId, sal_True); pChildWindow = pViewFrame->GetChildWindow(mnChildWindowId); } diff --git a/sd/source/ui/framework/factories/ChildWindowPane.hxx b/sd/source/ui/framework/factories/ChildWindowPane.hxx index 4d2f154a327f..2b2b2d395e09 100644..100755 --- a/sd/source/ui/framework/factories/ChildWindowPane.hxx +++ b/sd/source/ui/framework/factories/ChildWindowPane.hxx @@ -76,7 +76,7 @@ public: ChildWindowPane ( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::framework::XResourceId>& rxPaneId, - USHORT nChildWindowId, + sal_uInt16 nChildWindowId, ViewShellBase& rViewShellBase, ::std::auto_ptr<SfxShell> pShell); virtual ~ChildWindowPane (void) throw(); @@ -115,7 +115,7 @@ public: private: ::com::sun::star::uno::Reference<com::sun::star::drawing::framework::XResourceId> mxPaneId; - USHORT mnChildWindowId; + sal_uInt16 mnChildWindowId; ViewShellBase& mrViewShellBase; ::std::auto_ptr<SfxShell> mpShell; diff --git a/sd/source/ui/framework/factories/FrameWindowPane.hxx b/sd/source/ui/framework/factories/FrameWindowPane.hxx index 9fbc153f59ce..9fbc153f59ce 100644..100755 --- a/sd/source/ui/framework/factories/FrameWindowPane.hxx +++ b/sd/source/ui/framework/factories/FrameWindowPane.hxx diff --git a/sd/source/ui/framework/factories/FullScreenPane.cxx b/sd/source/ui/framework/factories/FullScreenPane.cxx index 74088422b4ab..92c85c1b76b4 100644..100755 --- a/sd/source/ui/framework/factories/FullScreenPane.cxx +++ b/sd/source/ui/framework/factories/FullScreenPane.cxx @@ -73,7 +73,7 @@ FullScreenPane::FullScreenPane ( return; // Create a new top-leve window that is displayed full screen. - mpWorkWindow->ShowFullScreenMode(TRUE, nScreenNumber); + mpWorkWindow->ShowFullScreenMode(sal_True, nScreenNumber); // For debugging (non-fullscreen) use mpWorkWindow->SetScreenNumber(nScreenNumber); mpWorkWindow->SetMenuBarMode(MENUBAR_MODE_HIDE); mpWorkWindow->SetBorderStyle(WINDOW_BORDER_REMOVEBORDER); @@ -178,7 +178,7 @@ Reference<accessibility::XAccessible> SAL_CALL FullScreenPane::getAccessible (vo ThrowIfDisposed(); if (mpWorkWindow != NULL) - return mpWorkWindow->GetAccessible(FALSE); + return mpWorkWindow->GetAccessible(sal_False); else return NULL; } diff --git a/sd/source/ui/framework/factories/Pane.cxx b/sd/source/ui/framework/factories/Pane.cxx index 94081f24b733..a50c3d52b91a 100644..100755 --- a/sd/source/ui/framework/factories/Pane.cxx +++ b/sd/source/ui/framework/factories/Pane.cxx @@ -149,7 +149,7 @@ Reference<accessibility::XAccessible> SAL_CALL Pane::getAccessible (void) ThrowIfDisposed(); ::Window* pWindow = GetWindow(); if (pWindow != NULL) - return pWindow->GetAccessible(FALSE); + return pWindow->GetAccessible(sal_False); else return NULL; } diff --git a/sd/source/ui/framework/module/ShellStackGuard.hxx b/sd/source/ui/framework/module/ShellStackGuard.hxx index 694e7fe5719f..694e7fe5719f 100644..100755 --- a/sd/source/ui/framework/module/ShellStackGuard.hxx +++ b/sd/source/ui/framework/module/ShellStackGuard.hxx diff --git a/sd/source/ui/framework/tools/FrameworkHelper.cxx b/sd/source/ui/framework/tools/FrameworkHelper.cxx index 8c325ff202af..618919dc32f5 100755 --- a/sd/source/ui/framework/tools/FrameworkHelper.cxx +++ b/sd/source/ui/framework/tools/FrameworkHelper.cxx @@ -654,10 +654,10 @@ ViewShell::ShellType FrameworkHelper::GetViewId (const rtl::OUString& rsViewURL) void FrameworkHelper::HandleModeChangeSlot ( - ULONG nSlotId, + sal_uLong nSlotId, SfxRequest& rRequest) { - BOOL bIsActive = TRUE; + sal_Bool bIsActive = sal_True; if ( ! mxConfigurationController.is()) return; @@ -676,8 +676,8 @@ void FrameworkHelper::HandleModeChangeSlot ( SFX_REQUEST_ARG (rRequest, pIsActive, SfxBoolItem, - (USHORT)nSlotId, - FALSE); + (sal_uInt16)nSlotId, + sal_False); bIsActive = pIsActive->GetValue (); } } diff --git a/sd/source/ui/func/bulmaper.cxx b/sd/source/ui/func/bulmaper.cxx index 1a6e8992a10e..a7f7cbbfd017 100644..100755 --- a/sd/source/ui/func/bulmaper.cxx +++ b/sd/source/ui/func/bulmaper.cxx @@ -65,16 +65,16 @@ void SdBulletMapper::PreMapNumBulletForDialog( SfxItemSet& rSet ) { - if( SFX_ITEM_SET == rSet.GetItemState( EE_PARA_NUMBULLET, FALSE ) ) + if( SFX_ITEM_SET == rSet.GetItemState( EE_PARA_NUMBULLET, sal_False ) ) { SvxNumRule* pRule = ((SvxNumBulletItem*)rSet.GetItem( EE_PARA_NUMBULLET ))->GetNumRule(); if(pRule && pRule->GetNumRuleType() == SVX_RULETYPE_PRESENTATION_NUMBERING) { // 10er Bullet Item auf 9er Item mappen - SvxNumRule aNewRule( pRule->GetFeatureFlags(), 9, FALSE, SVX_RULETYPE_PRESENTATION_NUMBERING ); + SvxNumRule aNewRule( pRule->GetFeatureFlags(), 9, sal_False, SVX_RULETYPE_PRESENTATION_NUMBERING ); - for( USHORT i = 0; i < 9; i++ ) + for( sal_uInt16 i = 0; i < 9; i++ ) aNewRule.SetLevel(i, pRule->GetLevel(i)); rSet.Put( SvxNumBulletItem( aNewRule, EE_PARA_NUMBULLET ) ); @@ -84,7 +84,7 @@ void SdBulletMapper::PreMapNumBulletForDialog( SfxItemSet& rSet ) void SdBulletMapper::PostMapNumBulletForDialog( SfxItemSet& rSet ) { - if( SFX_ITEM_SET == rSet.GetItemState( EE_PARA_NUMBULLET, FALSE ) ) + if( SFX_ITEM_SET == rSet.GetItemState( EE_PARA_NUMBULLET, sal_False ) ) { SvxNumRule* pRule = ((SvxNumBulletItem*)rSet.GetItem( EE_PARA_NUMBULLET ))->GetNumRule(); @@ -94,9 +94,9 @@ void SdBulletMapper::PostMapNumBulletForDialog( SfxItemSet& rSet ) if(pRule->GetNumRuleType() == SVX_RULETYPE_PRESENTATION_NUMBERING) { // 9er Bullet Item auf 10er Item mappen - SvxNumRule aNewRule( pRule->GetFeatureFlags(), 10, FALSE, SVX_RULETYPE_PRESENTATION_NUMBERING ); + SvxNumRule aNewRule( pRule->GetFeatureFlags(), 10, sal_False, SVX_RULETYPE_PRESENTATION_NUMBERING ); - for( USHORT i = 0; i < 9; i++ ) + for( sal_uInt16 i = 0; i < 9; i++ ) aNewRule.SetLevel(i, pRule->GetLevel(i)); rSet.Put( SvxNumBulletItem( aNewRule, EE_PARA_NUMBULLET ) ); @@ -108,8 +108,8 @@ void SdBulletMapper::PostMapNumBulletForDialog( SfxItemSet& rSet ) void SdBulletMapper::MapFontsInNumRule( SvxNumRule& aNumRule, const SfxItemSet& rSet ) { - const USHORT nCount = aNumRule.GetLevelCount(); - for( USHORT nLevel = 0; nLevel < nCount; nLevel++ ) + const sal_uInt16 nCount = aNumRule.GetLevelCount(); + for( sal_uInt16 nLevel = 0; nLevel < nCount; nLevel++ ) { const SvxNumberFormat& rSrcLevel = aNumRule.GetLevel(nLevel); SvxNumberFormat aNewLevel( rSrcLevel ); @@ -143,22 +143,22 @@ void SdBulletMapper::MapFontsInNumRule( SvxNumRule& aNumRule, const SfxItemSet& Font aMyFont; const SvxFontItem& rFItem = - (SvxFontItem&)rSet.Get(GetWhich( (USHORT)nFontID )); + (SvxFontItem&)rSet.Get(GetWhich( (sal_uInt16)nFontID )); aMyFont.SetFamily(rFItem.GetFamily()); aMyFont.SetName(rFItem.GetFamilyName()); aMyFont.SetCharSet(rFItem.GetCharSet()); aMyFont.SetPitch(rFItem.GetPitch()); const SvxFontHeightItem& rFHItem = - (SvxFontHeightItem&)rSet.Get(GetWhich( (USHORT)nFontHeightID )); + (SvxFontHeightItem&)rSet.Get(GetWhich( (sal_uInt16)nFontHeightID )); aMyFont.SetSize(Size(0, rFHItem.GetHeight())); const SvxWeightItem& rWItem = - (SvxWeightItem&)rSet.Get(GetWhich( (USHORT)nWeightID )); + (SvxWeightItem&)rSet.Get(GetWhich( (sal_uInt16)nWeightID )); aMyFont.SetWeight(rWItem.GetWeight()); const SvxPostureItem& rPItem = - (SvxPostureItem&)rSet.Get(GetWhich( (USHORT)nPostureID )); + (SvxPostureItem&)rSet.Get(GetWhich( (sal_uInt16)nPostureID )); aMyFont.SetItalic(rPItem.GetPosture()); const SvxUnderlineItem& rUItem = (SvxUnderlineItem&)rSet.Get(GetWhich(SID_ATTR_CHAR_UNDERLINE)); diff --git a/sd/source/ui/func/fuarea.cxx b/sd/source/ui/func/fuarea.cxx index 31c4c1358d3a..72596095fbae 100644..100755 --- a/sd/source/ui/func/fuarea.cxx +++ b/sd/source/ui/func/fuarea.cxx @@ -89,7 +89,7 @@ void FuArea::DoExecute( SfxRequest& rReq ) } // Attribute wurden geaendert, Listboxes in Objectbars muessen aktualisiert werden - static USHORT SidArray[] = { + static sal_uInt16 SidArray[] = { SID_ATTR_FILL_STYLE, SID_ATTR_FILL_COLOR, SID_ATTR_FILL_GRADIENT, diff --git a/sd/source/ui/func/fubullet.cxx b/sd/source/ui/func/fubullet.cxx index 92aa2d3cc9f3..259a44a66591 100755 --- a/sd/source/ui/func/fubullet.cxx +++ b/sd/source/ui/func/fubullet.cxx @@ -140,7 +140,7 @@ void FuBullet::InsertFormattingMark( sal_Unicode cMark ) { // prevent flickering pOV->HideCursor(); - pOL->SetUpdateMode(FALSE); + pOL->SetUpdateMode(sal_False); // remove old selected text pOV->InsertText( aEmptyStr ); @@ -152,7 +152,7 @@ void FuBullet::InsertFormattingMark( sal_Unicode cMark ) // insert given text String aStr( cMark ); - pOV->InsertText( cMark, TRUE); + pOV->InsertText( cMark, sal_True); ESelection aSel = pOV->GetSelection(); aSel.nStartPara = aSel.nEndPara; @@ -162,7 +162,7 @@ void FuBullet::InsertFormattingMark( sal_Unicode cMark ) rUndoMgr.LeaveListAction(); // restart repainting - pOL->SetUpdateMode(TRUE); + pOL->SetUpdateMode(sal_True); pOV->ShowCursor(); } } @@ -172,7 +172,7 @@ void FuBullet::InsertSpecialCharacter( SfxRequest& rReq ) const SfxItemSet *pArgs = rReq.GetArgs(); const SfxPoolItem* pItem = 0; if( pArgs ) - pArgs->GetItemState(mpDoc->GetPool().GetWhich(SID_CHARMAP), FALSE, &pItem); + pArgs->GetItemState(mpDoc->GetPool().GetWhich(SID_CHARMAP), sal_False, &pItem); String aChars, aFontName; Font aFont; @@ -180,7 +180,7 @@ void FuBullet::InsertSpecialCharacter( SfxRequest& rReq ) { aChars = ((const SfxStringItem*)pItem)->GetValue(); const SfxPoolItem* pFtItem = NULL; - pArgs->GetItemState( mpDoc->GetPool().GetWhich(SID_ATTR_SPECIALCHAR), FALSE, &pFtItem); + pArgs->GetItemState( mpDoc->GetPool().GetWhich(SID_ATTR_SPECIALCHAR), sal_False, &pFtItem); const SfxStringItem* pFontItem = PTR_CAST( SfxStringItem, pFtItem ); if ( pFontItem ) { @@ -200,7 +200,7 @@ void FuBullet::InsertSpecialCharacter( SfxRequest& rReq ) if (!aChars.Len() ) { SfxAllItemSet aSet( mpDoc->GetPool() ); - aSet.Put( SfxBoolItem( FN_PARAM_1, FALSE ) ); + aSet.Put( SfxBoolItem( FN_PARAM_1, sal_False ) ); SfxItemSet aFontAttr( mpDoc->GetPool() ); mpView->GetAttributes( aFontAttr ); @@ -218,11 +218,11 @@ void FuBullet::InsertSpecialCharacter( SfxRequest& rReq ) // Wenn Zeichen selektiert ist kann es angezeigt werden // pDLg->SetFont( ); // pDlg->SetChar( ); - USHORT nResult = pDlg->Execute(); + sal_uInt16 nResult = pDlg->Execute(); if( nResult == RET_OK ) { - SFX_ITEMSET_ARG( pDlg->GetOutputItemSet(), pCItem, SfxStringItem, SID_CHARMAP, FALSE ); - SFX_ITEMSET_ARG( pDlg->GetOutputItemSet(), pFItem, SvxFontItem, SID_ATTR_CHAR_FONT, FALSE ); + SFX_ITEMSET_ARG( pDlg->GetOutputItemSet(), pCItem, SfxStringItem, SID_CHARMAP, sal_False ); + SFX_ITEMSET_ARG( pDlg->GetOutputItemSet(), pFItem, SvxFontItem, SID_ATTR_CHAR_FONT, sal_False ); if ( pFItem ) { aFont.SetName( pFItem->GetFamilyName() ); @@ -264,7 +264,7 @@ void FuBullet::InsertSpecialCharacter( SfxRequest& rReq ) { // nicht flackern pOV->HideCursor(); - pOL->SetUpdateMode(FALSE); + pOL->SetUpdateMode(sal_False); // alte Attributierung merken; // dazu vorher selektierten Bereich loeschen, denn der muss eh weg @@ -279,7 +279,7 @@ void FuBullet::InsertSpecialCharacter( SfxRequest& rReq ) ::svl::IUndoManager& rUndoMgr = pOL->GetUndoManager(); rUndoMgr.EnterListAction(String(SdResId(STR_UNDO_INSERT_SPECCHAR)), aEmptyStr ); - pOV->InsertText(aChars, TRUE); + pOV->InsertText(aChars, sal_True); // attributieren (Font setzen) SfxItemSet aSet(pOL->GetEmptyItemSet()); @@ -303,7 +303,7 @@ void FuBullet::InsertSpecialCharacter( SfxRequest& rReq ) rUndoMgr.LeaveListAction(); // ab jetzt wieder anzeigen - pOL->SetUpdateMode(TRUE); + pOL->SetUpdateMode(sal_True); pOV->ShowCursor(); } } diff --git a/sd/source/ui/func/fuchar.cxx b/sd/source/ui/func/fuchar.cxx index f43b33c8318a..d9daa4e325b4 100644..100755 --- a/sd/source/ui/func/fuchar.cxx +++ b/sd/source/ui/func/fuchar.cxx @@ -85,13 +85,13 @@ void FuChar::DoExecute( SfxRequest& rReq ) SfxItemSet aNewAttr( mpViewShell->GetPool(), EE_ITEMS_START, EE_ITEMS_END ); - aNewAttr.Put( aEditAttr, FALSE ); + aNewAttr.Put( aEditAttr, sal_False ); SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create(); SfxAbstractTabDialog* pDlg = pFact ? pFact->CreateSdTabCharDialog( NULL, &aNewAttr, mpDoc->GetDocSh() ) : 0; if( pDlg ) { - USHORT nResult = pDlg->Execute(); + sal_uInt16 nResult = pDlg->Execute(); if( nResult == RET_OK ) { @@ -110,7 +110,7 @@ void FuChar::DoExecute( SfxRequest& rReq ) mpView->SetAttributes(*pArgs); // invalidieren der Slots, die in der DrTxtObjBar auftauchen - static USHORT SidArray[] = { + static sal_uInt16 SidArray[] = { SID_ATTR_CHAR_FONT, SID_ATTR_CHAR_POSTURE, SID_ATTR_CHAR_WEIGHT, @@ -126,9 +126,9 @@ void FuChar::DoExecute( SfxRequest& rReq ) if( mpDoc->GetOnlineSpell() ) { const SfxPoolItem* pItem; - if( SFX_ITEM_SET == pArgs->GetItemState(EE_CHAR_LANGUAGE, FALSE, &pItem ) || - SFX_ITEM_SET == pArgs->GetItemState(EE_CHAR_LANGUAGE_CJK, FALSE, &pItem ) || - SFX_ITEM_SET == pArgs->GetItemState(EE_CHAR_LANGUAGE_CTL, FALSE, &pItem ) ) + if( SFX_ITEM_SET == pArgs->GetItemState(EE_CHAR_LANGUAGE, sal_False, &pItem ) || + SFX_ITEM_SET == pArgs->GetItemState(EE_CHAR_LANGUAGE_CJK, sal_False, &pItem ) || + SFX_ITEM_SET == pArgs->GetItemState(EE_CHAR_LANGUAGE_CTL, sal_False, &pItem ) ) { mpDoc->StopOnlineSpelling(); mpDoc->StartOnlineSpelling(); diff --git a/sd/source/ui/func/fucon3d.cxx b/sd/source/ui/func/fucon3d.cxx index ef0827cc6efc..2b34ac183661 100644..100755 --- a/sd/source/ui/func/fucon3d.cxx +++ b/sd/source/ui/func/fucon3d.cxx @@ -131,7 +131,7 @@ E3dCompoundObject* FuConstruct3dObject::ImpCreateBasic3DShape() case SID_3D_SHELL: { - XPolygon aXPoly(Point (0, 1250), 2500, 2500, 0, 900, FALSE); + XPolygon aXPoly(Point (0, 1250), 2500, 2500, 0, 900, sal_False); aXPoly.Scale(5.0, 5.0); ::basegfx::B2DPolygon aB2DPolygon(aXPoly.getB2DPolygon()); @@ -143,13 +143,13 @@ E3dCompoundObject* FuConstruct3dObject::ImpCreateBasic3DShape() // Dies ist ein offenes Objekt, muss daher defaultmaessig // doppelseitig behandelt werden - p3DObj->SetMergedItem(Svx3DDoubleSidedItem(TRUE)); + p3DObj->SetMergedItem(Svx3DDoubleSidedItem(sal_True)); break; } case SID_3D_HALF_SPHERE: { - XPolygon aXPoly(Point (0, 1250), 2500, 2500, 0, 900, FALSE); + XPolygon aXPoly(Point (0, 1250), 2500, 2500, 0, 900, sal_False); aXPoly.Scale(5.0, 5.0); aXPoly.Insert(0, Point (2400*5, 1250*5), XPOLY_NORMAL); @@ -326,16 +326,16 @@ void FuConstruct3dObject::ImpPrepareBasic3DShape(E3dCompoundObject* p3DObj, E3dS pScene->SetMergedItemSetAndBroadcast(aAttr); } -BOOL FuConstruct3dObject::MouseButtonDown(const MouseEvent& rMEvt) +sal_Bool FuConstruct3dObject::MouseButtonDown(const MouseEvent& rMEvt) { - BOOL bReturn = FuConstruct::MouseButtonDown(rMEvt); + sal_Bool bReturn = FuConstruct::MouseButtonDown(rMEvt); if ( rMEvt.IsLeft() && !mpView->IsAction() ) { Point aPnt( mpWindow->PixelToLogic( rMEvt.GetPosPixel() ) ); mpWindow->CaptureMouse(); - USHORT nDrgLog = USHORT ( mpWindow->PixelToLogic(Size(DRGPIX,0)).Width() ); + sal_uInt16 nDrgLog = sal_uInt16 ( mpWindow->PixelToLogic(Size(DRGPIX,0)).Width() ); E3dCompoundObject* p3DObj = NULL; @@ -372,7 +372,7 @@ BOOL FuConstruct3dObject::MouseButtonDown(const MouseEvent& rMEvt) |* \************************************************************************/ -BOOL FuConstruct3dObject::MouseMove(const MouseEvent& rMEvt) +sal_Bool FuConstruct3dObject::MouseMove(const MouseEvent& rMEvt) { return FuConstruct::MouseMove(rMEvt); } @@ -383,15 +383,15 @@ BOOL FuConstruct3dObject::MouseMove(const MouseEvent& rMEvt) |* \************************************************************************/ -BOOL FuConstruct3dObject::MouseButtonUp(const MouseEvent& rMEvt) +sal_Bool FuConstruct3dObject::MouseButtonUp(const MouseEvent& rMEvt) { - BOOL bReturn = FALSE; + sal_Bool bReturn = sal_False; if ( mpView->IsCreateObj() && rMEvt.IsLeft() ) { Point aPnt( mpWindow->PixelToLogic( rMEvt.GetPosPixel() ) ); mpView->EndCreateObj(SDRCREATE_FORCEEND); - bReturn = TRUE; + bReturn = sal_True; } bReturn = FuConstruct::MouseButtonUp(rMEvt) || bReturn; @@ -406,12 +406,12 @@ BOOL FuConstruct3dObject::MouseButtonUp(const MouseEvent& rMEvt) |* |* Tastaturereignisse bearbeiten |* -|* Wird ein KeyEvent bearbeitet, so ist der Return-Wert TRUE, andernfalls -|* FALSE. +|* Wird ein KeyEvent bearbeitet, so ist der Return-Wert sal_True, andernfalls +|* sal_False. |* \************************************************************************/ -BOOL FuConstruct3dObject::KeyInput(const KeyEvent& rKEvt) +sal_Bool FuConstruct3dObject::KeyInput(const KeyEvent& rKEvt) { return( FuConstruct::KeyInput(rKEvt) ); } @@ -468,7 +468,7 @@ SdrObject* FuConstruct3dObject::CreateDefaultObject(const sal_uInt16 nID, const // copied code from E3dView::InitScene double fCamZ(aVolume.getMaxZ() + ((fW + fH) / 4.0)); Camera3D aCam(pScene->GetCamera()); - aCam.SetAutoAdjustProjection(FALSE); + aCam.SetAutoAdjustProjection(sal_False); aCam.SetViewWindow(- fW / 2, - fH / 2, fW, fH); ::basegfx::B3DPoint aLookAt; double fDefaultCamPosZ = mpView->GetDefaultCamPosZ(); diff --git a/sd/source/ui/func/fuconarc.cxx b/sd/source/ui/func/fuconarc.cxx index 7a7ab2b9dc2e..3cb1a8c4ee0b 100644..100755 --- a/sd/source/ui/func/fuconarc.cxx +++ b/sd/source/ui/func/fuconarc.cxx @@ -95,12 +95,12 @@ void FuConstructArc::DoExecute( SfxRequest& rReq ) if (pArgs) { - SFX_REQUEST_ARG (rReq, pCenterX, SfxUInt32Item, ID_VAL_CENTER_X, FALSE); - SFX_REQUEST_ARG (rReq, pCenterY, SfxUInt32Item, ID_VAL_CENTER_Y, FALSE); - SFX_REQUEST_ARG (rReq, pAxisX, SfxUInt32Item, ID_VAL_AXIS_X, FALSE); - SFX_REQUEST_ARG (rReq, pAxisY, SfxUInt32Item, ID_VAL_AXIS_Y, FALSE); - SFX_REQUEST_ARG (rReq, pPhiStart, SfxUInt32Item, ID_VAL_ANGLESTART, FALSE); - SFX_REQUEST_ARG (rReq, pPhiEnd, SfxUInt32Item, ID_VAL_ANGLEEND, FALSE); + SFX_REQUEST_ARG (rReq, pCenterX, SfxUInt32Item, ID_VAL_CENTER_X, sal_False); + SFX_REQUEST_ARG (rReq, pCenterY, SfxUInt32Item, ID_VAL_CENTER_Y, sal_False); + SFX_REQUEST_ARG (rReq, pAxisX, SfxUInt32Item, ID_VAL_AXIS_X, sal_False); + SFX_REQUEST_ARG (rReq, pAxisY, SfxUInt32Item, ID_VAL_AXIS_Y, sal_False); + SFX_REQUEST_ARG (rReq, pPhiStart, SfxUInt32Item, ID_VAL_ANGLESTART, sal_False); + SFX_REQUEST_ARG (rReq, pPhiEnd, SfxUInt32Item, ID_VAL_ANGLEEND, sal_False); Rectangle aNewRectangle (pCenterX->GetValue () - pAxisX->GetValue () / 2, pCenterY->GetValue () - pAxisY->GetValue () / 2, @@ -125,15 +125,15 @@ void FuConstructArc::DoExecute( SfxRequest& rReq ) |* \************************************************************************/ -BOOL FuConstructArc::MouseButtonDown( const MouseEvent& rMEvt ) +sal_Bool FuConstructArc::MouseButtonDown( const MouseEvent& rMEvt ) { - BOOL bReturn = FuConstruct::MouseButtonDown( rMEvt ); + sal_Bool bReturn = FuConstruct::MouseButtonDown( rMEvt ); if ( rMEvt.IsLeft() && !mpView->IsAction() ) { Point aPnt( mpWindow->PixelToLogic( rMEvt.GetPosPixel() ) ); mpWindow->CaptureMouse(); - USHORT nDrgLog = USHORT ( mpWindow->PixelToLogic(Size(DRGPIX,0)).Width() ); + sal_uInt16 nDrgLog = sal_uInt16 ( mpWindow->PixelToLogic(Size(DRGPIX,0)).Width() ); mpView->BegCreateObj(aPnt, (OutputDevice*) NULL, nDrgLog); SdrObject* pObj = mpView->GetCreateObj(); @@ -143,11 +143,11 @@ BOOL FuConstructArc::MouseButtonDown( const MouseEvent& rMEvt ) SfxItemSet aAttr(mpDoc->GetPool()); SetStyleSheet(aAttr, pObj); -//-/ pObj->NbcSetAttributes(aAttr, FALSE); +//-/ pObj->NbcSetAttributes(aAttr, sal_False); pObj->SetMergedItemSet(aAttr); } - bReturn = TRUE; + bReturn = sal_True; } return bReturn; } @@ -158,7 +158,7 @@ BOOL FuConstructArc::MouseButtonDown( const MouseEvent& rMEvt ) |* \************************************************************************/ -BOOL FuConstructArc::MouseMove( const MouseEvent& rMEvt ) +sal_Bool FuConstructArc::MouseMove( const MouseEvent& rMEvt ) { return FuConstruct::MouseMove(rMEvt); } @@ -169,26 +169,26 @@ BOOL FuConstructArc::MouseMove( const MouseEvent& rMEvt ) |* \************************************************************************/ -BOOL FuConstructArc::MouseButtonUp( const MouseEvent& rMEvt ) +sal_Bool FuConstructArc::MouseButtonUp( const MouseEvent& rMEvt ) { - BOOL bReturn = FALSE; - BOOL bCreated = FALSE; + sal_Bool bReturn = sal_False; + sal_Bool bCreated = sal_False; if ( mpView->IsCreateObj() && rMEvt.IsLeft() ) { Point aPnt( mpWindow->PixelToLogic( rMEvt.GetPosPixel() ) ); - ULONG nCount = mpView->GetSdrPageView()->GetObjList()->GetObjCount(); + sal_uLong nCount = mpView->GetSdrPageView()->GetObjList()->GetObjCount(); if (mpView->EndCreateObj(SDRCREATE_NEXTPOINT) ) { if (nCount != mpView->GetSdrPageView()->GetObjList()->GetObjCount()) { - bCreated = TRUE; + bCreated = sal_True; } } - bReturn = TRUE; + bReturn = sal_True; } bReturn = FuConstruct::MouseButtonUp (rMEvt) || bReturn; @@ -203,14 +203,14 @@ BOOL FuConstructArc::MouseButtonUp( const MouseEvent& rMEvt ) |* |* Tastaturereignisse bearbeiten |* -|* Wird ein KeyEvent bearbeitet, so ist der Return-Wert TRUE, andernfalls -|* FALSE. +|* Wird ein KeyEvent bearbeitet, so ist der Return-Wert sal_True, andernfalls +|* sal_False. |* \************************************************************************/ -BOOL FuConstructArc::KeyInput(const KeyEvent& rKEvt) +sal_Bool FuConstructArc::KeyInput(const KeyEvent& rKEvt) { - BOOL bReturn = FuConstruct::KeyInput(rKEvt); + sal_Bool bReturn = FuConstruct::KeyInput(rKEvt); return(bReturn); } @@ -258,7 +258,7 @@ void FuConstructArc::Activate() break; } - mpView->SetCurrentObj((UINT16)aObjKind); + mpView->SetCurrentObj((sal_uInt16)aObjKind); FuConstruct::Activate(); // FuDraw::Activate(); diff --git a/sd/source/ui/func/fuconbez.cxx b/sd/source/ui/func/fuconbez.cxx index e95a2377e4ee..69f2f5266389 100644..100755 --- a/sd/source/ui/func/fuconbez.cxx +++ b/sd/source/ui/func/fuconbez.cxx @@ -98,7 +98,7 @@ void FuConstructBezierPolygon::DoExecute( SfxRequest& rReq ) if( pArgs ) { const SfxPoolItem* pPoolItem = NULL; - if( SFX_ITEM_SET == pArgs->GetItemState( SID_ADD_MOTION_PATH, TRUE, &pPoolItem ) ) + if( SFX_ITEM_SET == pArgs->GetItemState( SID_ADD_MOTION_PATH, sal_True, &pPoolItem ) ) maTargets = ( ( const SfxUnoAnyItem* ) pPoolItem )->GetValue(); } } @@ -109,9 +109,9 @@ void FuConstructBezierPolygon::DoExecute( SfxRequest& rReq ) |* \************************************************************************/ -BOOL FuConstructBezierPolygon::MouseButtonDown(const MouseEvent& rMEvt) +sal_Bool FuConstructBezierPolygon::MouseButtonDown(const MouseEvent& rMEvt) { - BOOL bReturn = FuConstruct::MouseButtonDown(rMEvt); + sal_Bool bReturn = FuConstruct::MouseButtonDown(rMEvt); SdrViewEvent aVEvt; SdrHitKind eHit = mpView->PickAnything(rMEvt, SDRMOUSEBUTTONDOWN, aVEvt); @@ -129,11 +129,11 @@ BOOL FuConstructBezierPolygon::MouseButtonDown(const MouseEvent& rMEvt) { // Texteingabe hier nicht zulassen aVEvt.eEvent = SDREVENT_BEGDRAGOBJ; - mpView->EnableExtendedMouseEventDispatcher(FALSE); + mpView->EnableExtendedMouseEventDispatcher(sal_False); } else { - mpView->EnableExtendedMouseEventDispatcher(TRUE); + mpView->EnableExtendedMouseEventDispatcher(sal_True); } if (eHit == SDRHIT_MARKEDOBJECT && nEditMode == SID_BEZIER_INSERT) @@ -166,9 +166,9 @@ BOOL FuConstructBezierPolygon::MouseButtonDown(const MouseEvent& rMEvt) |* \************************************************************************/ -BOOL FuConstructBezierPolygon::MouseMove(const MouseEvent& rMEvt) +sal_Bool FuConstructBezierPolygon::MouseMove(const MouseEvent& rMEvt) { - BOOL bReturn = FuConstruct::MouseMove(rMEvt); + sal_Bool bReturn = FuConstruct::MouseMove(rMEvt); return(bReturn); } @@ -178,15 +178,15 @@ BOOL FuConstructBezierPolygon::MouseMove(const MouseEvent& rMEvt) |* \************************************************************************/ -BOOL FuConstructBezierPolygon::MouseButtonUp(const MouseEvent& rMEvt ) +sal_Bool FuConstructBezierPolygon::MouseButtonUp(const MouseEvent& rMEvt ) { - BOOL bReturn = FALSE; - BOOL bCreated = FALSE; + sal_Bool bReturn = sal_False; + sal_Bool bCreated = sal_False; SdrViewEvent aVEvt; mpView->PickAnything(rMEvt, SDRMOUSEBUTTONUP, aVEvt); - ULONG nCount = mpView->GetSdrPageView()->GetObjList()->GetObjCount(); + sal_uLong nCount = mpView->GetSdrPageView()->GetObjList()->GetObjCount(); if (mpView->IsInsObjPoint()) { @@ -199,15 +199,15 @@ BOOL FuConstructBezierPolygon::MouseButtonUp(const MouseEvent& rMEvt ) if (aVEvt.eEvent == SDREVENT_ENDCREATE) { - bReturn = TRUE; + bReturn = sal_True; if (nCount == (mpView->GetSdrPageView()->GetObjList()->GetObjCount() - 1)) { - bCreated = TRUE; + bCreated = sal_True; } // Trick, um FuDraw::DoubleClick nicht auszuloesen - bMBDown = FALSE; + bMBDown = sal_False; } @@ -260,14 +260,14 @@ BOOL FuConstructBezierPolygon::MouseButtonUp(const MouseEvent& rMEvt ) |* |* Tastaturereignisse bearbeiten |* -|* Wird ein KeyEvent bearbeitet, so ist der Return-Wert TRUE, andernfalls -|* FALSE. +|* Wird ein KeyEvent bearbeitet, so ist der Return-Wert sal_True, andernfalls +|* sal_False. |* \************************************************************************/ -BOOL FuConstructBezierPolygon::KeyInput(const KeyEvent& rKEvt) +sal_Bool FuConstructBezierPolygon::KeyInput(const KeyEvent& rKEvt) { - BOOL bReturn = FuConstruct::KeyInput(rKEvt); + sal_Bool bReturn = FuConstruct::KeyInput(rKEvt); return(bReturn); } @@ -280,7 +280,7 @@ BOOL FuConstructBezierPolygon::KeyInput(const KeyEvent& rKEvt) void FuConstructBezierPolygon::Activate() { - mpView->EnableExtendedMouseEventDispatcher(TRUE); + mpView->EnableExtendedMouseEventDispatcher(sal_True); SdrObjKind eKind; @@ -331,7 +331,7 @@ void FuConstructBezierPolygon::Activate() break; } - mpView->SetCurrentObj((UINT16)eKind); + mpView->SetCurrentObj((sal_uInt16)eKind); FuConstruct::Activate(); } @@ -344,7 +344,7 @@ void FuConstructBezierPolygon::Activate() void FuConstructBezierPolygon::Deactivate() { - mpView->EnableExtendedMouseEventDispatcher(FALSE); + mpView->EnableExtendedMouseEventDispatcher(sal_False); FuConstruct::Deactivate(); } @@ -373,7 +373,7 @@ void FuConstructBezierPolygon::SelectionHasChanged() |* \************************************************************************/ -void FuConstructBezierPolygon::SetEditMode(USHORT nMode) +void FuConstructBezierPolygon::SetEditMode(sal_uInt16 nMode) { nEditMode = nMode; ForcePointer(); diff --git a/sd/source/ui/func/fuconcs.cxx b/sd/source/ui/func/fuconcs.cxx index 0627abdd62fc..5b65c8cbb902 100644..100755 --- a/sd/source/ui/func/fuconcs.cxx +++ b/sd/source/ui/func/fuconcs.cxx @@ -133,16 +133,16 @@ void FuConstructCustomShape::DoExecute( SfxRequest& rReq ) |* \************************************************************************/ -BOOL FuConstructCustomShape::MouseButtonDown(const MouseEvent& rMEvt) +sal_Bool FuConstructCustomShape::MouseButtonDown(const MouseEvent& rMEvt) { - BOOL bReturn = FuConstruct::MouseButtonDown(rMEvt); + sal_Bool bReturn = FuConstruct::MouseButtonDown(rMEvt); if ( rMEvt.IsLeft() && !mpView->IsAction() ) { Point aPnt( mpWindow->PixelToLogic( rMEvt.GetPosPixel() ) ); mpWindow->CaptureMouse(); - USHORT nDrgLog = USHORT ( mpWindow->PixelToLogic(Size(DRGPIX,0)).Width() ); + sal_uInt16 nDrgLog = sal_uInt16 ( mpWindow->PixelToLogic(Size(DRGPIX,0)).Width() ); mpView->BegCreateObj(aPnt, (OutputDevice*) NULL, nDrgLog); @@ -172,7 +172,7 @@ BOOL FuConstructCustomShape::MouseButtonDown(const MouseEvent& rMEvt) |* \************************************************************************/ -BOOL FuConstructCustomShape::MouseMove(const MouseEvent& rMEvt) +sal_Bool FuConstructCustomShape::MouseMove(const MouseEvent& rMEvt) { return FuConstruct::MouseMove(rMEvt); } @@ -183,7 +183,7 @@ BOOL FuConstructCustomShape::MouseMove(const MouseEvent& rMEvt) |* \************************************************************************/ -BOOL FuConstructCustomShape::MouseButtonUp(const MouseEvent& rMEvt) +sal_Bool FuConstructCustomShape::MouseButtonUp(const MouseEvent& rMEvt) { sal_Bool bReturn(sal_False); @@ -207,14 +207,14 @@ BOOL FuConstructCustomShape::MouseButtonUp(const MouseEvent& rMEvt) |* |* Tastaturereignisse bearbeiten |* -|* Wird ein KeyEvent bearbeitet, so ist der Return-Wert TRUE, andernfalls -|* FALSE. +|* Wird ein KeyEvent bearbeitet, so ist der Return-Wert sal_True, andernfalls +|* sal_False. |* \************************************************************************/ -BOOL FuConstructCustomShape::KeyInput(const KeyEvent& rKEvt) +sal_Bool FuConstructCustomShape::KeyInput(const KeyEvent& rKEvt) { - BOOL bReturn = FuConstruct::KeyInput(rKEvt); + sal_Bool bReturn = FuConstruct::KeyInput(rKEvt); return(bReturn); } diff --git a/sd/source/ui/func/fuconrec.cxx b/sd/source/ui/func/fuconrec.cxx index ef7eaae17004..751e6f364bd1 100644..100755 --- a/sd/source/ui/func/fuconrec.cxx +++ b/sd/source/ui/func/fuconrec.cxx @@ -122,10 +122,10 @@ void FuConstructRectangle::DoExecute( SfxRequest& rReq ) { case SID_DRAW_ELLIPSE : { - SFX_REQUEST_ARG (rReq, pCenterX, SfxUInt32Item, ID_VAL_CENTER_X, FALSE); - SFX_REQUEST_ARG (rReq, pCenterY, SfxUInt32Item, ID_VAL_CENTER_Y, FALSE); - SFX_REQUEST_ARG (rReq, pAxisX, SfxUInt32Item, ID_VAL_AXIS_X, FALSE); - SFX_REQUEST_ARG (rReq, pAxisY, SfxUInt32Item, ID_VAL_AXIS_Y, FALSE); + SFX_REQUEST_ARG (rReq, pCenterX, SfxUInt32Item, ID_VAL_CENTER_X, sal_False); + SFX_REQUEST_ARG (rReq, pCenterY, SfxUInt32Item, ID_VAL_CENTER_Y, sal_False); + SFX_REQUEST_ARG (rReq, pAxisX, SfxUInt32Item, ID_VAL_AXIS_X, sal_False); + SFX_REQUEST_ARG (rReq, pAxisY, SfxUInt32Item, ID_VAL_AXIS_Y, sal_False); Rectangle aNewRectangle (pCenterX->GetValue () - pAxisX->GetValue () / 2, pCenterY->GetValue () - pAxisY->GetValue () / 2, @@ -140,10 +140,10 @@ void FuConstructRectangle::DoExecute( SfxRequest& rReq ) case SID_DRAW_RECT : { - SFX_REQUEST_ARG (rReq, pMouseStartX, SfxUInt32Item, ID_VAL_MOUSESTART_X, FALSE); - SFX_REQUEST_ARG (rReq, pMouseStartY, SfxUInt32Item, ID_VAL_MOUSESTART_Y, FALSE); - SFX_REQUEST_ARG (rReq, pMouseEndX, SfxUInt32Item, ID_VAL_MOUSEEND_X, FALSE); - SFX_REQUEST_ARG (rReq, pMouseEndY, SfxUInt32Item, ID_VAL_MOUSEEND_Y, FALSE); + SFX_REQUEST_ARG (rReq, pMouseStartX, SfxUInt32Item, ID_VAL_MOUSESTART_X, sal_False); + SFX_REQUEST_ARG (rReq, pMouseStartY, SfxUInt32Item, ID_VAL_MOUSESTART_Y, sal_False); + SFX_REQUEST_ARG (rReq, pMouseEndX, SfxUInt32Item, ID_VAL_MOUSEEND_X, sal_False); + SFX_REQUEST_ARG (rReq, pMouseEndY, SfxUInt32Item, ID_VAL_MOUSEEND_Y, sal_False); Rectangle aNewRectangle (pMouseStartX->GetValue (), pMouseStartY->GetValue (), @@ -204,16 +204,16 @@ void FuConstructRectangle::DoExecute( SfxRequest& rReq ) |* \************************************************************************/ -BOOL FuConstructRectangle::MouseButtonDown(const MouseEvent& rMEvt) +sal_Bool FuConstructRectangle::MouseButtonDown(const MouseEvent& rMEvt) { - BOOL bReturn = FuConstruct::MouseButtonDown(rMEvt); + sal_Bool bReturn = FuConstruct::MouseButtonDown(rMEvt); if ( rMEvt.IsLeft() && !mpView->IsAction() ) { Point aPnt( mpWindow->PixelToLogic( rMEvt.GetPosPixel() ) ); mpWindow->CaptureMouse(); - USHORT nDrgLog = USHORT ( mpWindow->PixelToLogic(Size(DRGPIX,0)).Width() ); + sal_uInt16 nDrgLog = sal_uInt16 ( mpWindow->PixelToLogic(Size(DRGPIX,0)).Width() ); if (mpView->GetCurrentObjIdentifier() == OBJ_CAPTION) { @@ -237,7 +237,7 @@ BOOL FuConstructRectangle::MouseButtonDown(const MouseEvent& rMEvt) pObj->SetMergedItemSet(aAttr); if( nSlotId == SID_DRAW_CAPTION_VERTICAL ) - ( (SdrTextObj*) pObj)->SetVerticalWriting( TRUE ); + ( (SdrTextObj*) pObj)->SetVerticalWriting( sal_True ); } } return bReturn; @@ -249,7 +249,7 @@ BOOL FuConstructRectangle::MouseButtonDown(const MouseEvent& rMEvt) |* \************************************************************************/ -BOOL FuConstructRectangle::MouseMove(const MouseEvent& rMEvt) +sal_Bool FuConstructRectangle::MouseMove(const MouseEvent& rMEvt) { return FuConstruct::MouseMove(rMEvt); } @@ -260,7 +260,7 @@ BOOL FuConstructRectangle::MouseMove(const MouseEvent& rMEvt) |* \************************************************************************/ -BOOL FuConstructRectangle::MouseButtonUp(const MouseEvent& rMEvt) +sal_Bool FuConstructRectangle::MouseButtonUp(const MouseEvent& rMEvt) { sal_Bool bReturn(sal_False); @@ -274,7 +274,7 @@ BOOL FuConstructRectangle::MouseButtonUp(const MouseEvent& rMEvt) { SdrLayerAdmin& rAdmin = mpDoc->GetLayerAdmin(); String aStr(SdResId(STR_LAYER_MEASURELINES)); - pObj->SetLayer(rAdmin.GetLayerID(aStr, FALSE)); + pObj->SetLayer(rAdmin.GetLayerID(aStr, sal_False)); } // #88751# init text position when vertica caption object is created @@ -311,14 +311,14 @@ BOOL FuConstructRectangle::MouseButtonUp(const MouseEvent& rMEvt) |* |* Tastaturereignisse bearbeiten |* -|* Wird ein KeyEvent bearbeitet, so ist der Return-Wert TRUE, andernfalls -|* FALSE. +|* Wird ein KeyEvent bearbeitet, so ist der Return-Wert sal_True, andernfalls +|* sal_False. |* \************************************************************************/ -BOOL FuConstructRectangle::KeyInput(const KeyEvent& rKEvt) +sal_Bool FuConstructRectangle::KeyInput(const KeyEvent& rKEvt) { - BOOL bReturn = FuConstruct::KeyInput(rKEvt); + sal_Bool bReturn = FuConstruct::KeyInput(rKEvt); return(bReturn); } @@ -424,7 +424,7 @@ void FuConstructRectangle::Activate() break; } - mpView->SetCurrentObj((UINT16)aObjKind); + mpView->SetCurrentObj((sal_uInt16)aObjKind); FuConstruct::Activate(); } @@ -473,7 +473,7 @@ void FuConstructRectangle::Deactivate() nSlotId == SID_LINE_ARROW_SQUARE || nSlotId == SID_LINE_SQUARE_ARROW ) { - mpView->SetGlueVisible( FALSE ); + mpView->SetGlueVisible( sal_False ); } FuConstruct::Deactivate(); } @@ -544,8 +544,8 @@ void FuConstructRectangle::SetAttributes(SfxItemSet& rAttr, SdrObject* pObj) Size aSize(pObj->GetLogicRect().GetSize()); rAttr.Put( SdrTextMinFrameHeightItem( aSize.Height() ) ); rAttr.Put( SdrTextMinFrameWidthItem( aSize.Width() ) ); - rAttr.Put( SdrTextAutoGrowHeightItem( TRUE ) ); - rAttr.Put( SdrTextAutoGrowWidthItem( TRUE ) ); + rAttr.Put( SdrTextAutoGrowHeightItem( sal_True ) ); + rAttr.Put( SdrTextAutoGrowWidthItem( sal_True ) ); // #103516# Support full with for vertical caption objects, too if(SID_DRAW_CAPTION == nSlotId) @@ -573,12 +573,12 @@ void FuConstructRectangle::SetAttributes(SfxItemSet& rAttr, SdrObject* pObj) if (pSheet) { - pObj->SetStyleSheet(pSheet, FALSE); + pObj->SetStyleSheet(pSheet, sal_False); } SdrLayerAdmin& rAdmin = mpDoc->GetLayerAdmin(); String aStr(SdResId(STR_LAYER_MEASURELINES)); - pObj->SetLayer(rAdmin.GetLayerID(aStr, FALSE)); + pObj->SetLayer(rAdmin.GetLayerID(aStr, sal_False)); } else if (nSlotId == OBJ_CUSTOMSHAPE ) { @@ -960,8 +960,8 @@ SdrObject* FuConstructRectangle::CreateDefaultObject(const sal_uInt16 nID, const { if(pObj->ISA(SdrEdgeObj)) { - ((SdrEdgeObj*)pObj)->SetTailPoint(FALSE, aStart); - ((SdrEdgeObj*)pObj)->SetTailPoint(TRUE, aEnd); + ((SdrEdgeObj*)pObj)->SetTailPoint(sal_False, aStart); + ((SdrEdgeObj*)pObj)->SetTailPoint(sal_True, aEnd); } else { diff --git a/sd/source/ui/func/fuconstr.cxx b/sd/source/ui/func/fuconstr.cxx index a1ab9b853ff4..07c39718a954 100755 --- a/sd/source/ui/func/fuconstr.cxx +++ b/sd/source/ui/func/fuconstr.cxx @@ -68,7 +68,7 @@ FuConstruct::FuConstruct ( SdDrawDocument* pDoc, SfxRequest& rReq) : FuDraw(pViewSh, pWin, pView, pDoc, rReq), - bSelectionChanged(FALSE) + bSelectionChanged(sal_False) { } @@ -83,12 +83,12 @@ void FuConstruct::DoExecute( SfxRequest& rReq ) |* \************************************************************************/ -BOOL FuConstruct::MouseButtonDown(const MouseEvent& rMEvt) +sal_Bool FuConstruct::MouseButtonDown(const MouseEvent& rMEvt) { - BOOL bReturn = FuDraw::MouseButtonDown(rMEvt); + sal_Bool bReturn = FuDraw::MouseButtonDown(rMEvt); - bMBDown = TRUE; - bSelectionChanged = FALSE; + bMBDown = sal_True; + bSelectionChanged = sal_False; if ( mpView->IsAction() ) { @@ -96,14 +96,14 @@ BOOL FuConstruct::MouseButtonDown(const MouseEvent& rMEvt) // erasing the last two points when creating a polygon. // if ( rMEvt.IsRight() ) // mpView->BckAction(); - return TRUE; + return sal_True; } - bFirstMouseMove = TRUE; + bFirstMouseMove = sal_True; aDragTimer.Start(); aMDPos = mpWindow->PixelToLogic( rMEvt.GetPosPixel() ); - USHORT nHitLog = USHORT (mpWindow->PixelToLogic(Size(HITPIX,0)).Width()); + sal_uInt16 nHitLog = sal_uInt16 (mpWindow->PixelToLogic(Size(HITPIX,0)).Width()); if (rMEvt.IsLeft() && mpView->IsExtendedMouseEventDispatcherEnabled()) { @@ -113,14 +113,14 @@ BOOL FuConstruct::MouseButtonDown(const MouseEvent& rMEvt) if ( pHdl != NULL || mpView->IsMarkedHit(aMDPos, nHitLog) ) { - USHORT nDrgLog = USHORT ( mpWindow->PixelToLogic(Size(DRGPIX,0)).Width() ); + sal_uInt16 nDrgLog = sal_uInt16 ( mpWindow->PixelToLogic(Size(DRGPIX,0)).Width() ); mpView->BegDragObj(aMDPos, (OutputDevice*) NULL, pHdl, nDrgLog); - bReturn = TRUE; + bReturn = sal_True; } else if ( mpView->AreObjectsMarked() ) { mpView->UnmarkAll(); - bReturn = TRUE; + bReturn = sal_True; } } @@ -133,14 +133,14 @@ BOOL FuConstruct::MouseButtonDown(const MouseEvent& rMEvt) |* \************************************************************************/ -BOOL FuConstruct::MouseMove(const MouseEvent& rMEvt) +sal_Bool FuConstruct::MouseMove(const MouseEvent& rMEvt) { FuDraw::MouseMove(rMEvt); if (aDragTimer.IsActive() ) { if( bFirstMouseMove ) - bFirstMouseMove = FALSE; + bFirstMouseMove = sal_False; else aDragTimer.Stop(); } @@ -154,7 +154,7 @@ BOOL FuConstruct::MouseMove(const MouseEvent& rMEvt) mpView->MovAction(aPnt); } - return TRUE; + return sal_True; } /************************************************************************* @@ -163,14 +163,14 @@ BOOL FuConstruct::MouseMove(const MouseEvent& rMEvt) |* \************************************************************************/ -BOOL FuConstruct::MouseButtonUp(const MouseEvent& rMEvt) +sal_Bool FuConstruct::MouseButtonUp(const MouseEvent& rMEvt) { - BOOL bReturn = TRUE; + sal_Bool bReturn = sal_True; if (aDragTimer.IsActive() ) { aDragTimer.Stop(); - bIsInDragMode = FALSE; + bIsInDragMode = sal_False; } FuDraw::MouseButtonUp(rMEvt); @@ -180,11 +180,11 @@ BOOL FuConstruct::MouseButtonUp(const MouseEvent& rMEvt) if ( mpView && mpView->IsDragObj() ) { FrameView* pFrameView = mpViewShell->GetFrameView(); - BOOL bDragWithCopy = (rMEvt.IsMod1() && pFrameView->IsDragWithCopy()); + sal_Bool bDragWithCopy = (rMEvt.IsMod1() && pFrameView->IsDragWithCopy()); if (bDragWithCopy) { - bDragWithCopy = !mpView->IsPresObjSelected(FALSE, TRUE); + bDragWithCopy = !mpView->IsPresObjSelected(sal_False, sal_True); } mpView->SetDragWithCopy(bDragWithCopy); @@ -196,19 +196,19 @@ BOOL FuConstruct::MouseButtonUp(const MouseEvent& rMEvt) } else { - bReturn = FALSE; + bReturn = sal_False; } if ( mpView && !mpView->IsAction() ) { mpWindow->ReleaseMouse(); - USHORT nDrgLog = USHORT ( mpWindow->PixelToLogic(Size(DRGPIX,0)).Width() ); + sal_uInt16 nDrgLog = sal_uInt16 ( mpWindow->PixelToLogic(Size(DRGPIX,0)).Width() ); if ( !mpView->AreObjectsMarked() ) { SdrObject* pObj; SdrPageView* pPV; - USHORT nHitLog = USHORT ( mpWindow->PixelToLogic(Size(HITPIX,0)).Width() ); + sal_uInt16 nHitLog = sal_uInt16 ( mpWindow->PixelToLogic(Size(HITPIX,0)).Width() ); if (!mpView->PickObj(aPnt, mpView->getHitTolLog(), pObj, pPV)) { @@ -226,7 +226,7 @@ BOOL FuConstruct::MouseButtonUp(const MouseEvent& rMEvt) * Toggle zw. Selektion und Rotation **************************************************************/ SdrObject* pSingleObj = NULL; - ULONG nMarkCount = mpView->GetMarkedObjectList().GetMarkCount(); + sal_uLong nMarkCount = mpView->GetMarkedObjectList().GetMarkCount(); if (nMarkCount==1) { @@ -246,14 +246,14 @@ BOOL FuConstruct::MouseButtonUp(const MouseEvent& rMEvt) } } - USHORT nClicks = rMEvt.GetClicks(); + sal_uInt16 nClicks = rMEvt.GetClicks(); if (nClicks == 2 && rMEvt.IsLeft() && bMBDown && !rMEvt.IsMod1() && !rMEvt.IsMod2() && !rMEvt.IsShift() ) { DoubleClick(rMEvt); } - bMBDown = FALSE; + bMBDown = sal_False; return bReturn; } @@ -262,14 +262,14 @@ BOOL FuConstruct::MouseButtonUp(const MouseEvent& rMEvt) |* |* Tastaturereignisse bearbeiten |* -|* Wird ein KeyEvent bearbeitet, so ist der Return-Wert TRUE, andernfalls -|* FALSE. +|* Wird ein KeyEvent bearbeitet, so ist der Return-Wert sal_True, andernfalls +|* sal_False. |* \************************************************************************/ -BOOL FuConstruct::KeyInput(const KeyEvent& rKEvt) +sal_Bool FuConstruct::KeyInput(const KeyEvent& rKEvt) { - BOOL bReturn = FALSE; + sal_Bool bReturn = sal_False; if ( !bReturn ) bReturn = FuDraw::KeyInput(rKEvt); @@ -396,7 +396,7 @@ void FuConstruct::SetStyleSheet( SfxItemSet& rAttr, SdrObject* pObj, ***********************************************/ String aName( pPage->GetLayoutName() ); String aSep = UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( SD_LT_SEPARATOR ) ); - USHORT n = aName.Search(aSep); + sal_uInt16 n = aName.Search(aSep); n = n + aSep.Len(); aName.Erase(n); aName.Append( String ( SdResId( STR_LAYOUT_BACKGROUNDOBJECTS ) ) ); @@ -407,7 +407,7 @@ void FuConstruct::SetStyleSheet( SfxItemSet& rAttr, SdrObject* pObj, if (pSheet) { // applying style sheet for background objects - pObj->SetStyleSheet(pSheet, FALSE); + pObj->SetStyleSheet(pSheet, sal_False); SfxItemSet& rSet = pSheet->GetItemSet(); const XFillStyleItem& rFillStyle = (const XFillStyleItem&)rSet.Get(XATTR_FILLSTYLE); if ( bForceFillStyle ) @@ -436,7 +436,7 @@ void FuConstruct::SetStyleSheet( SfxItemSet& rAttr, SdrObject* pObj, DBG_ASSERT(pSheet, "Objektvorlage nicht gefunden"); if (pSheet) { - pObj->SetStyleSheet(pSheet, FALSE); + pObj->SetStyleSheet(pSheet, sal_False); SfxItemSet aAttr(*mpView->GetDefaultAttr().Clone()); aAttr.Put(pSheet->GetItemSet().Get(XATTR_FILLSTYLE)); pObj->SetMergedItemSet(aAttr); diff --git a/sd/source/ui/func/fuconuno.cxx b/sd/source/ui/func/fuconuno.cxx index fffcaf3c0b9f..25a045652906 100644..100755 --- a/sd/source/ui/func/fuconuno.cxx +++ b/sd/source/ui/func/fuconuno.cxx @@ -89,8 +89,8 @@ void FuConstructUnoControl::DoExecute( SfxRequest& rReq ) { FuConstruct::DoExecute( rReq ); - SFX_REQUEST_ARG( rReq, pInventorItem, SfxUInt32Item, SID_FM_CONTROL_INVENTOR, FALSE ); - SFX_REQUEST_ARG( rReq, pIdentifierItem, SfxUInt16Item, SID_FM_CONTROL_IDENTIFIER, FALSE ); + SFX_REQUEST_ARG( rReq, pInventorItem, SfxUInt32Item, SID_FM_CONTROL_INVENTOR, sal_False ); + SFX_REQUEST_ARG( rReq, pIdentifierItem, SfxUInt16Item, SID_FM_CONTROL_IDENTIFIER, sal_False ); if( pInventorItem ) nInventor = pInventorItem->GetValue(); if( pIdentifierItem ) @@ -106,17 +106,17 @@ void FuConstructUnoControl::DoExecute( SfxRequest& rReq ) |* MouseButtonDown-event |* \************************************************************************/ -BOOL FuConstructUnoControl::MouseButtonDown(const MouseEvent& rMEvt) +sal_Bool FuConstructUnoControl::MouseButtonDown(const MouseEvent& rMEvt) { - BOOL bReturn = FuConstruct::MouseButtonDown(rMEvt); + sal_Bool bReturn = FuConstruct::MouseButtonDown(rMEvt); if ( rMEvt.IsLeft() && !mpView->IsAction() ) { Point aPnt( mpWindow->PixelToLogic( rMEvt.GetPosPixel() ) ); mpWindow->CaptureMouse(); - USHORT nDrgLog = USHORT ( mpWindow->PixelToLogic(Size(DRGPIX,0)).Width() ); + sal_uInt16 nDrgLog = sal_uInt16 ( mpWindow->PixelToLogic(Size(DRGPIX,0)).Width() ); mpView->BegCreateObj(aPnt, (OutputDevice*) NULL, nDrgLog); - bReturn = TRUE; + bReturn = sal_True; } return bReturn; } @@ -126,7 +126,7 @@ BOOL FuConstructUnoControl::MouseButtonDown(const MouseEvent& rMEvt) |* MouseMove-event |* \************************************************************************/ -BOOL FuConstructUnoControl::MouseMove(const MouseEvent& rMEvt) +sal_Bool FuConstructUnoControl::MouseMove(const MouseEvent& rMEvt) { return FuConstruct::MouseMove(rMEvt); } @@ -136,15 +136,15 @@ BOOL FuConstructUnoControl::MouseMove(const MouseEvent& rMEvt) |* MouseButtonUp-event |* \************************************************************************/ -BOOL FuConstructUnoControl::MouseButtonUp(const MouseEvent& rMEvt) +sal_Bool FuConstructUnoControl::MouseButtonUp(const MouseEvent& rMEvt) { - BOOL bReturn = FALSE; + sal_Bool bReturn = sal_False; if ( mpView->IsCreateObj() && rMEvt.IsLeft() ) { Point aPnt( mpWindow->PixelToLogic( rMEvt.GetPosPixel() ) ); mpView->EndCreateObj(SDRCREATE_FORCEEND); - bReturn = TRUE; + bReturn = sal_True; } bReturn = (FuConstruct::MouseButtonUp(rMEvt) || bReturn); @@ -159,13 +159,13 @@ BOOL FuConstructUnoControl::MouseButtonUp(const MouseEvent& rMEvt) |* |* Tastaturereignisse bearbeiten |* -|* Wird ein KeyEvent bearbeitet, so ist der Return-Wert TRUE, andernfalls -|* FALSE. +|* Wird ein KeyEvent bearbeitet, so ist der Return-Wert sal_True, andernfalls +|* sal_False. |* \************************************************************************/ -BOOL FuConstructUnoControl::KeyInput(const KeyEvent& rKEvt) +sal_Bool FuConstructUnoControl::KeyInput(const KeyEvent& rKEvt) { - BOOL bReturn = FuConstruct::KeyInput(rKEvt); + sal_Bool bReturn = FuConstruct::KeyInput(rKEvt); return(bReturn); } diff --git a/sd/source/ui/func/fucopy.cxx b/sd/source/ui/func/fucopy.cxx index 0335ff9aa13c..c9ba73ce420b 100644..100755 --- a/sd/source/ui/func/fucopy.cxx +++ b/sd/source/ui/func/fucopy.cxx @@ -100,12 +100,12 @@ void FuCopy::DoExecute( SfxRequest& rReq ) mpView->GetAttributes( aAttr ); const SfxPoolItem* pPoolItem = NULL; - if( SFX_ITEM_SET == aAttr.GetItemState( XATTR_FILLSTYLE, TRUE, &pPoolItem ) ) + if( SFX_ITEM_SET == aAttr.GetItemState( XATTR_FILLSTYLE, sal_True, &pPoolItem ) ) { XFillStyle eStyle = ( ( const XFillStyleItem* ) pPoolItem )->GetValue(); if( eStyle == XFILL_SOLID && - SFX_ITEM_SET == aAttr.GetItemState( XATTR_FILLCOLOR, TRUE, &pPoolItem ) ) + SFX_ITEM_SET == aAttr.GetItemState( XATTR_FILLCOLOR, sal_True, &pPoolItem ) ) { const XFillColorItem* pItem = ( const XFillColorItem* ) pPoolItem; XColorItem aXColorItem( ATTR_COPY_START_COLOR, pItem->GetName(), @@ -121,7 +121,7 @@ void FuCopy::DoExecute( SfxRequest& rReq ) AbstractCopyDlg* pDlg = pFact->CreateCopyDlg(NULL, aSet, mpDoc->GetColorTable(), mpView ); if( pDlg ) { - USHORT nResult = pDlg->Execute(); + sal_uInt16 nResult = pDlg->Execute(); switch( nResult ) { @@ -144,50 +144,50 @@ void FuCopy::DoExecute( SfxRequest& rReq ) } Rectangle aRect; - INT32 lWidth = 0, lHeight = 0, lSizeX = 0L, lSizeY = 0L, lAngle = 0L; - UINT16 nNumber = 0; + sal_Int32 lWidth = 0, lHeight = 0, lSizeX = 0L, lSizeY = 0L, lAngle = 0L; + sal_uInt16 nNumber = 0; Color aStartColor, aEndColor; - BOOL bColor = FALSE; + sal_Bool bColor = sal_False; const SfxPoolItem* pPoolItem = NULL; // Anzahl - if( SFX_ITEM_SET == pArgs->GetItemState( ATTR_COPY_NUMBER, TRUE, &pPoolItem ) ) + if( SFX_ITEM_SET == pArgs->GetItemState( ATTR_COPY_NUMBER, sal_True, &pPoolItem ) ) nNumber = ( ( const SfxUInt16Item* ) pPoolItem )->GetValue(); // Verschiebung - if( SFX_ITEM_SET == pArgs->GetItemState( ATTR_COPY_MOVE_X, TRUE, &pPoolItem ) ) + if( SFX_ITEM_SET == pArgs->GetItemState( ATTR_COPY_MOVE_X, sal_True, &pPoolItem ) ) lSizeX = ( ( const SfxInt32Item* ) pPoolItem )->GetValue(); - if( SFX_ITEM_SET == pArgs->GetItemState( ATTR_COPY_MOVE_Y, TRUE, &pPoolItem ) ) + if( SFX_ITEM_SET == pArgs->GetItemState( ATTR_COPY_MOVE_Y, sal_True, &pPoolItem ) ) lSizeY = ( ( const SfxInt32Item* ) pPoolItem )->GetValue(); - if( SFX_ITEM_SET == pArgs->GetItemState( ATTR_COPY_ANGLE, TRUE, &pPoolItem ) ) + if( SFX_ITEM_SET == pArgs->GetItemState( ATTR_COPY_ANGLE, sal_True, &pPoolItem ) ) lAngle = ( ( const SfxInt32Item* )pPoolItem )->GetValue(); // Verrgroesserung / Verkleinerung - if( SFX_ITEM_SET == pArgs->GetItemState( ATTR_COPY_WIDTH, TRUE, &pPoolItem ) ) + if( SFX_ITEM_SET == pArgs->GetItemState( ATTR_COPY_WIDTH, sal_True, &pPoolItem ) ) lWidth = ( ( const SfxInt32Item* ) pPoolItem )->GetValue(); - if( SFX_ITEM_SET == pArgs->GetItemState( ATTR_COPY_HEIGHT, TRUE, &pPoolItem ) ) + if( SFX_ITEM_SET == pArgs->GetItemState( ATTR_COPY_HEIGHT, sal_True, &pPoolItem ) ) lHeight = ( ( const SfxInt32Item* ) pPoolItem )->GetValue(); // Startfarbe / Endfarbe - if( SFX_ITEM_SET == pArgs->GetItemState( ATTR_COPY_START_COLOR, TRUE, &pPoolItem ) ) + if( SFX_ITEM_SET == pArgs->GetItemState( ATTR_COPY_START_COLOR, sal_True, &pPoolItem ) ) { aStartColor = ( ( const XColorItem* ) pPoolItem )->GetColorValue(); - bColor = TRUE; + bColor = sal_True; } - if( SFX_ITEM_SET == pArgs->GetItemState( ATTR_COPY_END_COLOR, TRUE, &pPoolItem ) ) + if( SFX_ITEM_SET == pArgs->GetItemState( ATTR_COPY_END_COLOR, sal_True, &pPoolItem ) ) { aEndColor = ( ( const XColorItem* ) pPoolItem )->GetColorValue(); if( aStartColor == aEndColor ) - bColor = FALSE; + bColor = sal_False; } else - bColor = FALSE; + bColor = sal_False; // Handles wegnehmen //HMHmpView->HideMarkHdl(); SfxProgress* pProgress = NULL; - BOOL bWaiting = FALSE; + sal_Bool bWaiting = sal_False; if( nNumber > 1 ) { @@ -196,12 +196,12 @@ void FuCopy::DoExecute( SfxRequest& rReq ) aStr.Append( String( SdResId( STR_UNDO_COPYOBJECTS ) ) ); pProgress = new SfxProgress( mpDocSh, aStr, nNumber ); - mpDocSh->SetWaitCursor( TRUE ); - bWaiting = TRUE; + mpDocSh->SetWaitCursor( sal_True ); + bWaiting = sal_True; } const SdrMarkList aMarkList( mpView->GetMarkedObjectList() ); - const ULONG nMarkCount = aMarkList.GetMarkCount(); + const sal_uLong nMarkCount = aMarkList.GetMarkCount(); SdrObject* pObj = NULL; // Anzahl moeglicher Kopien berechnen @@ -210,16 +210,16 @@ void FuCopy::DoExecute( SfxRequest& rReq ) if( lWidth < 0L ) { long nTmp = ( aRect.Right() - aRect.Left() ) / -lWidth; - nNumber = (UINT16) Min( nTmp, (long)nNumber ); + nNumber = (sal_uInt16) Min( nTmp, (long)nNumber ); } if( lHeight < 0L ) { long nTmp = ( aRect.Bottom() - aRect.Top() ) / -lHeight; - nNumber = (UINT16) Min( nTmp, (long)nNumber ); + nNumber = (sal_uInt16) Min( nTmp, (long)nNumber ); } - for( USHORT i = 1; i <= nNumber; i++ ) + for( sal_uInt16 i = 1; i <= nNumber; i++ ) { if( pProgress ) pProgress->SetState( i ); @@ -239,7 +239,7 @@ void FuCopy::DoExecute( SfxRequest& rReq ) // get newly selected objects SdrMarkList aCopyMarkList( mpView->GetMarkedObjectList() ); - ULONG j, nCopyMarkCount = aMarkList.GetMarkCount(); + sal_uLong j, nCopyMarkCount = aMarkList.GetMarkCount(); // set protection flags at marked copies to null for( j = 0; j < nCopyMarkCount; j++ ) @@ -248,8 +248,8 @@ void FuCopy::DoExecute( SfxRequest& rReq ) if( pObj ) { - pObj->SetMoveProtect( FALSE ); - pObj->SetResizeProtect( FALSE ); + pObj->SetMoveProtect( sal_False ); + pObj->SetResizeProtect( sal_False ); } } @@ -287,9 +287,9 @@ void FuCopy::DoExecute( SfxRequest& rReq ) { // Koennte man sicher noch optimieren, wuerde aber u.U. // zu Rundungsfehlern fuehren - BYTE nRed = aStartColor.GetRed() + (BYTE) ( ( (long) aEndColor.GetRed() - (long) aStartColor.GetRed() ) * (long) i / (long) nNumber ); - BYTE nGreen = aStartColor.GetGreen() + (BYTE) ( ( (long) aEndColor.GetGreen() - (long) aStartColor.GetGreen() ) * (long) i / (long) nNumber ); - BYTE nBlue = aStartColor.GetBlue() + (BYTE) ( ( (long) aEndColor.GetBlue() - (long) aStartColor.GetBlue() ) * (long) i / (long) nNumber ); + sal_uInt8 nRed = aStartColor.GetRed() + (sal_uInt8) ( ( (long) aEndColor.GetRed() - (long) aStartColor.GetRed() ) * (long) i / (long) nNumber ); + sal_uInt8 nGreen = aStartColor.GetGreen() + (sal_uInt8) ( ( (long) aEndColor.GetGreen() - (long) aStartColor.GetGreen() ) * (long) i / (long) nNumber ); + sal_uInt8 nBlue = aStartColor.GetBlue() + (sal_uInt8) ( ( (long) aEndColor.GetBlue() - (long) aStartColor.GetBlue() ) * (long) i / (long) nNumber ); Color aNewColor( nRed, nGreen, nBlue ); SfxItemSet aNewSet( mpViewShell->GetPool(), XATTR_FILLSTYLE, XATTR_FILLCOLOR, 0L ); aNewSet.Put( XFillStyleItem( XFILL_SOLID ) ); @@ -302,10 +302,10 @@ void FuCopy::DoExecute( SfxRequest& rReq ) delete pProgress; if ( bWaiting ) - mpDocSh->SetWaitCursor( FALSE ); + mpDocSh->SetWaitCursor( sal_False ); // Handles zeigen - mpView->AdjustMarkHdl(); //HMH TRUE ); + mpView->AdjustMarkHdl(); //HMH sal_True ); //HMHpView->ShowMarkHdl(); mpView->EndUndo(); diff --git a/sd/source/ui/func/fucushow.cxx b/sd/source/ui/func/fucushow.cxx index 1ca6da60a713..0e2f1b4ca890 100644..100755 --- a/sd/source/ui/func/fucushow.cxx +++ b/sd/source/ui/func/fucushow.cxx @@ -77,10 +77,10 @@ void FuCustomShowDlg::DoExecute( SfxRequest& ) AbstractSdCustomShowDlg* pDlg = pFact ? pFact->CreateSdCustomShowDlg( NULL, *mpDoc ) : 0; if( pDlg ) { - USHORT nRet = pDlg->Execute(); + sal_uInt16 nRet = pDlg->Execute(); if( pDlg->IsModified() ) { - mpDoc->SetChanged( TRUE ); + mpDoc->SetChanged( sal_True ); sd::PresentationSettings& rSettings = mpDoc->getPresentationSettings(); rSettings.mbCustomShow = pDlg->IsCustomShow(); } diff --git a/sd/source/ui/func/fudraw.cxx b/sd/source/ui/func/fudraw.cxx index 4d03abd7b8bc..8fcf4ce72c22 100755 --- a/sd/source/ui/func/fudraw.cxx +++ b/sd/source/ui/func/fudraw.cxx @@ -93,9 +93,9 @@ TYPEINIT1( FuDraw, FuPoor ); FuDraw::FuDraw(ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq) : FuPoor(pViewSh, pWin, pView, pDoc, rReq), - bMBDown(FALSE), - bDragHelpLine(FALSE), - bPermanent(FALSE) + bMBDown(sal_False), + bDragHelpLine(sal_False), + bPermanent(sal_False) { } @@ -116,14 +116,14 @@ FuDraw::~FuDraw() |* \************************************************************************/ -BOOL FuDraw::MouseButtonDown(const MouseEvent& rMEvt) +sal_Bool FuDraw::MouseButtonDown(const MouseEvent& rMEvt) { // #95491# remember button state for creation of own MouseEvents SetMouseButtonCode(rMEvt.GetButtons()); - BOOL bReturn = FALSE; + sal_Bool bReturn = sal_False; - bDragHelpLine = FALSE; + bDragHelpLine = sal_False; aMDPos = mpWindow->PixelToLogic( rMEvt.GetPosPixel() ); @@ -131,11 +131,11 @@ BOOL FuDraw::MouseButtonDown(const MouseEvent& rMEvt) { FrameView* pFrameView = mpViewShell->GetFrameView(); -// BOOL bOrtho = mpView->IsOrthoDesired() || pFrameView->IsOrtho(); +// sal_Bool bOrtho = mpView->IsOrthoDesired() || pFrameView->IsOrtho(); // bOrtho = bOrtho != rMEvt.IsShift(); - BOOL bOrtho = FALSE; + sal_Bool bOrtho = sal_False; - BOOL bRestricted = TRUE; + sal_Bool bRestricted = sal_True; if (mpView->IsDragObj()) { @@ -145,7 +145,7 @@ BOOL FuDraw::MouseButtonDown(const MouseEvent& rMEvt) if (!pHdl || (!pHdl->IsCornerHdl() && !pHdl->IsVertexHdl())) { // Move - bRestricted = FALSE; + bRestricted = sal_False; } } @@ -162,46 +162,46 @@ BOOL FuDraw::MouseButtonDown(const MouseEvent& rMEvt) } if (!mpView->IsSnapEnabled()) - mpView->SetSnapEnabled(TRUE); - BOOL bSnapModPressed = rMEvt.IsMod1(); + mpView->SetSnapEnabled(sal_True); + sal_Bool bSnapModPressed = rMEvt.IsMod1(); - BOOL bGridSnap = pFrameView->IsGridSnap(); + sal_Bool bGridSnap = pFrameView->IsGridSnap(); bGridSnap = (bSnapModPressed != bGridSnap); if (mpView->IsGridSnap() != bGridSnap) mpView->SetGridSnap(bGridSnap); - BOOL bBordSnap = pFrameView->IsBordSnap(); + sal_Bool bBordSnap = pFrameView->IsBordSnap(); bBordSnap = (bSnapModPressed != bBordSnap); if (mpView->IsBordSnap() != bBordSnap) mpView->SetBordSnap(bBordSnap); - BOOL bHlplSnap = pFrameView->IsHlplSnap(); + sal_Bool bHlplSnap = pFrameView->IsHlplSnap(); bHlplSnap = (bSnapModPressed != bHlplSnap); if (mpView->IsHlplSnap() != bHlplSnap) mpView->SetHlplSnap(bHlplSnap); - BOOL bOFrmSnap = pFrameView->IsOFrmSnap(); + sal_Bool bOFrmSnap = pFrameView->IsOFrmSnap(); bOFrmSnap = (bSnapModPressed != bOFrmSnap); if (mpView->IsOFrmSnap() != bOFrmSnap) mpView->SetOFrmSnap(bOFrmSnap); - BOOL bOPntSnap = pFrameView->IsOPntSnap(); + sal_Bool bOPntSnap = pFrameView->IsOPntSnap(); bOPntSnap = (bSnapModPressed != bOPntSnap); if (mpView->IsOPntSnap() != bOPntSnap) mpView->SetOPntSnap(bOPntSnap); - BOOL bOConSnap = pFrameView->IsOConSnap(); + sal_Bool bOConSnap = pFrameView->IsOConSnap(); bOConSnap = (bSnapModPressed != bOConSnap); if (mpView->IsOConSnap() != bOConSnap) mpView->SetOConSnap(bOConSnap); - BOOL bAngleSnap = rMEvt.IsShift() == !pFrameView->IsAngleSnapEnabled(); + sal_Bool bAngleSnap = rMEvt.IsShift() == !pFrameView->IsAngleSnapEnabled(); if (mpView->IsAngleSnapEnabled() != bAngleSnap) mpView->SetAngleSnapEnabled(bAngleSnap); @@ -209,7 +209,7 @@ BOOL FuDraw::MouseButtonDown(const MouseEvent& rMEvt) if (mpView->IsOrtho() != bOrtho) mpView->SetOrtho(bOrtho); - BOOL bCenter = rMEvt.IsMod2(); + sal_Bool bCenter = rMEvt.IsMod2(); if ( mpView->IsCreate1stPointAsCenter() != bCenter || mpView->IsResizeAtCenter() != bCenter ) @@ -219,13 +219,13 @@ BOOL FuDraw::MouseButtonDown(const MouseEvent& rMEvt) } SdrPageView* pPV = 0; - USHORT nHitLog = USHORT ( mpWindow->PixelToLogic(Size(HITPIX,0)).Width() ); + sal_uInt16 nHitLog = sal_uInt16 ( mpWindow->PixelToLogic(Size(HITPIX,0)).Width() ); // #76572# look only for HelpLines when they are visible (!) - BOOL bHelpLine(FALSE); + sal_Bool bHelpLine(sal_False); if(mpView->IsHlplVisible()) bHelpLine = mpView->PickHelpLine(aMDPos, nHitLog, *mpWindow, nHelpLine, pPV); - BOOL bHitHdl = (mpView->PickHandle(aMDPos) != NULL); + sal_Bool bHitHdl = (mpView->PickHandle(aMDPos) != NULL); if ( bHelpLine && !mpView->IsCreateObj() @@ -234,7 +234,7 @@ BOOL FuDraw::MouseButtonDown(const MouseEvent& rMEvt) mpWindow->CaptureMouse(); mpView->BegDragHelpLine(nHelpLine, pPV); bDragHelpLine = mpView->IsDragHelpLine(); - bReturn = TRUE; + bReturn = sal_True; } } ForcePointer(&rMEvt); @@ -248,16 +248,16 @@ BOOL FuDraw::MouseButtonDown(const MouseEvent& rMEvt) |* \************************************************************************/ -BOOL FuDraw::MouseMove(const MouseEvent& rMEvt) +sal_Bool FuDraw::MouseMove(const MouseEvent& rMEvt) { FrameView* pFrameView = mpViewShell->GetFrameView(); Point aPos = mpWindow->PixelToLogic( rMEvt.GetPosPixel() ); -// BOOL bOrtho = mpView->IsOrthoDesired() || pFrameView->IsOrtho(); +// sal_Bool bOrtho = mpView->IsOrthoDesired() || pFrameView->IsOrtho(); // bOrtho = bOrtho != rMEvt.IsShift(); - BOOL bOrtho = FALSE; + sal_Bool bOrtho = sal_False; - BOOL bRestricted = TRUE; + sal_Bool bRestricted = sal_True; if (mpView->IsDragObj()) { @@ -267,7 +267,7 @@ BOOL FuDraw::MouseMove(const MouseEvent& rMEvt) if (!pHdl || (!pHdl->IsCornerHdl() && !pHdl->IsVertexHdl())) { // Move - bRestricted = FALSE; + bRestricted = sal_False; } } @@ -285,46 +285,46 @@ BOOL FuDraw::MouseMove(const MouseEvent& rMEvt) bOrtho = rMEvt.IsShift() != pFrameView->IsOrtho(); } - BOOL bSnapModPressed = rMEvt.IsMod2(); + sal_Bool bSnapModPressed = rMEvt.IsMod2(); mpView->SetDragWithCopy(rMEvt.IsMod1() && pFrameView->IsDragWithCopy()); - BOOL bGridSnap = pFrameView->IsGridSnap(); + sal_Bool bGridSnap = pFrameView->IsGridSnap(); bGridSnap = (bSnapModPressed != bGridSnap); if (mpView->IsGridSnap() != bGridSnap) mpView->SetGridSnap(bGridSnap); - BOOL bBordSnap = pFrameView->IsBordSnap(); + sal_Bool bBordSnap = pFrameView->IsBordSnap(); bBordSnap = (bSnapModPressed != bBordSnap); if (mpView->IsBordSnap() != bBordSnap) mpView->SetBordSnap(bBordSnap); - BOOL bHlplSnap = pFrameView->IsHlplSnap(); + sal_Bool bHlplSnap = pFrameView->IsHlplSnap(); bHlplSnap = (bSnapModPressed != bHlplSnap); if (mpView->IsHlplSnap() != bHlplSnap) mpView->SetHlplSnap(bHlplSnap); - BOOL bOFrmSnap = pFrameView->IsOFrmSnap(); + sal_Bool bOFrmSnap = pFrameView->IsOFrmSnap(); bOFrmSnap = (bSnapModPressed != bOFrmSnap); if (mpView->IsOFrmSnap() != bOFrmSnap) mpView->SetOFrmSnap(bOFrmSnap); - BOOL bOPntSnap = pFrameView->IsOPntSnap(); + sal_Bool bOPntSnap = pFrameView->IsOPntSnap(); bOPntSnap = (bSnapModPressed != bOPntSnap); if (mpView->IsOPntSnap() != bOPntSnap) mpView->SetOPntSnap(bOPntSnap); - BOOL bOConSnap = pFrameView->IsOConSnap(); + sal_Bool bOConSnap = pFrameView->IsOConSnap(); bOConSnap = (bSnapModPressed != bOConSnap); if (mpView->IsOConSnap() != bOConSnap) mpView->SetOConSnap(bOConSnap); - BOOL bAngleSnap = rMEvt.IsShift() == !pFrameView->IsAngleSnapEnabled(); + sal_Bool bAngleSnap = rMEvt.IsShift() == !pFrameView->IsAngleSnapEnabled(); if (mpView->IsAngleSnapEnabled() != bAngleSnap) mpView->SetAngleSnapEnabled(bAngleSnap); @@ -332,7 +332,7 @@ BOOL FuDraw::MouseMove(const MouseEvent& rMEvt) if (mpView->IsOrtho() != bOrtho) mpView->SetOrtho(bOrtho); - BOOL bCenter = rMEvt.IsMod2(); + sal_Bool bCenter = rMEvt.IsMod2(); if ( mpView->IsCreate1stPointAsCenter() != bCenter || mpView->IsResizeAtCenter() != bCenter ) @@ -345,7 +345,7 @@ BOOL FuDraw::MouseMove(const MouseEvent& rMEvt) mpView->MovDragHelpLine(aPos); } - BOOL bReturn = mpView->MouseMove(rMEvt, mpWindow); + sal_Bool bReturn = mpView->MouseMove(rMEvt, mpWindow); if (mpView->IsAction()) { @@ -365,7 +365,7 @@ BOOL FuDraw::MouseMove(const MouseEvent& rMEvt) |* \************************************************************************/ -BOOL FuDraw::MouseButtonUp(const MouseEvent& rMEvt) +sal_Bool FuDraw::MouseButtonUp(const MouseEvent& rMEvt) { if ( mpView->IsDragHelpLine() ) mpView->EndDragHelpLine(); @@ -383,9 +383,9 @@ BOOL FuDraw::MouseButtonUp(const MouseEvent& rMEvt) FrameView* pFrameView = mpViewShell->GetFrameView(); mpView->SetOrtho( pFrameView->IsOrtho() ); mpView->SetAngleSnapEnabled( pFrameView->IsAngleSnapEnabled() ); - mpView->SetSnapEnabled(TRUE); - mpView->SetCreate1stPointAsCenter(FALSE); - mpView->SetResizeAtCenter(FALSE); + mpView->SetSnapEnabled(sal_True); + mpView->SetCreate1stPointAsCenter(sal_False); + mpView->SetResizeAtCenter(sal_False); mpView->SetDragWithCopy(pFrameView->IsDragWithCopy()); mpView->SetGridSnap(pFrameView->IsGridSnap()); mpView->SetBordSnap(pFrameView->IsBordSnap()); @@ -394,24 +394,24 @@ BOOL FuDraw::MouseButtonUp(const MouseEvent& rMEvt) mpView->SetOPntSnap(pFrameView->IsOPntSnap()); mpView->SetOConSnap(pFrameView->IsOConSnap()); - bIsInDragMode = FALSE; + bIsInDragMode = sal_False; ForcePointer(&rMEvt); FuPoor::MouseButtonUp(rMEvt); - return FALSE; + return sal_False; } /************************************************************************* |* |* Process keyboard-events |* -|* When processing a KeyEvent the returnvalue is TRUE, otherwise FALSE. +|* When processing a KeyEvent the returnvalue is sal_True, otherwise sal_False. |* \************************************************************************/ -BOOL FuDraw::KeyInput(const KeyEvent& rKEvt) +sal_Bool FuDraw::KeyInput(const KeyEvent& rKEvt) { - BOOL bReturn = FALSE; + sal_Bool bReturn = sal_False; switch ( rKEvt.GetKeyCode().GetCode() ) { @@ -426,7 +426,7 @@ BOOL FuDraw::KeyInput(const KeyEvent& rKEvt) { if (!mpDocSh->IsReadOnly()) { - if ( mpView && mpView->IsPresObjSelected(FALSE, TRUE, FALSE, TRUE) ) + if ( mpView && mpView->IsPresObjSelected(sal_False, sal_True, sal_False, sal_True) ) { InfoBox(mpWindow, String(SdResId(STR_ACTION_NOTPOSSIBLE) ) ).Execute(); } @@ -452,7 +452,7 @@ BOOL FuDraw::KeyInput(const KeyEvent& rKEvt) mpView->DeleteMarked(); } } - bReturn = TRUE; + bReturn = sal_True; } break; @@ -484,7 +484,7 @@ BOOL FuDraw::KeyInput(const KeyEvent& rKEvt) if(mpView->AreObjectsMarked()) mpView->MakeVisible(mpView->GetAllMarkedRect(), *mpWindow); - bReturn = TRUE; + bReturn = sal_True; } } break; @@ -497,13 +497,13 @@ BOOL FuDraw::KeyInput(const KeyEvent& rKEvt) { // #97016# mark last object mpView->UnmarkAllObj(); - mpView->MarkNextObj(FALSE); + mpView->MarkNextObj(sal_False); // #97016# II if(mpView->AreObjectsMarked()) mpView->MakeVisible(mpView->GetAllMarkedRect(), *mpWindow); - bReturn = TRUE; + bReturn = sal_True; } } break; @@ -516,13 +516,13 @@ BOOL FuDraw::KeyInput(const KeyEvent& rKEvt) { // #97016# mark first object mpView->UnmarkAllObj(); - mpView->MarkNextObj(TRUE); + mpView->MarkNextObj(sal_True); // #97016# II if(mpView->AreObjectsMarked()) mpView->MakeVisible(mpView->GetAllMarkedRect(), *mpWindow); - bReturn = TRUE; + bReturn = sal_True; } } break; @@ -596,9 +596,9 @@ void FuDraw::Deactivate() void FuDraw::ForcePointer(const MouseEvent* pMEvt) { Point aPnt; - USHORT nModifier = 0; - BOOL bLeftDown = FALSE; - BOOL bDefPointer = TRUE; + sal_uInt16 nModifier = 0; + sal_Bool bLeftDown = sal_False; + sal_Bool bDefPointer = sal_True; if (pMEvt) { @@ -618,7 +618,7 @@ void FuDraw::ForcePointer(const MouseEvent* pMEvt) /****************************************************************** * Giesskannenmodus ******************************************************************/ - bDefPointer = FALSE; + bDefPointer = sal_False; mpWindow->SetPointer(Pointer(POINTER_FILL)); } } @@ -631,7 +631,7 @@ void FuDraw::ForcePointer(const MouseEvent* pMEvt) /****************************************************************** * Giesskannenmodus ******************************************************************/ - bDefPointer = FALSE; + bDefPointer = sal_False; mpWindow->SetPointer(Pointer(POINTER_FILL)); } else if (!pHdl && @@ -644,7 +644,7 @@ void FuDraw::ForcePointer(const MouseEvent* pMEvt) if (pMask && pMask->IsEyedropping()) { - bDefPointer = FALSE; + bDefPointer = sal_False; mpWindow->SetPointer(Pointer(POINTER_REFHAND)); } } @@ -672,7 +672,7 @@ void FuDraw::ForcePointer(const MouseEvent* pMEvt) if ((pObject->ISA(E3dObject)) && (rMarkList.GetMarkCount() == 1)) { mpWindow->SetPointer(Pointer(POINTER_ROTATE)); - bDefPointer = FALSE; // Otherwise it'll be calles Joes routine and the mousepointer will reconfigurate again + bDefPointer = sal_False; // Otherwise it'll be calles Joes routine and the mousepointer will reconfigurate again } } @@ -687,7 +687,7 @@ void FuDraw::ForcePointer(const MouseEvent* pMEvt) } else if (eHit == SDRHIT_TEXTEDITOBJ && this->ISA(FuSelection)) { - UINT16 nSdrObjKind = aVEvt.pObj->GetObjIdentifier(); + sal_uInt16 nSdrObjKind = aVEvt.pObj->GetObjIdentifier(); if ( nSdrObjKind != OBJ_TEXT && nSdrObjKind != OBJ_TITLETEXT && @@ -695,7 +695,7 @@ void FuDraw::ForcePointer(const MouseEvent* pMEvt) aVEvt.pObj->IsEmptyPresObj() ) { pObj = NULL; - bDefPointer = FALSE; + bDefPointer = sal_False; mpWindow->SetPointer(Pointer(POINTER_ARROW)); } } @@ -728,22 +728,22 @@ void FuDraw::ForcePointer(const MouseEvent* pMEvt) |* \************************************************************************/ -BOOL FuDraw::SetPointer(SdrObject* pObj, const Point& rPos) +sal_Bool FuDraw::SetPointer(SdrObject* pObj, const Point& rPos) { - BOOL bSet = FALSE; + sal_Bool bSet = sal_False; - BOOL bAnimationInfo = (!mpDocSh->ISA(GraphicDocShell) && - mpDoc->GetAnimationInfo(pObj)) ? TRUE:FALSE; + sal_Bool bAnimationInfo = (!mpDocSh->ISA(GraphicDocShell) && + mpDoc->GetAnimationInfo(pObj)) ? sal_True:sal_False; - BOOL bImageMapInfo = FALSE; + sal_Bool bImageMapInfo = sal_False; if (!bAnimationInfo) - bImageMapInfo = mpDoc->GetIMapInfo(pObj) ? TRUE:FALSE; + bImageMapInfo = mpDoc->GetIMapInfo(pObj) ? sal_True:sal_False; if (bAnimationInfo || bImageMapInfo) { const SetOfByte* pVisiLayer = &mpView->GetSdrPageView()->GetVisibleLayers(); - USHORT nHitLog(USHORT (mpWindow->PixelToLogic(Size(HITPIX,0)).Width())); + sal_uInt16 nHitLog(sal_uInt16 (mpWindow->PixelToLogic(Size(HITPIX,0)).Width())); long n2HitLog(nHitLog * 2); Point aHitPosR(rPos); Point aHitPosL(rPos); @@ -794,7 +794,7 @@ BOOL FuDraw::SetPointer(SdrObject* pObj, const Point& rPos) pInfo->meTextEffect != presentation::AnimationEffect_NONE ))))) { // Animations-Objekt - bSet = TRUE; + bSet = sal_True; mpWindow->SetPointer(Pointer(POINTER_REFHAND)); } } @@ -804,7 +804,7 @@ BOOL FuDraw::SetPointer(SdrObject* pObj, const Point& rPos) /****************************************************** * ImageMap ******************************************************/ - bSet = TRUE; + bSet = sal_True; mpWindow->SetPointer(Pointer(POINTER_REFHAND)); } } @@ -823,7 +823,7 @@ BOOL FuDraw::SetPointer(SdrObject* pObj, const Point& rPos) void FuDraw::DoubleClick(const MouseEvent& rMEvt) { - USHORT nHitLog = USHORT ( mpWindow->PixelToLogic(Size(HITPIX,0)).Width() ); + sal_uInt16 nHitLog = sal_uInt16 ( mpWindow->PixelToLogic(Size(HITPIX,0)).Width() ); if ( mpView->AreObjectsMarked() ) { @@ -834,8 +834,8 @@ void FuDraw::DoubleClick(const MouseEvent& rMEvt) SdrMark* pMark = rMarkList.GetMark(0); SdrObject* pObj = pMark->GetMarkedSdrObj(); - UINT32 nInv = pObj->GetObjInventor(); - UINT16 nSdrObjKind = pObj->GetObjIdentifier(); + sal_uInt32 nInv = pObj->GetObjInventor(); + sal_uInt16 nSdrObjKind = pObj->GetObjIdentifier(); if (nInv == SdrInventor && nSdrObjKind == OBJ_OLE2) { @@ -870,7 +870,7 @@ void FuDraw::DoubleClick(const MouseEvent& rMEvt) { // hit group -> select subobject mpView->UnMarkAll(); - mpView->MarkObj(aMDPos, nHitLog, rMEvt.IsShift(), TRUE); + mpView->MarkObj(aMDPos, nHitLog, rMEvt.IsShift(), sal_True); } } } @@ -884,9 +884,9 @@ void FuDraw::DoubleClick(const MouseEvent& rMEvt) |* \************************************************************************/ -BOOL FuDraw::RequestHelp(const HelpEvent& rHEvt) +sal_Bool FuDraw::RequestHelp(const HelpEvent& rHEvt) { - BOOL bReturn = FALSE; + sal_Bool bReturn = sal_False; if (Help::IsBalloonHelpEnabled() || Help::IsQuickHelpEnabled()) { @@ -933,9 +933,9 @@ BOOL FuDraw::RequestHelp(const HelpEvent& rHEvt) |* \************************************************************************/ -BOOL FuDraw::SetHelpText(SdrObject* pObj, const Point& rPosPixel, const SdrViewEvent& rVEvt) +sal_Bool FuDraw::SetHelpText(SdrObject* pObj, const Point& rPosPixel, const SdrViewEvent& rVEvt) { - BOOL bSet = FALSE; + sal_Bool bSet = sal_False; String aHelpText; Point aPos(mpWindow->PixelToLogic(mpWindow->ScreenToOutputPixel(rPosPixel))); @@ -1074,7 +1074,7 @@ BOOL FuDraw::SetHelpText(SdrObject* pObj, const Point& rPosPixel, const SdrViewE if (aHelpText.Len()) { - bSet = TRUE; + bSet = sal_True; Rectangle aLogicPix = mpWindow->LogicToPixel(pObj->GetLogicRect()); Rectangle aScreenRect(mpWindow->OutputToScreenPixel(aLogicPix.TopLeft()), mpWindow->OutputToScreenPixel(aLogicPix.BottomRight())); diff --git a/sd/source/ui/func/fudspord.cxx b/sd/source/ui/func/fudspord.cxx index 2e6ad66e11f1..50b014612c8d 100644..100755 --- a/sd/source/ui/func/fudspord.cxx +++ b/sd/source/ui/func/fudspord.cxx @@ -93,12 +93,12 @@ FunctionReference FuDisplayOrder::Create( ViewShell* pViewSh, ::sd::Window* pWin |* \************************************************************************/ -BOOL FuDisplayOrder::MouseButtonDown(const MouseEvent& rMEvt) +sal_Bool FuDisplayOrder::MouseButtonDown(const MouseEvent& rMEvt) { // #95491# remember button state for creation of own MouseEvents SetMouseButtonCode(rMEvt.GetButtons()); - return TRUE; + return sal_True; } /************************************************************************* @@ -107,7 +107,7 @@ BOOL FuDisplayOrder::MouseButtonDown(const MouseEvent& rMEvt) |* \************************************************************************/ -BOOL FuDisplayOrder::MouseMove(const MouseEvent& rMEvt) +sal_Bool FuDisplayOrder::MouseMove(const MouseEvent& rMEvt) { SdrObject* pPickObj; SdrPageView* pPV; @@ -133,7 +133,7 @@ BOOL FuDisplayOrder::MouseMove(const MouseEvent& rMEvt) implClearOverlay(); } - return TRUE; + return sal_True; } /************************************************************************* @@ -142,7 +142,7 @@ BOOL FuDisplayOrder::MouseMove(const MouseEvent& rMEvt) |* \************************************************************************/ -BOOL FuDisplayOrder::MouseButtonUp(const MouseEvent& rMEvt) +sal_Bool FuDisplayOrder::MouseButtonUp(const MouseEvent& rMEvt) { // #95491# remember button state for creation of own MouseEvents SetMouseButtonCode(rMEvt.GetButtons()); @@ -164,7 +164,7 @@ BOOL FuDisplayOrder::MouseButtonUp(const MouseEvent& rMEvt) mpViewShell->Cancel(); - return TRUE; + return sal_True; } /************************************************************************* diff --git a/sd/source/ui/func/fuediglu.cxx b/sd/source/ui/func/fuediglu.cxx index ddae68d8b9ab..51d6c56f15b6 100644..100755 --- a/sd/source/ui/func/fuediglu.cxx +++ b/sd/source/ui/func/fuediglu.cxx @@ -82,7 +82,7 @@ FunctionReference FuEditGluePoints::Create( ViewShell* pViewSh, ::sd::Window* pW void FuEditGluePoints::DoExecute( SfxRequest& rReq ) { FuDraw::DoExecute( rReq ); - mpView->SetInsGluePointMode(FALSE); + mpView->SetInsGluePointMode(sal_False); mpViewShell->GetViewShellBase().GetToolBarManager()->AddToolBar( ToolBarManager::TBG_FUNCTION, ToolBarManager::msGluePointsToolBar); @@ -98,7 +98,7 @@ FuEditGluePoints::~FuEditGluePoints() { mpView->BrkAction(); mpView->UnmarkAllGluePoints(); - mpView->SetInsGluePointMode(FALSE); + mpView->SetInsGluePointMode(sal_False); } /************************************************************************* @@ -107,25 +107,25 @@ FuEditGluePoints::~FuEditGluePoints() |* \************************************************************************/ -BOOL FuEditGluePoints::MouseButtonDown(const MouseEvent& rMEvt) +sal_Bool FuEditGluePoints::MouseButtonDown(const MouseEvent& rMEvt) { mpView->SetActualWin( mpWindow ); - BOOL bReturn = FuDraw::MouseButtonDown(rMEvt); + sal_Bool bReturn = FuDraw::MouseButtonDown(rMEvt); if (mpView->IsAction()) { if (rMEvt.IsRight()) mpView->BckAction(); - return TRUE; + return sal_True; } if (rMEvt.IsLeft()) { - bReturn = TRUE; - USHORT nHitLog = USHORT ( mpWindow->PixelToLogic(Size(HITPIX,0)).Width() ); - USHORT nDrgLog = USHORT ( mpWindow->PixelToLogic(Size(DRGPIX,0)).Width() ); + bReturn = sal_True; + sal_uInt16 nHitLog = sal_uInt16 ( mpWindow->PixelToLogic(Size(HITPIX,0)).Width() ); + sal_uInt16 nDrgLog = sal_uInt16 ( mpWindow->PixelToLogic(Size(DRGPIX,0)).Width() ); mpWindow->CaptureMouse(); SdrViewEvent aVEvt; @@ -200,7 +200,7 @@ BOOL FuEditGluePoints::MouseButtonDown(const MouseEvent& rMEvt) mpView->UnmarkAllObj(); } - BOOL bMarked = FALSE; + sal_Bool bMarked = sal_False; if (!rMEvt.IsMod1()) { @@ -251,7 +251,7 @@ BOOL FuEditGluePoints::MouseButtonDown(const MouseEvent& rMEvt) |* \************************************************************************/ -BOOL FuEditGluePoints::MouseMove(const MouseEvent& rMEvt) +sal_Bool FuEditGluePoints::MouseMove(const MouseEvent& rMEvt) { mpView->SetActualWin( mpWindow ); @@ -267,7 +267,7 @@ BOOL FuEditGluePoints::MouseMove(const MouseEvent& rMEvt) ForcePointer(&rMEvt); - return TRUE; + return sal_True; } /************************************************************************* @@ -276,21 +276,21 @@ BOOL FuEditGluePoints::MouseMove(const MouseEvent& rMEvt) |* \************************************************************************/ -BOOL FuEditGluePoints::MouseButtonUp(const MouseEvent& rMEvt) +sal_Bool FuEditGluePoints::MouseButtonUp(const MouseEvent& rMEvt) { mpView->SetActualWin( mpWindow ); - BOOL bReturn = FALSE; + sal_Bool bReturn = sal_False; if (mpView->IsAction()) { - bReturn = TRUE; + bReturn = sal_True; mpView->EndAction(); } FuDraw::MouseButtonUp(rMEvt); - USHORT nDrgLog = USHORT ( mpWindow->PixelToLogic(Size(DRGPIX,0)).Width() ); + sal_uInt16 nDrgLog = sal_uInt16 ( mpWindow->PixelToLogic(Size(DRGPIX,0)).Width() ); Point aPos = mpWindow->PixelToLogic( rMEvt.GetPosPixel() ); if (Abs(aMDPos.X() - aPos.X()) < nDrgLog && @@ -316,16 +316,16 @@ BOOL FuEditGluePoints::MouseButtonUp(const MouseEvent& rMEvt) |* |* Tastaturereignisse bearbeiten |* -|* Wird ein KeyEvent bearbeitet, so ist der Return-Wert TRUE, andernfalls -|* FALSE. +|* Wird ein KeyEvent bearbeitet, so ist der Return-Wert sal_True, andernfalls +|* sal_False. |* \************************************************************************/ -BOOL FuEditGluePoints::KeyInput(const KeyEvent& rKEvt) +sal_Bool FuEditGluePoints::KeyInput(const KeyEvent& rKEvt) { mpView->SetActualWin( mpWindow ); - BOOL bReturn = FuDraw::KeyInput(rKEvt); + sal_Bool bReturn = FuDraw::KeyInput(rKEvt); return bReturn; } @@ -336,7 +336,7 @@ BOOL FuEditGluePoints::KeyInput(const KeyEvent& rKEvt) |* \************************************************************************/ -BOOL FuEditGluePoints::Command(const CommandEvent& rCEvt) +sal_Bool FuEditGluePoints::Command(const CommandEvent& rCEvt) { mpView->SetActualWin( mpWindow ); return FuPoor::Command( rCEvt ); @@ -362,7 +362,7 @@ void FuEditGluePoints::Activate() void FuEditGluePoints::Deactivate() { - mpView->SetGluePointEditMode( FALSE ); + mpView->SetGluePointEditMode( sal_False ); FuDraw::Deactivate(); } @@ -414,44 +414,44 @@ void FuEditGluePoints::ReceiveRequest(SfxRequest& rReq) { const SfxItemSet* pSet = rReq.GetArgs(); const SfxPoolItem& rItem = pSet->Get(SID_GLUE_PERCENT); - BOOL bPercent = ((const SfxBoolItem&) rItem).GetValue(); + sal_Bool bPercent = ((const SfxBoolItem&) rItem).GetValue(); mpView->SetMarkedGluePointsPercent(bPercent); } break; case SID_GLUE_HORZALIGN_CENTER: { - mpView->SetMarkedGluePointsAlign(FALSE, SDRHORZALIGN_CENTER); + mpView->SetMarkedGluePointsAlign(sal_False, SDRHORZALIGN_CENTER); } break; case SID_GLUE_HORZALIGN_LEFT: { - mpView->SetMarkedGluePointsAlign(FALSE, SDRHORZALIGN_LEFT); + mpView->SetMarkedGluePointsAlign(sal_False, SDRHORZALIGN_LEFT); } break; case SID_GLUE_HORZALIGN_RIGHT: { - mpView->SetMarkedGluePointsAlign(FALSE, SDRHORZALIGN_RIGHT); + mpView->SetMarkedGluePointsAlign(sal_False, SDRHORZALIGN_RIGHT); } break; case SID_GLUE_VERTALIGN_CENTER: { - mpView->SetMarkedGluePointsAlign(TRUE, SDRVERTALIGN_CENTER); + mpView->SetMarkedGluePointsAlign(sal_True, SDRVERTALIGN_CENTER); } break; case SID_GLUE_VERTALIGN_TOP: { - mpView->SetMarkedGluePointsAlign(TRUE, SDRVERTALIGN_TOP); + mpView->SetMarkedGluePointsAlign(sal_True, SDRVERTALIGN_TOP); } break; case SID_GLUE_VERTALIGN_BOTTOM: { - mpView->SetMarkedGluePointsAlign(TRUE, SDRVERTALIGN_BOTTOM); + mpView->SetMarkedGluePointsAlign(sal_True, SDRVERTALIGN_BOTTOM); } break; } diff --git a/sd/source/ui/func/fuexpand.cxx b/sd/source/ui/func/fuexpand.cxx index e45b8ce36673..ff4b3f512d2f 100755 --- a/sd/source/ui/func/fuexpand.cxx +++ b/sd/source/ui/func/fuexpand.cxx @@ -89,8 +89,8 @@ void FuExpandPage::DoExecute( SfxRequest& ) // Selektierte Seite finden (nur Standard-Seiten) SdPage* pActualPage = NULL; - USHORT i = 0; - USHORT nCount = mpDoc->GetSdPageCount(PK_STANDARD); + sal_uInt16 i = 0; + sal_uInt16 nCount = mpDoc->GetSdPageCount(PK_STANDARD); while (!pActualPage && i < nCount) { @@ -106,8 +106,8 @@ void FuExpandPage::DoExecute( SfxRequest& ) { ::sd::Outliner* pOutl = new ::sd::Outliner( mpDoc, OUTLINERMODE_OUTLINEOBJECT ); - pOutl->SetUpdateMode(FALSE); - pOutl->EnableUndo(FALSE); + pOutl->SetUpdateMode(sal_False); + pOutl->EnableUndo(sal_False); if (mpDocSh) pOutl->SetRefDevice( SD_MOD()->GetRefDevice( *mpDocSh ) ); @@ -116,7 +116,7 @@ void FuExpandPage::DoExecute( SfxRequest& ) pOutl->SetStyleSheetPool((SfxStyleSheetPool*) mpDoc->GetStyleSheetPool()); SetOfByte aVisibleLayers = pActualPage->TRG_GetMasterPageVisibleLayers(); - USHORT nActualPageNum = pActualPage->GetPageNum(); + sal_uInt16 nActualPageNum = pActualPage->GetPageNum(); SdPage* pActualNotesPage = (SdPage*) mpDoc->GetPage(nActualPageNum + 1); SdrTextObj* pActualOutline = (SdrTextObj*) pActualPage->GetPresObj(PRESOBJ_OUTLINE); @@ -133,25 +133,25 @@ void FuExpandPage::DoExecute( SfxRequest& ) // Harte Absatz- und Zeichenattribute entfernen SfxItemSet aEmptyEEAttr(mpDoc->GetPool(), EE_ITEMS_START, EE_ITEMS_END); - ULONG nParaCount1 = pOutl->GetParagraphCount(); + sal_uLong nParaCount1 = pOutl->GetParagraphCount(); - for (USHORT nPara = 0; nPara < nParaCount1; nPara++) + for (sal_uInt16 nPara = 0; nPara < nParaCount1; nPara++) { pOutl->QuickRemoveCharAttribs(nPara); pOutl->SetParaAttribs(nPara, aEmptyEEAttr); } - USHORT nPos = 2; + sal_uInt16 nPos = 2; Paragraph* pPara = pOutl->GetParagraph( 0 ); while (pPara) { - ULONG nParaPos = pOutl->GetAbsPos( pPara ); - sal_Int16 nDepth = pOutl->GetDepth( (USHORT) nParaPos ); + sal_uLong nParaPos = pOutl->GetAbsPos( pPara ); + sal_Int16 nDepth = pOutl->GetDepth( (sal_uInt16) nParaPos ); if ( nDepth == 0 ) { // Seite mit Titel & Gliederung! - SdPage* pPage = (SdPage*) mpDoc->AllocPage(FALSE); + SdPage* pPage = (SdPage*) mpDoc->AllocPage(sal_False); pPage->SetSize(pActualPage->GetSize() ); pPage->SetBorder(pActualPage->GetLftBorder(), pActualPage->GetUppBorder(), @@ -169,11 +169,11 @@ void FuExpandPage::DoExecute( SfxRequest& ) // MasterPage der aktuellen Seite verwenden pPage->TRG_SetMasterPage(pActualPage->TRG_GetMasterPage()); pPage->SetLayoutName(pActualPage->GetLayoutName()); - pPage->SetAutoLayout(AUTOLAYOUT_ENUM, TRUE); + pPage->SetAutoLayout(AUTOLAYOUT_ENUM, sal_True); pPage->TRG_SetMasterPageVisibleLayers(aVisibleLayers); // Notiz-Seite - SdPage* pNotesPage = (SdPage*) mpDoc->AllocPage(FALSE); + SdPage* pNotesPage = (SdPage*) mpDoc->AllocPage(sal_False); pNotesPage->SetSize(pActualNotesPage->GetSize()); pNotesPage->SetBorder(pActualNotesPage->GetLftBorder(), pActualNotesPage->GetUppBorder(), @@ -192,14 +192,14 @@ void FuExpandPage::DoExecute( SfxRequest& ) // MasterPage der aktuellen Seite verwenden pNotesPage->TRG_SetMasterPage(pActualNotesPage->TRG_GetMasterPage()); pNotesPage->SetLayoutName(pActualNotesPage->GetLayoutName()); - pNotesPage->SetAutoLayout(pActualNotesPage->GetAutoLayout(), TRUE); + pNotesPage->SetAutoLayout(pActualNotesPage->GetAutoLayout(), sal_True); pNotesPage->TRG_SetMasterPageVisibleLayers(aVisibleLayers); // Title-Textobjekt erstellen SdrTextObj* pTextObj = (SdrTextObj*) pPage->GetPresObj(PRESOBJ_TITLE); // - OutlinerParaObject* pOutlinerParaObject = pOutl->CreateParaObject( (USHORT) nParaPos, 1); + OutlinerParaObject* pOutlinerParaObject = pOutl->CreateParaObject( (sal_uInt16) nParaPos, 1); pOutlinerParaObject->SetOutlinerMode(OUTLINERMODE_TITLEOBJECT); if( pOutlinerParaObject->GetDepth(0) != -1 ) @@ -218,12 +218,12 @@ void FuExpandPage::DoExecute( SfxRequest& ) pTextObj->SetOutlinerParaObject(pOutlinerParaObject); - pTextObj->SetEmptyPresObj(FALSE); + pTextObj->SetEmptyPresObj(sal_False); SfxStyleSheet* pSheet = pPage->GetStyleSheetForPresObj(PRESOBJ_TITLE); - pTextObj->NbcSetStyleSheet(pSheet, FALSE); + pTextObj->NbcSetStyleSheet(pSheet, sal_False); - ULONG nChildCount = pOutl->GetChildCount(pPara); + sal_uLong nChildCount = pOutl->GetChildCount(pPara); if (nChildCount > 0) { @@ -231,19 +231,19 @@ void FuExpandPage::DoExecute( SfxRequest& ) SdrTextObj* pOutlineObj = (SdrTextObj*) pPage->GetPresObj(PRESOBJ_OUTLINE); pPara = pOutl->GetParagraph( ++nParaPos ); - OutlinerParaObject* pOPO = pOutl->CreateParaObject( (USHORT) nParaPos, (USHORT) nChildCount); + OutlinerParaObject* pOPO = pOutl->CreateParaObject( (sal_uInt16) nParaPos, (sal_uInt16) nChildCount); // -- SdrOutliner* pTempOutl = SdrMakeOutliner( OUTLINERMODE_OUTLINEOBJECT, mpDoc ); pTempOutl->SetText( *pOPO ); - ULONG nParaCount2 = pTempOutl->GetParagraphCount(); - ULONG nPara; + sal_uLong nParaCount2 = pTempOutl->GetParagraphCount(); + sal_uLong nPara; for( nPara = 0; nPara < nParaCount2; nPara++ ) { pTempOutl->SetDepth ( pTempOutl->GetParagraph( nPara ), - pTempOutl->GetDepth((USHORT) nPara ) - 1); + pTempOutl->GetDepth((sal_uInt16) nPara ) - 1); } delete pOPO; @@ -252,9 +252,9 @@ void FuExpandPage::DoExecute( SfxRequest& ) // -- pOutlineObj->SetOutlinerParaObject( pOPO ); - pOutlineObj->SetEmptyPresObj(FALSE); + pOutlineObj->SetEmptyPresObj(sal_False); - // Harte Attribute entfernen (Flag auf TRUE) + // Harte Attribute entfernen (Flag auf sal_True) SfxItemSet aAttr(mpDoc->GetPool()); aAttr.Put(XLineStyleItem(XLINE_NONE)); aAttr.Put(XFillStyleItem(XFILL_NONE)); diff --git a/sd/source/ui/func/fuformatpaintbrush.cxx b/sd/source/ui/func/fuformatpaintbrush.cxx index 0d43ea73c964..ade6f3b52771 100644..100755 --- a/sd/source/ui/func/fuformatpaintbrush.cxx +++ b/sd/source/ui/func/fuformatpaintbrush.cxx @@ -105,7 +105,7 @@ static void unmarkimpl( SdrView* pView ) pView->UnMarkAll(); } -BOOL FuFormatPaintBrush::MouseButtonDown(const MouseEvent& rMEvt) +sal_Bool FuFormatPaintBrush::MouseButtonDown(const MouseEvent& rMEvt) { if(mpView&&mpWindow) { @@ -116,7 +116,7 @@ BOOL FuFormatPaintBrush::MouseButtonDown(const MouseEvent& rMEvt) { SdrObject* pPickObj=0; SdrPageView* pPV=0; - USHORT nHitLog = USHORT ( mpWindow->PixelToLogic(Size(HITPIX,0)).Width() ); + sal_uInt16 nHitLog = sal_uInt16 ( mpWindow->PixelToLogic(Size(HITPIX,0)).Width() ); mpView->PickObj( mpWindow->PixelToLogic( rMEvt.GetPosPixel() ),nHitLog, pPickObj, pPV, SDRSEARCH_PICKMARKABLE); if( (pPickObj != 0) && !pPickObj->IsEmptyPresObj() ) @@ -152,18 +152,18 @@ BOOL FuFormatPaintBrush::MouseButtonDown(const MouseEvent& rMEvt) if( aVEvt.pObj ) { - USHORT nHitLog = USHORT ( mpWindow->PixelToLogic(Size(HITPIX,0)).Width() ); - BOOL bToggle = FALSE; - mpView->MarkObj(mpWindow->PixelToLogic( rMEvt.GetPosPixel() ), nHitLog, bToggle, FALSE); - return TRUE; + sal_uInt16 nHitLog = sal_uInt16 ( mpWindow->PixelToLogic(Size(HITPIX,0)).Width() ); + sal_Bool bToggle = sal_False; + mpView->MarkObj(mpWindow->PixelToLogic( rMEvt.GetPosPixel() ), nHitLog, bToggle, sal_False); + return sal_True; } } - return FALSE; + return sal_False; } -BOOL FuFormatPaintBrush::MouseMove(const MouseEvent& rMEvt) +sal_Bool FuFormatPaintBrush::MouseMove(const MouseEvent& rMEvt) { - BOOL bReturn = FALSE; + sal_Bool bReturn = sal_False; if( mpWindow && mpView ) { if ( mpView->IsTextEdit() ) @@ -173,10 +173,10 @@ BOOL FuFormatPaintBrush::MouseMove(const MouseEvent& rMEvt) } else { - USHORT nHitLog = USHORT ( mpWindow->PixelToLogic(Size(HITPIX,0)).Width() ); + sal_uInt16 nHitLog = sal_uInt16 ( mpWindow->PixelToLogic(Size(HITPIX,0)).Width() ); SdrObject* pObj=0; SdrPageView* pPV=0; - BOOL bOverMarkableObject = mpView->PickObj( mpWindow->PixelToLogic( rMEvt.GetPosPixel() ),nHitLog, pObj, pPV, SDRSEARCH_PICKMARKABLE); + sal_Bool bOverMarkableObject = mpView->PickObj( mpWindow->PixelToLogic( rMEvt.GetPosPixel() ),nHitLog, pObj, pPV, SDRSEARCH_PICKMARKABLE); if(bOverMarkableObject && HasContentForThisType(pObj->GetObjInventor(),pObj->GetObjIdentifier()) ) mpWindow->SetPointer(Pointer(POINTER_FILL)); @@ -187,7 +187,7 @@ BOOL FuFormatPaintBrush::MouseMove(const MouseEvent& rMEvt) return bReturn; } -BOOL FuFormatPaintBrush::MouseButtonUp(const MouseEvent& rMEvt) +sal_Bool FuFormatPaintBrush::MouseButtonUp(const MouseEvent& rMEvt) { if( mpItemSet.get() && mpView && mpView->AreObjectsMarked() ) { @@ -209,19 +209,19 @@ BOOL FuFormatPaintBrush::MouseButtonUp(const MouseEvent& rMEvt) mpViewShell->GetViewFrame()->GetBindings().Invalidate(SID_FORMATPAINTBRUSH); if( mbPermanent ) - return TRUE; + return sal_True; } implcancel(); - return TRUE; + return sal_True; } -BOOL FuFormatPaintBrush::KeyInput(const KeyEvent& rKEvt) +sal_Bool FuFormatPaintBrush::KeyInput(const KeyEvent& rKEvt) { if( (rKEvt.GetKeyCode().GetCode() == KEY_ESCAPE) && mpViewShell ) { implcancel(); - return TRUE; + return sal_True; } return FuPoor::KeyInput(rKEvt); } @@ -231,8 +231,8 @@ void FuFormatPaintBrush::Activate() mbOldIsQuickTextEditMode = mpViewShell->GetFrameView()->IsQuickEdit(); if( !mbOldIsQuickTextEditMode ) { - mpViewShell->GetFrameView()->SetQuickEdit(TRUE); - mpView->SetQuickTextEditMode(TRUE); + mpViewShell->GetFrameView()->SetQuickEdit(sal_True); + mpView->SetQuickTextEditMode(sal_True); } } @@ -240,12 +240,12 @@ void FuFormatPaintBrush::Deactivate() { if( !mbOldIsQuickTextEditMode ) { - mpViewShell->GetFrameView()->SetQuickEdit(FALSE); - mpView->SetQuickTextEditMode(FALSE); + mpViewShell->GetFrameView()->SetQuickEdit(sal_False); + mpView->SetQuickTextEditMode(sal_False); } } -bool FuFormatPaintBrush::HasContentForThisType( UINT32 nObjectInventor, UINT16 nObjectIdentifier ) const +bool FuFormatPaintBrush::HasContentForThisType( sal_uInt32 nObjectInventor, sal_uInt16 nObjectIdentifier ) const { if( mpItemSet.get() == 0 ) return false; @@ -265,7 +265,7 @@ void FuFormatPaintBrush::Paste( bool bNoCharacterFormats, bool bNoParagraphForma { String sLabel( mpViewShell->GetViewShellBase().RetrieveLabelFromCommand( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FormatPaintbrush" ) ) ) ); mpDoc->BegUndo( sLabel ); - mpDoc->AddUndo(mpDoc->GetSdrUndoFactory().CreateUndoAttrObject(*pObj,FALSE,TRUE)); + mpDoc->AddUndo(mpDoc->GetSdrUndoFactory().CreateUndoAttrObject(*pObj,sal_False,sal_True)); } mpView->ApplyFormatPaintBrush( *mpItemSet.get(), bNoCharacterFormats, bNoParagraphFormats ); @@ -280,7 +280,7 @@ void FuFormatPaintBrush::Paste( bool bNoCharacterFormats, bool bNoParagraphForma /* static */ void FuFormatPaintBrush::GetMenuState( DrawViewShell& rDrawViewShell, SfxItemSet &rSet ) { const SdrMarkList& rMarkList = rDrawViewShell.GetDrawView()->GetMarkedObjectList(); - const ULONG nMarkCount = rMarkList.GetMarkCount(); + const sal_uLong nMarkCount = rMarkList.GetMarkCount(); if( nMarkCount == 1 ) { diff --git a/sd/source/ui/func/fuhhconv.cxx b/sd/source/ui/func/fuhhconv.cxx index a7f96a5b50d2..abe45670c100 100644..100755 --- a/sd/source/ui/func/fuhhconv.cxx +++ b/sd/source/ui/func/fuhhconv.cxx @@ -79,16 +79,16 @@ FuHangulHanjaConversion::FuHangulHanjaConversion ( SfxRequest& rReq ) : FuPoor(pViewSh, pWin, pView, pDocument, rReq), pSdOutliner(NULL), - bOwnOutliner(FALSE) + bOwnOutliner(sal_False) { if ( mpViewShell->ISA(DrawViewShell) ) { - bOwnOutliner = TRUE; + bOwnOutliner = sal_True; pSdOutliner = new Outliner( mpDoc, OUTLINERMODE_TEXTOBJECT ); } else if ( mpViewShell->ISA(OutlineViewShell) ) { - bOwnOutliner = FALSE; + bOwnOutliner = sal_False; pSdOutliner = mpDoc->GetOutliner(); } @@ -125,8 +125,8 @@ FunctionReference FuHangulHanjaConversion::Create( ViewShell* pViewSh, ::sd::Win |* \************************************************************************/ -void FuHangulHanjaConversion::StartConversion( INT16 nSourceLanguage, INT16 nTargetLanguage, - const Font *pTargetFont, INT32 nOptions, BOOL bIsInteractive ) +void FuHangulHanjaConversion::StartConversion( sal_Int16 nSourceLanguage, sal_Int16 nTargetLanguage, + const Font *pTargetFont, sal_Int32 nOptions, sal_Bool bIsInteractive ) { String aString( SdResId(STR_UNDO_HANGULHANJACONVERSION) ); @@ -142,7 +142,7 @@ void FuHangulHanjaConversion::StartConversion( INT16 nSourceLanguage, INT16 nTar { pSdOutliner->EndConversion(); - bOwnOutliner = TRUE; + bOwnOutliner = sal_True; pSdOutliner = new Outliner( mpDoc, OUTLINERMODE_TEXTOBJECT ); pSdOutliner->BeginConversion(); } @@ -151,7 +151,7 @@ void FuHangulHanjaConversion::StartConversion( INT16 nSourceLanguage, INT16 nTar pSdOutliner->EndConversion(); delete pSdOutliner; - bOwnOutliner = FALSE; + bOwnOutliner = sal_False; pSdOutliner = mpDoc->GetOutliner(); pSdOutliner->BeginConversion(); } @@ -179,7 +179,7 @@ void FuHangulHanjaConversion::StartConversion( INT16 nSourceLanguage, INT16 nTar } -void FuHangulHanjaConversion::ConvertStyles( INT16 nTargetLanguage, const Font *pTargetFont ) +void FuHangulHanjaConversion::ConvertStyles( sal_Int16 nTargetLanguage, const Font *pTargetFont ) { if( !mpDoc ) return; @@ -195,11 +195,11 @@ void FuHangulHanjaConversion::ConvertStyles( INT16 nTargetLanguage, const Font * const bool bHasParent = pStyle->GetParent().Len() != 0; - if( !bHasParent || rSet.GetItemState( EE_CHAR_LANGUAGE_CJK, FALSE ) == SFX_ITEM_SET ) + if( !bHasParent || rSet.GetItemState( EE_CHAR_LANGUAGE_CJK, sal_False ) == SFX_ITEM_SET ) rSet.Put( SvxLanguageItem( nTargetLanguage, EE_CHAR_LANGUAGE_CJK ) ); if( pTargetFont && - ( !bHasParent || rSet.GetItemState( EE_CHAR_FONTINFO_CJK, FALSE ) == SFX_ITEM_SET ) ) + ( !bHasParent || rSet.GetItemState( EE_CHAR_FONTINFO_CJK, sal_False ) == SFX_ITEM_SET ) ) { // set new font attribute SvxFontItem aFontItem( (SvxFontItem&) rSet.Get( EE_CHAR_FONTINFO_CJK ) ); diff --git a/sd/source/ui/func/fuinsert.cxx b/sd/source/ui/func/fuinsert.cxx index f29288ea2b03..0e1c346f1871 100755 --- a/sd/source/ui/func/fuinsert.cxx +++ b/sd/source/ui/func/fuinsert.cxx @@ -165,7 +165,7 @@ void FuInsertGraphic::DoExecute( SfxRequest& ) } else { - SdGRFFilter::HandleGraphicFilterError( (USHORT)nError, GraphicFilter::GetGraphicFilter()->GetLastError().nStreamError ); + SdGRFFilter::HandleGraphicFilterError( (sal_uInt16)nError, GraphicFilter::GetGraphicFilter()->GetLastError().nStreamError ); } } } @@ -200,7 +200,7 @@ FunctionReference FuInsertClipboard::Create( ViewShell* pViewSh, ::sd::Window* p void FuInsertClipboard::DoExecute( SfxRequest& ) { TransferableDataHelper aDataHelper( TransferableDataHelper::CreateFromSystemClipboard( mpWindow ) ); - ULONG nFormatId; + sal_uLong nFormatId; SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); SfxAbstractPasteDialog* pDlg = pFact->CreatePasteDialog( mpViewShell->GetActiveWindow() ); @@ -229,7 +229,7 @@ void FuInsertClipboard::DoExecute( SfxRequest& ) if( !mpView->InsertData( aDataHelper, mpWindow->PixelToLogic( Rectangle( Point(), mpWindow->GetOutputSizePixel() ).Center() ), - nAction, FALSE, nFormatId ) && + nAction, sal_False, nFormatId ) && ( mpViewShell && mpViewShell->ISA( DrawViewShell ) ) ) { DrawViewShell* pDrViewSh = static_cast<DrawViewShell*>(mpViewShell); @@ -370,7 +370,7 @@ void FuInsertOLE::DoExecute( SfxRequest& rReq ) bool bRet = true; if( pPickObj ) - mpView->ReplaceObjectAtView(pPickObj, *pPV, pOleObj, TRUE ); + mpView->ReplaceObjectAtView(pPickObj, *pPV, pOleObj, sal_True ); else bRet = mpView->InsertObjectAtView(pOleObj, *pPV, SDRINSERT_SETDEFLAYER); @@ -419,7 +419,7 @@ void FuInsertOLE::DoExecute( SfxRequest& rReq ) * Objekt einfuegen **********************************************************************/ sal_Int64 nAspect = embed::Aspects::MSOLE_CONTENT; - BOOL bCreateNew = FALSE; + sal_Bool bCreateNew = sal_False; uno::Reference < embed::XEmbeddedObject > xObj; uno::Reference < embed::XStorage > xStorage = comphelper::OStorageHelper::GetTemporaryStorage(); SvObjectServerList aServerLst; @@ -527,9 +527,9 @@ void FuInsertOLE::DoExecute( SfxRequest& rReq ) { //TODO/LATER: needs status for RESIZEONPRINTERCHANGE //if( SVOBJ_MISCSTATUS_RESIZEONPRINTERCHANGE & xObj->getStatus( nAspect ) ) - // aIPObj->OnDocumentPrinterChanged( mpDocSh->GetPrinter(FALSE) ); + // aIPObj->OnDocumentPrinterChanged( mpDocSh->GetPrinter(sal_False) ); - BOOL bInsertNewObject = TRUE; + sal_Bool bInsertNewObject = sal_True; Size aSize; MapUnit aMapUnit = MAP_100TH_MM; @@ -584,8 +584,8 @@ void FuInsertOLE::DoExecute( SfxRequest& rReq ) /************************************************** * Das leere OLE-Objekt bekommt ein neues IPObj **************************************************/ - bInsertNewObject = FALSE; - pObj->SetEmptyPresObj(FALSE); + bInsertNewObject = sal_False; + pObj->SetEmptyPresObj(sal_False); ( (SdrOle2Obj*) pObj)->SetOutlinerParaObject(NULL); ( (SdrOle2Obj*) pObj)->SetObjRef(xObj); ( (SdrOle2Obj*) pObj)->SetPersistName(aName); diff --git a/sd/source/ui/func/fuinsfil.cxx b/sd/source/ui/func/fuinsfil.cxx index d14a5859d47b..15508e20c0ca 100644..100755 --- a/sd/source/ui/func/fuinsfil.cxx +++ b/sd/source/ui/func/fuinsfil.cxx @@ -86,9 +86,9 @@ namespace sd { TYPEINIT1( FuInsertFile, FuPoor ); -#define POOL_BUFFER_SIZE (USHORT)32768 -#define BASIC_BUFFER_SIZE (USHORT)8192 -#define DOCUMENT_BUFFER_SIZE (USHORT)32768 +#define POOL_BUFFER_SIZE (sal_uInt16)32768 +#define BASIC_BUFFER_SIZE (sal_uInt16)8192 +#define DOCUMENT_BUFFER_SIZE (sal_uInt16)32768 /************************************************************************* |* @@ -259,8 +259,8 @@ void FuInsertFile::DoExecute( SfxRequest& rReq ) } else { - SFX_REQUEST_ARG (rReq, pFileName, SfxStringItem, ID_VAL_DUMMY0, FALSE); - SFX_REQUEST_ARG (rReq, pFilterName, SfxStringItem, ID_VAL_DUMMY1, FALSE); + SFX_REQUEST_ARG (rReq, pFileName, SfxStringItem, ID_VAL_DUMMY0, sal_False); + SFX_REQUEST_ARG (rReq, pFilterName, SfxStringItem, ID_VAL_DUMMY1, sal_False); aFile = pFileName->GetValue (); @@ -268,15 +268,15 @@ void FuInsertFile::DoExecute( SfxRequest& rReq ) aFilterName = pFilterName->GetValue (); } - mpDocSh->SetWaitCursor( TRUE ); + mpDocSh->SetWaitCursor( sal_True ); - SfxMedium* pMedium = new SfxMedium( aFile, STREAM_READ | STREAM_NOCREATE, FALSE ); + SfxMedium* pMedium = new SfxMedium( aFile, STREAM_READ | STREAM_NOCREATE, sal_False ); const SfxFilter* pFilter = NULL; SFX_APP()->GetFilterMatcher().GuessFilter( *pMedium, &pFilter, SFX_FILTER_IMPORT, SFX_FILTER_NOTINSTALLED | SFX_FILTER_EXECUTABLE ); - BOOL bDrawMode = mpViewShell && mpViewShell->ISA(DrawViewShell); - BOOL bInserted = FALSE; + sal_Bool bDrawMode = mpViewShell && mpViewShell->ISA(DrawViewShell); + sal_Bool bInserted = sal_False; if( pFilter ) { @@ -296,19 +296,19 @@ void FuInsertFile::DoExecute( SfxRequest& rReq ) InsSDDinOlMode( pMedium ); // don't delete Medium here, ownership of pMedium has changed in this case - bInserted = TRUE; + bInserted = sal_True; } } else { - BOOL bFound = ( ::std::find( aFilterVector.begin(), aFilterVector.end(), pFilter->GetMimeType() ) != aFilterVector.end() ); + sal_Bool bFound = ( ::std::find( aFilterVector.begin(), aFilterVector.end(), pFilter->GetMimeType() ) != aFilterVector.end() ); if( !bFound && ( aFilterName.SearchAscii( "Text" ) != STRING_NOTFOUND || aFilterName.SearchAscii( "Rich" ) != STRING_NOTFOUND || aFilterName.SearchAscii( "RTF" ) != STRING_NOTFOUND || aFilterName.SearchAscii( "HTML" ) != STRING_NOTFOUND ) ) { - bFound = TRUE; + bFound = sal_True; } if( bFound ) @@ -318,13 +318,13 @@ void FuInsertFile::DoExecute( SfxRequest& rReq ) else InsTextOrRTFinOlMode(pMedium); - bInserted = TRUE; + bInserted = sal_True; delete pMedium; } } } - mpDocSh->SetWaitCursor( FALSE ); + mpDocSh->SetWaitCursor( sal_False ); if( !bInserted ) { @@ -336,37 +336,37 @@ void FuInsertFile::DoExecute( SfxRequest& rReq ) // ----------------------------------------------------------------------------- -BOOL FuInsertFile::InsSDDinDrMode(SfxMedium* pMedium) +sal_Bool FuInsertFile::InsSDDinDrMode(SfxMedium* pMedium) { - BOOL bOK = FALSE; + sal_Bool bOK = sal_False; // Liste mit Seitennamen (wenn NULL, dann alle Seiten) List* pBookmarkList = NULL; - mpDocSh->SetWaitCursor( FALSE ); + mpDocSh->SetWaitCursor( sal_False ); SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create(); AbstractSdInsertPagesObjsDlg* pDlg = pFact ? pFact->CreateSdInsertPagesObjsDlg( NULL, mpDoc, pMedium, aFile ) : 0; if( !pDlg ) - return FALSE; + return sal_False; // Ev. wird eine QueryBox geoeffnet ("Links aktualisieren?"), // daher wird der Dialog der aktuelle DefModalDialogParent ::Window* pDefParent = GetpApp()->GetDefDialogParent(); GetpApp()->SetDefDialogParent(pDlg->GetWindow()); - USHORT nRet = pDlg->Execute(); + sal_uInt16 nRet = pDlg->Execute(); GetpApp()->SetDefDialogParent(pDefParent); - mpDocSh->SetWaitCursor( TRUE ); + mpDocSh->SetWaitCursor( sal_True ); if( nRet == RET_OK ) { // Zuerst Seiten einfuegen pBookmarkList = pDlg->GetList( 1 ); // Seiten - BOOL bLink = pDlg->IsLink(); - BOOL bReplace = FALSE; + sal_Bool bLink = pDlg->IsLink(); + sal_Bool bReplace = sal_False; SdPage* pPage = NULL; ::sd::View* pView = mpViewShell->GetView(); @@ -379,7 +379,7 @@ BOOL FuInsertFile::InsSDDinDrMode(SfxMedium* pMedium) pPage = static_cast<SdPage*>(pView->GetSdrPageView()->GetPage()); } - USHORT nPos = 0xFFFF; + sal_uInt16 nPos = 0xFFFF; if (pPage && !pPage->IsMasterPage()) { @@ -393,7 +393,7 @@ BOOL FuInsertFile::InsSDDinDrMode(SfxMedium* pMedium) } } - BOOL bNameOK; + sal_Bool bNameOK; List* pObjectBookmarkList = pDlg->GetList( 2 ); // Objekte List* pExchangeList = NULL; @@ -404,13 +404,13 @@ BOOL FuInsertFile::InsSDDinDrMode(SfxMedium* pMedium) // Um zu gewaehrleisten, dass alle Seitennamen eindeutig sind, werden // die einzufuegenden geprueft und gegebenenfalls in einer Ersatzliste // aufgenommen - // bNameOK == FALSE -> Benutzer hat abgebrochen + // bNameOK == sal_False -> Benutzer hat abgebrochen bNameOK = mpView->GetExchangeList( pExchangeList, pBookmarkList, 0 ); if( bNameOK ) bOK = mpDoc->InsertBookmarkAsPage( pBookmarkList, pExchangeList, bLink, bReplace, nPos, - FALSE, NULL, TRUE, TRUE, FALSE ); + sal_False, NULL, sal_True, sal_True, sal_False ); // Loeschen der BookmarkList if( pBookmarkList ) @@ -491,15 +491,15 @@ void FuInsertFile::InsTextOrRTFinDrMode(SfxMedium* pMedium) if( !pDlg ) return; - mpDocSh->SetWaitCursor( FALSE ); + mpDocSh->SetWaitCursor( sal_False ); - USHORT nRet = pDlg->Execute(); - mpDocSh->SetWaitCursor( TRUE ); + sal_uInt16 nRet = pDlg->Execute(); + mpDocSh->SetWaitCursor( sal_True ); if( nRet == RET_OK ) { // gewaehltes Dateiformat: Text oder RTF oder HTML (Default ist Text) - USHORT nFormat = EE_FORMAT_TEXT; + sal_uInt16 nFormat = EE_FORMAT_TEXT; if( aFilterName.SearchAscii( "Rich") != STRING_NOTFOUND ) nFormat = EE_FORMAT_RTF; @@ -532,7 +532,7 @@ void FuInsertFile::InsTextOrRTFinDrMode(SfxMedium* pMedium) DBG_ASSERT( pStream, "Kein InStream!" ); pStream->Seek( 0 ); - ULONG nErr = pOutliner->Read( *pStream, pMedium->GetBaseURL(), nFormat, mpDocSh->GetHeaderAttributes() ); + sal_uLong nErr = pOutliner->Read( *pStream, pMedium->GetBaseURL(), nFormat, mpDocSh->GetHeaderAttributes() ); if (nErr || !pOutliner->GetEditEngine().GetText().Len()) { @@ -565,9 +565,9 @@ void FuInsertFile::InsTextOrRTFinDrMode(SfxMedium* pMedium) while ( pOutliner->GetParagraphCount() > 1 ) { Paragraph* pPara = pOutliner->GetParagraph( 0 ); - ULONG nLen = pOutliner->GetText( pPara, 1 ).Len(); - pOutliner->QuickDelete( ESelection( 0, (USHORT) nLen, 1, 0 ) ); - pOutliner->QuickInsertLineBreak( ESelection( 0, (USHORT) nLen, 0, (USHORT) nLen ) ); + sal_uLong nLen = pOutliner->GetText( pPara, 1 ).Len(); + pOutliner->QuickDelete( ESelection( 0, (sal_uInt16) nLen, 1, 0 ) ); + pOutliner->QuickInsertLineBreak( ESelection( 0, (sal_uInt16) nLen, 0, (sal_uInt16) nLen ) ); } } } @@ -628,7 +628,7 @@ void FuInsertFile::InsTextOrRTFinDrMode(SfxMedium* pMedium) void FuInsertFile::InsTextOrRTFinOlMode(SfxMedium* pMedium) { // gewaehltes Dateiformat: Text oder RTF oder HTML (Default ist Text) - USHORT nFormat = EE_FORMAT_TEXT; + sal_uInt16 nFormat = EE_FORMAT_TEXT; if( aFilterName.SearchAscii( "Rich") != STRING_NOTFOUND ) nFormat = EE_FORMAT_RTF; @@ -644,14 +644,14 @@ void FuInsertFile::InsTextOrRTFinOlMode(SfxMedium* pMedium) { pPara = pDocliner->GetParent(pPara); } - ULONG nTargetPos = pDocliner->GetAbsPos(pPara) + 1; + sal_uLong nTargetPos = pDocliner->GetAbsPos(pPara) + 1; // Layout der Vorgaengerseite uebernehmen - USHORT nPage = 0; + sal_uInt16 nPage = 0; pPara = pDocliner->GetParagraph( pDocliner->GetAbsPos( pPara ) - 1 ); while (pPara) { - ULONG nPos = pDocliner->GetAbsPos( pPara ); + sal_uLong nPos = pDocliner->GetAbsPos( pPara ); if ( pDocliner->HasParaFlag( pPara, PARAFLAG_ISPAGE ) ) nPage++; pPara = pDocliner->GetParagraph( nPos - 1 ); @@ -678,7 +678,7 @@ void FuInsertFile::InsTextOrRTFinOlMode(SfxMedium* pMedium) DBG_ASSERT( pStream, "Kein InStream!" ); pStream->Seek( 0 ); - ULONG nErr = pOutliner->Read(*pStream, pMedium->GetBaseURL(), nFormat, mpDocSh->GetHeaderAttributes()); + sal_uLong nErr = pOutliner->Read(*pStream, pMedium->GetBaseURL(), nFormat, mpDocSh->GetHeaderAttributes()); if (nErr || !pOutliner->GetEditEngine().GetText().Len()) { @@ -688,20 +688,20 @@ void FuInsertFile::InsTextOrRTFinOlMode(SfxMedium* pMedium) } else { - ULONG nParaCount = pOutliner->GetParagraphCount(); + sal_uLong nParaCount = pOutliner->GetParagraphCount(); // fuer Fortschrittsanzeige: Anzahl der Ebene-0-Absaetze - USHORT nNewPages = 0; + sal_uInt16 nNewPages = 0; pPara = pOutliner->GetParagraph( 0 ); while (pPara) { - ULONG nPos = pOutliner->GetAbsPos( pPara ); + sal_uLong nPos = pOutliner->GetAbsPos( pPara ); if( pOutliner->HasParaFlag( pPara, PARAFLAG_ISPAGE ) ) nNewPages++; pPara = pOutliner->GetParagraph( ++nPos ); } - mpDocSh->SetWaitCursor( FALSE ); + mpDocSh->SetWaitCursor( sal_False ); SfxProgress* pProgress = new SfxProgress( mpDocSh, String( SdResId(STR_CREATE_PAGES)), nNewPages); if( pProgress ) @@ -712,13 +712,13 @@ void FuInsertFile::InsTextOrRTFinOlMode(SfxMedium* pMedium) pDocliner->GetUndoManager().EnterListAction( String(SdResId(STR_UNDO_INSERT_FILE)), String() ); - ULONG nSourcePos = 0; + sal_uLong nSourcePos = 0; SfxStyleSheet* pStyleSheet = pPage->GetStyleSheetForPresObj( PRESOBJ_OUTLINE ); Paragraph* pSourcePara = pOutliner->GetParagraph( 0 ); while (pSourcePara) { - ULONG nPos = pOutliner->GetAbsPos( pSourcePara ); - sal_Int16 nDepth = pOutliner->GetDepth( (USHORT) nPos ); + sal_uLong nPos = pOutliner->GetAbsPos( pSourcePara ); + sal_Int16 nDepth = pOutliner->GetDepth( (sal_uInt16) nPos ); // den letzte Absatz nur uebernehmen, wenn er gefuellt ist if (nSourcePos < nParaCount - 1 || @@ -750,7 +750,7 @@ void FuInsertFile::InsTextOrRTFinOlMode(SfxMedium* pMedium) if( pProgress ) delete pProgress; - mpDocSh->SetWaitCursor( TRUE ); + mpDocSh->SetWaitCursor( sal_True ); } delete pOutliner; @@ -758,7 +758,7 @@ void FuInsertFile::InsTextOrRTFinOlMode(SfxMedium* pMedium) // ----------------------------------------------------------------------------- -BOOL FuInsertFile::InsSDDinOlMode(SfxMedium* pMedium) +sal_Bool FuInsertFile::InsSDDinOlMode(SfxMedium* pMedium) { OutlineView* pOlView = static_cast<OutlineView*>(mpView); @@ -796,10 +796,10 @@ BOOL FuInsertFile::InsSDDinOlMode(SfxMedium* pMedium) pOutliner->SetEndMovingHdl(aOldEndMovingHdl); pOutliner->SetStatusEventHdl(aOldStatusEventHdl); - return TRUE; + return sal_True; } else - return FALSE; + return sal_False; } // ----------------------------------------------------------------------------- diff --git a/sd/source/ui/func/fuline.cxx b/sd/source/ui/func/fuline.cxx index b14d5f6acc08..c6135426a246 100644..100755 --- a/sd/source/ui/func/fuline.cxx +++ b/sd/source/ui/func/fuline.cxx @@ -80,7 +80,7 @@ FunctionReference FuLine::Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd:: void FuLine::DoExecute( SfxRequest& rReq ) { - BOOL bHasMarked = mpView->AreObjectsMarked(); + sal_Bool bHasMarked = mpView->AreObjectsMarked(); const SfxItemSet* pArgs = rReq.GetArgs(); @@ -102,7 +102,7 @@ void FuLine::DoExecute( SfxRequest& rReq ) } // Attribute wurden geaendert, Listboxes in Objectbars muessen aktualisiert werden - static USHORT SidArray[] = { + static sal_uInt16 SidArray[] = { SID_ATTR_LINE_STYLE, SID_ATTR_LINE_DASH, SID_ATTR_LINE_WIDTH, diff --git a/sd/source/ui/func/fulinend.cxx b/sd/source/ui/func/fulinend.cxx index 9c53518507f3..30292667bc3e 100644..100755 --- a/sd/source/ui/func/fulinend.cxx +++ b/sd/source/ui/func/fulinend.cxx @@ -95,10 +95,10 @@ void FuLineEnd::DoExecute( SfxRequest& ) if( aInfoRec.bCanConvToPath && pObj->GetObjInventor() == SdrInventor && pObj->GetObjIdentifier() != OBJ_GRUP ) - // bCanConvToPath ist bei Gruppenobjekten TRUE, + // bCanConvToPath ist bei Gruppenobjekten sal_True, // stuerzt aber bei ConvertToPathObj() ab ! { - pNewObj = pConvPolyObj = pObj->ConvertToPolyObj( TRUE, FALSE ); + pNewObj = pConvPolyObj = pObj->ConvertToPolyObj( sal_True, sal_False ); if( !pNewObj || !pNewObj->ISA( SdrPathObj ) ) return; // Abbruch, zusaetzliche Sicherheit, die bei @@ -121,18 +121,18 @@ void FuLineEnd::DoExecute( SfxRequest& ) long nCount = pLineEndList->Count(); long j = 1; - BOOL bDifferent = FALSE; + sal_Bool bDifferent = sal_False; while( !bDifferent ) { aName = aNewName; aName.Append( sal_Unicode(' ') ); aName.Append( UniString::CreateFromInt32( j++ ) ); - bDifferent = TRUE; + bDifferent = sal_True; for( long i = 0; i < nCount && bDifferent; i++ ) { if( aName == pLineEndList->GetLineEnd( i )->GetName() ) - bDifferent = FALSE; + bDifferent = sal_False; } } @@ -146,12 +146,12 @@ void FuLineEnd::DoExecute( SfxRequest& ) if( pDlg->Execute() == RET_OK ) { pDlg->GetName( aName ); - bDifferent = TRUE; + bDifferent = sal_True; for( long i = 0; i < nCount && bDifferent; i++ ) { if( aName == pLineEndList->GetLineEnd( i )->GetName() ) - bDifferent = FALSE; + bDifferent = sal_False; } if( bDifferent ) diff --git a/sd/source/ui/func/fumorph.cxx b/sd/source/ui/func/fumorph.cxx index 1dc2d40fefd3..742c1d6db96b 100644..100755 --- a/sd/source/ui/func/fumorph.cxx +++ b/sd/source/ui/func/fumorph.cxx @@ -99,8 +99,8 @@ void FuMorph::DoExecute( SfxRequest& ) pCloneObj2->SetOutlinerParaObject(NULL); // Path-Objekte erzeugen - SdrObject* pPolyObj1 = pCloneObj1->ConvertToPolyObj(FALSE, FALSE); - SdrObject* pPolyObj2 = pCloneObj2->ConvertToPolyObj(FALSE, FALSE); + SdrObject* pPolyObj1 = pCloneObj1->ConvertToPolyObj(sal_False, sal_False); + SdrObject* pPolyObj2 = pCloneObj2->ConvertToPolyObj(sal_False, sal_False); SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create(); AbstractMorphDlg* pDlg = pFact ? pFact->CreateMorphDlg( static_cast< ::Window*>(mpWindow), pObj1, pObj2 ) : 0; if(pPolyObj1 && pPolyObj2 && pDlg && (pDlg->Execute() == RET_OK)) @@ -331,7 +331,7 @@ void FuMorph::ImpAddPolys(::basegfx::B2DPolyPolygon& rSmaller, const ::basegfx:: ////////////////////////////////////////////////////////////////////////////// // create group object with morphed polygons // -void FuMorph::ImpInsertPolygons(List& rPolyPolyList3D, BOOL bAttributeFade, +void FuMorph::ImpInsertPolygons(List& rPolyPolyList3D, sal_Bool bAttributeFade, const SdrObject* pObj1, const SdrObject* pObj2) { Color aStartFillCol; @@ -344,11 +344,11 @@ void FuMorph::ImpInsertPolygons(List& rPolyPolyList3D, BOOL bAttributeFade, SfxItemPool* pPool = pObj1->GetObjectItemPool(); SfxItemSet aSet1( *pPool,SDRATTR_START,SDRATTR_NOTPERSIST_FIRST-1,EE_ITEMS_START,EE_ITEMS_END,0 ); SfxItemSet aSet2( aSet1 ); - BOOL bLineColor = FALSE; - BOOL bFillColor = FALSE; - BOOL bLineWidth = FALSE; - BOOL bIgnoreLine = FALSE; - BOOL bIgnoreFill = FALSE; + sal_Bool bLineColor = sal_False; + sal_Bool bFillColor = sal_False; + sal_Bool bLineWidth = sal_False; + sal_Bool bIgnoreLine = sal_False; + sal_Bool bIgnoreFill = sal_False; aSet1.Put(pObj1->GetMergedItemSet()); aSet2.Put(pObj2->GetMergedItemSet()); @@ -362,7 +362,7 @@ void FuMorph::ImpInsertPolygons(List& rPolyPolyList3D, BOOL bAttributeFade, { if ( ( eLineStyle1 != XLINE_NONE ) && ( eLineStyle2 != XLINE_NONE ) ) { - bLineWidth = bLineColor = TRUE; + bLineWidth = bLineColor = sal_True; aStartLineCol = static_cast< XLineColorItem const & >( aSet1.Get(XATTR_LINECOLOR)).GetColorValue(); @@ -373,18 +373,18 @@ void FuMorph::ImpInsertPolygons(List& rPolyPolyList3D, BOOL bAttributeFade, nEndLineWidth = ITEMVALUE( aSet2, XATTR_LINEWIDTH, XLineWidthItem ); } else if ( ( eLineStyle1 == XLINE_NONE ) && ( eLineStyle2 == XLINE_NONE ) ) - bIgnoreLine = TRUE; + bIgnoreLine = sal_True; if ( ( eFillStyle1 == XFILL_SOLID ) && ( eFillStyle2 == XFILL_SOLID ) ) { - bFillColor = TRUE; + bFillColor = sal_True; aStartFillCol = static_cast< XFillColorItem const & >( aSet1.Get(XATTR_FILLCOLOR)).GetColorValue(); aEndFillCol = static_cast< XFillColorItem const & >( aSet2.Get(XATTR_FILLCOLOR)).GetColorValue(); } else if ( ( eFillStyle1 == XFILL_NONE ) && ( eFillStyle2 == XFILL_NONE ) ) - bIgnoreFill = TRUE; + bIgnoreFill = sal_True; } if ( pPageView ) @@ -392,7 +392,7 @@ void FuMorph::ImpInsertPolygons(List& rPolyPolyList3D, BOOL bAttributeFade, SfxItemSet aSet( aSet1 ); SdrObjGroup* pObjGroup = new SdrObjGroup; SdrObjList* pObjList = pObjGroup->GetSubList(); - const ULONG nCount = rPolyPolyList3D.Count(); + const sal_uLong nCount = rPolyPolyList3D.Count(); const double fStep = 1. / ( nCount + 1 ); const double fDelta = nEndLineWidth - nStartLineWidth; double fFactor = fStep; @@ -400,7 +400,7 @@ void FuMorph::ImpInsertPolygons(List& rPolyPolyList3D, BOOL bAttributeFade, aSet.Put( XLineStyleItem( XLINE_SOLID ) ); aSet.Put( XFillStyleItem( XFILL_SOLID ) ); - for ( ULONG i = 0; i < nCount; i++, fFactor += fStep ) + for ( sal_uLong i = 0; i < nCount; i++, fFactor += fStep ) { const ::basegfx::B2DPolyPolygon& rPolyPoly3D = *(::basegfx::B2DPolyPolygon*)rPolyPolyList3D.GetObject(i); SdrPathObj* pNewObj = new SdrPathObj(OBJ_POLY, rPolyPoly3D); @@ -506,7 +506,7 @@ sal_Bool FuMorph::ImpMorphPolygons( rPolyPolyList3D.Insert(pNewPolyPoly2D, LIST_APPEND); } } - return TRUE; + return sal_True; } diff --git a/sd/source/ui/func/fuoaprms.cxx b/sd/source/ui/func/fuoaprms.cxx index 980176b20b19..826bacbea622 100755 --- a/sd/source/ui/func/fuoaprms.cxx +++ b/sd/source/ui/func/fuoaprms.cxx @@ -97,8 +97,8 @@ void FuObjectAnimationParameters::DoExecute( SfxRequest& rReq ) ::svl::IUndoManager* pUndoMgr = mpViewShell->GetViewFrame()->GetObjectShell()->GetUndoManager(); const SdrMarkList& rMarkList = mpView->GetMarkedObjectList(); - ULONG nCount = rMarkList.GetMarkCount(); - ULONG nObject = 0; + sal_uLong nCount = rMarkList.GetMarkCount(); + sal_uLong nObject = 0; short nAnimationSet = ATTR_MISSING; short nEffectSet = ATTR_MISSING; @@ -120,26 +120,26 @@ void FuObjectAnimationParameters::DoExecute( SfxRequest& rReq ) -// BOOL bDontKnow = FALSE; +// sal_Bool bDontKnow = sal_False; // defaulten (fuer Undo-Aktion) presentation::AnimationEffect eEffect = presentation::AnimationEffect_NONE; presentation::AnimationEffect eTextEffect = presentation::AnimationEffect_NONE; presentation::AnimationSpeed eSpeed = presentation::AnimationSpeed_MEDIUM; - BOOL bActive = FALSE; - BOOL bFadeOut = FALSE; + sal_Bool bActive = sal_False; + sal_Bool bFadeOut = sal_False; Color aFadeColor = COL_LIGHTGRAY; - BOOL bInvisible = FALSE; - BOOL bSoundOn = FALSE; + sal_Bool bInvisible = sal_False; + sal_Bool bSoundOn = sal_False; String aSound; - BOOL bPlayFull = FALSE; + sal_Bool bPlayFull = sal_False; presentation::ClickAction eClickAction = presentation::ClickAction_NONE; String aBookmark; presentation::AnimationEffect eSecondEffect = presentation::AnimationEffect_NONE; presentation::AnimationSpeed eSecondSpeed = presentation::AnimationSpeed_MEDIUM; - BOOL bSecondSoundOn = FALSE; - BOOL bSecondPlayFull = FALSE; + sal_Bool bSecondSoundOn = sal_False; + sal_Bool bSecondPlayFull = sal_False; SdAnimationInfo* pInfo; @@ -257,7 +257,7 @@ void FuObjectAnimationParameters::DoExecute( SfxRequest& rReq ) } else { - if (nAnimationSet == ATTR_SET && bActive == TRUE) + if (nAnimationSet == ATTR_SET && bActive == sal_True) nAnimationSet = ATTR_MIXED; if (nEffectSet == ATTR_SET && eEffect != presentation::AnimationEffect_NONE) @@ -269,22 +269,22 @@ void FuObjectAnimationParameters::DoExecute( SfxRequest& rReq ) if (nSpeedSet == ATTR_SET) nSpeedSet = ATTR_MIXED; - if (nFadeOutSet == ATTR_SET && bFadeOut == TRUE) + if (nFadeOutSet == ATTR_SET && bFadeOut == sal_True) nFadeOutSet = ATTR_MIXED; if (nFadeColorSet == ATTR_SET) nFadeColorSet = ATTR_MIXED; - if (nInvisibleSet == ATTR_SET && bInvisible == TRUE) + if (nInvisibleSet == ATTR_SET && bInvisible == sal_True) nInvisibleSet = ATTR_MIXED; - if (nSoundOnSet == ATTR_SET && bSoundOn == TRUE) + if (nSoundOnSet == ATTR_SET && bSoundOn == sal_True) nSoundOnSet = ATTR_MIXED; if (nSoundFileSet == ATTR_SET) nSoundFileSet = ATTR_MIXED; - if (nPlayFullSet == ATTR_SET && bPlayFull == TRUE) + if (nPlayFullSet == ATTR_SET && bPlayFull == sal_True) nPlayFullSet = ATTR_MIXED; if (nClickActionSet == ATTR_SET && eClickAction != presentation::ClickAction_NONE) @@ -299,10 +299,10 @@ void FuObjectAnimationParameters::DoExecute( SfxRequest& rReq ) if (nSecondSpeedSet == ATTR_SET) nSecondSpeedSet = ATTR_MIXED; - if (nSecondSoundOnSet == ATTR_SET && bSecondSoundOn == TRUE) + if (nSecondSoundOnSet == ATTR_SET && bSecondSoundOn == sal_True) nSecondSoundOnSet = ATTR_MIXED; - if (nSecondPlayFullSet == ATTR_SET && bSecondPlayFull == TRUE) + if (nSecondPlayFullSet == ATTR_SET && bSecondPlayFull == sal_True) nSecondPlayFullSet = ATTR_MIXED; } } @@ -371,24 +371,24 @@ void FuObjectAnimationParameters::DoExecute( SfxRequest& rReq ) else if (nAnimationSet == ATTR_MIXED) aSet.InvalidateItem(ATTR_ANIMATION_ACTIVE); else - aSet.Put(SfxBoolItem(ATTR_ANIMATION_ACTIVE, FALSE)); + aSet.Put(SfxBoolItem(ATTR_ANIMATION_ACTIVE, sal_False)); if (nEffectSet == ATTR_SET) - aSet.Put(SfxAllEnumItem(ATTR_ANIMATION_EFFECT, (USHORT)eEffect)); + aSet.Put(SfxAllEnumItem(ATTR_ANIMATION_EFFECT, (sal_uInt16)eEffect)); else if (nEffectSet == ATTR_MIXED) aSet.InvalidateItem( ATTR_ANIMATION_EFFECT ); else aSet.Put(SfxAllEnumItem(ATTR_ANIMATION_EFFECT, presentation::AnimationEffect_NONE)); if (nTextEffectSet == ATTR_SET) - aSet.Put(SfxAllEnumItem(ATTR_ANIMATION_TEXTEFFECT, (USHORT)eTextEffect)); + aSet.Put(SfxAllEnumItem(ATTR_ANIMATION_TEXTEFFECT, (sal_uInt16)eTextEffect)); else if (nTextEffectSet == ATTR_MIXED) aSet.InvalidateItem( ATTR_ANIMATION_TEXTEFFECT ); else aSet.Put(SfxAllEnumItem(ATTR_ANIMATION_TEXTEFFECT, presentation::AnimationEffect_NONE)); if (nSpeedSet == ATTR_SET) - aSet.Put(SfxAllEnumItem(ATTR_ANIMATION_SPEED, (USHORT)eSpeed)); + aSet.Put(SfxAllEnumItem(ATTR_ANIMATION_SPEED, (sal_uInt16)eSpeed)); else aSet.InvalidateItem(ATTR_ANIMATION_SPEED); @@ -397,7 +397,7 @@ void FuObjectAnimationParameters::DoExecute( SfxRequest& rReq ) else if (nFadeOutSet == ATTR_MIXED) aSet.InvalidateItem(ATTR_ANIMATION_FADEOUT); else - aSet.Put(SfxBoolItem(ATTR_ANIMATION_FADEOUT, FALSE)); + aSet.Put(SfxBoolItem(ATTR_ANIMATION_FADEOUT, sal_False)); if (nFadeColorSet == ATTR_SET) aSet.Put(SvxColorItem(aFadeColor, ATTR_ANIMATION_COLOR)); @@ -411,14 +411,14 @@ void FuObjectAnimationParameters::DoExecute( SfxRequest& rReq ) else if (nInvisibleSet == ATTR_MIXED) aSet.InvalidateItem(ATTR_ANIMATION_INVISIBLE); else - aSet.Put(SfxBoolItem(ATTR_ANIMATION_INVISIBLE, FALSE)); + aSet.Put(SfxBoolItem(ATTR_ANIMATION_INVISIBLE, sal_False)); if (nSoundOnSet == ATTR_SET) aSet.Put(SfxBoolItem(ATTR_ANIMATION_SOUNDON, bSoundOn)); else if (nSoundOnSet == ATTR_MIXED) aSet.InvalidateItem(ATTR_ANIMATION_SOUNDON); else - aSet.Put(SfxBoolItem(ATTR_ANIMATION_SOUNDON, FALSE)); + aSet.Put(SfxBoolItem(ATTR_ANIMATION_SOUNDON, sal_False)); if (nSoundFileSet == ATTR_SET) aSet.Put(SfxStringItem(ATTR_ANIMATION_SOUNDFILE, aSound)); @@ -430,10 +430,10 @@ void FuObjectAnimationParameters::DoExecute( SfxRequest& rReq ) else if (nPlayFullSet == ATTR_MIXED) aSet.InvalidateItem(ATTR_ANIMATION_PLAYFULL); else - aSet.Put(SfxBoolItem(ATTR_ANIMATION_PLAYFULL, FALSE)); + aSet.Put(SfxBoolItem(ATTR_ANIMATION_PLAYFULL, sal_False)); if (nClickActionSet == ATTR_SET) - aSet.Put(SfxAllEnumItem(ATTR_ACTION, (USHORT)eClickAction)); + aSet.Put(SfxAllEnumItem(ATTR_ACTION, (sal_uInt16)eClickAction)); else if (nClickActionSet == ATTR_MIXED) aSet.InvalidateItem(ATTR_ACTION); else @@ -445,14 +445,14 @@ void FuObjectAnimationParameters::DoExecute( SfxRequest& rReq ) aSet.InvalidateItem(ATTR_ACTION_FILENAME); if (nSecondEffectSet == ATTR_SET) - aSet.Put(SfxAllEnumItem(ATTR_ACTION_EFFECT, (USHORT)eSecondEffect)); + aSet.Put(SfxAllEnumItem(ATTR_ACTION_EFFECT, (sal_uInt16)eSecondEffect)); else if (nSecondEffectSet == ATTR_MIXED) aSet.InvalidateItem( ATTR_ACTION_EFFECT ); else aSet.Put(SfxAllEnumItem(ATTR_ACTION_EFFECT, presentation::AnimationEffect_NONE)); if (nSecondSpeedSet == ATTR_SET) - aSet.Put(SfxAllEnumItem(ATTR_ACTION_EFFECTSPEED, (USHORT)eSecondSpeed)); + aSet.Put(SfxAllEnumItem(ATTR_ACTION_EFFECTSPEED, (sal_uInt16)eSecondSpeed)); else aSet.InvalidateItem(ATTR_ACTION_EFFECTSPEED); @@ -461,19 +461,19 @@ void FuObjectAnimationParameters::DoExecute( SfxRequest& rReq ) else if (nSecondSoundOnSet == ATTR_MIXED) aSet.InvalidateItem(ATTR_ACTION_SOUNDON); else - aSet.Put(SfxBoolItem(ATTR_ACTION_SOUNDON, FALSE)); + aSet.Put(SfxBoolItem(ATTR_ACTION_SOUNDON, sal_False)); if (nSecondPlayFullSet == ATTR_SET) aSet.Put(SfxBoolItem(ATTR_ACTION_PLAYFULL, bSecondPlayFull)); else if (nPlayFullSet == ATTR_MIXED) aSet.InvalidateItem(ATTR_ACTION_PLAYFULL); else - aSet.Put(SfxBoolItem(ATTR_ACTION_PLAYFULL, FALSE)); + aSet.Put(SfxBoolItem(ATTR_ACTION_PLAYFULL, sal_False)); SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create(); SfxAbstractDialog* pDlg = pFact ? pFact->CreatSdActionDialog( NULL, &aSet, mpView ) : 0; - USHORT nResult = pDlg ? pDlg->Execute() : RET_CANCEL; + sal_uInt16 nResult = pDlg ? pDlg->Execute() : RET_CANCEL; if( nResult == RET_OK ) { @@ -706,11 +706,11 @@ void FuObjectAnimationParameters::DoExecute( SfxRequest& rReq ) pInfo = mpDoc->GetAnimationInfo(pObject); - BOOL bCreated = FALSE; + sal_Bool bCreated = sal_False; if( !pInfo ) { pInfo = SdDrawDocument::GetShapeUserData(*pObject,true); - bCreated = TRUE; + bCreated = sal_True; } // das Pfadobjekt fuer 'an Kurve entlang'? @@ -731,7 +731,7 @@ void FuObjectAnimationParameters::DoExecute( SfxRequest& rReq ) // pAction->SetPathObj(pInfo->mpPathObj, pInfo->mpPathObj); pAction->SetClickAction(pInfo->meClickAction, pInfo->meClickAction); pAction->SetBookmark(pInfo->GetBookmark(), pInfo->GetBookmark()); -// pAction->SetInvisibleInPres(pInfo->mbInvisibleInPresentation, TRUE); +// pAction->SetInvisibleInPres(pInfo->mbInvisibleInPresentation, sal_True); pAction->SetVerb(pInfo->mnVerb, pInfo->mnVerb); pAction->SetSecondEffect(pInfo->meSecondEffect, pInfo->meSecondEffect); pAction->SetSecondSpeed(pInfo->meSecondSpeed, pInfo->meSecondSpeed); @@ -739,7 +739,7 @@ void FuObjectAnimationParameters::DoExecute( SfxRequest& rReq ) pAction->SetSecondPlayFull(pInfo->mbSecondPlayFull, pInfo->mbSecondPlayFull); pUndoGroup->AddAction(pAction); -// pInfo->mbInvisibleInPresentation = TRUE; +// pInfo->mbInvisibleInPresentation = sal_True; } else { @@ -762,7 +762,7 @@ void FuObjectAnimationParameters::DoExecute( SfxRequest& rReq ) pAction->SetBookmark(pInfo->GetBookmark(), aBookmark); // pAction->SetInvisibleInPres(pInfo->mbInvisibleInPresentation, // pInfo->mbInvisibleInPresentation); - pAction->SetVerb(pInfo->mnVerb, (USHORT)pInfo->GetBookmark().ToInt32() ); + pAction->SetVerb(pInfo->mnVerb, (sal_uInt16)pInfo->GetBookmark().ToInt32() ); pAction->SetSecondEffect(pInfo->meSecondEffect, eSecondEffect); pAction->SetSecondSpeed(pInfo->meSecondSpeed, eSecondSpeed); pAction->SetSecondSoundOn(pInfo->mbSecondSoundOn, bSecondSoundOn); @@ -823,7 +823,7 @@ void FuObjectAnimationParameters::DoExecute( SfxRequest& rReq ) // pInfo->mSetPath(pPath); if (eClickAction == presentation::ClickAction_VERB) - pInfo->mnVerb = (USHORT)aBookmark.ToInt32(); + pInfo->mnVerb = (sal_uInt16)aBookmark.ToInt32(); } } // Undo Gruppe dem Undo Manager uebergeben diff --git a/sd/source/ui/func/fuolbull.cxx b/sd/source/ui/func/fuolbull.cxx index 32ca9d3278b3..c8de0fd5dfea 100644..100755 --- a/sd/source/ui/func/fuolbull.cxx +++ b/sd/source/ui/func/fuolbull.cxx @@ -84,14 +84,14 @@ void FuOutlineBullet::DoExecute( SfxRequest& rReq ) SfxItemSet aNewAttr( mpViewShell->GetPool(), EE_ITEMS_START, EE_ITEMS_END ); - aNewAttr.Put( aEditAttr, FALSE ); + aNewAttr.Put( aEditAttr, sal_False ); // Dialog hochfahren und ausfuehren SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create(); SfxAbstractTabDialog* pDlg = pFact ? pFact->CreateSdOutlineBulletTabDlg( NULL, &aNewAttr, mpView ) : 0; if( pDlg ) { - USHORT nResult = pDlg->Execute(); + sal_uInt16 nResult = pDlg->Execute(); switch( nResult ) { diff --git a/sd/source/ui/func/fuoltext.cxx b/sd/source/ui/func/fuoltext.cxx index 2797631d12db..b2a913ea3b61 100644..100755 --- a/sd/source/ui/func/fuoltext.cxx +++ b/sd/source/ui/func/fuoltext.cxx @@ -53,7 +53,7 @@ namespace sd { -static USHORT SidArray[] = { +static sal_uInt16 SidArray[] = { SID_STYLE_FAMILY2, SID_STYLE_FAMILY3, SID_STYLE_FAMILY5, @@ -118,9 +118,9 @@ FunctionReference FuOutlineText::Create( ViewShell* pViewSh, ::sd::Window* pWin, |* \************************************************************************/ -BOOL FuOutlineText::MouseButtonDown(const MouseEvent& rMEvt) +sal_Bool FuOutlineText::MouseButtonDown(const MouseEvent& rMEvt) { - BOOL bReturn = FALSE; + sal_Bool bReturn = sal_False; mpWindow->GrabFocus(); @@ -145,9 +145,9 @@ BOOL FuOutlineText::MouseButtonDown(const MouseEvent& rMEvt) |* \************************************************************************/ -BOOL FuOutlineText::MouseMove(const MouseEvent& rMEvt) +sal_Bool FuOutlineText::MouseMove(const MouseEvent& rMEvt) { - BOOL bReturn = FALSE; + sal_Bool bReturn = sal_False; bReturn = pOutlineView->GetViewByWindow(mpWindow)->MouseMove(rMEvt); @@ -181,9 +181,9 @@ BOOL FuOutlineText::MouseMove(const MouseEvent& rMEvt) |* \************************************************************************/ -BOOL FuOutlineText::MouseButtonUp(const MouseEvent& rMEvt) +sal_Bool FuOutlineText::MouseButtonUp(const MouseEvent& rMEvt) { - BOOL bReturn = FALSE; + sal_Bool bReturn = sal_False; bReturn = pOutlineView->GetViewByWindow(mpWindow)->MouseButtonUp(rMEvt); @@ -201,11 +201,11 @@ BOOL FuOutlineText::MouseButtonUp(const MouseEvent& rMEvt) if( pField && pField->ISA( SvxURLField ) ) { - bReturn = TRUE; + bReturn = sal_True; mpWindow->ReleaseMouse(); SfxStringItem aStrItem( SID_FILE_NAME, ( (SvxURLField*) pField)->GetURL() ); SfxStringItem aReferer( SID_REFERER, mpDocSh->GetMedium()->GetName() ); - SfxBoolItem aBrowseItem( SID_BROWSE, TRUE ); + SfxBoolItem aBrowseItem( SID_BROWSE, sal_True ); SfxViewFrame* pFrame = mpViewShell->GetViewFrame(); if ( rMEvt.IsMod1() ) @@ -235,16 +235,16 @@ BOOL FuOutlineText::MouseButtonUp(const MouseEvent& rMEvt) |* |* Tastaturereignisse bearbeiten |* -|* Wird ein KeyEvent bearbeitet, so ist der Return-Wert TRUE, andernfalls -|* FALSE. +|* Wird ein KeyEvent bearbeitet, so ist der Return-Wert sal_True, andernfalls +|* sal_False. |* \************************************************************************/ -BOOL FuOutlineText::KeyInput(const KeyEvent& rKEvt) +sal_Bool FuOutlineText::KeyInput(const KeyEvent& rKEvt) { - BOOL bReturn = FALSE; + sal_Bool bReturn = sal_False; - USHORT nKeyGroup = rKEvt.GetKeyCode().GetGroup(); + sal_uInt16 nKeyGroup = rKEvt.GetKeyCode().GetGroup(); if( !mpDocSh->IsReadOnly() || nKeyGroup == KEYGROUP_CURSOR ) { mpWindow->GrabFocus(); diff --git a/sd/source/ui/func/fuoutl.cxx b/sd/source/ui/func/fuoutl.cxx index c0ef53f144b3..e4d263a1e4a6 100755 --- a/sd/source/ui/func/fuoutl.cxx +++ b/sd/source/ui/func/fuoutl.cxx @@ -66,9 +66,9 @@ FuOutline::FuOutline ( |* \************************************************************************/ -BOOL FuOutline::Command(const CommandEvent& rCEvt) +sal_Bool FuOutline::Command(const CommandEvent& rCEvt) { - BOOL bResult = FALSE; + sal_Bool bResult = sal_False; OutlinerView* pOlView = static_cast<OutlineView*>(mpView)->GetViewByWindow(mpWindow); @@ -77,7 +77,7 @@ BOOL FuOutline::Command(const CommandEvent& rCEvt) if (pOlView) { pOlView->Command(rCEvt); // liefert leider keinen Returnwert - bResult = TRUE; + bResult = sal_True; } return bResult; } diff --git a/sd/source/ui/func/fupage.cxx b/sd/source/ui/func/fupage.cxx index fdbad8a3df22..4d068e1fde90 100755 --- a/sd/source/ui/func/fupage.cxx +++ b/sd/source/ui/func/fupage.cxx @@ -101,8 +101,8 @@ TYPEINIT1( FuPage, FuPoor ); void mergeItemSetsImpl( SfxItemSet& rTarget, const SfxItemSet& rSource ) { - const USHORT* pPtr = rSource.GetRanges(); - USHORT p1, p2; + const sal_uInt16* pPtr = rSource.GetRanges(); + sal_uInt16 p1, p2; while( *pPtr ) { p1 = pPtr[0]; @@ -218,7 +218,7 @@ const SfxItemSet* FuPage::ExecuteDialog( Window* pParent ) SvxPageItem aPageItem( SID_ATTR_PAGE ); aPageItem.SetDescName( mpPage->GetName() ); aPageItem.SetPageUsage( (SvxPageUsage) SVX_PAGE_ALL ); - aPageItem.SetLandscape( mpPage->GetOrientation() == ORIENTATION_LANDSCAPE ? TRUE: FALSE ); + aPageItem.SetLandscape( mpPage->GetOrientation() == ORIENTATION_LANDSCAPE ? sal_True: sal_False ); aPageItem.SetNumType( mpDoc->GetPageNumType() ); aNewAttr.Put( aPageItem ); @@ -232,20 +232,20 @@ const SfxItemSet* FuPage::ExecuteDialog( Window* pParent ) aNewAttr.Put( aMaxSizeItem ); // paperbin - SvxPaperBinItem aPaperBinItem( SID_ATTR_PAGE_PAPERBIN, (const BYTE)mpPage->GetPaperBin() ); + SvxPaperBinItem aPaperBinItem( SID_ATTR_PAGE_PAPERBIN, (const sal_uInt8)mpPage->GetPaperBin() ); aNewAttr.Put( aPaperBinItem ); - SvxLRSpaceItem aLRSpaceItem( (USHORT)mpPage->GetLftBorder(), (USHORT)mpPage->GetRgtBorder(), 0, 0, mpDoc->GetPool().GetWhich(SID_ATTR_LRSPACE)); + SvxLRSpaceItem aLRSpaceItem( (sal_uInt16)mpPage->GetLftBorder(), (sal_uInt16)mpPage->GetRgtBorder(), 0, 0, mpDoc->GetPool().GetWhich(SID_ATTR_LRSPACE)); aNewAttr.Put( aLRSpaceItem ); - SvxULSpaceItem aULSpaceItem( (USHORT)mpPage->GetUppBorder(), (USHORT)mpPage->GetLwrBorder(), mpDoc->GetPool().GetWhich(SID_ATTR_ULSPACE)); + SvxULSpaceItem aULSpaceItem( (sal_uInt16)mpPage->GetUppBorder(), (sal_uInt16)mpPage->GetLwrBorder(), mpDoc->GetPool().GetWhich(SID_ATTR_ULSPACE)); aNewAttr.Put( aULSpaceItem ); // Applikation bool bScale = mpDoc->GetDocumentType() != DOCUMENT_TYPE_DRAW; - aNewAttr.Put( SfxBoolItem( SID_ATTR_PAGE_EXT1, bScale ? TRUE : FALSE ) ); + aNewAttr.Put( SfxBoolItem( SID_ATTR_PAGE_EXT1, bScale ? sal_True : sal_False ) ); - BOOL bFullSize = mpPage->IsMasterPage() ? + sal_Bool bFullSize = mpPage->IsMasterPage() ? mpPage->IsBackgroundFullSize() : ((SdPage&)mpPage->TRG_GetMasterPage()).IsBackgroundFullSize(); aNewAttr.Put( SfxBoolItem( SID_ATTR_PAGE_EXT2, bFullSize ) ); @@ -253,8 +253,8 @@ const SfxItemSet* FuPage::ExecuteDialog( Window* pParent ) /////////////////////////////////////////////////////////////////////// // Merge ItemSet for dialog - const USHORT* pPtr = aNewAttr.GetRanges(); - USHORT p1 = pPtr[0], p2 = pPtr[1]; + const sal_uInt16* pPtr = aNewAttr.GetRanges(); + sal_uInt16 p1 = pPtr[0], p2 = pPtr[1]; while(pPtr[2] && (pPtr[2] - p2 == 1)) { p2 = pPtr[3]; @@ -324,8 +324,8 @@ const SfxItemSet* FuPage::ExecuteDialog( Window* pParent ) aMigrateSet.Put( XFillBitmapItem( String(RTL_CONSTASCII_USTRINGPARAM("background")), XOBitmap(aGraphic) ) ); mpDoc->MigrateItemSet( &aMigrateSet, pTempSet.get(), NULL ); - pTempSet->Put( XFillBmpStretchItem( TRUE )); - pTempSet->Put( XFillBmpTileItem( FALSE )); + pTempSet->Put( XFillBmpStretchItem( sal_True )); + pTempSet->Put( XFillBmpTileItem( sal_False )); } } } @@ -346,8 +346,8 @@ const SfxItemSet* FuPage::ExecuteDialog( Window* pParent ) { // if some fillstyle-items are not set in the dialog, then // try to use the items before - BOOL bChanges = FALSE; - for( USHORT i=XATTR_FILL_FIRST; i<XATTR_FILL_LAST; i++ ) + sal_Bool bChanges = sal_False; + for( sal_uInt16 i=XATTR_FILL_FIRST; i<XATTR_FILL_LAST; i++ ) { if( aMergedAttr.GetItemState( i ) != SFX_ITEM_DEFAULT ) { @@ -355,7 +355,7 @@ const SfxItemSet* FuPage::ExecuteDialog( Window* pParent ) pTempSet->Put( aMergedAttr.Get( i ) ); else if( aMergedAttr.GetItem( i ) != pTempSet->GetItem( i ) ) - bChanges = TRUE; + bChanges = sal_True; } } @@ -363,7 +363,7 @@ const SfxItemSet* FuPage::ExecuteDialog( Window* pParent ) if( ( ( (XFillStyleItem*) pTempSet->GetItem( XATTR_FILLSTYLE ) )->GetValue() == XFILL_NONE ) || ( ( pTempSet->GetItemState( XATTR_FILLSTYLE ) == SFX_ITEM_DEFAULT ) && ( ( (XFillStyleItem*) aMergedAttr.GetItem( XATTR_FILLSTYLE ) )->GetValue() == XFILL_NONE ) ) ) - mbPageBckgrdDeleted = TRUE; + mbPageBckgrdDeleted = sal_True; bool bSetToAllPages = false; @@ -420,8 +420,8 @@ const SfxItemSet* FuPage::ExecuteDialog( Window* pParent ) pUndoGroup->SetComment(aComment); //Set background on all master pages - USHORT nMasterPageCount = mpDoc->GetMasterSdPageCount(ePageKind); - for (USHORT i = 0; i < nMasterPageCount; ++i) + sal_uInt16 nMasterPageCount = mpDoc->GetMasterSdPageCount(ePageKind); + for (sal_uInt16 i = 0; i < nMasterPageCount; ++i) { SdPage *pMasterPage = mpDoc->GetMasterSdPage(i, ePageKind); SdStyleSheet *pStyle = @@ -434,8 +434,8 @@ const SfxItemSet* FuPage::ExecuteDialog( Window* pParent ) } //Remove background from all pages to reset to the master bg - USHORT nPageCount(mpDoc->GetSdPageCount(ePageKind)); - for(USHORT i=0; i<nPageCount; ++i) + sal_uInt16 nPageCount(mpDoc->GetSdPageCount(ePageKind)); + for(sal_uInt16 i=0; i<nPageCount; ++i) { SdPage *pPage = mpDoc->GetSdPage(i, ePageKind); @@ -457,7 +457,7 @@ const SfxItemSet* FuPage::ExecuteDialog( Window* pParent ) // if background filling is set to master pages then clear from page set if( mbMasterPage || bSetToAllPages ) { - for( USHORT nWhich = XATTR_FILL_FIRST; nWhich <= XATTR_FILL_LAST; nWhich++ ) + for( sal_uInt16 nWhich = XATTR_FILL_FIRST; nWhich <= XATTR_FILL_LAST; nWhich++ ) { pTempSet->ClearItem( nWhich ); } @@ -471,7 +471,7 @@ const SfxItemSet* FuPage::ExecuteDialog( Window* pParent ) mpDoc->SetDefaultWritingMode( nVal == FRMDIR_HORI_RIGHT_TOP ? ::com::sun::star::text::WritingMode_RL_TB : ::com::sun::star::text::WritingMode_LR_TB ); } - mpDoc->SetChanged(TRUE); + mpDoc->SetChanged(sal_True); // BackgroundFill of Masterpage: no hard attributes allowed SdrPage& rUsedMasterPage = mpPage->IsMasterPage() ? *mpPage : mpPage->TRG_GetMasterPage(); @@ -501,16 +501,16 @@ void FuPage::ApplyItemSet( const SfxItemSet* pArgs ) // Set new page-attributes PageKind ePageKind = mpDrawViewShell->GetPageKind(); const SfxPoolItem* pPoolItem; - BOOL bSetPageSizeAndBorder = FALSE; + sal_Bool bSetPageSizeAndBorder = sal_False; Size aNewSize(maSize); - INT32 nLeft = -1, nRight = -1, nUpper = -1, nLower = -1; - BOOL bScaleAll = TRUE; + sal_Int32 nLeft = -1, nRight = -1, nUpper = -1, nLower = -1; + sal_Bool bScaleAll = sal_True; Orientation eOrientation = mpPage->GetOrientation(); SdPage* pMasterPage = mpPage->IsMasterPage() ? mpPage : &(SdPage&)(mpPage->TRG_GetMasterPage()); - BOOL bFullSize = pMasterPage->IsBackgroundFullSize(); - USHORT nPaperBin = mpPage->GetPaperBin(); + sal_Bool bFullSize = pMasterPage->IsBackgroundFullSize(); + sal_uInt16 nPaperBin = mpPage->GetPaperBin(); - if( pArgs->GetItemState(SID_ATTR_PAGE, TRUE, &pPoolItem) == SFX_ITEM_SET ) + if( pArgs->GetItemState(SID_ATTR_PAGE, sal_True, &pPoolItem) == SFX_ITEM_SET ) { mpDoc->SetPageNumType(((const SvxPageItem*) pPoolItem)->GetNumType()); @@ -518,71 +518,71 @@ void FuPage::ApplyItemSet( const SfxItemSet* pArgs ) ORIENTATION_LANDSCAPE : ORIENTATION_PORTRAIT; if( mpPage->GetOrientation() != eOrientation ) - bSetPageSizeAndBorder = TRUE; + bSetPageSizeAndBorder = sal_True; mpDrawViewShell->ResetActualPage(); } - if( pArgs->GetItemState(SID_ATTR_PAGE_SIZE, TRUE, &pPoolItem) == SFX_ITEM_SET ) + if( pArgs->GetItemState(SID_ATTR_PAGE_SIZE, sal_True, &pPoolItem) == SFX_ITEM_SET ) { aNewSize = ((const SvxSizeItem*) pPoolItem)->GetSize(); if( mpPage->GetSize() != aNewSize ) - bSetPageSizeAndBorder = TRUE; + bSetPageSizeAndBorder = sal_True; } if( pArgs->GetItemState(mpDoc->GetPool().GetWhich(SID_ATTR_LRSPACE), - TRUE, &pPoolItem) == SFX_ITEM_SET ) + sal_True, &pPoolItem) == SFX_ITEM_SET ) { nLeft = ((const SvxLRSpaceItem*) pPoolItem)->GetLeft(); nRight = ((const SvxLRSpaceItem*) pPoolItem)->GetRight(); if( mpPage->GetLftBorder() != nLeft || mpPage->GetRgtBorder() != nRight ) - bSetPageSizeAndBorder = TRUE; + bSetPageSizeAndBorder = sal_True; } if( pArgs->GetItemState(mpDoc->GetPool().GetWhich(SID_ATTR_ULSPACE), - TRUE, &pPoolItem) == SFX_ITEM_SET ) + sal_True, &pPoolItem) == SFX_ITEM_SET ) { nUpper = ((const SvxULSpaceItem*) pPoolItem)->GetUpper(); nLower = ((const SvxULSpaceItem*) pPoolItem)->GetLower(); if( mpPage->GetUppBorder() != nUpper || mpPage->GetLwrBorder() != nLower ) - bSetPageSizeAndBorder = TRUE; + bSetPageSizeAndBorder = sal_True; } - if( pArgs->GetItemState(mpDoc->GetPool().GetWhich(SID_ATTR_PAGE_EXT1), TRUE, &pPoolItem) == SFX_ITEM_SET ) + if( pArgs->GetItemState(mpDoc->GetPool().GetWhich(SID_ATTR_PAGE_EXT1), sal_True, &pPoolItem) == SFX_ITEM_SET ) { bScaleAll = ((const SfxBoolItem*) pPoolItem)->GetValue(); } - if( pArgs->GetItemState(mpDoc->GetPool().GetWhich(SID_ATTR_PAGE_EXT2), TRUE, &pPoolItem) == SFX_ITEM_SET ) + if( pArgs->GetItemState(mpDoc->GetPool().GetWhich(SID_ATTR_PAGE_EXT2), sal_True, &pPoolItem) == SFX_ITEM_SET ) { bFullSize = ((const SfxBoolItem*) pPoolItem)->GetValue(); if(pMasterPage->IsBackgroundFullSize() != bFullSize ) - bSetPageSizeAndBorder = TRUE; + bSetPageSizeAndBorder = sal_True; } // Papierschacht (PaperBin) - if( pArgs->GetItemState(mpDoc->GetPool().GetWhich(SID_ATTR_PAGE_PAPERBIN), TRUE, &pPoolItem) == SFX_ITEM_SET ) + if( pArgs->GetItemState(mpDoc->GetPool().GetWhich(SID_ATTR_PAGE_PAPERBIN), sal_True, &pPoolItem) == SFX_ITEM_SET ) { nPaperBin = ((const SvxPaperBinItem*) pPoolItem)->GetValue(); if( mpPage->GetPaperBin() != nPaperBin ) - bSetPageSizeAndBorder = TRUE; + bSetPageSizeAndBorder = sal_True; } if (nLeft == -1 && nUpper != -1) { - bSetPageSizeAndBorder = TRUE; + bSetPageSizeAndBorder = sal_True; nLeft = mpPage->GetLftBorder(); nRight = mpPage->GetRgtBorder(); } else if (nLeft != -1 && nUpper == -1) { - bSetPageSizeAndBorder = TRUE; + bSetPageSizeAndBorder = sal_True; nUpper = mpPage->GetUppBorder(); nLower = mpPage->GetLwrBorder(); } @@ -592,8 +592,8 @@ void FuPage::ApplyItemSet( const SfxItemSet* pArgs ) //////////////////////////////////////////////////////////////////////////////// // - // if bMasterPage==FALSE then create a background-object for this page with the - // properties set in the dialog before, but if mbPageBckgrdDeleted==TRUE then + // if bMasterPage==sal_False then create a background-object for this page with the + // properties set in the dialog before, but if mbPageBckgrdDeleted==sal_True then // the background of this page was set to invisible, so it would be a mistake // to create a new background-object for this page ! // @@ -615,7 +615,7 @@ void FuPage::ApplyItemSet( const SfxItemSet* pArgs ) if( mpBackgroundObjUndoAction ) { // set merge flag, because a SdUndoGroupAction could have been inserted before - mpDocSh->GetUndoManager()->AddUndoAction( mpBackgroundObjUndoAction, TRUE ); + mpDocSh->GetUndoManager()->AddUndoAction( mpBackgroundObjUndoAction, sal_True ); mpBackgroundObjUndoAction = 0; } diff --git a/sd/source/ui/func/fuparagr.cxx b/sd/source/ui/func/fuparagr.cxx index 68f8a3e922d0..66fe24e2c56e 100644..100755 --- a/sd/source/ui/func/fuparagr.cxx +++ b/sd/source/ui/func/fuparagr.cxx @@ -114,7 +114,7 @@ void FuParagraph::DoExecute( SfxRequest& rReq ) SfxAbstractTabDialog* pDlg = pFact ? pFact->CreateSdParagraphTabDlg(NULL, &aNewAttr ) : 0; if( pDlg ) { - USHORT nResult = pDlg->Execute(); + sal_uInt16 nResult = pDlg->Execute(); switch( nResult ) { @@ -156,7 +156,7 @@ void FuParagraph::DoExecute( SfxRequest& rReq ) } // invalidieren der Slots - static USHORT SidArray[] = { + static sal_uInt16 SidArray[] = { SID_ATTR_TABSTOP, SID_ATTR_PARA_ADJUST_LEFT, SID_ATTR_PARA_ADJUST_RIGHT, diff --git a/sd/source/ui/func/fupoor.cxx b/sd/source/ui/func/fupoor.cxx index 0342c5f2bbc5..57a06e873f81 100755 --- a/sd/source/ui/func/fupoor.cxx +++ b/sd/source/ui/func/fupoor.cxx @@ -100,11 +100,11 @@ FuPoor::FuPoor ( nSlotId( rReq.GetSlot() ), nSlotValue(0), pDialog(NULL), - bIsInDragMode(FALSE), - bNoScrollUntilInside (TRUE), - bScrollable (FALSE), - bDelayActive (FALSE), - bFirstMouseMove (FALSE), + bIsInDragMode(sal_False), + bNoScrollUntilInside (sal_True), + bScrollable (sal_False), + bDelayActive (sal_False), + bFirstMouseMove (sal_False), // #95491# remember MouseButton state mnCode(0) { @@ -162,7 +162,7 @@ void FuPoor::Deactivate() aScrollTimer.Stop(); aDelayToScrollTimer.Stop (); bScrollable = - bDelayActive = FALSE; + bDelayActive = sal_False; if (pDialog) { @@ -200,7 +200,7 @@ void FuPoor::ForceScroll(const Point& aPixPos) if ( bNoScrollUntilInside ) { if ( rRect.IsInside(aPos) ) - bNoScrollUntilInside = FALSE; + bNoScrollUntilInside = sal_False; } else { @@ -249,16 +249,16 @@ IMPL_LINK_INLINE_END( FuPoor, ScrollHdl, Timer *, pTimer ) |* |* Tastaturereignisse bearbeiten |* -|* Wird ein KeyEvent bearbeitet, so ist der Return-Wert TRUE, andernfalls -|* FALSE. +|* Wird ein KeyEvent bearbeitet, so ist der Return-Wert sal_True, andernfalls +|* sal_False. |* \************************************************************************/ -BOOL FuPoor::KeyInput(const KeyEvent& rKEvt) +sal_Bool FuPoor::KeyInput(const KeyEvent& rKEvt) { - USHORT nCode = rKEvt.GetKeyCode().GetCode(); - BOOL bReturn = FALSE; - BOOL bSlideShow = SlideShow::IsRunning( mpViewShell->GetViewShellBase() ); + sal_uInt16 nCode = rKEvt.GetKeyCode().GetCode(); + sal_Bool bReturn = sal_False; + sal_Bool bSlideShow = SlideShow::IsRunning( mpViewShell->GetViewShellBase() ); switch (nCode) { @@ -312,7 +312,7 @@ BOOL FuPoor::KeyInput(const KeyEvent& rKEvt) } // consumed - bReturn = TRUE; + bReturn = sal_True; } } else @@ -340,7 +340,7 @@ BOOL FuPoor::KeyInput(const KeyEvent& rKEvt) } // consumed - bReturn = TRUE; + bReturn = sal_True; } } } @@ -369,7 +369,7 @@ BOOL FuPoor::KeyInput(const KeyEvent& rKEvt) } // consumed - bReturn = TRUE; + bReturn = sal_True; } } break; @@ -389,9 +389,9 @@ BOOL FuPoor::KeyInput(const KeyEvent& rKEvt) if (mpViewShell->ISA(DrawViewShell)) static_cast<DrawViewShell*>(mpViewShell) - ->SetZoomOnPage(FALSE); + ->SetZoomOnPage(sal_False); - bReturn = TRUE; + bReturn = sal_True; } } break; @@ -405,9 +405,9 @@ BOOL FuPoor::KeyInput(const KeyEvent& rKEvt) if (mpViewShell->ISA(DrawViewShell)) static_cast<DrawViewShell*>(mpViewShell) - ->SetZoomOnPage(FALSE); + ->SetZoomOnPage(sal_False); - bReturn = TRUE; + bReturn = sal_True; } } break; @@ -419,7 +419,7 @@ BOOL FuPoor::KeyInput(const KeyEvent& rKEvt) // Zoom auf Seite mpViewShell->GetViewFrame()->GetDispatcher()-> Execute(SID_SIZE_PAGE, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD); - bReturn = TRUE; + bReturn = sal_True; } } break; @@ -431,7 +431,7 @@ BOOL FuPoor::KeyInput(const KeyEvent& rKEvt) // Zoom auf selektierte Objekte mpViewShell->GetViewFrame()->GetDispatcher()-> Execute(SID_SIZE_OPTIMAL, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD); - bReturn = TRUE; + bReturn = sal_True; } } break; @@ -444,7 +444,7 @@ BOOL FuPoor::KeyInput(const KeyEvent& rKEvt) { // Naechstes ZoomRect einstellen mpViewShell->SetZoomRect(pZoomList->GetNextZoomRect()); - bReturn = TRUE; + bReturn = sal_True; } } break; @@ -457,7 +457,7 @@ BOOL FuPoor::KeyInput(const KeyEvent& rKEvt) { // Vorheriges ZoomRect einstellen mpViewShell->SetZoomRect(pZoomList->GetPreviousZoomRect()); - bReturn = TRUE; + bReturn = sal_True; } } break; @@ -470,7 +470,7 @@ BOOL FuPoor::KeyInput(const KeyEvent& rKEvt) { // Sprung zu erster Seite static_cast<DrawViewShell*>(mpViewShell)->SwitchPage(0); - bReturn = TRUE; + bReturn = sal_True; } } break; @@ -487,7 +487,7 @@ BOOL FuPoor::KeyInput(const KeyEvent& rKEvt) static_cast<DrawViewShell*>(mpViewShell) ->SwitchPage(mpDoc->GetSdPageCount( pPage->GetPageKind()) - 1); - bReturn = TRUE; + bReturn = sal_True; } } break; @@ -508,9 +508,9 @@ BOOL FuPoor::KeyInput(const KeyEvent& rKEvt) mpView->SdrEndTextEdit(); // Previous page. - bReturn = TRUE; + bReturn = sal_True; SdPage* pPage = static_cast<DrawViewShell*>(mpViewShell)->GetActualPage(); - USHORT nSdPage = (pPage->GetPageNum() - 1) / 2; + sal_uInt16 nSdPage = (pPage->GetPageNum() - 1) / 2; if (nSdPage > 0) { @@ -554,9 +554,9 @@ BOOL FuPoor::KeyInput(const KeyEvent& rKEvt) mpView->SdrEndTextEdit(); // Next page. - bReturn = TRUE; + bReturn = sal_True; SdPage* pPage = static_cast<DrawViewShell*>(mpViewShell)->GetActualPage(); - USHORT nSdPage = (pPage->GetPageNum() - 1) / 2; + sal_uInt16 nSdPage = (pPage->GetPageNum() - 1) / 2; if (nSdPage < mpDoc->GetSdPageCount(pPage->GetPageKind()) - 1) { @@ -641,7 +641,7 @@ BOOL FuPoor::KeyInput(const KeyEvent& rKEvt) } } - bReturn = TRUE; + bReturn = sal_True; } } } @@ -821,13 +821,13 @@ BOOL FuPoor::KeyInput(const KeyEvent& rKEvt) if(mpView->IsDragObj()) { FASTBOOL bWasNoSnap = rDragStat.IsNoSnap(); - BOOL bWasSnapEnabled = mpView->IsSnapEnabled(); + sal_Bool bWasSnapEnabled = mpView->IsSnapEnabled(); // switch snapping off if(!bWasNoSnap) - ((SdrDragStat&)rDragStat).SetNoSnap(TRUE); + ((SdrDragStat&)rDragStat).SetNoSnap(sal_True); if(bWasSnapEnabled) - mpView->SetSnapEnabled(FALSE); + mpView->SetSnapEnabled(sal_False); mpView->MovAction(aEndPoint); mpView->EndDragObj(); @@ -860,7 +860,7 @@ BOOL FuPoor::KeyInput(const KeyEvent& rKEvt) ScrollEnd(); } - bReturn = TRUE; + bReturn = sal_True; } } break; @@ -902,7 +902,7 @@ BOOL FuPoor::KeyInput(const KeyEvent& rKEvt) 0L); // consumed - bReturn = TRUE; + bReturn = sal_True; } } } @@ -953,7 +953,7 @@ BOOL FuPoor::KeyInput(const KeyEvent& rKEvt) 0L); // consumed - bReturn = TRUE; + bReturn = sal_True; } } } @@ -963,9 +963,9 @@ BOOL FuPoor::KeyInput(const KeyEvent& rKEvt) return(bReturn); } -BOOL FuPoor::MouseMove(const MouseEvent& ) +sal_Bool FuPoor::MouseMove(const MouseEvent& ) { - return FALSE; + return sal_False; } // #97016# II @@ -1027,14 +1027,14 @@ IMPL_LINK( FuPoor, DragHdl, Timer *, EMPTYARG ) { if( mpView ) { - USHORT nHitLog = USHORT ( mpWindow->PixelToLogic(Size(HITPIX,0)).Width() ); + sal_uInt16 nHitLog = sal_uInt16 ( mpWindow->PixelToLogic(Size(HITPIX,0)).Width() ); SdrHdl* pHdl = mpView->PickHandle(aMDPos); if ( pHdl==NULL && mpView->IsMarkedHit(aMDPos, nHitLog) - && !mpView->IsPresObjSelected(FALSE, TRUE) ) + && !mpView->IsPresObjSelected(sal_False, sal_True) ) { mpWindow->ReleaseMouse(); - bIsInDragMode = TRUE; + bIsInDragMode = sal_True; mpView->StartDrag( aMDPos, mpWindow ); } } @@ -1047,7 +1047,7 @@ IMPL_LINK( FuPoor, DragHdl, Timer *, EMPTYARG ) |* \************************************************************************/ -BOOL FuPoor::Command(const CommandEvent& rCEvt) +sal_Bool FuPoor::Command(const CommandEvent& rCEvt) { return( mpView->Command(rCEvt,mpWindow) ); } @@ -1061,7 +1061,7 @@ BOOL FuPoor::Command(const CommandEvent& rCEvt) IMPL_LINK_INLINE_START( FuPoor, DelayHdl, Timer *, EMPTYARG ) { aDelayToScrollTimer.Stop (); - bScrollable = TRUE; + bScrollable = sal_True; Point aPnt(mpWindow->GetPointerPosPixel()); @@ -1079,22 +1079,22 @@ IMPL_LINK_INLINE_END( FuPoor, DelayHdl, Timer *, pTimer ) |* \************************************************************************/ -BOOL FuPoor::MouseButtonUp (const MouseEvent& rMEvt) +sal_Bool FuPoor::MouseButtonUp (const MouseEvent& rMEvt) { // #95491# remember button state for creation of own MouseEvents SetMouseButtonCode(rMEvt.GetButtons()); aDelayToScrollTimer.Stop (); return bScrollable = - bDelayActive = FALSE; + bDelayActive = sal_False; } -BOOL FuPoor::MouseButtonDown(const MouseEvent& rMEvt) +sal_Bool FuPoor::MouseButtonDown(const MouseEvent& rMEvt) { // #95491# remember button state for creation of own MouseEvents SetMouseButtonCode(rMEvt.GetButtons()); - return FALSE; + return sal_False; } /************************************************************************* @@ -1105,7 +1105,7 @@ BOOL FuPoor::MouseButtonDown(const MouseEvent& rMEvt) void FuPoor::StartDelayToScrollTimer () { - bDelayActive = TRUE; + bDelayActive = sal_True; aDelayToScrollTimer.Start (); } @@ -1115,9 +1115,9 @@ void FuPoor::StartDelayToScrollTimer () |* \************************************************************************/ -BOOL FuPoor::RequestHelp(const HelpEvent& rHEvt) +sal_Bool FuPoor::RequestHelp(const HelpEvent& rHEvt) { - BOOL bReturn = FALSE; + sal_Bool bReturn = sal_False; SdrPageView* pPV = mpView->GetSdrPageView(); diff --git a/sd/source/ui/func/fuprlout.cxx b/sd/source/ui/func/fuprlout.cxx index 0d6f0b5aa565..2f0459c5e349 100644..100755 --- a/sd/source/ui/func/fuprlout.cxx +++ b/sd/source/ui/func/fuprlout.cxx @@ -76,8 +76,8 @@ SO2_DECL_REF(SvStorage) TYPEINIT1( FuPresentationLayout, FuPoor ); -#define POOL_BUFFER_SIZE (USHORT)32768 -#define DOCUMENT_BUFFER_SIZE (USHORT)32768 +#define POOL_BUFFER_SIZE (sal_uInt16)32768 +#define DOCUMENT_BUFFER_SIZE (sal_uInt16)32768 #define DOCUMENT_TOKEN (sal_Unicode('#')) /************************************************************************* @@ -114,11 +114,11 @@ void FuPresentationLayout::DoExecute( SfxRequest& rReq ) mpView->UnmarkAll(); } - BOOL bError = FALSE; + sal_Bool bError = sal_False; // die aktive Seite ermitteln - USHORT nSelectedPage = SDRPAGE_NOTFOUND; - for (USHORT nPage = 0; nPage < mpDoc->GetSdPageCount(PK_STANDARD); nPage++) + sal_uInt16 nSelectedPage = SDRPAGE_NOTFOUND; + for (sal_uInt16 nPage = 0; nPage < mpDoc->GetSdPageCount(PK_STANDARD); nPage++) { if (mpDoc->GetSdPage(nPage, PK_STANDARD)->IsSelected()) { @@ -135,19 +135,19 @@ void FuPresentationLayout::DoExecute( SfxRequest& rReq ) // wenn wir auf einer Masterpage sind, gelten die Aenderungen fuer alle // Seiten und Notizseiten, die das betreffende Layout benutzen - BOOL bOnMaster = FALSE; + sal_Bool bOnMaster = sal_False; if( mpViewShell && mpViewShell->ISA(DrawViewShell)) { EditMode eEditMode = static_cast<DrawViewShell*>(mpViewShell)->GetEditMode(); if (eEditMode == EM_MASTERPAGE) - bOnMaster = TRUE; + bOnMaster = sal_True; } - BOOL bMasterPage = bOnMaster; - BOOL bCheckMasters = FALSE; + sal_Bool bMasterPage = bOnMaster; + sal_Bool bCheckMasters = sal_False; // Dialog aufrufen - BOOL bLoad = FALSE; // tauchen neue Masterpages auf? + sal_Bool bLoad = sal_False; // tauchen neue Masterpages auf? String aFile; SfxItemSet aSet(mpDoc->GetPool(), ATTR_PRESLAYOUT_START, ATTR_PRESLAYOUT_END); @@ -177,7 +177,7 @@ void FuPresentationLayout::DoExecute( SfxRequest& rReq ) SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create(); AbstractSdPresLayoutDlg* pDlg = pFact ? pFact->CreateSdPresLayoutDlg(mpDocSh, mpViewShell, NULL, aSet ) : 0; - USHORT nResult = pDlg ? pDlg->Execute() : RET_CANCEL; + sal_uInt16 nResult = pDlg ? pDlg->Execute() : RET_CANCEL; switch (nResult) { @@ -196,14 +196,14 @@ void FuPresentationLayout::DoExecute( SfxRequest& rReq ) break; default: - bError = TRUE; + bError = sal_True; } delete pDlg; } if (!bError) { - mpDocSh->SetWaitCursor( TRUE ); + mpDocSh->SetWaitCursor( sal_True ); // Hier werden nur Masterpages ausgewechselt, d.h. die aktuelle Seite // bleibt aktuell. Damit beim Ein- und Ausfuegen der Masterpages nicht @@ -213,7 +213,7 @@ void FuPresentationLayout::DoExecute( SfxRequest& rReq ) // removing a masterpage, it's possible that you are removing the // current masterpage. So you have to call ResetActualPage ! if( mpViewShell->ISA(DrawViewShell) && !bCheckMasters ) - static_cast<DrawView*>(mpView)->BlockPageOrderChangedHint(TRUE); + static_cast<DrawView*>(mpView)->BlockPageOrderChangedHint(sal_True); if (bLoad) { @@ -238,7 +238,7 @@ void FuPresentationLayout::DoExecute( SfxRequest& rReq ) // Blockade wieder aufheben if (mpViewShell->ISA(DrawViewShell) && !bCheckMasters ) - static_cast<DrawView*>(mpView)->BlockPageOrderChangedHint(FALSE); + static_cast<DrawView*>(mpView)->BlockPageOrderChangedHint(sal_False); /************************************************************************* |* Falls dargestellte Masterpage sichtbar war, neu darstellen @@ -251,7 +251,7 @@ void FuPresentationLayout::DoExecute( SfxRequest& rReq ) { ::sd::View* pView = static_cast<DrawViewShell*>(mpViewShell)->GetView(); - USHORT nPgNum = pSelectedPage->TRG_GetMasterPage().GetPageNum(); + sal_uInt16 nPgNum = pSelectedPage->TRG_GetMasterPage().GetPageNum(); if (static_cast<DrawViewShell*>(mpViewShell)->GetPageKind() == PK_NOTES) nPgNum++; @@ -275,12 +275,12 @@ void FuPresentationLayout::DoExecute( SfxRequest& rReq ) DrawViewShell* pDrawViewSh = static_cast<DrawViewShell*>(mpViewShell); EditMode eMode = pDrawViewSh->GetEditMode(); - BOOL bLayer = pDrawViewSh->IsLayerModeActive(); + sal_Bool bLayer = pDrawViewSh->IsLayerModeActive(); pDrawViewSh->ChangeEditMode( eMode, !bLayer ); pDrawViewSh->ChangeEditMode( eMode, bLayer ); } - mpDocSh->SetWaitCursor( FALSE ); + mpDocSh->SetWaitCursor( sal_False ); } } diff --git a/sd/source/ui/func/fuprobjs.cxx b/sd/source/ui/func/fuprobjs.cxx index d65bc8aaffe3..56db54cc7564 100644..100755 --- a/sd/source/ui/func/fuprobjs.cxx +++ b/sd/source/ui/func/fuprobjs.cxx @@ -97,32 +97,32 @@ void FuPresentationObjects::DoExecute( SfxRequest& ) String aLayoutName = (((SfxStringItem&)aSet.Get(SID_STATUS_LAYOUT)).GetValue()); DBG_ASSERT(aLayoutName.Len(), "Layout unbestimmt"); - BOOL bUnique = FALSE; + sal_Bool bUnique = sal_False; sal_Int16 nDepth, nTmp; OutlineView* pOlView = static_cast<OutlineView*>(pOutlineViewShell->GetView()); OutlinerView* pOutlinerView = pOlView->GetViewByWindow( (Window*) mpWindow ); ::Outliner* pOutl = pOutlinerView->GetOutliner(); List* pList = pOutlinerView->CreateSelectionList(); Paragraph* pPara = (Paragraph*)pList->First(); - nDepth = pOutl->GetDepth((USHORT)pOutl->GetAbsPos( pPara ) ); + nDepth = pOutl->GetDepth((sal_uInt16)pOutl->GetAbsPos( pPara ) ); bool bPage = pOutl->HasParaFlag( pPara, PARAFLAG_ISPAGE ); while( pPara ) { - nTmp = pOutl->GetDepth((USHORT) pOutl->GetAbsPos( pPara ) ); + nTmp = pOutl->GetDepth((sal_uInt16) pOutl->GetAbsPos( pPara ) ); if( nDepth != nTmp ) { - bUnique = FALSE; + bUnique = sal_False; break; } if( pOutl->HasParaFlag( pPara, PARAFLAG_ISPAGE ) != bPage ) { - bUnique = FALSE; + bUnique = sal_False; break; } - bUnique = TRUE; + bUnique = sal_True; pPara = (Paragraph*) pList->Next(); } @@ -131,7 +131,7 @@ void FuPresentationObjects::DoExecute( SfxRequest& ) { String aStyleName = aLayoutName; aStyleName.AppendAscii( RTL_CONSTASCII_STRINGPARAM( SD_LT_SEPARATOR ) ); - USHORT nDlgId = TAB_PRES_LAYOUT_TEMPLATE; + sal_uInt16 nDlgId = TAB_PRES_LAYOUT_TEMPLATE; PresentationObjects ePO; if( bPage ) diff --git a/sd/source/ui/func/fuscale.cxx b/sd/source/ui/func/fuscale.cxx index dc5677c6ef2d..f5185dcbad0c 100644..100755 --- a/sd/source/ui/func/fuscale.cxx +++ b/sd/source/ui/func/fuscale.cxx @@ -86,7 +86,7 @@ FunctionReference FuScale::Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd: void FuScale::DoExecute( SfxRequest& rReq ) { - INT16 nValue; + sal_Int16 nValue; const SfxItemSet* pArgs = rReq.GetArgs(); @@ -94,9 +94,9 @@ void FuScale::DoExecute( SfxRequest& rReq ) { SfxItemSet aNewAttr( mpDoc->GetPool(), SID_ATTR_ZOOM, SID_ATTR_ZOOM ); SvxZoomItem* pZoomItem; - USHORT nZoomValues = SVX_ZOOM_ENABLE_ALL; + sal_uInt16 nZoomValues = SVX_ZOOM_ENABLE_ALL; - nValue = (INT16) mpWindow->GetZoom(); + nValue = (sal_Int16) mpWindow->GetZoom(); // Zoom auf Seitengroesse ? if( mpViewShell && mpViewShell->ISA( DrawViewShell ) && @@ -141,8 +141,8 @@ void FuScale::DoExecute( SfxRequest& rReq ) if( pDlg ) { - pDlg->SetLimits( (USHORT)mpWindow->GetMinZoom(), (USHORT)mpWindow->GetMaxZoom() ); - USHORT nResult = pDlg->Execute(); + pDlg->SetLimits( (sal_uInt16)mpWindow->GetMinZoom(), (sal_uInt16)mpWindow->GetMaxZoom() ); + sal_uInt16 nResult = pDlg->Execute(); switch( nResult ) { case RET_CANCEL: @@ -205,7 +205,7 @@ void FuScale::DoExecute( SfxRequest& rReq ) } else if(mpViewShell && (pArgs->Count () == 1)) { - SFX_REQUEST_ARG (rReq, pScale, SfxUInt32Item, ID_VAL_ZOOM, FALSE); + SFX_REQUEST_ARG (rReq, pScale, SfxUInt32Item, ID_VAL_ZOOM, sal_False); mpViewShell->SetZoom (pScale->GetValue ()); mpViewShell->GetViewFrame()->GetBindings().Invalidate( SidArrayZoom ); diff --git a/sd/source/ui/func/fusearch.cxx b/sd/source/ui/func/fusearch.cxx index 04fcf124cc14..3591b70af7bf 100755 --- a/sd/source/ui/func/fusearch.cxx +++ b/sd/source/ui/func/fusearch.cxx @@ -54,7 +54,7 @@ class SfxRequest; namespace sd { -static USHORT SidArraySpell[] = { +static sal_uInt16 SidArraySpell[] = { SID_DRAWINGMODE, SID_OUTLINEMODE, SID_DIAMODE, @@ -78,7 +78,7 @@ FuSearch::FuSearch ( SfxRequest& rReq ) : FuPoor(pViewSh, pWin, pView, pDoc, rReq), pSdOutliner(NULL), - bOwnOutliner(FALSE) + bOwnOutliner(sal_False) { } @@ -95,12 +95,12 @@ void FuSearch::DoExecute( SfxRequest& ) if ( mpViewShell->ISA(DrawViewShell) ) { - bOwnOutliner = TRUE; + bOwnOutliner = sal_True; pSdOutliner = new ::sd::Outliner( mpDoc, OUTLINERMODE_TEXTOBJECT ); } else if ( mpViewShell->ISA(OutlineViewShell) ) { - bOwnOutliner = FALSE; + bOwnOutliner = sal_False; pSdOutliner = mpDoc->GetOutliner(); } @@ -146,7 +146,7 @@ void FuSearch::SearchAndReplace( const SvxSearchItem* pSearchItem ) { pSdOutliner->EndSpelling(); - bOwnOutliner = TRUE; + bOwnOutliner = sal_True; pSdOutliner = new ::sd::Outliner( mpDoc, OUTLINERMODE_TEXTOBJECT ); pSdOutliner->PrepareSpelling(); } @@ -155,14 +155,14 @@ void FuSearch::SearchAndReplace( const SvxSearchItem* pSearchItem ) pSdOutliner->EndSpelling(); delete pSdOutliner; - bOwnOutliner = FALSE; + bOwnOutliner = sal_False; pSdOutliner = mpDoc->GetOutliner(); pSdOutliner->PrepareSpelling(); } if (pSdOutliner) { - BOOL bEndSpelling = pSdOutliner->StartSearchAndReplace(pSearchItem); + sal_Bool bEndSpelling = pSdOutliner->StartSearchAndReplace(pSearchItem); if (bEndSpelling) { diff --git a/sd/source/ui/func/fusel.cxx b/sd/source/ui/func/fusel.cxx index 5c380da547bc..1d0b5d918b35 100755 --- a/sd/source/ui/func/fusel.cxx +++ b/sd/source/ui/func/fusel.cxx @@ -109,12 +109,12 @@ FuSelection::FuSelection ( SdDrawDocument* pDoc, SfxRequest& rReq) : FuDraw(pViewSh, pWin, pView, pDoc, rReq), - bTempRotation(FALSE), - bSelectionChanged(FALSE), - bHideAndAnimate(FALSE), + bTempRotation(sal_False), + bSelectionChanged(sal_False), + bHideAndAnimate(sal_False), pHdl(NULL), - bSuppressChangesOfSelection(FALSE), - bMirrorSide0(FALSE), + bSuppressChangesOfSelection(sal_False), + bMirrorSide0(sal_False), nEditMode(SID_BEZIER_MOVE), pWaterCanCandidate(NULL) { @@ -158,38 +158,38 @@ FuSelection::~FuSelection() |* \************************************************************************/ -BOOL FuSelection::MouseButtonDown(const MouseEvent& rMEvt) +sal_Bool FuSelection::MouseButtonDown(const MouseEvent& rMEvt) { // Hack fuer #?????# - bHideAndAnimate = FALSE; + bHideAndAnimate = sal_False; pHdl = NULL; - BOOL bReturn = FuDraw::MouseButtonDown(rMEvt); - BOOL bWaterCan = SD_MOD()->GetWaterCan(); + sal_Bool bReturn = FuDraw::MouseButtonDown(rMEvt); + sal_Bool bWaterCan = SD_MOD()->GetWaterCan(); const bool bReadOnly = mpDocSh->IsReadOnly(); // When the right mouse button is pressed then only select objects // (and deselect others) as a preparation for showing the context // menu. const bool bSelectionOnly = rMEvt.IsRight(); - bMBDown = TRUE; - bSelectionChanged = FALSE; + bMBDown = sal_True; + bSelectionChanged = sal_False; if ( mpView->IsAction() ) { if ( rMEvt.IsRight() ) mpView->BckAction(); - return TRUE; + return sal_True; } - USHORT nDrgLog = USHORT ( mpWindow->PixelToLogic(Size(DRGPIX,0)).Width() ); - USHORT nHitLog = USHORT ( mpWindow->PixelToLogic(Size(HITPIX,0)).Width() ); + sal_uInt16 nDrgLog = sal_uInt16 ( mpWindow->PixelToLogic(Size(DRGPIX,0)).Width() ); + sal_uInt16 nHitLog = sal_uInt16 ( mpWindow->PixelToLogic(Size(HITPIX,0)).Width() ); // The following code is executed for right clicks as well as for left // clicks in order to modify the selection for the right button as a // preparation for the context menu. The functions BegMarkObject() and // BegDragObject(), however, are not called for right clicks because a) - // it makes no sense and b) to have IsAction() return FALSE when called + // it makes no sense and b) to have IsAction() return sal_False when called // from Command() which is a prerequisite for the context menu. if ((rMEvt.IsLeft() || rMEvt.IsRight()) && !mpView->IsAction() @@ -206,7 +206,7 @@ BOOL FuSelection::MouseButtonDown(const MouseEvent& rMEvt) long nAngle0 = GetAngle(aMDPos - mpView->GetRef1()); nAngle0 -= 27000; nAngle0 = NormAngle360(nAngle0); - bMirrorSide0 = BOOL (nAngle0 < 18000L); + bMirrorSide0 = sal_Bool (nAngle0 < 18000L); if (!pHdl && mpView->Is3DRotationCreationActive()) { @@ -214,23 +214,23 @@ BOOL FuSelection::MouseButtonDown(const MouseEvent& rMEvt) * Wenn 3D-Rotationskoerper erstellt werden sollen, jetzt * die Erstellung beenden ******************************************************************/ - bSuppressChangesOfSelection = TRUE; + bSuppressChangesOfSelection = sal_True; if(mpWindow) mpWindow->EnterWait(); mpView->End3DCreation(); - bSuppressChangesOfSelection = FALSE; + bSuppressChangesOfSelection = sal_False; mpView->ResetCreationActive(); if(mpWindow) mpWindow->LeaveWait(); } - BOOL bTextEdit = FALSE; + sal_Bool bTextEdit = sal_False; SdrViewEvent aVEvt; SdrHitKind eHit = mpView->PickAnything(rMEvt, SDRMOUSEBUTTONDOWN, aVEvt); if ( eHit == SDRHIT_TEXTEDITOBJ && ( mpViewShell->GetFrameView()->IsQuickEdit() || dynamic_cast< sdr::table::SdrTableObj* >( aVEvt.pObj ) != NULL ) ) { - bTextEdit = TRUE; + bTextEdit = sal_True; } if(!bTextEdit @@ -253,24 +253,24 @@ BOOL FuSelection::MouseButtonDown(const MouseEvent& rMEvt) else { // Handle oder markiertes Objekt getroffen - bFirstMouseMove = TRUE; + bFirstMouseMove = sal_True; aDragTimer.Start(); } if ( ! rMEvt.IsRight()) mpView->BegDragObj(aMDPos, (OutputDevice*) NULL, pHdl, nDrgLog); - bReturn = TRUE; + bReturn = sal_True; } else { if (!rMEvt.IsMod2() && mpView->PickObj(aMDPos, mpView->getHitTolLog(), pObj, pPV, SDRSEARCH_PICKMACRO)) { mpView->BegMacroObj(aMDPos, nHitLog, pObj, pPV, mpWindow); - bReturn = TRUE; + bReturn = sal_True; } else if ( bTextEdit ) { - UINT16 nSdrObjKind = aVEvt.pObj->GetObjIdentifier(); + sal_uInt16 nSdrObjKind = aVEvt.pObj->GetObjIdentifier(); if (aVEvt.pObj->GetObjInventor() == SdrInventor && (nSdrObjKind == OBJ_TEXT || @@ -295,7 +295,7 @@ BOOL FuSelection::MouseButtonDown(const MouseEvent& rMEvt) mpWindow->ReleaseMouse(); SfxStringItem aStrItem(SID_FILE_NAME, aVEvt.pURLField->GetURL()); SfxStringItem aReferer(SID_REFERER, mpDocSh->GetMedium()->GetName()); - SfxBoolItem aBrowseItem( SID_BROWSE, TRUE ); + SfxBoolItem aBrowseItem( SID_BROWSE, sal_True ); SfxViewFrame* pFrame = mpViewShell->GetViewFrame(); mpWindow->ReleaseMouse(); @@ -313,7 +313,7 @@ BOOL FuSelection::MouseButtonDown(const MouseEvent& rMEvt) &aStrItem, &aFrameItem, &aBrowseItem, &aReferer, 0L); } - bReturn = TRUE; + bReturn = sal_True; } else if(!rMEvt.IsMod2() && mpViewShell->ISA(DrawViewShell) @@ -353,7 +353,7 @@ BOOL FuSelection::MouseButtonDown(const MouseEvent& rMEvt) { // New: double click on empty space/on obj on MasterPage, leave group mpView->LeaveOneGroup(); - bReturn = TRUE; + bReturn = sal_True; } } } @@ -372,8 +372,8 @@ BOOL FuSelection::MouseButtonDown(const MouseEvent& rMEvt) } else { - bReturn = TRUE; - BOOL bDeactivateOLE = FALSE; + bReturn = sal_True; + sal_Bool bDeactivateOLE = sal_False; if ( !rMEvt.IsShift() && !rMEvt.IsMod2() ) { @@ -384,13 +384,13 @@ BOOL FuSelection::MouseButtonDown(const MouseEvent& rMEvt) if (pIPClient && pIPClient->IsObjectInPlaceActive()) { // OLE-Objekt wird im nachfolgenden UnmarkAll() deaktiviert - bDeactivateOLE = TRUE; + bDeactivateOLE = sal_True; } mpView->UnmarkAll(); } - BOOL bMarked = FALSE; + sal_Bool bMarked = sal_False; if ( !rMEvt.IsMod1() && !bDeactivateOLE) { @@ -400,15 +400,15 @@ BOOL FuSelection::MouseButtonDown(const MouseEvent& rMEvt) } else { - BOOL bToggle = FALSE; + sal_Bool bToggle = sal_False; if (rMEvt.IsShift() && mpView->GetMarkedObjectList().GetMarkCount() > 1) { // Bei Einfachselektion kein Toggle - bToggle = TRUE; + bToggle = sal_True; } - bMarked = mpView->MarkObj(aMDPos, nHitLog, bToggle, FALSE); + bMarked = mpView->MarkObj(aMDPos, nHitLog, bToggle, sal_False); } } @@ -543,7 +543,7 @@ BOOL FuSelection::MouseButtonDown(const MouseEvent& rMEvt) mpView->UnmarkAllObj(); } - BOOL bMarked = FALSE; + sal_Bool bMarked = sal_False; if (!rMEvt.IsMod1()) { @@ -553,7 +553,7 @@ BOOL FuSelection::MouseButtonDown(const MouseEvent& rMEvt) } else { - bMarked = mpView->MarkObj(aMDPos, nHitLog, rMEvt.IsShift(), FALSE); + bMarked = mpView->MarkObj(aMDPos, nHitLog, rMEvt.IsShift(), sal_False); } } @@ -602,15 +602,15 @@ BOOL FuSelection::MouseButtonDown(const MouseEvent& rMEvt) |* \************************************************************************/ -BOOL FuSelection::MouseMove(const MouseEvent& rMEvt) +sal_Bool FuSelection::MouseMove(const MouseEvent& rMEvt) { - BOOL bReturn = FuDraw::MouseMove(rMEvt); + sal_Bool bReturn = FuDraw::MouseMove(rMEvt); if (aDragTimer.IsActive()) { if(bFirstMouseMove) { - bFirstMouseMove = FALSE; + bFirstMouseMove = sal_False; } else { @@ -646,9 +646,9 @@ BOOL FuSelection::MouseMove(const MouseEvent& rMEvt) |* \************************************************************************/ -BOOL FuSelection::MouseButtonUp(const MouseEvent& rMEvt) +sal_Bool FuSelection::MouseButtonUp(const MouseEvent& rMEvt) { - BOOL bReturn = FALSE; + sal_Bool bReturn = sal_False; // When the right mouse button is pressed then only select objects // (and deselect others) as a preparation for showing the context // menu. @@ -657,24 +657,24 @@ BOOL FuSelection::MouseButtonUp(const MouseEvent& rMEvt) if (bHideAndAnimate) { // Animation laeuft noch -> sofort returnieren - bHideAndAnimate = FALSE; + bHideAndAnimate = sal_False; pHdl = NULL; mpWindow->ReleaseMouse(); - return(TRUE); + return(sal_True); } if (aDragTimer.IsActive() ) { aDragTimer.Stop(); - bIsInDragMode = FALSE; + bIsInDragMode = sal_False; } if( !mpView ) - return (FALSE); + return (sal_False); Point aPnt( mpWindow->PixelToLogic( rMEvt.GetPosPixel() ) ); - USHORT nHitLog = USHORT ( mpWindow->PixelToLogic(Size(HITPIX,0)).Width() ); - USHORT nDrgLog = USHORT ( mpWindow->PixelToLogic(Size(DRGPIX,0)).Width() ); + sal_uInt16 nHitLog = sal_uInt16 ( mpWindow->PixelToLogic(Size(HITPIX,0)).Width() ); + sal_uInt16 nDrgLog = sal_uInt16 ( mpWindow->PixelToLogic(Size(DRGPIX,0)).Width() ); if (mpView->IsFrameDragSingles() || !mpView->HasMarkablePoints()) { @@ -687,11 +687,11 @@ BOOL FuSelection::MouseButtonUp(const MouseEvent& rMEvt) * Objekt wurde verschoben ******************************************************************/ FrameView* pFrameView = mpViewShell->GetFrameView(); - BOOL bDragWithCopy = (rMEvt.IsMod1() && pFrameView->IsDragWithCopy()); + sal_Bool bDragWithCopy = (rMEvt.IsMod1() && pFrameView->IsDragWithCopy()); if (bDragWithCopy) { - bDragWithCopy = !mpView->IsPresObjSelected(FALSE, TRUE); + bDragWithCopy = !mpView->IsPresObjSelected(sal_False, sal_True); } mpView->SetDragWithCopy(bDragWithCopy); @@ -708,7 +708,7 @@ BOOL FuSelection::MouseButtonUp(const MouseEvent& rMEvt) * Toggle zw. Selektion und Rotation **************************************************************/ SdrObject* pSingleObj = NULL; - ULONG nMarkCount = mpView->GetMarkedObjectList().GetMarkCount(); + sal_uLong nMarkCount = mpView->GetMarkedObjectList().GetMarkCount(); if (nMarkCount==1) { @@ -725,7 +725,7 @@ BOOL FuSelection::MouseButtonUp(const MouseEvent& rMEvt) && ! bSelectionOnly) { - bTempRotation = TRUE; + bTempRotation = sal_True; nSlotId = SID_OBJECT_ROTATE; Activate(); } @@ -739,9 +739,9 @@ BOOL FuSelection::MouseButtonUp(const MouseEvent& rMEvt) { if (!pHdl) { - bSuppressChangesOfSelection = TRUE; + bSuppressChangesOfSelection = sal_True; mpView->Start3DCreation(); - bSuppressChangesOfSelection = FALSE; + bSuppressChangesOfSelection = sal_False; } else if (pHdl->GetKind() != HDL_MIRX && pHdl->GetKind() != HDL_REF1 && @@ -754,15 +754,15 @@ BOOL FuSelection::MouseButtonUp(const MouseEvent& rMEvt) long nAngle1 = GetAngle(aPnt - mpView->GetRef1()); nAngle1 -= 27000; nAngle1 = NormAngle360(nAngle1); - BOOL bMirrorSide1 = BOOL (nAngle1 < 18000L); + sal_Bool bMirrorSide1 = sal_Bool (nAngle1 < 18000L); if (bMirrorSide0 != bMirrorSide1) { - bSuppressChangesOfSelection = TRUE; + bSuppressChangesOfSelection = sal_True; if(mpWindow) mpWindow->EnterWait(); mpView->End3DCreation(); - bSuppressChangesOfSelection = FALSE; + bSuppressChangesOfSelection = sal_False; nSlotId = SID_OBJECT_SELECT; if(mpWindow) mpWindow->LeaveWait(); @@ -813,7 +813,7 @@ BOOL FuSelection::MouseButtonUp(const MouseEvent& rMEvt) mpView->AddUndo(mpDoc->GetSdrUndoFactory().CreateUndoGeoObject(*pWaterCanCandidate)); mpView->AddUndo(pUndoAttr); - pWaterCanCandidate->SetStyleSheet (pStyleSheet, FALSE); + pWaterCanCandidate->SetStyleSheet (pStyleSheet, sal_False); // #108981# mpView->EndUndo(); @@ -826,7 +826,7 @@ BOOL FuSelection::MouseButtonUp(const MouseEvent& rMEvt) // one now. } - USHORT nClicks = rMEvt.GetClicks(); + sal_uInt16 nClicks = rMEvt.GetClicks(); if (nClicks == 2 && rMEvt.IsLeft() && bMBDown && !rMEvt.IsMod1() && !rMEvt.IsShift() ) @@ -834,13 +834,13 @@ BOOL FuSelection::MouseButtonUp(const MouseEvent& rMEvt) DoubleClick(rMEvt); } - bMBDown = FALSE; + bMBDown = sal_False; ForcePointer(&rMEvt); pHdl = NULL; mpWindow->ReleaseMouse(); SdrObject* pSingleObj = NULL; - ULONG nMarkCount = mpView->GetMarkedObjectList().GetMarkCount(); + sal_uLong nMarkCount = mpView->GetMarkedObjectList().GetMarkCount(); if (nMarkCount==1) { @@ -856,7 +856,7 @@ BOOL FuSelection::MouseButtonUp(const MouseEvent& rMEvt) (pSingleObj->GetObjInventor() != SdrInventor || pSingleObj->GetObjIdentifier() == OBJ_MEASURE) ) ) { - bReturn = TRUE; + bReturn = sal_True; ForcePointer(&rMEvt); pHdl = NULL; mpWindow->ReleaseMouse(); @@ -881,11 +881,11 @@ BOOL FuSelection::MouseButtonUp(const MouseEvent& rMEvt) else if ( mpView->IsDragObj() ) { FrameView* pFrameView = mpViewShell->GetFrameView(); - BOOL bDragWithCopy = (rMEvt.IsMod1() && pFrameView->IsDragWithCopy()); + sal_Bool bDragWithCopy = (rMEvt.IsMod1() && pFrameView->IsDragWithCopy()); if (bDragWithCopy) { - bDragWithCopy = !mpView->IsPresObjSelected(FALSE, TRUE); + bDragWithCopy = !mpView->IsPresObjSelected(sal_False, sal_True); } mpView->SetDragWithCopy(bDragWithCopy); @@ -895,7 +895,7 @@ BOOL FuSelection::MouseButtonUp(const MouseEvent& rMEvt) { mpView->EndAction(); - USHORT nDrgLog2 = USHORT ( mpWindow->PixelToLogic(Size(DRGPIX,0)).Width() ); + sal_uInt16 nDrgLog2 = sal_uInt16 ( mpWindow->PixelToLogic(Size(DRGPIX,0)).Width() ); Point aPos = mpWindow->PixelToLogic( rMEvt.GetPosPixel() ); if (Abs(aMDPos.X() - aPos.X()) < nDrgLog2 && @@ -918,7 +918,7 @@ BOOL FuSelection::MouseButtonUp(const MouseEvent& rMEvt) Abs(aPnt.Y() - aMDPos.Y()) < nDrgLog) { // Gruppe betreten - mpView->MarkObj(aPnt, nHitLog, FALSE, rMEvt.IsMod1()); + mpView->MarkObj(aPnt, nHitLog, sal_False, rMEvt.IsMod1()); } @@ -936,14 +936,14 @@ BOOL FuSelection::MouseButtonUp(const MouseEvent& rMEvt) |* |* Tastaturereignisse bearbeiten |* -|* Wird ein KeyEvent bearbeitet, so ist der Return-Wert TRUE, andernfalls -|* FALSE. +|* Wird ein KeyEvent bearbeitet, so ist der Return-Wert sal_True, andernfalls +|* sal_False. |* \************************************************************************/ -BOOL FuSelection::KeyInput(const KeyEvent& rKEvt) +sal_Bool FuSelection::KeyInput(const KeyEvent& rKEvt) { - BOOL bReturn = FALSE; + sal_Bool bReturn = sal_False; switch (rKEvt.GetKeyCode().GetCode()) { @@ -990,7 +990,7 @@ void FuSelection::Activate() // (gemapter) Slot wird explizit auf Rotate gesetzt #31052# if( mpViewShell->ISA(DrawViewShell) ) { - USHORT* pSlotArray = + sal_uInt16* pSlotArray = static_cast<DrawViewShell*>(mpViewShell)->GetSlotArray(); pSlotArray[ 1 ] = SID_OBJECT_ROTATE; } @@ -1086,7 +1086,7 @@ void FuSelection::Activate() case SID_CONVERT_TO_3D_LATHE: { eMode = SDRDRAG_MIRROR; - bSuppressChangesOfSelection = TRUE; + bSuppressChangesOfSelection = sal_True; if ( mpView->GetDragMode() != eMode ) mpView->SetDragMode(eMode); @@ -1094,7 +1094,7 @@ void FuSelection::Activate() if (!mpView->Is3DRotationCreationActive()) mpView->Start3DCreation(); - bSuppressChangesOfSelection = FALSE; + bSuppressChangesOfSelection = sal_False; } break; @@ -1110,7 +1110,7 @@ void FuSelection::Activate() if (nSlotId != SID_OBJECT_ROTATE) { - bTempRotation = FALSE; + bTempRotation = sal_False; } FuDraw::Activate(); @@ -1138,7 +1138,7 @@ void FuSelection::Deactivate() void FuSelection::SelectionHasChanged() { - bSelectionChanged = TRUE; + bSelectionChanged = sal_True; FuDraw::SelectionHasChanged(); @@ -1161,17 +1161,17 @@ void FuSelection::SelectionHasChanged() |* \************************************************************************/ -void FuSelection::SetEditMode(USHORT nMode) +void FuSelection::SetEditMode(sal_uInt16 nMode) { nEditMode = nMode; if (nEditMode == SID_BEZIER_INSERT) { - mpView->SetInsObjPointMode(TRUE); + mpView->SetInsObjPointMode(sal_True); } else { - mpView->SetInsObjPointMode(FALSE); + mpView->SetInsObjPointMode(sal_False); } ForcePointer(); @@ -1187,11 +1187,11 @@ void FuSelection::SetEditMode(USHORT nMode) |* \************************************************************************/ -BOOL FuSelection::AnimateObj(SdrObject* pObj, const Point& rPos) +sal_Bool FuSelection::AnimateObj(SdrObject* pObj, const Point& rPos) { - BOOL bAnimated = FALSE; - BOOL bClosed = pObj->IsClosedObj(); - BOOL bFilled = FALSE; + sal_Bool bAnimated = sal_False; + sal_Bool bClosed = pObj->IsClosedObj(); + sal_Bool bFilled = sal_False; if (bClosed) { @@ -1204,7 +1204,7 @@ BOOL FuSelection::AnimateObj(SdrObject* pObj, const Point& rPos) } const SetOfByte* pVisiLayer = &mpView->GetSdrPageView()->GetVisibleLayers(); - USHORT nHitLog = USHORT ( mpWindow->PixelToLogic(Size(HITPIX,0)).Width() ); + sal_uInt16 nHitLog = sal_uInt16 ( mpWindow->PixelToLogic(Size(HITPIX,0)).Width() ); const long n2HitLog = nHitLog * 2; Point aHitPosR(rPos); Point aHitPosL(rPos); @@ -1235,13 +1235,13 @@ BOOL FuSelection::AnimateObj(SdrObject* pObj, const Point& rPos) SfxStringItem aReferer(SID_REFERER, mpDocSh->GetMedium()->GetName()); SfxViewFrame* pFrame = mpViewShell->GetViewFrame(); SfxFrameItem aFrameItem(SID_DOCFRAME, pFrame); - SfxBoolItem aBrowseItem( SID_BROWSE, TRUE ); + SfxBoolItem aBrowseItem( SID_BROWSE, sal_True ); mpWindow->ReleaseMouse(); pFrame->GetDispatcher()-> Execute(SID_OPENDOC, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, &aStrItem, &aFrameItem, &aBrowseItem, &aReferer, 0L); - bAnimated = TRUE; + bAnimated = sal_True; } } else if (!mpDocSh->ISA(GraphicDocShell) && @@ -1263,7 +1263,7 @@ BOOL FuSelection::AnimateObj(SdrObject* pObj, const Point& rPos) SfxStringItem aItem(SID_NAVIGATOR_OBJECT, pInfo->GetBookmark()); mpViewShell->GetViewFrame()->GetDispatcher()-> Execute(SID_NAVIGATOR_OBJECT, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD, &aItem, 0L); - bAnimated = TRUE; + bAnimated = sal_True; } break; @@ -1277,13 +1277,13 @@ BOOL FuSelection::AnimateObj(SdrObject* pObj, const Point& rPos) SfxStringItem aStrItem(SID_FILE_NAME, sBookmark); SfxViewFrame* pFrame = mpViewShell->GetViewFrame(); SfxFrameItem aFrameItem(SID_DOCFRAME, pFrame); - SfxBoolItem aBrowseItem( SID_BROWSE, TRUE ); + SfxBoolItem aBrowseItem( SID_BROWSE, sal_True ); pFrame->GetDispatcher()-> Execute(SID_OPENDOC, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, &aStrItem, &aFrameItem, &aBrowseItem, &aReferer, 0L); } - bAnimated = TRUE; + bAnimated = sal_True; } break; @@ -1294,7 +1294,7 @@ BOOL FuSelection::AnimateObj(SdrObject* pObj, const Point& rPos) mpViewShell->GetViewFrame()->GetDispatcher()-> Execute(SID_NAVIGATOR_PAGE, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD, &aItem, 0L); - bAnimated = TRUE; + bAnimated = sal_True; } break; @@ -1305,7 +1305,7 @@ BOOL FuSelection::AnimateObj(SdrObject* pObj, const Point& rPos) mpViewShell->GetViewFrame()->GetDispatcher()-> Execute(SID_NAVIGATOR_PAGE, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD, &aItem, 0L); - bAnimated = TRUE; + bAnimated = sal_True; } break; @@ -1316,7 +1316,7 @@ BOOL FuSelection::AnimateObj(SdrObject* pObj, const Point& rPos) mpViewShell->GetViewFrame()->GetDispatcher()-> Execute(SID_NAVIGATOR_PAGE, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD, &aItem, 0L); - bAnimated = TRUE; + bAnimated = sal_True; } break; @@ -1327,7 +1327,7 @@ BOOL FuSelection::AnimateObj(SdrObject* pObj, const Point& rPos) mpViewShell->GetViewFrame()->GetDispatcher()-> Execute(SID_NAVIGATOR_PAGE, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD, &aItem, 0L); - bAnimated = TRUE; + bAnimated = sal_True; } break; @@ -1342,7 +1342,7 @@ BOOL FuSelection::AnimateObj(SdrObject* pObj, const Point& rPos) { (void)e; } - bAnimated = TRUE; + bAnimated = sal_True; } break; @@ -1350,9 +1350,9 @@ BOOL FuSelection::AnimateObj(SdrObject* pObj, const Point& rPos) { // Verb zuweisen mpView->UnmarkAll(); - mpView->MarkObj(pObj, mpView->GetSdrPageView(), FALSE, FALSE); + mpView->MarkObj(pObj, mpView->GetSdrPageView(), sal_False, sal_False); pDrViewSh->DoVerb((sal_Int16)pInfo->mnVerb); - bAnimated = TRUE; + bAnimated = sal_True; } break; @@ -1366,7 +1366,7 @@ BOOL FuSelection::AnimateObj(SdrObject* pObj, const Point& rPos) if( INET_PROT_FILE == aURL.GetProtocol() ) { SfxStringItem aUrl( SID_FILE_NAME, aURL.GetMainURL( INetURLObject::NO_DECODE ) ); - SfxBoolItem aBrowsing( SID_BROWSE, TRUE ); + SfxBoolItem aBrowsing( SID_BROWSE, sal_True ); SfxViewFrame* pViewFrm = SfxViewFrame::Current(); if (pViewFrm) @@ -1377,7 +1377,7 @@ BOOL FuSelection::AnimateObj(SdrObject* pObj, const Point& rPos) 0L ); } - bAnimated = TRUE; + bAnimated = sal_True; } break; @@ -1398,17 +1398,17 @@ BOOL FuSelection::AnimateObj(SdrObject* pObj, const Point& rPos) *pInArgs, aRet, aOutArgsIndex, aOutArgs); // Check the return value from the script - BOOL bTmp = sal_False; + sal_Bool bTmp = sal_False; if ( eErr == ERRCODE_NONE && aRet.getValueType() == getCppuBooleanType() && sal_True == ( aRet >>= bTmp ) && - bTmp == TRUE ) + bTmp == sal_True ) { - bAnimated = TRUE; + bAnimated = sal_True; } else { - bAnimated = FALSE; + bAnimated = sal_False; } } else @@ -1437,7 +1437,7 @@ BOOL FuSelection::AnimateObj(SdrObject* pObj, const Point& rPos) default: { - bAnimated = FALSE; + bAnimated = sal_False; } break; } @@ -1461,7 +1461,7 @@ BOOL FuSelection::AnimateObj(SdrObject* pObj, const Point& rPos) break; default: - bAnimated = FALSE; + bAnimated = sal_False; break; } } @@ -1499,7 +1499,7 @@ SdrObject* FuSelection::pickObject (const Point& rTestPoint) { SdrObject* pObject = NULL; SdrPageView* pPageView; - USHORT nHitLog = USHORT (mpWindow->PixelToLogic(Size(HITPIX,0)).Width()); + sal_uInt16 nHitLog = sal_uInt16 (mpWindow->PixelToLogic(Size(HITPIX,0)).Width()); mpView->PickObj (rTestPoint, nHitLog, pObject, pPageView, SDRSEARCH_PICKMARKABLE); return pObject; } diff --git a/sd/source/ui/func/fusldlg.cxx b/sd/source/ui/func/fusldlg.cxx index 76af1555c861..d0a9f83eef49 100644..100755 --- a/sd/source/ui/func/fusldlg.cxx +++ b/sd/source/ui/func/fusldlg.cxx @@ -91,7 +91,7 @@ void FuSlideShowDlg::DoExecute( SfxRequest& ) for( nPage = mpDoc->GetSdPageCount( PK_STANDARD ) - 1L; nPage >= 0L; nPage-- ) { - pPage = mpDoc->GetSdPage( (USHORT) nPage, PK_STANDARD ); + pPage = mpDoc->GetSdPage( (sal_uInt16) nPage, PK_STANDARD ); String* pStr = new String( pPage->GetName() ); if ( !pStr->Len() ) @@ -100,7 +100,7 @@ void FuSlideShowDlg::DoExecute( SfxRequest& ) (*pStr).Append( UniString::CreateFromInt32( nPage + 1 ) ); } - aPageNameList.Insert( pStr, (ULONG) 0 ); + aPageNameList.Insert( pStr, (sal_uLong) 0 ); // ist dies unsere (vorhandene) erste Seite? if ( rPresPage == *pStr ) @@ -110,7 +110,7 @@ void FuSlideShowDlg::DoExecute( SfxRequest& ) } List* pCustomShowList = mpDoc->GetCustomShowList(); // No Create - BOOL bStartWithActualPage = SD_MOD()->GetSdOptions( mpDoc->GetDocumentType() )->IsStartWithActualPage(); + sal_Bool bStartWithActualPage = SD_MOD()->GetSdOptions( mpDoc->GetDocumentType() )->IsStartWithActualPage(); /* #109180# change in behaviour, even when always start with current page is enabled, range settings are still used if( bStartWithActualPage ) @@ -148,7 +148,7 @@ void FuSlideShowDlg::DoExecute( SfxRequest& ) rtl::OUString aPage; long nValue32; sal_Bool bValue; - bool bValuesChanged = FALSE; + bool bValuesChanged = sal_False; pDlg->GetAttr( aDlgSet ); @@ -254,7 +254,7 @@ void FuSlideShowDlg::DoExecute( SfxRequest& ) // wenn sich etwas geaendert hat, setzen wir das Modified-Flag, if ( bValuesChanged ) - mpDoc->SetChanged( TRUE ); + mpDoc->SetChanged( sal_True ); } delete pDlg; // Strings aus Liste loeschen diff --git a/sd/source/ui/func/fusnapln.cxx b/sd/source/ui/func/fusnapln.cxx index fad1cb324fd2..fb444635b7c9 100755 --- a/sd/source/ui/func/fusnapln.cxx +++ b/sd/source/ui/func/fusnapln.cxx @@ -76,14 +76,14 @@ void FuSnapLine::DoExecute( SfxRequest& rReq ) { const SfxItemSet* pArgs = rReq.GetArgs(); SdrPageView* pPV = 0; - USHORT nHelpLine = 0; - BOOL bCreateNew = TRUE; + sal_uInt16 nHelpLine = 0; + sal_Bool bCreateNew = sal_True; // Get index of snap line or snap point from the request. - SFX_REQUEST_ARG (rReq, pHelpLineIndex, SfxUInt32Item, ID_VAL_INDEX, FALSE); + SFX_REQUEST_ARG (rReq, pHelpLineIndex, SfxUInt32Item, ID_VAL_INDEX, sal_False); if (pHelpLineIndex != NULL) { - nHelpLine = static_cast<USHORT>(pHelpLineIndex->GetValue()); + nHelpLine = static_cast<sal_uInt16>(pHelpLineIndex->GetValue()); // Reset the argument pointer to trigger the display of the dialog. pArgs = NULL; } @@ -101,13 +101,13 @@ void FuSnapLine::DoExecute( SfxRequest& rReq ) // request. Determine it from the mouse position. aLinePos = static_cast<DrawViewShell*>(mpViewShell)->GetMousePos(); - static_cast<DrawViewShell*>(mpViewShell)->SetMousePosFreezed( FALSE ); + static_cast<DrawViewShell*>(mpViewShell)->SetMousePosFreezed( sal_False ); if ( aLinePos.X() >= 0 ) { aLinePos = mpWindow->PixelToLogic(aLinePos); - USHORT nHitLog = (USHORT) mpWindow->PixelToLogic(Size(HITPIX,0)).Width(); + sal_uInt16 nHitLog = (sal_uInt16) mpWindow->PixelToLogic(Size(HITPIX,0)).Width(); bLineExist = mpView->PickHelpLine(aLinePos, nHitLog, *mpWindow, nHelpLine, pPV); if ( bLineExist ) aLinePos = (pPV->GetHelpLines())[nHelpLine].GetPos(); @@ -142,23 +142,23 @@ void FuSnapLine::DoExecute( SfxRequest& rReq ) if ( rHelpLine.GetKind() == SDRHELPLINE_POINT ) { pDlg->SetText(String(SdResId(STR_SNAPDLG_SETPOINT))); - pDlg->SetInputFields(TRUE, TRUE); + pDlg->SetInputFields(sal_True, sal_True); } else { pDlg->SetText(String(SdResId(STR_SNAPDLG_SETLINE))); if ( rHelpLine.GetKind() == SDRHELPLINE_VERTICAL ) - pDlg->SetInputFields(TRUE, FALSE); + pDlg->SetInputFields(sal_True, sal_False); else - pDlg->SetInputFields(FALSE, TRUE); + pDlg->SetInputFields(sal_False, sal_True); } - bCreateNew = FALSE; + bCreateNew = sal_False; } else pDlg->HideDeleteBtn(); - USHORT nResult = pDlg->Execute(); + sal_uInt16 nResult = pDlg->Execute(); pDlg->GetAttr(aNewAttr); delete pDlg; diff --git a/sd/source/ui/func/fusumry.cxx b/sd/source/ui/func/fusumry.cxx index 3ed152d1f862..29711d74ede0 100644..100755 --- a/sd/source/ui/func/fusumry.cxx +++ b/sd/source/ui/func/fusumry.cxx @@ -80,10 +80,10 @@ void FuSummaryPage::DoExecute( SfxRequest& ) { ::sd::Outliner* pOutl = NULL; SdPage* pSummaryPage = NULL; - USHORT i = 0; - USHORT nFirstPage = SDRPAGE_NOTFOUND; - USHORT nSelectedPages = 0; - USHORT nCount = mpDoc->GetSdPageCount(PK_STANDARD); + sal_uInt16 i = 0; + sal_uInt16 nFirstPage = SDRPAGE_NOTFOUND; + sal_uInt16 nSelectedPages = 0; + sal_uInt16 nCount = mpDoc->GetSdPageCount(PK_STANDARD); while (i < nCount && nSelectedPages <= 1) { @@ -138,7 +138,7 @@ void FuSummaryPage::DoExecute( SfxRequest& ) SetOfByte aVisibleLayers = pActualPage->TRG_GetMasterPageVisibleLayers(); // Seite mit Titel & Gliederung! - pSummaryPage = (SdPage*) mpDoc->AllocPage(FALSE); + pSummaryPage = (SdPage*) mpDoc->AllocPage(sal_False); pSummaryPage->SetSize(pActualPage->GetSize() ); pSummaryPage->SetBorder(pActualPage->GetLftBorder(), pActualPage->GetUppBorder(), @@ -153,12 +153,12 @@ void FuSummaryPage::DoExecute( SfxRequest& ) // MasterPage der aktuellen Seite verwenden pSummaryPage->TRG_SetMasterPage(pActualPage->TRG_GetMasterPage()); pSummaryPage->SetLayoutName(pActualPage->GetLayoutName()); - pSummaryPage->SetAutoLayout(AUTOLAYOUT_ENUM, TRUE); + pSummaryPage->SetAutoLayout(AUTOLAYOUT_ENUM, sal_True); pSummaryPage->TRG_SetMasterPageVisibleLayers(aVisibleLayers); pSummaryPage->setHeaderFooterSettings(pActualPage->getHeaderFooterSettings()); // Notiz-Seite - SdPage* pNotesPage = (SdPage*) mpDoc->AllocPage(FALSE); + SdPage* pNotesPage = (SdPage*) mpDoc->AllocPage(sal_False); pNotesPage->SetSize(pActualNotesPage->GetSize()); pNotesPage->SetBorder(pActualNotesPage->GetLftBorder(), pActualNotesPage->GetUppBorder(), @@ -175,13 +175,13 @@ void FuSummaryPage::DoExecute( SfxRequest& ) // MasterPage der aktuellen Seite verwenden pNotesPage->TRG_SetMasterPage(pActualNotesPage->TRG_GetMasterPage()); pNotesPage->SetLayoutName(pActualNotesPage->GetLayoutName()); - pNotesPage->SetAutoLayout(pActualNotesPage->GetAutoLayout(), TRUE); + pNotesPage->SetAutoLayout(pActualNotesPage->GetAutoLayout(), sal_True); pNotesPage->TRG_SetMasterPageVisibleLayers(aVisibleLayers); pNotesPage->setHeaderFooterSettings(pActualNotesPage->getHeaderFooterSettings()); pOutl = new ::sd::Outliner( mpDoc, OUTLINERMODE_OUTLINEOBJECT ); - pOutl->SetUpdateMode(FALSE); - pOutl->EnableUndo(FALSE); + pOutl->SetUpdateMode(sal_False); + pOutl->EnableUndo(sal_False); if (mpDocSh) pOutl->SetRefDevice(SD_MOD()->GetRefDevice( *mpDocSh )); @@ -208,9 +208,9 @@ void FuSummaryPage::DoExecute( SfxRequest& ) // Harte Absatz- und Zeichenattribute entfernen SfxItemSet aEmptyEEAttr(mpDoc->GetPool(), EE_ITEMS_START, EE_ITEMS_END); - ULONG nParaCount = pOutl->GetParagraphCount(); + sal_uLong nParaCount = pOutl->GetParagraphCount(); - for (USHORT nPara = 0; nPara < nParaCount; nPara++) + for (sal_uInt16 nPara = 0; nPara < nParaCount; nPara++) { pOutl->SetStyleSheet( nPara, pStyle ); pOutl->QuickRemoveCharAttribs(nPara); @@ -219,9 +219,9 @@ void FuSummaryPage::DoExecute( SfxRequest& ) } pTextObj->SetOutlinerParaObject( pOutl->CreateParaObject() ); - pTextObj->SetEmptyPresObj(FALSE); + pTextObj->SetEmptyPresObj(sal_False); - // Harte Attribute entfernen (Flag auf TRUE) + // Harte Attribute entfernen (Flag auf sal_True) SfxItemSet aAttr(mpDoc->GetPool()); aAttr.Put(XLineStyleItem(XLINE_NONE)); aAttr.Put(XFillStyleItem(XFILL_NONE)); diff --git a/sd/source/ui/func/futempl.cxx b/sd/source/ui/func/futempl.cxx index 437d4bc246a6..d7a251cee531 100755 --- a/sd/source/ui/func/futempl.cxx +++ b/sd/source/ui/func/futempl.cxx @@ -116,22 +116,22 @@ FunctionReference FuTemplate::Create( ViewShell* pViewSh, ::sd::Window* pWin, :: void FuTemplate::DoExecute( SfxRequest& rReq ) { const SfxItemSet* pArgs = rReq.GetArgs(); - USHORT nSId = rReq.GetSlot(); + sal_uInt16 nSId = rReq.GetSlot(); // StyleSheet-Parameter holen SfxStyleSheetBasePool* pSSPool = mpDoc->GetDocSh()->GetStyleSheetPool(); SfxStyleSheetBase* pStyleSheet = NULL; const SfxPoolItem* pItem; - USHORT nFamily = USHRT_MAX; + sal_uInt16 nFamily = USHRT_MAX; if( pArgs && SFX_ITEM_SET == pArgs->GetItemState( SID_STYLE_FAMILY, - FALSE, &pItem )) + sal_False, &pItem )) { nFamily = ( (const SfxUInt16Item &) pArgs->Get( SID_STYLE_FAMILY ) ).GetValue(); } else if( pArgs && SFX_ITEM_SET == pArgs->GetItemState( SID_STYLE_FAMILYNAME, - FALSE, &pItem )) + sal_False, &pItem )) { String sFamily = ( (const SfxStringItem &) pArgs->Get( SID_STYLE_FAMILYNAME ) ).GetValue(); if (sFamily.CompareToAscii("graphics") == COMPARE_EQUAL) @@ -141,7 +141,7 @@ void FuTemplate::DoExecute( SfxRequest& rReq ) } String aStyleName; - USHORT nRetMask = 0xffff; + sal_uInt16 nRetMask = 0xffff; switch( nSId ) { @@ -205,7 +205,7 @@ void FuTemplate::DoExecute( SfxRequest& rReq ) { // Z.Z. geht immer noch der Dialog auf, um den Namen // der Vorlage einzugeben. - if( mpView->AreObjectsMarked() || TRUE ) + if( mpView->AreObjectsMarked() || sal_True ) { SfxStyleSheetBase *p = pSSPool->Find(aStyleName, (SfxStyleFamily) nFamily, SFXSTYLEBIT_ALL ); if(p) @@ -228,12 +228,12 @@ void FuTemplate::DoExecute( SfxRequest& rReq ) if( pStyleSheet ) { pSSPool->Remove( pStyleSheet ); - nRetMask = TRUE; - mpDoc->SetChanged(TRUE); + nRetMask = sal_True; + mpDoc->SetChanged(sal_True); } else { - nRetMask = FALSE; + nRetMask = sal_False; } break; @@ -260,7 +260,7 @@ void FuTemplate::DoExecute( SfxRequest& rReq ) (pOldStyleSheet->GetFamily() == SD_STYLE_FAMILY_MASTERPAGE && mpDoc->GetDocumentType() == DOCUMENT_TYPE_DRAW) ) { mpView->SetStyleSheet( (SfxStyleSheet*) pStyleSheet); - mpDoc->SetChanged(TRUE); + mpDoc->SetChanged(sal_True); mpViewShell->GetViewFrame()->GetBindings().Invalidate( SID_STYLE_FAMILY2 ); } } @@ -276,7 +276,7 @@ void FuTemplate::DoExecute( SfxRequest& rReq ) if( pArgs->GetItemState( nSId ) == SFX_ITEM_SET ) { aStyleName = ( ( (const SfxStringItem &) pArgs->Get( nSId ) ).GetValue() ); - SD_MOD()->SetWaterCan( TRUE ); + SD_MOD()->SetWaterCan( sal_True ); pStyleSheet = pSSPool->Find( aStyleName, (SfxStyleFamily) nFamily); } // keine Praesentationsobjektvorlagen, die werden nur @@ -291,11 +291,11 @@ void FuTemplate::DoExecute( SfxRequest& rReq ) } else - SD_MOD()->SetWaterCan( FALSE ); + SD_MOD()->SetWaterCan( sal_False ); } else { - SD_MOD()->SetWaterCan( FALSE ); + SD_MOD()->SetWaterCan( sal_False ); // Werkzeugleiste muss wieder enabled werden mpViewShell->Invalidate(); } @@ -318,7 +318,7 @@ void FuTemplate::DoExecute( SfxRequest& rReq ) SfxAbstractTabDialog* pStdDlg = NULL; SfxAbstractTabDialog* pPresDlg = NULL; SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create(); - BOOL bOldDocInOtherLanguage = FALSE; + sal_Bool bOldDocInOtherLanguage = sal_False; SfxItemSet aOriSet( pStyleSheet->GetItemSet() ); SfxStyleFamily eFamily = pStyleSheet->GetFamily(); @@ -330,7 +330,7 @@ void FuTemplate::DoExecute( SfxRequest& rReq ) else if (eFamily == SD_STYLE_FAMILY_PSEUDO) { String aName(pStyleSheet->GetName()); - USHORT nDlgId = 0; + sal_uInt16 nDlgId = 0; if (aName == String(SdResId(STR_PSEUDOSHEET_TITLE))) { @@ -369,7 +369,7 @@ void FuTemplate::DoExecute( SfxRequest& rReq ) // die Nummer ermitteln; ein Leerzeichen zwischen // Name und Nummer beachten String aNumStr(aName.Copy(aOutlineStr.Len() + 1)); - USHORT nLevel = (USHORT)aNumStr.ToInt32(); + sal_uInt16 nLevel = (sal_uInt16)aNumStr.ToInt32(); switch (nLevel) { case 1: ePO = PO_OUTLINE_1; break; @@ -386,7 +386,7 @@ void FuTemplate::DoExecute( SfxRequest& rReq ) else { DBG_ERROR("Vorlage aus aelterer anderssprachiger Version"); - bOldDocInOtherLanguage = TRUE; + bOldDocInOtherLanguage = sal_True; } if( !bOldDocInOtherLanguage ) @@ -398,7 +398,7 @@ void FuTemplate::DoExecute( SfxRequest& rReq ) { } - USHORT nResult = RET_CANCEL; + sal_uInt16 nResult = RET_CANCEL; const SfxItemSet* pOutSet = NULL; if (pStdDlg) { @@ -459,7 +459,7 @@ void FuTemplate::DoExecute( SfxRequest& rReq ) if( (ePO >= PO_OUTLINE_1) && (ePO <= PO_OUTLINE_8) ) { - for( USHORT n = (USHORT)(ePO - PO_OUTLINE_1 + 2); n < 10; n++ ) + for( sal_uInt16 n = (sal_uInt16)(ePO - PO_OUTLINE_1 + 2); n < 10; n++ ) { String aName( sStyleName ); aName.Append( String::CreateFromInt32( (sal_Int32) n )); @@ -623,16 +623,16 @@ void FuTemplate::DoExecute( SfxRequest& rReq ) if( mpDoc->GetOnlineSpell() ) { const SfxPoolItem* pTempItem; - if( SFX_ITEM_SET == rAttr.GetItemState(EE_CHAR_LANGUAGE, FALSE, &pTempItem ) || - SFX_ITEM_SET == rAttr.GetItemState(EE_CHAR_LANGUAGE_CJK, FALSE, &pTempItem ) || - SFX_ITEM_SET == rAttr.GetItemState(EE_CHAR_LANGUAGE_CTL, FALSE, &pTempItem ) ) + if( SFX_ITEM_SET == rAttr.GetItemState(EE_CHAR_LANGUAGE, sal_False, &pTempItem ) || + SFX_ITEM_SET == rAttr.GetItemState(EE_CHAR_LANGUAGE_CJK, sal_False, &pTempItem ) || + SFX_ITEM_SET == rAttr.GetItemState(EE_CHAR_LANGUAGE_CTL, sal_False, &pTempItem ) ) { mpDoc->StopOnlineSpelling(); mpDoc->StartOnlineSpelling(); } } - mpDoc->SetChanged(TRUE); + mpDoc->SetChanged(sal_True); } break; @@ -657,7 +657,7 @@ void FuTemplate::DoExecute( SfxRequest& rReq ) { nRetMask = pStyleSheet->GetMask(); SfxItemSet aCoreSet( mpDoc->GetPool() ); - mpView->GetAttributes( aCoreSet, TRUE ); + mpView->GetAttributes( aCoreSet, sal_True ); // wenn das Objekt eine Vorlage hatte, wird diese Parent // der neuen Vorlage @@ -683,7 +683,7 @@ void FuTemplate::DoExecute( SfxRequest& rReq ) } ( (SfxStyleSheet*) pStyleSheet )->Broadcast( SfxSimpleHint( SFX_HINT_DATACHANGED ) ); - mpDoc->SetChanged(TRUE); + mpDoc->SetChanged(sal_True); mpViewShell->GetViewFrame()->GetBindings().Invalidate( SID_STYLE_FAMILY2 ); } @@ -710,7 +710,7 @@ void FuTemplate::DoExecute( SfxRequest& rReq ) mpView->SetStyleSheet( (SfxStyleSheet*) pStyleSheet); ( (SfxStyleSheet*) pStyleSheet )->Broadcast( SfxSimpleHint( SFX_HINT_DATACHANGED ) ); - mpDoc->SetChanged(TRUE); + mpDoc->SetChanged(sal_True); mpViewShell->GetViewFrame()->GetBindings().Invalidate( SID_STYLE_FAMILY2 ); } } diff --git a/sd/source/ui/func/futext.cxx b/sd/source/ui/func/futext.cxx index 2835821796a1..559437f5a2b5 100755 --- a/sd/source/ui/func/futext.cxx +++ b/sd/source/ui/func/futext.cxx @@ -88,7 +88,7 @@ using namespace ::com::sun::star::linguistic2; namespace sd { -static USHORT SidArray[] = { +static sal_uInt16 SidArray[] = { SID_STYLE_FAMILY2, // 5542 SID_STYLE_FAMILY5, // 5545 SID_CUT, // 5710 @@ -129,7 +129,7 @@ static USHORT SidArray[] = { TYPEINIT1( FuText, FuConstruct ); -static BOOL bTestText = 0; +static sal_Bool bTestText = 0; /************************************************************************* |* @@ -139,7 +139,7 @@ static BOOL bTestText = 0; FuText::FuText( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ) : FuConstruct(pViewSh, pWin, pView, pDoc, rReq) -, bFirstObjCreated(FALSE) +, bFirstObjCreated(sal_False) , rRequest (rReq) { } @@ -160,7 +160,7 @@ void FuText::disposing() { if(mpView) { - if(mpView->SdrEndTextEdit(FALSE) == SDRENDTEXTEDIT_DELETED) + if(mpView->SdrEndTextEdit(sal_False) == SDRENDTEXTEDIT_DELETED) mxTextObj.reset( 0 ); // die RequestHandler der benutzten Outliner zuruecksetzen auf den @@ -233,7 +233,7 @@ void FuText::DoExecute( SfxRequest& ) } } - BOOL bQuickDrag = TRUE; + sal_Bool bQuickDrag = sal_True; const SfxItemSet* pArgs = rRequest.GetArgs(); @@ -243,10 +243,10 @@ void FuText::DoExecute( SfxRequest& ) && SID_TEXTEDIT == nSlotId && SFX_ITEM_SET == pArgs->GetItemState(SID_TEXTEDIT) - && (UINT16)((SfxUInt16Item&)pArgs->Get(SID_TEXTEDIT)).GetValue() == 2) + && (sal_uInt16)((SfxUInt16Item&)pArgs->Get(SID_TEXTEDIT)).GetValue() == 2) { // Selection by doubleclick -> don't allow QuickDrag - bQuickDrag = FALSE; + bQuickDrag = sal_False; } SetInEditMode(aMEvt, bQuickDrag); @@ -258,22 +258,22 @@ void FuText::DoExecute( SfxRequest& ) |* \************************************************************************/ -BOOL FuText::MouseButtonDown(const MouseEvent& rMEvt) +sal_Bool FuText::MouseButtonDown(const MouseEvent& rMEvt) { - bMBDown = TRUE; + bMBDown = sal_True; - BOOL bReturn = FuDraw::MouseButtonDown(rMEvt); + sal_Bool bReturn = FuDraw::MouseButtonDown(rMEvt); /* af: (de)Select object before showing the context menu. // Fuer PopupMenu (vorher DrawViewShell) if ((rMEvt.GetButtons() == MOUSE_RIGHT) && rMEvt.GetClicks() == 1 && mpView->IsTextEdit()) { - return (TRUE); + return (sal_True); } */ - mpView->SetMarkHdlWhenTextEdit(TRUE); + mpView->SetMarkHdlWhenTextEdit(sal_True); SdrViewEvent aVEvt; SdrHitKind eHit = mpView->PickAnything(rMEvt, SDRMOUSEBUTTONDOWN, aVEvt); @@ -281,7 +281,7 @@ BOOL FuText::MouseButtonDown(const MouseEvent& rMEvt) { // Text getroffen -> Event von SdrView auswerten lassen if (mpView->MouseButtonDown(rMEvt, mpWindow)) - return (TRUE); + return (sal_True); } if (rMEvt.GetClicks() == 1) @@ -315,16 +315,16 @@ BOOL FuText::MouseButtonDown(const MouseEvent& rMEvt) if (eHit == SDRHIT_TEXTEDIT) { - SetInEditMode(rMEvt, FALSE); + SetInEditMode(rMEvt, sal_False); } else { - BOOL bMacro = FALSE; + sal_Bool bMacro = sal_False; if (bMacro && mpView->PickObj(aMDPos,mpView->getHitTolLog(),pObj,pPV,SDRSEARCH_PICKMACRO)) { // Makro - USHORT nHitLog = USHORT ( mpWindow->PixelToLogic(Size(HITPIX,0)).Width() ); + sal_uInt16 nHitLog = sal_uInt16 ( mpWindow->PixelToLogic(Size(HITPIX,0)).Width() ); mpView->BegMacroObj(aMDPos,nHitLog,pObj,pPV,mpWindow); } else @@ -362,7 +362,7 @@ BOOL FuText::MouseButtonDown(const MouseEvent& rMEvt) mxTextObj.reset( static_cast<SdrTextObj*>(aVEvt.pObj) ); } - SetInEditMode(rMEvt, TRUE); + SetInEditMode(rMEvt, sal_True); } else if (aVEvt.eEvent == SDREVENT_EXECUTEURL && !rMEvt.IsMod2()) { @@ -372,7 +372,7 @@ BOOL FuText::MouseButtonDown(const MouseEvent& rMEvt) mpWindow->ReleaseMouse(); SfxStringItem aStrItem(SID_FILE_NAME, aVEvt.pURLField->GetURL()); SfxStringItem aReferer(SID_REFERER, mpDocSh->GetMedium()->GetName()); - SfxBoolItem aBrowseItem( SID_BROWSE, TRUE ); + SfxBoolItem aBrowseItem( SID_BROWSE, sal_True ); SfxViewFrame* pFrame = mpViewShell->GetViewFrame(); mpWindow->ReleaseMouse(); @@ -434,7 +434,7 @@ BOOL FuText::MouseButtonDown(const MouseEvent& rMEvt) } // Objekt draggen - bFirstMouseMove = TRUE; + bFirstMouseMove = sal_True; aDragTimer.Start(); } @@ -445,7 +445,7 @@ BOOL FuText::MouseButtonDown(const MouseEvent& rMEvt) eHit = mpView->PickAnything(rMEvt, SDRMOUSEBUTTONDOWN, aVEvt); if( (eHit == SDRHIT_HANDLE) || (eHit == SDRHIT_MARKEDOBJECT) ) { - USHORT nDrgLog = USHORT ( mpWindow->PixelToLogic(Size(DRGPIX,0)).Width() ); + sal_uInt16 nDrgLog = sal_uInt16 ( mpWindow->PixelToLogic(Size(DRGPIX,0)).Width() ); mpView->BegDragObj(aMDPos, (OutputDevice*) NULL, aVEvt.pHdl, nDrgLog); } } @@ -460,7 +460,7 @@ BOOL FuText::MouseButtonDown(const MouseEvent& rMEvt) **********************************************************/ mpView->SetCurrentObj(OBJ_TEXT); mpView->SetEditMode(SDREDITMODE_CREATE); - USHORT nDrgLog = USHORT ( mpWindow->PixelToLogic(Size(DRGPIX,0)).Width() ); + sal_uInt16 nDrgLog = sal_uInt16 ( mpWindow->PixelToLogic(Size(DRGPIX,0)).Width() ); mpView->BegCreateObj(aMDPos, (OutputDevice*) NULL, nDrgLog); } else @@ -480,7 +480,7 @@ BOOL FuText::MouseButtonDown(const MouseEvent& rMEvt) else if ( rMEvt.GetClicks() == 2 && !mpView->IsTextEdit() ) { MouseEvent aMEvt( mpWindow->GetPointerPosPixel() ); - SetInEditMode( aMEvt, FALSE ); + SetInEditMode( aMEvt, sal_False ); } if (!bIsInDragMode) @@ -498,14 +498,14 @@ BOOL FuText::MouseButtonDown(const MouseEvent& rMEvt) |* \************************************************************************/ -BOOL FuText::MouseMove(const MouseEvent& rMEvt) +sal_Bool FuText::MouseMove(const MouseEvent& rMEvt) { - BOOL bReturn = FuDraw::MouseMove(rMEvt); + sal_Bool bReturn = FuDraw::MouseMove(rMEvt); if (aDragTimer.IsActive() ) { if( bFirstMouseMove ) - bFirstMouseMove = FALSE; + bFirstMouseMove = sal_False; else aDragTimer.Stop(); } @@ -542,8 +542,8 @@ void FuText::ImpSetAttributesForNewTextObject(SdrTextObj* pTxtObj) // Hoehe bekommt (sonst wird zuviel gepainted) SfxItemSet aSet(mpViewShell->GetPool()); aSet.Put(SdrTextMinFrameHeightItem(0)); - aSet.Put(SdrTextAutoGrowWidthItem(FALSE)); - aSet.Put(SdrTextAutoGrowHeightItem(TRUE)); + aSet.Put(SdrTextAutoGrowWidthItem(sal_False)); + aSet.Put(SdrTextAutoGrowHeightItem(sal_True)); pTxtObj->SetMergedItemSet(aSet); pTxtObj->AdjustTextFrameWidthAndHeight(); aSet.Put(SdrTextMaxFrameHeightItem(pTxtObj->GetLogicRect().GetSize().Height())); @@ -553,8 +553,8 @@ void FuText::ImpSetAttributesForNewTextObject(SdrTextObj* pTxtObj) { SfxItemSet aSet(mpViewShell->GetPool()); aSet.Put(SdrTextMinFrameWidthItem(0)); - aSet.Put(SdrTextAutoGrowWidthItem(TRUE)); - aSet.Put(SdrTextAutoGrowHeightItem(FALSE)); + aSet.Put(SdrTextAutoGrowWidthItem(sal_True)); + aSet.Put(SdrTextAutoGrowHeightItem(sal_False)); // #91853# Needs to be set since default is SDRTEXTHORZADJUST_BLOCK aSet.Put(SdrTextHorzAdjustItem(SDRTEXTHORZADJUST_RIGHT)); @@ -572,8 +572,8 @@ void FuText::ImpSetAttributesForNewTextObject(SdrTextObj* pTxtObj) SfxItemSet aSet(mpViewShell->GetPool()); // #91510# - aSet.Put(SdrTextAutoGrowWidthItem(TRUE)); - aSet.Put(SdrTextAutoGrowHeightItem(FALSE)); + aSet.Put(SdrTextAutoGrowWidthItem(sal_True)); + aSet.Put(SdrTextAutoGrowHeightItem(sal_False)); // #91508# //aSet.Put(SdrTextVertAdjustItem(SDRTEXTVERTADJUST_TOP)); @@ -599,8 +599,8 @@ void FuText::ImpSetAttributesFitToSize(SdrTextObj* pTxtObj) SfxItemSet aSet(mpViewShell->GetPool(), SDRATTR_TEXT_AUTOGROWHEIGHT, SDRATTR_TEXT_AUTOGROWWIDTH); SdrFitToSizeType eFTS = SDRTEXTFIT_PROPORTIONAL; aSet.Put(SdrTextFitToSizeTypeItem(eFTS)); - aSet.Put(SdrTextAutoGrowHeightItem(FALSE)); - aSet.Put(SdrTextAutoGrowWidthItem(FALSE)); + aSet.Put(SdrTextAutoGrowHeightItem(sal_False)); + aSet.Put(SdrTextAutoGrowWidthItem(sal_False)); pTxtObj->SetMergedItemSet(aSet); pTxtObj->AdjustTextFrameWidthAndHeight(); } @@ -612,8 +612,8 @@ void FuText::ImpSetAttributesFitToSizeVertical(SdrTextObj* pTxtObj) SDRATTR_TEXT_AUTOGROWHEIGHT, SDRATTR_TEXT_AUTOGROWWIDTH); SdrFitToSizeType eFTS = SDRTEXTFIT_PROPORTIONAL; aSet.Put(SdrTextFitToSizeTypeItem(eFTS)); - aSet.Put(SdrTextAutoGrowHeightItem(FALSE)); - aSet.Put(SdrTextAutoGrowWidthItem(FALSE)); + aSet.Put(SdrTextAutoGrowHeightItem(sal_False)); + aSet.Put(SdrTextAutoGrowWidthItem(sal_False)); pTxtObj->SetMergedItemSet(aSet); pTxtObj->AdjustTextFrameWidthAndHeight(); } @@ -630,8 +630,8 @@ void FuText::ImpSetAttributesFitCommon(SdrTextObj* pTxtObj) SfxItemSet aSet(mpViewShell->GetPool()); aSet.Put(SdrTextMinFrameHeightItem(0)); aSet.Put(SdrTextMaxFrameHeightItem(0)); - aSet.Put(SdrTextAutoGrowHeightItem(TRUE)); - aSet.Put(SdrTextAutoGrowWidthItem(FALSE)); + aSet.Put(SdrTextAutoGrowHeightItem(sal_True)); + aSet.Put(SdrTextAutoGrowWidthItem(sal_False)); pTxtObj->SetMergedItemSet(aSet); } else if( nSlotId == SID_ATTR_CHAR_VERTICAL ) @@ -639,8 +639,8 @@ void FuText::ImpSetAttributesFitCommon(SdrTextObj* pTxtObj) SfxItemSet aSet(mpViewShell->GetPool()); aSet.Put(SdrTextMinFrameWidthItem(0)); aSet.Put(SdrTextMaxFrameWidthItem(0)); - aSet.Put(SdrTextAutoGrowWidthItem(TRUE)); - aSet.Put(SdrTextAutoGrowHeightItem(FALSE)); + aSet.Put(SdrTextAutoGrowWidthItem(sal_True)); + aSet.Put(SdrTextAutoGrowHeightItem(sal_False)); pTxtObj->SetMergedItemSet(aSet); } @@ -648,14 +648,14 @@ void FuText::ImpSetAttributesFitCommon(SdrTextObj* pTxtObj) } } -BOOL FuText::MouseButtonUp(const MouseEvent& rMEvt) +sal_Bool FuText::MouseButtonUp(const MouseEvent& rMEvt) { - BOOL bReturn = FALSE; + sal_Bool bReturn = sal_False; if (aDragTimer.IsActive()) { aDragTimer.Stop(); - bIsInDragMode = FALSE; + bIsInDragMode = sal_False; } mpViewShell->GetViewFrame()->GetBindings().Invalidate( SidArray ); @@ -663,9 +663,9 @@ BOOL FuText::MouseButtonUp(const MouseEvent& rMEvt) Point aPnt( mpWindow->PixelToLogic( rMEvt.GetPosPixel() ) ); if( (mpView && mpView->MouseButtonUp(rMEvt, mpWindow)) || rMEvt.GetClicks() == 2 ) - return (TRUE); // Event von der SdrView ausgewertet + return (sal_True); // Event von der SdrView ausgewertet - BOOL bEmptyTextObj = FALSE; + sal_Bool bEmptyTextObj = sal_False; if (mxTextObj.is()) { @@ -675,9 +675,9 @@ BOOL FuText::MouseButtonUp(const MouseEvent& rMEvt) && ( rMarkList.GetMark(0)->GetMarkedSdrObj() == mxTextObj.get()) ) { if( mxTextObj.is() && !GetTextObj()->GetOutlinerParaObject() ) - bEmptyTextObj = TRUE; + bEmptyTextObj = sal_True; else - bFirstObjCreated = TRUE; + bFirstObjCreated = sal_True; } else { @@ -691,11 +691,11 @@ BOOL FuText::MouseButtonUp(const MouseEvent& rMEvt) * Objekt wurde verschoben **********************************************************************/ FrameView* pFrameView = mpViewShell->GetFrameView(); - BOOL bDragWithCopy = (rMEvt.IsMod1() && pFrameView->IsDragWithCopy()); + sal_Bool bDragWithCopy = (rMEvt.IsMod1() && pFrameView->IsDragWithCopy()); if (bDragWithCopy) { - bDragWithCopy = !mpView->IsPresObjSelected(FALSE, TRUE); + bDragWithCopy = !mpView->IsPresObjSelected(sal_False, sal_True); } mpView->SetDragWithCopy(bDragWithCopy); @@ -703,7 +703,7 @@ BOOL FuText::MouseButtonUp(const MouseEvent& rMEvt) mpView->ForceMarkedToAnotherPage(); mpView->SetCurrentObj(OBJ_TEXT); - USHORT nDrgLog = USHORT ( mpWindow->PixelToLogic(Size(DRGPIX,0)).Width() ); + sal_uInt16 nDrgLog = sal_uInt16 ( mpWindow->PixelToLogic(Size(DRGPIX,0)).Width() ); if ( mpView->IsRotateAllowed() && mpViewShell->GetFrameView()->IsClickChangeRotation() && (rMEvt.GetClicks() != 2) && !rMEvt.IsShift() && !rMEvt.IsMod1() && !rMEvt.IsMod2() && !rMEvt.IsRight() && @@ -728,7 +728,7 @@ BOOL FuText::MouseButtonUp(const MouseEvent& rMEvt) // vertical when there was a vertical one used last time. OutlinerParaObject* pOPO = GetTextObj()->GetOutlinerParaObject(); SdrOutliner& rOutl = mxTextObj->GetModel()->GetDrawOutliner(GetTextObj()); - BOOL bVertical((pOPO && pOPO->IsVertical()) + sal_Bool bVertical((pOPO && pOPO->IsVertical()) || nSlotId == SID_ATTR_CHAR_VERTICAL || nSlotId == SID_TEXT_FITTOSIZE_VERTICAL); rOutl.SetVertical(bVertical); @@ -766,14 +766,14 @@ BOOL FuText::MouseButtonUp(const MouseEvent& rMEvt) // #97016# ImpSetAttributesFitToSize(GetTextObj()); - SetInEditMode(rMEvt, FALSE); + SetInEditMode(rMEvt, sal_False); } else if ( nSlotId == SID_TEXT_FITTOSIZE_VERTICAL ) { // #97016# ImpSetAttributesFitToSizeVertical(GetTextObj()); - SetInEditMode(rMEvt, FALSE); + SetInEditMode(rMEvt, sal_False); } else { @@ -783,7 +783,7 @@ BOOL FuText::MouseButtonUp(const MouseEvent& rMEvt) // Damit die Handles und der graue Rahmen stimmen mpView->AdjustMarkHdl(); mpView->PickHandle(aPnt); - SetInEditMode(rMEvt, FALSE); + SetInEditMode(rMEvt, sal_False); } } else if ( mpView && mpView->IsAction()) @@ -793,7 +793,7 @@ BOOL FuText::MouseButtonUp(const MouseEvent& rMEvt) ForcePointer(&rMEvt); mpWindow->ReleaseMouse(); - USHORT nDrgLog1 = USHORT ( mpWindow->PixelToLogic(Size(DRGPIX,0)).Width() ); + sal_uInt16 nDrgLog1 = sal_uInt16 ( mpWindow->PixelToLogic(Size(DRGPIX,0)).Width() ); if ( mpView && !mpView->AreObjectsMarked() && Abs(aMDPos.X() - aPnt.X()) < nDrgLog1 && @@ -818,13 +818,13 @@ BOOL FuText::MouseButtonUp(const MouseEvent& rMEvt) **********************************************************************/ mpView->SetCurrentObj(OBJ_TEXT); mpView->SetEditMode(SDREDITMODE_CREATE); - USHORT nDrgLog = USHORT ( mpWindow->PixelToLogic(Size(DRGPIX,0)).Width() ); + sal_uInt16 nDrgLog = sal_uInt16 ( mpWindow->PixelToLogic(Size(DRGPIX,0)).Width() ); mpView->BegCreateObj(aMDPos, (OutputDevice*) NULL, nDrgLog); - BOOL bSnapEnabled = mpView->IsSnapEnabled(); + sal_Bool bSnapEnabled = mpView->IsSnapEnabled(); if (bSnapEnabled) - mpView->SetSnapEnabled(FALSE); + mpView->SetSnapEnabled(sal_False); aPnt.X() += nDrgLog + nDrgLog; aPnt.Y() += nDrgLog + nDrgLog; @@ -834,7 +834,7 @@ BOOL FuText::MouseButtonUp(const MouseEvent& rMEvt) if(mxTextObj.is()) { - GetTextObj()->SetDisableAutoWidthOnDragging(TRUE); + GetTextObj()->SetDisableAutoWidthOnDragging(sal_True); } if(!mpView->EndCreateObj(SDRCREATE_FORCEEND)) @@ -850,8 +850,8 @@ BOOL FuText::MouseButtonUp(const MouseEvent& rMEvt) SfxItemSet aSet(mpViewShell->GetPool()); aSet.Put(SdrTextMinFrameHeightItem(0)); aSet.Put(SdrTextMinFrameWidthItem(0)); - aSet.Put(SdrTextAutoGrowHeightItem(TRUE)); - aSet.Put(SdrTextAutoGrowWidthItem(TRUE)); + aSet.Put(SdrTextAutoGrowHeightItem(sal_True)); + aSet.Put(SdrTextAutoGrowWidthItem(sal_True)); // #91508# if(nSlotId == SID_ATTR_CHAR_VERTICAL) @@ -929,11 +929,11 @@ BOOL FuText::MouseButtonUp(const MouseEvent& rMEvt) } GetTextObj()->SetMergedItemSet(aSet); - GetTextObj()->SetDisableAutoWidthOnDragging(TRUE); - SetInEditMode(rMEvt, FALSE); + GetTextObj()->SetDisableAutoWidthOnDragging(sal_True); + SetInEditMode(rMEvt, sal_False); } - bFirstObjCreated = TRUE; + bFirstObjCreated = sal_True; } else { @@ -948,7 +948,7 @@ BOOL FuText::MouseButtonUp(const MouseEvent& rMEvt) } } - bMBDown = FALSE; + bMBDown = sal_False; FuConstruct::MouseButtonUp(rMEvt); return (bReturn); } @@ -957,18 +957,18 @@ BOOL FuText::MouseButtonUp(const MouseEvent& rMEvt) |* |* Tastaturereignisse bearbeiten |* -|* Wird ein KeyEvent bearbeitet, so ist der Return-Wert TRUE, andernfalls -|* FALSE. +|* Wird ein KeyEvent bearbeitet, so ist der Return-Wert sal_True, andernfalls +|* sal_False. |* \************************************************************************/ -BOOL FuText::KeyInput(const KeyEvent& rKEvt) +sal_Bool FuText::KeyInput(const KeyEvent& rKEvt) { - BOOL bReturn = FALSE; - mpView->SetMarkHdlWhenTextEdit(TRUE); + sal_Bool bReturn = sal_False; + mpView->SetMarkHdlWhenTextEdit(sal_True); KeyCode nCode = rKEvt.GetKeyCode(); - BOOL bShift = nCode.IsShift(); + sal_Bool bShift = nCode.IsShift(); // #97016# IV if(mxTextObj.is()) @@ -992,14 +992,14 @@ BOOL FuText::KeyInput(const KeyEvent& rKEvt) if ( mxTextObj.is() && mxTextObj->GetObjInventor() == SdrInventor && mxTextObj->GetObjIdentifier() == OBJ_TITLETEXT && rKEvt.GetKeyCode().GetCode() == KEY_RETURN ) { // Titeltext-Objekt: immer "weiche" Umbrueche - bShift = TRUE; + bShift = sal_True; } - USHORT nKey = nCode.GetCode(); + sal_uInt16 nKey = nCode.GetCode(); KeyCode aKeyCode (nKey, bShift, nCode.IsMod1(), nCode.IsMod2(), nCode.IsMod3() ); KeyEvent aKEvt(rKEvt.GetCharCode(), aKeyCode); - BOOL bOK = TRUE; + sal_Bool bOK = sal_True; if (mpDocSh->IsReadOnly()) { @@ -1007,17 +1007,17 @@ BOOL FuText::KeyInput(const KeyEvent& rKEvt) } if( aKeyCode.GetCode() == KEY_PAGEUP || aKeyCode.GetCode() == KEY_PAGEDOWN ) { - bOK = FALSE; // default handling in base class + bOK = sal_False; // default handling in base class } if (bOK && mpView->KeyInput(aKEvt, mpWindow) ) { - bReturn = TRUE; + bReturn = sal_True; mpViewShell->GetViewFrame()->GetBindings().Invalidate( SidArray ); // if ( pTextObj ) -// pTextObj->SetEmptyPresObj(FALSE); +// pTextObj->SetEmptyPresObj(sal_False); } else if (aKeyCode == KEY_ESCAPE) { @@ -1091,7 +1091,7 @@ void FuText::Deactivate() |* \************************************************************************/ -void FuText::SetInEditMode(const MouseEvent& rMEvt, BOOL bQuickDrag) +void FuText::SetInEditMode(const MouseEvent& rMEvt, sal_Bool bQuickDrag) { SdrPageView* pPV = mpView->GetSdrPageView(); if( mxTextObj.is() && (mxTextObj->GetPage() == pPV->GetPage()) ) @@ -1103,12 +1103,12 @@ void FuText::SetInEditMode(const MouseEvent& rMEvt, BOOL bQuickDrag) else mpView->SetEditMode(SDREDITMODE_EDIT); - BOOL bEmptyOutliner = FALSE; + sal_Bool bEmptyOutliner = sal_False; if (!GetTextObj()->GetOutlinerParaObject() && mpView->GetTextEditOutliner()) { ::Outliner* pOutl = mpView->GetTextEditOutliner(); - ULONG nParaAnz = pOutl->GetParagraphCount(); + sal_uLong nParaAnz = pOutl->GetParagraphCount(); Paragraph* p1stPara = pOutl->GetParagraph( 0 ); if (nParaAnz==1 && p1stPara) @@ -1116,15 +1116,15 @@ void FuText::SetInEditMode(const MouseEvent& rMEvt, BOOL bQuickDrag) // Bei nur einem Pararaph if (pOutl->GetText(p1stPara).Len() == 0) { - bEmptyOutliner = TRUE; + bEmptyOutliner = sal_True; } } } if (GetTextObj() != mpView->GetTextEditObject() || bEmptyOutliner) { - UINT32 nInv = mxTextObj->GetObjInventor(); - UINT16 nSdrObjKind = mxTextObj->GetObjIdentifier(); + sal_uInt32 nInv = mxTextObj->GetObjInventor(); + sal_uInt16 nSdrObjKind = mxTextObj->GetObjIdentifier(); if (nInv == SdrInventor && GetTextObj()->HasTextEdit() && (nSdrObjKind == OBJ_TEXT || @@ -1142,7 +1142,7 @@ void FuText::SetInEditMode(const MouseEvent& rMEvt, BOOL bQuickDrag) { OutlinerParaObject* pOPO = pTextObj->GetOutlinerParaObject(); if( ( pOPO && pOPO->IsVertical() ) || (nSlotId == SID_ATTR_CHAR_VERTICAL) || (nSlotId == SID_TEXT_FITTOSIZE_VERTICAL) ) - pOutl->SetVertical( TRUE ); + pOutl->SetVertical( sal_True ); if( pTextObj->getTextCount() > 1 ) { @@ -1153,7 +1153,7 @@ void FuText::SetInEditMode(const MouseEvent& rMEvt, BOOL bQuickDrag) if (mpView->SdrBeginTextEdit(pTextObj, pPV, mpWindow, sal_True, pOutl) && mxTextObj->GetObjInventor() == SdrInventor) { - bFirstObjCreated = TRUE; + bFirstObjCreated = sal_True; DeleteDefaultText(); OutlinerView* pOLV = mpView->GetTextEditOutlinerView(); @@ -1210,9 +1210,9 @@ void FuText::SetInEditMode(const MouseEvent& rMEvt, BOOL bQuickDrag) |* \************************************************************************/ -BOOL FuText::DeleteDefaultText() +sal_Bool FuText::DeleteDefaultText() { - BOOL bDeleted = FALSE; + sal_Bool bDeleted = sal_False; if ( mxTextObj.is() && mxTextObj->IsEmptyPresObj() ) { @@ -1231,21 +1231,21 @@ BOOL FuText::DeleteDefaultText() { ::Outliner* pOutliner = mpView->GetTextEditOutliner(); SfxStyleSheet* pSheet = pOutliner->GetStyleSheet( 0 ); - BOOL bIsUndoEnabled = pOutliner->IsUndoEnabled(); + sal_Bool bIsUndoEnabled = pOutliner->IsUndoEnabled(); if( bIsUndoEnabled ) - pOutliner->EnableUndo(FALSE); + pOutliner->EnableUndo(sal_False); pOutliner->SetText( String(), pOutliner->GetParagraph( 0 ) ); if( bIsUndoEnabled ) - pOutliner->EnableUndo(TRUE); + pOutliner->EnableUndo(sal_True); if (pSheet && (ePresObjKind == PRESOBJ_NOTES || ePresObjKind == PRESOBJ_TEXT)) pOutliner->SetStyleSheet(0, pSheet); - mxTextObj->SetEmptyPresObj(TRUE); - bDeleted = TRUE; + mxTextObj->SetEmptyPresObj(sal_True); + bDeleted = sal_True; } } } @@ -1259,7 +1259,7 @@ BOOL FuText::DeleteDefaultText() |* \************************************************************************/ -BOOL FuText::Command(const CommandEvent& rCEvt) +sal_Bool FuText::Command(const CommandEvent& rCEvt) { return( FuPoor::Command(rCEvt) ); } @@ -1270,9 +1270,9 @@ BOOL FuText::Command(const CommandEvent& rCEvt) |* \************************************************************************/ -BOOL FuText::RequestHelp(const HelpEvent& rHEvt) +sal_Bool FuText::RequestHelp(const HelpEvent& rHEvt) { - BOOL bReturn = FALSE; + sal_Bool bReturn = sal_False; OutlinerView* pOLV = mpView->GetTextEditOutlinerView(); @@ -1369,7 +1369,7 @@ void FuText::ReceiveRequest(SfxRequest& rReq) } } - BOOL bQuickDrag = TRUE; + sal_Bool bQuickDrag = sal_True; const SfxItemSet* pArgs = rReq.GetArgs(); @@ -1379,10 +1379,10 @@ void FuText::ReceiveRequest(SfxRequest& rReq) && SID_TEXTEDIT == nSlotId && SFX_ITEM_SET == pArgs->GetItemState(SID_TEXTEDIT) - && (UINT16) ((SfxUInt16Item&) pArgs->Get(SID_TEXTEDIT)).GetValue() == 2) + && (sal_uInt16) ((SfxUInt16Item&) pArgs->Get(SID_TEXTEDIT)).GetValue() == 2) { // Anwahl per Doppelklick -> kein QuickDrag zulassen - bQuickDrag = FALSE; + bQuickDrag = sal_False; } SetInEditMode(aMEvt, bQuickDrag); @@ -1399,7 +1399,7 @@ void FuText::ReceiveRequest(SfxRequest& rReq) IMPL_LINK( FuText, SpellError, void *, nLang ) { - String aError( SvtLanguageTable::GetLanguageString( (LanguageType)(ULONG)nLang ) ); + String aError( SvtLanguageTable::GetLanguageString( (LanguageType)(sal_uLong)nLang ) ); ErrorHandler::HandleError(* new StringErrorInfo( ERRCODE_SVX_LINGU_LANGUAGENOTEXISTS, aError) ); return 0; diff --git a/sd/source/ui/func/futransf.cxx b/sd/source/ui/func/futransf.cxx index 31797f3c8a03..6b8edfb50892 100755 --- a/sd/source/ui/func/futransf.cxx +++ b/sd/source/ui/func/futransf.cxx @@ -93,7 +93,7 @@ void FuTransform::DoExecute( SfxRequest& rReq ) { std::auto_ptr< SfxAbstractTabDialog > pDlg( pFact->CreateCaptionDialog( NULL, mpView ) ); - const USHORT* pRange = pDlg->GetInputRanges( *aNewAttr.GetPool() ); + const sal_uInt16* pRange = pDlg->GetInputRanges( *aNewAttr.GetPool() ); SfxItemSet aCombSet( *aNewAttr.GetPool(), pRange ); aCombSet.Put( aNewAttr ); aCombSet.Put( aSet ); diff --git a/sd/source/ui/func/futxtatt.cxx b/sd/source/ui/func/futxtatt.cxx index f434f2790620..6a46e9fca940 100644..100755 --- a/sd/source/ui/func/futxtatt.cxx +++ b/sd/source/ui/func/futxtatt.cxx @@ -78,7 +78,7 @@ void FuTextAttrDlg::DoExecute( SfxRequest& rReq ) SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); SfxAbstractTabDialog *pDlg = pFact->CreateTextTabDialog( NULL, &aNewAttr, mpView ); - USHORT nResult = pDlg->Execute(); + sal_uInt16 nResult = pDlg->Execute(); switch( nResult ) { diff --git a/sd/source/ui/func/fuzoom.cxx b/sd/source/ui/func/fuzoom.cxx index 390522cc33ca..14ad1bad4ad3 100644..100755 --- a/sd/source/ui/func/fuzoom.cxx +++ b/sd/source/ui/func/fuzoom.cxx @@ -50,7 +50,7 @@ namespace sd { -USHORT SidArrayZoom[] = { +sal_uInt16 SidArrayZoom[] = { SID_ATTR_ZOOM, SID_ZOOM_OUT, SID_ZOOM_IN, @@ -71,8 +71,8 @@ FuZoom::FuZoom( SdDrawDocument* pDoc, SfxRequest& rReq) : FuPoor(pViewSh, pWin, pView, pDoc, rReq), - bVisible(FALSE), - bStartDrag(FALSE) + bVisible(sal_False), + bStartDrag(sal_False) { } @@ -89,8 +89,8 @@ FuZoom::~FuZoom() // Hide ZoomRect mpViewShell->DrawMarkRect(aZoomRect); - bVisible = FALSE; - bStartDrag = FALSE; + bVisible = sal_False; + bStartDrag = sal_False; } } @@ -106,18 +106,18 @@ FunctionReference FuZoom::Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd:: |* \************************************************************************/ -BOOL FuZoom::MouseButtonDown(const MouseEvent& rMEvt) +sal_Bool FuZoom::MouseButtonDown(const MouseEvent& rMEvt) { // #95491# remember button state for creation of own MouseEvents SetMouseButtonCode(rMEvt.GetButtons()); mpWindow->CaptureMouse(); - bStartDrag = TRUE; + bStartDrag = sal_True; aBeginPosPix = rMEvt.GetPosPixel(); aBeginPos = mpWindow->PixelToLogic(aBeginPosPix); - return TRUE; + return sal_True; } /************************************************************************* @@ -126,7 +126,7 @@ BOOL FuZoom::MouseButtonDown(const MouseEvent& rMEvt) |* \************************************************************************/ -BOOL FuZoom::MouseMove(const MouseEvent& rMEvt) +sal_Bool FuZoom::MouseMove(const MouseEvent& rMEvt) { if (bStartDrag) { @@ -169,7 +169,7 @@ BOOL FuZoom::MouseMove(const MouseEvent& rMEvt) mpViewShell->DrawMarkRect(aZoomRect); } - bVisible = TRUE; + bVisible = sal_True; } return bStartDrag; @@ -181,7 +181,7 @@ BOOL FuZoom::MouseMove(const MouseEvent& rMEvt) |* \************************************************************************/ -BOOL FuZoom::MouseButtonUp(const MouseEvent& rMEvt) +sal_Bool FuZoom::MouseButtonUp(const MouseEvent& rMEvt) { // #95491# remember button state for creation of own MouseEvents SetMouseButtonCode(rMEvt.GetButtons()); @@ -190,7 +190,7 @@ BOOL FuZoom::MouseButtonUp(const MouseEvent& rMEvt) { // Hide ZoomRect mpViewShell->DrawMarkRect(aZoomRect); - bVisible = FALSE; + bVisible = sal_False; } Point aPosPix = rMEvt.GetPosPixel(); @@ -199,7 +199,7 @@ BOOL FuZoom::MouseButtonUp(const MouseEvent& rMEvt) { // Zoom Size aZoomSizePixel = mpWindow->LogicToPixel(aZoomRect).GetSize(); - ULONG nTol = DRGPIX + DRGPIX; + sal_uLong nTol = DRGPIX + DRGPIX; if ( aZoomSizePixel.Width() < (long) nTol && aZoomSizePixel.Height() < (long) nTol ) { @@ -221,11 +221,11 @@ BOOL FuZoom::MouseButtonUp(const MouseEvent& rMEvt) mpWindow->GetOutputSizePixel())); mpViewShell->GetZoomList()->InsertZoomRect(aVisAreaWin); - bStartDrag = FALSE; + bStartDrag = sal_False; mpWindow->ReleaseMouse(); mpViewShell->Cancel(); - return TRUE; + return sal_True; } /************************************************************************* diff --git a/sd/source/ui/func/sdundogr.cxx b/sd/source/ui/func/sdundogr.cxx index 7b7a361bba80..aa2803ddb245 100755 --- a/sd/source/ui/func/sdundogr.cxx +++ b/sd/source/ui/func/sdundogr.cxx @@ -42,8 +42,8 @@ TYPEINIT1(SdUndoGroup, SdUndoAction); SdUndoGroup::~SdUndoGroup() { - ULONG nLast = aCtn.Count(); - for (ULONG nAction = 0; nAction < nLast; nAction++) + sal_uLong nLast = aCtn.Count(); + for (sal_uLong nAction = 0; nAction < nLast; nAction++) { delete (SdUndoAction*) aCtn.GetObject(nAction); } @@ -56,9 +56,9 @@ SdUndoGroup::~SdUndoGroup() |* \************************************************************************/ -BOOL SdUndoGroup::Merge( SfxUndoAction* pNextAction ) +sal_Bool SdUndoGroup::Merge( SfxUndoAction* pNextAction ) { - BOOL bRet = FALSE; + sal_Bool bRet = sal_False; if( pNextAction && pNextAction->ISA( SdUndoAction ) ) { @@ -67,7 +67,7 @@ BOOL SdUndoGroup::Merge( SfxUndoAction* pNextAction ) if( pClone ) { AddAction( pClone ); - bRet = TRUE; + bRet = sal_True; } } @@ -85,7 +85,7 @@ void SdUndoGroup::Undo() long nLast = aCtn.Count(); for (long nAction = nLast - 1; nAction >= 0; nAction--) { - ((SdUndoAction*)aCtn.GetObject((ULONG)nAction))->Undo(); + ((SdUndoAction*)aCtn.GetObject((sal_uLong)nAction))->Undo(); } } @@ -98,8 +98,8 @@ void SdUndoGroup::Undo() void SdUndoGroup::Redo() { - ULONG nLast = aCtn.Count(); - for (ULONG nAction = 0; nAction < nLast; nAction++) + sal_uLong nLast = aCtn.Count(); + for (sal_uLong nAction = 0; nAction < nLast; nAction++) { ((SdUndoAction*)aCtn.GetObject(nAction))->Redo(); } diff --git a/sd/source/ui/func/smarttag.cxx b/sd/source/ui/func/smarttag.cxx index a8b6c0647237..60959eb18ea3 100755 --- a/sd/source/ui/func/smarttag.cxx +++ b/sd/source/ui/func/smarttag.cxx @@ -121,30 +121,30 @@ bool SmartTag::getContext( SdrViewContext& /*rContext*/ ) // -------------------------------------------------------------------- -ULONG SmartTag::GetMarkablePointCount() const +sal_uLong SmartTag::GetMarkablePointCount() const { return 0; } // -------------------------------------------------------------------- -ULONG SmartTag::GetMarkedPointCount() const +sal_uLong SmartTag::GetMarkedPointCount() const { return 0; } // -------------------------------------------------------------------- -BOOL SmartTag::MarkPoint(SdrHdl& /*rHdl*/, BOOL /*bUnmark*/ ) +sal_Bool SmartTag::MarkPoint(SdrHdl& /*rHdl*/, sal_Bool /*bUnmark*/ ) { - return FALSE; + return sal_False; } // -------------------------------------------------------------------- -BOOL SmartTag::MarkPoints(const Rectangle* /*pRect*/, BOOL /*bUnmark*/ ) +sal_Bool SmartTag::MarkPoints(const Rectangle* /*pRect*/, sal_Bool /*bUnmark*/ ) { - return FALSE; + return sal_False; } // -------------------------------------------------------------------- @@ -368,14 +368,14 @@ bool SmartTagSet::getContext( SdrViewContext& rContext ) const // support point editing // -------------------------------------------------------------------- -BOOL SmartTagSet::HasMarkablePoints() const +sal_Bool SmartTagSet::HasMarkablePoints() const { - return GetMarkablePointCount() != 0 ? TRUE : FALSE; + return GetMarkablePointCount() != 0 ? sal_True : sal_False; } // -------------------------------------------------------------------- -ULONG SmartTagSet::GetMarkablePointCount() const +sal_uLong SmartTagSet::GetMarkablePointCount() const { if( mxSelectedTag.is() ) return mxSelectedTag->GetMarkablePointCount(); @@ -384,14 +384,14 @@ ULONG SmartTagSet::GetMarkablePointCount() const // -------------------------------------------------------------------- -BOOL SmartTagSet::HasMarkedPoints() const +sal_Bool SmartTagSet::HasMarkedPoints() const { - return GetMarkedPointCount() != 0 ? TRUE : FALSE; + return GetMarkedPointCount() != 0 ? sal_True : sal_False; } // -------------------------------------------------------------------- -ULONG SmartTagSet::GetMarkedPointCount() const +sal_uLong SmartTagSet::GetMarkedPointCount() const { if( mxSelectedTag.is() ) return mxSelectedTag->GetMarkedPointCount(); @@ -401,7 +401,7 @@ ULONG SmartTagSet::GetMarkedPointCount() const // -------------------------------------------------------------------- -BOOL SmartTagSet::IsPointMarkable(const SdrHdl& rHdl) const +sal_Bool SmartTagSet::IsPointMarkable(const SdrHdl& rHdl) const { const SmartHdl* pSmartHdl = dynamic_cast< const SmartHdl* >( &rHdl ); @@ -410,21 +410,21 @@ BOOL SmartTagSet::IsPointMarkable(const SdrHdl& rHdl) const // -------------------------------------------------------------------- -BOOL SmartTagSet::MarkPoint(SdrHdl& rHdl, BOOL bUnmark ) +sal_Bool SmartTagSet::MarkPoint(SdrHdl& rHdl, sal_Bool bUnmark ) { if( mxSelectedTag.is() ) return mxSelectedTag->MarkPoint( rHdl, bUnmark ); - return FALSE; + return sal_False; } // -------------------------------------------------------------------- -BOOL SmartTagSet::MarkPoints(const Rectangle* pRect, BOOL bUnmark) +sal_Bool SmartTagSet::MarkPoints(const Rectangle* pRect, sal_Bool bUnmark) { if( mxSelectedTag.is() ) return mxSelectedTag->MarkPoints( pRect, bUnmark ); - return FALSE; + return sal_False; } // -------------------------------------------------------------------- diff --git a/sd/source/ui/func/unprlout.cxx b/sd/source/ui/func/unprlout.cxx index ec0b223cf6a8..6f01d8613e0d 100644..100755 --- a/sd/source/ui/func/unprlout.cxx +++ b/sd/source/ui/func/unprlout.cxx @@ -53,7 +53,7 @@ SdPresentationLayoutUndoAction::SdPresentationLayoutUndoAction( String aTheNewLayoutName, AutoLayout eTheOldAutoLayout, AutoLayout eTheNewAutoLayout, - BOOL bSet, + sal_Bool bSet, SdPage* pThePage): SdUndoAction(pTheDoc) { @@ -76,9 +76,9 @@ SdPresentationLayoutUndoAction::SdPresentationLayoutUndoAction( void SdPresentationLayoutUndoAction::Undo() { - pPage->SetPresentationLayout(aOldLayoutName, TRUE, TRUE, TRUE); + pPage->SetPresentationLayout(aOldLayoutName, sal_True, sal_True, sal_True); if (bSetAutoLayout) - pPage->SetAutoLayout(eOldAutoLayout, TRUE); + pPage->SetAutoLayout(eOldAutoLayout, sal_True); } /************************************************************************* @@ -91,7 +91,7 @@ void SdPresentationLayoutUndoAction::Redo() { pPage->SetPresentationLayout(aNewLayoutName); if (bSetAutoLayout) - pPage->SetAutoLayout(eNewAutoLayout, TRUE); + pPage->SetAutoLayout(eNewAutoLayout, sal_True); } /************************************************************************* diff --git a/sd/source/ui/inc/3dchld.hxx b/sd/source/ui/inc/3dchld.hxx index d90d52704b0d..b5258f06eba6 100644..100755 --- a/sd/source/ui/inc/3dchld.hxx +++ b/sd/source/ui/inc/3dchld.hxx @@ -41,7 +41,7 @@ class Sd3DChildWindow : public SfxChildWindow { public: - Sd3DChildWindow( Window*, USHORT, SfxBindings*, SfxChildWinInfo* ); + Sd3DChildWindow( Window*, sal_uInt16, SfxBindings*, SfxChildWinInfo* ); SFX_DECL_CHILDWINDOW(Sd3DChildWindow); }; diff --git a/sd/source/ui/inc/AccessibleOutlineEditSource.hxx b/sd/source/ui/inc/AccessibleOutlineEditSource.hxx index a398d31ffbda..f40d735c5e64 100644..100755 --- a/sd/source/ui/inc/AccessibleOutlineEditSource.hxx +++ b/sd/source/ui/inc/AccessibleOutlineEditSource.hxx @@ -73,7 +73,7 @@ namespace accessibility virtual SfxBroadcaster& GetBroadcaster() const; // the view forwarder - virtual BOOL IsValid() const; + virtual sal_Bool IsValid() const; virtual Rectangle GetVisArea() const; virtual Point LogicToPixel( const Point& rPoint, const MapMode& rMapMode ) const; virtual Point PixelToLogic( const Point& rPoint, const MapMode& rMapMode ) const; diff --git a/sd/source/ui/inc/AccessibleSlideView.hxx b/sd/source/ui/inc/AccessibleSlideView.hxx index f98d345c2019..3ac193b05d20 100644..100755 --- a/sd/source/ui/inc/AccessibleSlideView.hxx +++ b/sd/source/ui/inc/AccessibleSlideView.hxx @@ -192,7 +192,7 @@ public: void SetPageVisible( sal_uInt16 nPage, sal_Bool bVisible ); void Reset(); - void FocusHasChanged( USHORT nOldFocusPage, USHORT nNewFocusPage ); + void FocusHasChanged( sal_uInt16 nOldFocusPage, sal_uInt16 nNewFocusPage ); private: diff --git a/sd/source/ui/inc/AccessibleViewForwarder.hxx b/sd/source/ui/inc/AccessibleViewForwarder.hxx index 5c8fba1e6b2d..7817f2d0c4d9 100755 --- a/sd/source/ui/inc/AccessibleViewForwarder.hxx +++ b/sd/source/ui/inc/AccessibleViewForwarder.hxx @@ -65,7 +65,7 @@ public: @return Return <true/> if the view forwarder is valid and <false/> else. */ - virtual BOOL IsValid (void) const; + virtual sal_Bool IsValid (void) const; /** Returns the area of the underlying document that is visible in the * corresponding window. @@ -123,7 +123,7 @@ public: protected: SdrPaintView* mpView; - USHORT mnWindowId; + sal_uInt16 mnWindowId; OutputDevice& mrDevice; private: diff --git a/sd/source/ui/inc/AnimationChildWindow.hxx b/sd/source/ui/inc/AnimationChildWindow.hxx index c3718220a172..dedb54d10365 100644..100755 --- a/sd/source/ui/inc/AnimationChildWindow.hxx +++ b/sd/source/ui/inc/AnimationChildWindow.hxx @@ -42,7 +42,7 @@ class AnimationChildWindow public: AnimationChildWindow( ::Window*, - USHORT, + sal_uInt16, SfxBindings*, SfxChildWinInfo*); diff --git a/sd/source/ui/inc/BreakDlg.hxx b/sd/source/ui/inc/BreakDlg.hxx index ee5ee7b1db0a..7a7ff35ac721 100644..100755 --- a/sd/source/ui/inc/BreakDlg.hxx +++ b/sd/source/ui/inc/BreakDlg.hxx @@ -61,8 +61,8 @@ public: ::Window* pWindow, DrawView* pDrView, DrawDocShell* pShell, - ULONG nSumActionCount, - ULONG nObjCount); + sal_uLong nSumActionCount, + sal_uLong nObjCount); virtual ~BreakDlg(); short Execute(); @@ -79,7 +79,7 @@ private: CancelButton aBtnCancel; DrawView* pDrView; - BOOL bCancel; + sal_Bool bCancel; Timer aTimer; SvdProgressInfo *pProgrInfo; diff --git a/sd/source/ui/inc/DrawDocShell.hxx b/sd/source/ui/inc/DrawDocShell.hxx index b3f626f62137..65b4c1e89ffd 100755 --- a/sd/source/ui/inc/DrawDocShell.hxx +++ b/sd/source/ui/inc/DrawDocShell.hxx @@ -70,37 +70,37 @@ public: DrawDocShell ( SfxObjectCreateMode eMode = SFX_CREATE_MODE_EMBEDDED, - BOOL bSdDataObj=FALSE, + sal_Bool bSdDataObj=sal_False, DocumentType=DOCUMENT_TYPE_IMPRESS); DrawDocShell ( const sal_uInt64 nModelCreationFlags, - BOOL bSdDataObj=FALSE, + sal_Bool bSdDataObj=sal_False, DocumentType=DOCUMENT_TYPE_IMPRESS); DrawDocShell ( SdDrawDocument* pDoc, SfxObjectCreateMode eMode = SFX_CREATE_MODE_EMBEDDED, - BOOL bSdDataObj=FALSE, + sal_Bool bSdDataObj=sal_False, DocumentType=DOCUMENT_TYPE_IMPRESS); virtual ~DrawDocShell(); void UpdateRefDevice(); - virtual void Activate( BOOL bMDI ); - virtual void Deactivate( BOOL bMDI ); - virtual BOOL InitNew( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage ); - virtual BOOL ConvertFrom( SfxMedium &rMedium ); - virtual BOOL Save(); - virtual BOOL SaveAsOwnFormat( SfxMedium& rMedium ); - virtual BOOL ConvertTo( SfxMedium &rMedium ); - virtual BOOL SaveCompleted( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage ); + virtual void Activate( sal_Bool bMDI ); + virtual void Deactivate( sal_Bool bMDI ); + virtual sal_Bool InitNew( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage ); + virtual sal_Bool ConvertFrom( SfxMedium &rMedium ); + virtual sal_Bool Save(); + virtual sal_Bool SaveAsOwnFormat( SfxMedium& rMedium ); + virtual sal_Bool ConvertTo( SfxMedium &rMedium ); + virtual sal_Bool SaveCompleted( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage ); virtual sal_Bool Load( SfxMedium &rMedium ); virtual sal_Bool LoadFrom( SfxMedium& rMedium ); virtual sal_Bool SaveAs( SfxMedium &rMedium ); - virtual Rectangle GetVisArea(USHORT nAspect) const; - virtual void Draw(OutputDevice*, const JobSetup& rSetup, USHORT nAspect = ASPECT_CONTENT); + virtual Rectangle GetVisArea(sal_uInt16 nAspect) const; + virtual void Draw(OutputDevice*, const JobSetup& rSetup, sal_uInt16 nAspect = ASPECT_CONTENT); virtual ::svl::IUndoManager* GetUndoManager(); virtual Printer* GetDocumentPrinter(); @@ -109,7 +109,7 @@ public: virtual void SetOrganizerSearchMask(SfxStyleSheetBasePool* pBasePool) const; virtual Size GetFirstPageSize(); virtual void FillClass(SvGlobalName* pClassName, sal_uInt32* pFormat, String* pAppName, String* pFullTypeName, String* pShortTypeName, sal_Int32 nFileFormat, sal_Bool bTemplate = sal_False ) const; - virtual void SetModified( BOOL = TRUE ); + virtual void SetModified( sal_Bool = sal_True ); using SotObject::GetInterface; using SfxObjectShell::GetVisArea; @@ -123,11 +123,11 @@ public: SdDrawDocument* GetDoc(); DocumentType GetDocumentType() const { return meDocType; } - SfxPrinter* GetPrinter(BOOL bCreate); + SfxPrinter* GetPrinter(sal_Bool bCreate); void SetPrinter(SfxPrinter *pNewPrinter); void UpdateFontList(); - BOOL IsInDestruction() const { return mbInDestruction; } + sal_Bool IsInDestruction() const { return mbInDestruction; } void CancelSearching(); @@ -138,9 +138,9 @@ public: void Disconnect(sd::ViewShell* pViewSh); void UpdateTablePointers(); - BOOL GotoBookmark(const String& rBookmark); + sal_Bool GotoBookmark(const String& rBookmark); - Bitmap GetPagePreviewBitmap(SdPage* pPage, USHORT nMaxEdgePixel); + Bitmap GetPagePreviewBitmap(SdPage* pPage, sal_uInt16 nMaxEdgePixel); /** checks, if the given name is a valid new name for a slide @@ -153,17 +153,17 @@ public: @param rName the new name that is to be set for a slide. This string may be set to an empty string (see below). - @return TRUE, if the new name is unique. Note that if the user entered + @return sal_True, if the new name is unique. Note that if the user entered a default name of a not-yet-existing slide (e.g. 'Slide 17'), - TRUE is returned, but rName is set to an empty string. + sal_True is returned, but rName is set to an empty string. */ - BOOL CheckPageName(::Window* pWin, String& rName ); + sal_Bool CheckPageName(::Window* pWin, String& rName ); - void SetSlotFilter(BOOL bEnable = FALSE, USHORT nCount = 0, const USHORT* pSIDs = NULL) { mbFilterEnable = bEnable; mnFilterCount = nCount; mpFilterSIDs = pSIDs; } + void SetSlotFilter(sal_Bool bEnable = sal_False, sal_uInt16 nCount = 0, const sal_uInt16* pSIDs = NULL) { mbFilterEnable = bEnable; mnFilterCount = nCount; mpFilterSIDs = pSIDs; } void ApplySlotFilter() const; - UINT16 GetStyleFamily() const { return mnStyleFamily; } - void SetStyleFamily( UINT16 nSF ) { mnStyleFamily = nSF; } + sal_uInt16 GetStyleFamily() const { return mnStyleFamily; } + void SetStyleFamily( sal_uInt16 nSF ) { mnStyleFamily = nSF; } /** executes the SID_OPENDOC slot to let the framework open a document with the given URL and this document as a referer */ @@ -217,18 +217,18 @@ protected: FontList* mpFontList; ::sd::FunctionReference mxDocShellFunction; DocumentType meDocType; - UINT16 mnStyleFamily; - const USHORT* mpFilterSIDs; - USHORT mnFilterCount; - BOOL mbFilterEnable; - BOOL mbSdDataObj; - BOOL mbInDestruction; - BOOL mbOwnPrinter; - BOOL mbNewDocument; + sal_uInt16 mnStyleFamily; + const sal_uInt16* mpFilterSIDs; + sal_uInt16 mnFilterCount; + sal_Bool mbFilterEnable; + sal_Bool mbSdDataObj; + sal_Bool mbInDestruction; + sal_Bool mbOwnPrinter; + sal_Bool mbNewDocument; bool mbOwnDocument; // if true, we own mpDoc and will delete it in our d'tor void Construct(bool bClipboard); - virtual void InPlaceActivate( BOOL bActive ); + virtual void InPlaceActivate( sal_Bool bActive ); }; #ifndef SV_DECL_DRAW_DOC_SHELL_DEFINED diff --git a/sd/source/ui/inc/DrawViewShell.hxx b/sd/source/ui/inc/DrawViewShell.hxx index 1110c3ee130c..f6a94bb1f1d4 100755 --- a/sd/source/ui/inc/DrawViewShell.hxx +++ b/sd/source/ui/inc/DrawViewShell.hxx @@ -132,7 +132,7 @@ public: void HidePage(); - virtual BOOL KeyInput(const KeyEvent& rKEvt, ::sd::Window* pWin); + virtual sal_Bool KeyInput(const KeyEvent& rKEvt, ::sd::Window* pWin); virtual void MouseMove(const MouseEvent& rMEvt, ::sd::Window* pWin); virtual void MouseButtonUp(const MouseEvent& rMEvt, ::sd::Window* pWin); virtual void MouseButtonDown(const MouseEvent& rMEvt, ::sd::Window* pWin); @@ -159,12 +159,12 @@ public: void SelectionHasChanged(); void ModelHasChanged(); - virtual void Activate(BOOL bIsMDIActivate); - virtual void Deactivate(BOOL IsMDIActivate); + virtual void Activate(sal_Bool bIsMDIActivate); + virtual void Deactivate(sal_Bool IsMDIActivate); virtual void UIActivating( SfxInPlaceClient* ); virtual void UIDeactivated( SfxInPlaceClient* ); - virtual String GetSelectionText( BOOL bCompleteWords = FALSE ); - virtual BOOL HasSelection( BOOL bText = TRUE ) const; + virtual String GetSelectionText( sal_Bool bCompleteWords = sal_False ); + virtual sal_Bool HasSelection( sal_Bool bText = sal_True ) const; void ExecCtrl(SfxRequest& rReq); void GetCtrlState(SfxItemSet& rSet); @@ -229,13 +229,13 @@ public: const Ruler& rRuler, const MouseEvent& rMEvt); - virtual USHORT PrepareClose( BOOL bUI = TRUE, BOOL bForBrowsing = FALSE ); + virtual sal_uInt16 PrepareClose( sal_Bool bUI = sal_True, sal_Bool bForBrowsing = sal_False ); PageKind GetPageKind() { return mePageKind; } Point GetMousePos() { return maMousePos; } - BOOL IsMousePosFreezed() { return mbMousePosFreezed; } - void SetMousePosFreezed( BOOL bIn ) { mbMousePosFreezed = bIn; } + sal_Bool IsMousePosFreezed() { return mbMousePosFreezed; } + void SetMousePosFreezed( sal_Bool bIn ) { mbMousePosFreezed = bIn; } EditMode GetEditMode() const { return meEditMode; } virtual SdPage* GetActualPage() { return mpActualPage; } @@ -245,20 +245,20 @@ public: void ResetActualPage(); void ResetActualLayer(); - BOOL SwitchPage(USHORT nPage); - BOOL IsSwitchPageAllowed() const; + sal_Bool SwitchPage(sal_uInt16 nPage); + sal_Bool IsSwitchPageAllowed() const; - BOOL GotoBookmark(const String& rBookmark); + sal_Bool GotoBookmark(const String& rBookmark); void MakeVisible(const Rectangle& rRect, ::Window& rWin); virtual void ReadFrameViewData(FrameView* pView); virtual void WriteFrameViewData(); virtual ErrCode DoVerb(long nVerb); - virtual BOOL ActivateObject(SdrOle2Obj* pObj, long nVerb); + virtual sal_Bool ActivateObject(SdrOle2Obj* pObj, long nVerb); - void SetZoomOnPage( BOOL bZoom = TRUE ) { mbZoomOnPage = bZoom; } - BOOL IsZoomOnPage() { return mbZoomOnPage; } + void SetZoomOnPage( sal_Bool bZoom = sal_True ) { mbZoomOnPage = bZoom; } + sal_Bool IsZoomOnPage() { return mbZoomOnPage; } void CheckLineTo (SfxRequest& rReq); void FuTemp01(SfxRequest& rReq); void FuTemp02(SfxRequest& rReq); @@ -270,9 +270,9 @@ public: void LockInput(); void UnlockInput(); - BOOL IsInputLocked() const { return mnLockCount > 0UL; } + sal_Bool IsInputLocked() const { return mnLockCount > 0UL; } - USHORT GetCurPageId() { return( maTabControl.GetCurPageId() ); } + sal_uInt16 GetCurPageId() { return( maTabControl.GetCurPageId() ); } /** Show controls of the UI or hide them, depending on the given flag. Do not call this method directly. Call the method at ViewShellBase @@ -284,12 +284,12 @@ public: bool IsLayerModeActive (void) const; - USHORT* GetSlotArray() const { return mpSlotArray; } + sal_uInt16* GetSlotArray() const { return mpSlotArray; } virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt, DropTargetHelper& rTargetHelper, - ::sd::Window* pTargetWindow, USHORT nPage, USHORT nLayer ); + ::sd::Window* pTargetWindow, sal_uInt16 nPage, sal_uInt16 nLayer ); virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt, DropTargetHelper& rTargetHelper, - ::sd::Window* pTargetWindow, USHORT nPage, USHORT nLayer ); + ::sd::Window* pTargetWindow, sal_uInt16 nPage, sal_uInt16 nLayer ); virtual void WriteUserDataSequence ( ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, sal_Bool bBrowse = sal_False ); virtual void ReadUserDataSequence ( const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, sal_Bool bBrowse = sal_False ); @@ -353,7 +353,7 @@ public: <p>Implemented in <code>drviews8.cxx</code>.</p> */ - bool RenameSlide( USHORT nPageId, const String & rName ); + bool RenameSlide( sal_uInt16 nPageId, const String & rName ); /** modifies the given layer with the given values */ void ModifyLayer( SdrLayer* pLayer, const String& rLayerName, const String& rLayerTitle, const String& rLayerDesc, bool bIsVisible, bool bIsLocked, bool bIsPrintable ); @@ -372,18 +372,18 @@ protected: SdPage* mpActualPage; Rectangle maMarkRect; Point maMousePos; - BOOL mbMousePosFreezed; + sal_Bool mbMousePosFreezed; TabControl maTabControl; EditMode meEditMode; PageKind mePageKind; - BOOL mbZoomOnPage; - BOOL mbIsRulerDrag; - ULONG mnLockCount; + sal_Bool mbZoomOnPage; + sal_Bool mbIsRulerDrag; + sal_uLong mnLockCount; Timer maCloseTimer; - BOOL mbReadOnly; - USHORT* mpSlotArray; + sal_Bool mbReadOnly; + sal_uInt16* mpSlotArray; - static BOOL mbPipette; + static sal_Bool mbPipette; DECL_LINK( ClipboardChanged, TransferableDataHelper* ); DECL_LINK( CloseHdl, Timer* pTimer ); @@ -394,7 +394,7 @@ protected: void DeleteActualPage(); void DeleteActualLayer(); - virtual SvxRuler* CreateHRuler(::sd::Window* pWin, BOOL bIsFirst); + virtual SvxRuler* CreateHRuler(::sd::Window* pWin, sal_Bool bIsFirst); virtual SvxRuler* CreateVRuler(::sd::Window* pWin); virtual void UpdateHRuler(); virtual void UpdateVRuler(); @@ -403,13 +403,13 @@ protected: virtual Size GetOptimalSizePixel() const; void SetupPage( Size &rSize, long nLeft, long nRight, long nUpper, long nLower, - BOOL bSize, BOOL bMargin, BOOL bScaleAll ); + sal_Bool bSize, sal_Bool bMargin, sal_Bool bScaleAll ); - USHORT GetIdBySubId( USHORT nSId ); - void MapSlot( USHORT nSId ); - void UpdateToolboxImages( SfxItemSet &rSet, BOOL bPermanent = TRUE ); - USHORT GetMappedSlot( USHORT nSId ); - USHORT GetArrayId( USHORT nSId ); + sal_uInt16 GetIdBySubId( sal_uInt16 nSId ); + void MapSlot( sal_uInt16 nSId ); + void UpdateToolboxImages( SfxItemSet &rSet, sal_Bool bPermanent = sal_True ); + sal_uInt16 GetMappedSlot( sal_uInt16 nSId ); + sal_uInt16 GetArrayId( sal_uInt16 nSId ); void GetMenuStateSel(SfxItemSet& rSet); @@ -449,7 +449,7 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::scanner::XScannerManager > mxScannerManager; ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > mxScannerListener; TransferableClipboardListener* mpClipEvtLstnr; - BOOL mbPastePossible; + sal_Bool mbPastePossible; virtual void Notify (SfxBroadcaster& rBC, const SfxHint& rHint); @@ -484,7 +484,7 @@ private: */ void ShowSnapLineContextMenu ( SdrPageView& rPageView, - const USHORT nSnapLineIndex, + const sal_uInt16 nSnapLineIndex, const Point& rMouseLocation); using ViewShell::Notify; diff --git a/sd/source/ui/inc/FrameView.hxx b/sd/source/ui/inc/FrameView.hxx index 70e34e20dfa7..913f7532008d 100644..100755 --- a/sd/source/ui/inc/FrameView.hxx +++ b/sd/source/ui/inc/FrameView.hxx @@ -77,17 +77,17 @@ public: { maPrintableLayers = rPrintableLayers; } const SetOfByte& GetPrintableLayers() { return maPrintableLayers; } - void SetRuler(const BOOL bRulerOn) + void SetRuler(const sal_Bool bRulerOn) { mbRuler = bRulerOn; } - BOOL HasRuler() const { return mbRuler; } + sal_Bool HasRuler() const { return mbRuler; } - void SetNoColors(const BOOL bNoCol) + void SetNoColors(const sal_Bool bNoCol) { mbNoColors = bNoCol; } - BOOL IsNoColors() const { return mbNoColors; } + sal_Bool IsNoColors() const { return mbNoColors; } - void SetNoAttribs(const BOOL bNoAttr) + void SetNoAttribs(const sal_Bool bNoAttr) { mbNoAttribs = bNoAttr; } - BOOL IsNoAttribs() const { return mbNoAttribs; } + sal_Bool IsNoAttribs() const { return mbNoAttribs; } void SetVisArea(const Rectangle& rVisArea) { maVisArea = rVisArea; } @@ -103,15 +103,15 @@ public: /** can be used to get the page kind that was selected on last save of this document */ PageKind GetPageKindOnLoad() const { return mePageKindOnLoad; } - SD_DLLPUBLIC void SetSelectedPage (USHORT nPage); - USHORT GetSelectedPage () const; + SD_DLLPUBLIC void SetSelectedPage (sal_uInt16 nPage); + sal_uInt16 GetSelectedPage () const; /** is used in FrameView::ReadUserDataSequence() only to store the page that was selected while last saving this document */ - void SetSelectedPageOnLoad (USHORT nPage) { mnSelectedPageOnLoad = nPage; } + void SetSelectedPageOnLoad (sal_uInt16 nPage) { mnSelectedPageOnLoad = nPage; } /** can be used to get the page that was selected on last save of this document */ - USHORT GetSelectedPageOnLoad () const { return mnSelectedPageOnLoad; } + sal_uInt16 GetSelectedPageOnLoad () const { return mnSelectedPageOnLoad; } SD_DLLPUBLIC void SetViewShEditMode(EditMode eMode, PageKind eKind); EditMode GetViewShEditMode (PageKind eKind); @@ -126,22 +126,22 @@ public: */ EditMode GetViewShEditModeOnLoad (void) const; - void SetLayerMode(BOOL bMode) + void SetLayerMode(sal_Bool bMode) { mbLayerMode = bMode; } - BOOL IsLayerMode() const { return mbLayerMode; } + sal_Bool IsLayerMode() const { return mbLayerMode; } - void SetQuickEdit(BOOL bQEdit) + void SetQuickEdit(sal_Bool bQEdit) { mbQuickEdit = bQEdit; } - BOOL IsQuickEdit() const { return mbQuickEdit; } + sal_Bool IsQuickEdit() const { return mbQuickEdit; } - void SetBigHandles( BOOL bOn = TRUE ) { mbBigHandles = bOn; } - BOOL IsBigHandles() const { return mbBigHandles; } + void SetBigHandles( sal_Bool bOn = sal_True ) { mbBigHandles = bOn; } + sal_Bool IsBigHandles() const { return mbBigHandles; } - void SetDoubleClickTextEdit( BOOL bOn = TRUE ) { mbDoubleClickTextEdit = bOn; } - BOOL IsDoubleClickTextEdit() const { return mbDoubleClickTextEdit; } + void SetDoubleClickTextEdit( sal_Bool bOn = sal_True ) { mbDoubleClickTextEdit = bOn; } + sal_Bool IsDoubleClickTextEdit() const { return mbDoubleClickTextEdit; } - void SetClickChangeRotation( BOOL bOn = TRUE ) { mbClickChangeRotation = bOn; } - BOOL IsClickChangeRotation() const { return mbClickChangeRotation; } + void SetClickChangeRotation( sal_Bool bOn = sal_True ) { mbClickChangeRotation = bOn; } + sal_Bool IsClickChangeRotation() const { return mbClickChangeRotation; } /** Remember the type of the view shell that was (or soon will be) previously associated with this frame view. @@ -163,18 +163,18 @@ public: ViewShell::ShellType GetViewShellTypeOnLoad (void) const; - void SetPresentationViewShellId(USHORT nId) + void SetPresentationViewShellId(sal_uInt16 nId) { mnPresViewShellId = nId; } - USHORT GetPresentationViewShellId() const { return mnPresViewShellId; } + sal_uInt16 GetPresentationViewShellId() const { return mnPresViewShellId; } - void SetSlotId(USHORT nId) { mnSlotId = nId; } - USHORT GetSlotId() const { return mnSlotId; } + void SetSlotId(sal_uInt16 nId) { mnSlotId = nId; } + sal_uInt16 GetSlotId() const { return mnSlotId; } - void SetSlidesPerRow(USHORT nSlides) { mnSlidesPerRow = nSlides; } - USHORT GetSlidesPerRow() const { return mnSlidesPerRow; } + void SetSlidesPerRow(sal_uInt16 nSlides) { mnSlidesPerRow = nSlides; } + sal_uInt16 GetSlidesPerRow() const { return mnSlidesPerRow; } - void SetDrawMode(ULONG nNewDrawMode) { mnDrawMode = nNewDrawMode; }; - ULONG GetDrawMode() const { return mnDrawMode; }; + void SetDrawMode(sal_uLong nNewDrawMode) { mnDrawMode = nNewDrawMode; }; + sal_uLong GetDrawMode() const { return mnDrawMode; }; void SetTabCtrlPercent( double nPercent ) { mnTabCtrlPercent = nPercent; } double GetTabCtrlPercent() const { return mnTabCtrlPercent; } @@ -186,35 +186,35 @@ public: virtual void ReadUserDataSequence ( const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, sal_Bool bBrowse = sal_False ); private: - USHORT mnRefCount; + sal_uInt16 mnRefCount; VirtualDevice* mpVDev; - BOOL mbRuler; + sal_Bool mbRuler; SetOfByte maVisibleLayers; SetOfByte maLockedLayers; SetOfByte maPrintableLayers; SdrHelpLineList maStandardHelpLines; SdrHelpLineList maNotesHelpLines; SdrHelpLineList maHandoutHelpLines; - BOOL mbNoColors; // Gliederungsmodus - BOOL mbNoAttribs; // Gliederungsmodus + sal_Bool mbNoColors; // Gliederungsmodus + sal_Bool mbNoAttribs; // Gliederungsmodus Rectangle maVisArea; // Sichtbarer Bereich PageKind mePageKind; // Seitentyp (Standard, Notizen, Handzettel) - USHORT mnSelectedPage; // Selektierte Seite + sal_uInt16 mnSelectedPage; // Selektierte Seite PageKind mePageKindOnLoad; - USHORT mnSelectedPageOnLoad; + sal_uInt16 mnSelectedPageOnLoad; EditMode meStandardEditMode; // Editmode im Zeichenmodus (Page/MasterPage) EditMode meNotesEditMode; // Editmode im Notizen-Modus (Page/MasterPage) EditMode meHandoutEditMode; // Editmode im Handzettel-Modus (Page/MasterPage) EditMode meEditModeOnLoad; - BOOL mbLayerMode; // Layer an/aus - BOOL mbQuickEdit; // QuickEdit an/aus - BOOL mbBigHandles; // Grosse Handles - BOOL mbDoubleClickTextEdit; // Textmodus nach Doppelklick - BOOL mbClickChangeRotation; // Einfachklick wechselt Selektions-/Rotationsmodus - USHORT mnPresViewShellId; // ViewShell aus der die Pres. gestartet wurde - USHORT mnSlotId; // SlotId, welche initial ausgefuehrt wird - USHORT mnSlidesPerRow; // Dias pro Reihe auf dem Diatisch - ULONG mnDrawMode; // Drawmode fuer das normale Fenster + sal_Bool mbLayerMode; // Layer an/aus + sal_Bool mbQuickEdit; // QuickEdit an/aus + sal_Bool mbBigHandles; // Grosse Handles + sal_Bool mbDoubleClickTextEdit; // Textmodus nach Doppelklick + sal_Bool mbClickChangeRotation; // Einfachklick wechselt Selektions-/Rotationsmodus + sal_uInt16 mnPresViewShellId; // ViewShell aus der die Pres. gestartet wurde + sal_uInt16 mnSlotId; // SlotId, welche initial ausgefuehrt wird + sal_uInt16 mnSlidesPerRow; // Dias pro Reihe auf dem Diatisch + sal_uLong mnDrawMode; // Drawmode fuer das normale Fenster double mnTabCtrlPercent; /** Remember whether the navigator shows all shapes (<TRUE/>) or only the names ones (<FALSE/>). Not persistent. diff --git a/sd/source/ui/inc/GraphicDocShell.hxx b/sd/source/ui/inc/GraphicDocShell.hxx index 7b506c515185..a95f020cd85b 100644..100755 --- a/sd/source/ui/inc/GraphicDocShell.hxx +++ b/sd/source/ui/inc/GraphicDocShell.hxx @@ -56,12 +56,12 @@ public: GraphicDocShell ( SfxObjectCreateMode eMode = SFX_CREATE_MODE_EMBEDDED, - BOOL bSdDataObj=FALSE, + sal_Bool bSdDataObj=sal_False, DocumentType=DOCUMENT_TYPE_DRAW); GraphicDocShell ( const sal_uInt64 nModelCreationFlags, - BOOL bSdDataObj=FALSE, + sal_Bool bSdDataObj=sal_False, DocumentType=DOCUMENT_TYPE_DRAW); virtual ~GraphicDocShell (void); diff --git a/sd/source/ui/inc/GraphicObjectBar.hxx b/sd/source/ui/inc/GraphicObjectBar.hxx index 5a3c0cf4eb4d..14c6a45801a6 100644..100755 --- a/sd/source/ui/inc/GraphicObjectBar.hxx +++ b/sd/source/ui/inc/GraphicObjectBar.hxx @@ -57,7 +57,7 @@ public: protected: ::sd::View* mpView; ViewShell* mpViewSh; - USHORT nMappedSlotFilter; + sal_uInt16 nMappedSlotFilter; }; diff --git a/sd/source/ui/inc/LayerDialogChildWindow.hxx b/sd/source/ui/inc/LayerDialogChildWindow.hxx index 826902a09152..945630ee37d1 100644..100755 --- a/sd/source/ui/inc/LayerDialogChildWindow.hxx +++ b/sd/source/ui/inc/LayerDialogChildWindow.hxx @@ -41,7 +41,7 @@ class LayerDialogChildWindow public: LayerDialogChildWindow ( ::Window*, - USHORT, + sal_uInt16, SfxBindings*, SfxChildWinInfo*); virtual ~LayerDialogChildWindow (void); diff --git a/sd/source/ui/inc/LayerDialogContent.hxx b/sd/source/ui/inc/LayerDialogContent.hxx index 3c0b00025307..b1233b7249bc 100755 --- a/sd/source/ui/inc/LayerDialogContent.hxx +++ b/sd/source/ui/inc/LayerDialogContent.hxx @@ -51,7 +51,7 @@ public: virtual ~LayerDialogContent (void); protected: - virtual BOOL Close (void); + virtual sal_Bool Close (void); virtual void Resize (void); private: diff --git a/sd/source/ui/inc/NavigatorChildWindow.hxx b/sd/source/ui/inc/NavigatorChildWindow.hxx index a649a6f772a2..8a8c0bd0f534 100644..100755 --- a/sd/source/ui/inc/NavigatorChildWindow.hxx +++ b/sd/source/ui/inc/NavigatorChildWindow.hxx @@ -47,7 +47,7 @@ class NavigatorChildWindow public: NavigatorChildWindow ( ::Window*, - USHORT, + sal_uInt16, SfxBindings*, SfxChildWinInfo*); diff --git a/sd/source/ui/inc/NotesChildWindow.hxx b/sd/source/ui/inc/NotesChildWindow.hxx index 0d25c6cf3273..b69f67eee7e1 100644..100755 --- a/sd/source/ui/inc/NotesChildWindow.hxx +++ b/sd/source/ui/inc/NotesChildWindow.hxx @@ -43,7 +43,7 @@ class NotesChildWindow : public SfxChildWindow { public: - NotesChildWindow (::Window*, USHORT, SfxBindings*, SfxChildWinInfo*); + NotesChildWindow (::Window*, sal_uInt16, SfxBindings*, SfxChildWinInfo*); virtual ~NotesChildWindow (void); SFX_DECL_CHILDWINDOW (NotesChildWindow); diff --git a/sd/source/ui/inc/OutlineBulletDlg.hxx b/sd/source/ui/inc/OutlineBulletDlg.hxx index 4d10c9a0cc7a..253bd796c9ff 100644..100755 --- a/sd/source/ui/inc/OutlineBulletDlg.hxx +++ b/sd/source/ui/inc/OutlineBulletDlg.hxx @@ -54,14 +54,14 @@ public: const SfxItemSet* GetOutputItemSet() const; protected: - virtual void PageCreated( USHORT nId, SfxTabPage &rPage ); + virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ); private: using SfxTabDialog::GetOutputItemSet; SfxItemSet aInputSet; SfxItemSet *pOutputSet; - BOOL bTitle; + sal_Bool bTitle; ::sd::View *pSdView; }; diff --git a/sd/source/ui/inc/OutlineView.hxx b/sd/source/ui/inc/OutlineView.hxx index 78481294bf94..704bc1d125d9 100755 --- a/sd/source/ui/inc/OutlineView.hxx +++ b/sd/source/ui/inc/OutlineView.hxx @@ -121,14 +121,14 @@ public: DECL_LINK( EndDropHdl, void * ); DECL_LINK( PaintingFirstLineHdl, PaintFirstLineInfo* ); - ULONG GetPaperWidth() const { return 2*21000; } // DIN A4 Breite + sal_uLong GetPaperWidth() const { return 2*21000; } // DIN A4 Breite - BOOL PrepareClose(BOOL bUI = TRUE); + sal_Bool PrepareClose(sal_Bool bUI = sal_True); - virtual BOOL GetAttributes( SfxItemSet& rTargetSet, BOOL bOnlyHardAttr=FALSE ) const; - virtual BOOL SetAttributes(const SfxItemSet& rSet, BOOL bReplaceAll = FALSE); + virtual sal_Bool GetAttributes( SfxItemSet& rTargetSet, sal_Bool bOnlyHardAttr=sal_False ) const; + virtual sal_Bool SetAttributes(const SfxItemSet& rSet, sal_Bool bReplaceAll = sal_False); -// virtual BOOL HasMarkedObjUnused() const; +// virtual sal_Bool HasMarkedObjUnused() const; void FillOutliner(); void SetLinks(); void ResetLinks() const; @@ -141,14 +141,14 @@ public: const AcceptDropEvent& rEvt, DropTargetHelper& rTargetHelper, ::sd::Window* pTargetWindow = NULL, - USHORT nPage = SDRPAGE_NOTFOUND, - USHORT nLayer = SDRPAGE_NOTFOUND); + sal_uInt16 nPage = SDRPAGE_NOTFOUND, + sal_uInt16 nLayer = SDRPAGE_NOTFOUND); virtual sal_Int8 ExecuteDrop ( const ExecuteDropEvent& rEvt, DropTargetHelper& rTargetHelper, ::sd::Window* pTargetWindow = NULL, - USHORT nPage = SDRPAGE_NOTFOUND, - USHORT nLayer = SDRPAGE_NOTFOUND); + sal_uInt16 nPage = SDRPAGE_NOTFOUND, + sal_uInt16 nLayer = SDRPAGE_NOTFOUND); // #97766# Re-implement GetScriptType for this view to get correct results @@ -171,7 +171,7 @@ public: /** creates and inserts an empty slide for the given paragraph. */ SdPage* InsertSlideForParagraph( Paragraph* pPara ); - void UpdateParagraph( USHORT nPara ); + void UpdateParagraph( sal_uInt16 nPara ); protected: virtual void OnBeginPasteOrDrop( PasteOrDropInfos* pInfos ); @@ -199,10 +199,10 @@ private: List* mpOldParaOrder; List* mpSelectedParas; - USHORT mnPagesToProcess; // fuer die Fortschrittsanzeige - USHORT mnPagesProcessed; + sal_uInt16 mnPagesToProcess; // fuer die Fortschrittsanzeige + sal_uInt16 mnPagesProcessed; - BOOL mbFirstPaint; + sal_Bool mbFirstPaint; SfxProgress* mpProgress; diff --git a/sd/source/ui/inc/OutlineViewShell.hxx b/sd/source/ui/inc/OutlineViewShell.hxx index dce55f5d33f7..d411771b5e56 100755 --- a/sd/source/ui/inc/OutlineViewShell.hxx +++ b/sd/source/ui/inc/OutlineViewShell.hxx @@ -80,7 +80,7 @@ public: */ virtual void ArrangeGUIElements (void); - virtual USHORT PrepareClose( BOOL bUI = TRUE, BOOL bForBrowsing = FALSE ); + virtual sal_uInt16 PrepareClose( sal_Bool bUI = sal_True, sal_Bool bForBrowsing = sal_False ); virtual long VirtHScrollHdl(ScrollBar* pHScroll); virtual long VirtVScrollHdl(ScrollBar* pVHScroll); @@ -88,8 +88,8 @@ public: virtual void AddWindow(::sd::Window* pWin); virtual void RemoveWindow(::sd::Window* pWin); - virtual void Activate( BOOL IsMDIActivate ); - virtual void Deactivate( BOOL IsMDIActivate ); + virtual void Activate( sal_Bool IsMDIActivate ); + virtual void Deactivate( sal_Bool IsMDIActivate ); virtual SdPage* GetActualPage(); @@ -112,8 +112,8 @@ public: virtual void SetZoom(long nZoom); virtual void SetZoomRect(const Rectangle& rZoomRect); - virtual String GetSelectionText( BOOL bCompleteWords = FALSE ); - virtual BOOL HasSelection( BOOL bText = TRUE ) const; + virtual String GetSelectionText( sal_Bool bCompleteWords = sal_False ); + virtual sal_Bool HasSelection( sal_Bool bText = sal_True ) const; void Execute(SfxRequest& rReq); @@ -121,10 +121,10 @@ public: virtual void WriteFrameViewData(); virtual void Command( const CommandEvent& rCEvt, ::sd::Window* pWin ); - virtual BOOL KeyInput(const KeyEvent& rKEvt, ::sd::Window* pWin); + virtual sal_Bool KeyInput(const KeyEvent& rKEvt, ::sd::Window* pWin); virtual void MouseButtonUp(const MouseEvent& rMEvt, ::sd::Window* pWin); - ULONG Read(SvStream& rInput, const String& rBaseURL, USHORT eFormat); + sal_uLong Read(SvStream& rInput, const String& rBaseURL, sal_uInt16 eFormat); virtual void WriteUserDataSequence ( ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, sal_Bool bBrowse = sal_False ); virtual void ReadUserDataSequence ( const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, sal_Bool bBrowse = sal_False ); @@ -145,7 +145,7 @@ public: /** Update the preview to show the specified page. */ - virtual void UpdatePreview (SdPage* pPage, BOOL bInit = FALSE); + virtual void UpdatePreview (SdPage* pPage, sal_Bool bInit = sal_False); virtual css::uno::Reference<css::drawing::XDrawSubController> CreateSubController (void); @@ -167,7 +167,7 @@ private: OutlineView* pOlView; SdPage* pLastPage; // Zur performanten Aufbereitung der Preview TransferableClipboardListener* pClipEvtLstnr; - BOOL bPastePossible; + sal_Bool bPastePossible; bool mbInitialized; void Construct (DrawDocShell* pDocSh); diff --git a/sd/source/ui/inc/OutlinerIteratorImpl.hxx b/sd/source/ui/inc/OutlinerIteratorImpl.hxx index 320f5c6878d9..320f5c6878d9 100644..100755 --- a/sd/source/ui/inc/OutlinerIteratorImpl.hxx +++ b/sd/source/ui/inc/OutlinerIteratorImpl.hxx diff --git a/sd/source/ui/inc/PaneChildWindows.hxx b/sd/source/ui/inc/PaneChildWindows.hxx index 9ba0a1f03720..6324a0256e12 100755 --- a/sd/source/ui/inc/PaneChildWindows.hxx +++ b/sd/source/ui/inc/PaneChildWindows.hxx @@ -39,11 +39,11 @@ class PaneChildWindow public: PaneChildWindow ( ::Window* pParentWindow, - USHORT nId, + sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo, - const USHORT nDockWinTitleResId, - const USHORT nTitleBarResId, + const sal_uInt16 nDockWinTitleResId, + const sal_uInt16 nTitleBarResId, SfxChildAlignment eAlignment); virtual ~PaneChildWindow (void); }; @@ -55,7 +55,7 @@ class LeftPaneImpressChildWindow : public PaneChildWindow { public: - LeftPaneImpressChildWindow (::Window*, USHORT, SfxBindings*, SfxChildWinInfo*); + LeftPaneImpressChildWindow (::Window*, sal_uInt16, SfxBindings*, SfxChildWinInfo*); SFX_DECL_CHILDWINDOW(LeftPaneImpressChildWindow); }; @@ -67,7 +67,7 @@ class LeftPaneDrawChildWindow : public PaneChildWindow { public: - LeftPaneDrawChildWindow (::Window*, USHORT, SfxBindings*, SfxChildWinInfo*); + LeftPaneDrawChildWindow (::Window*, sal_uInt16, SfxBindings*, SfxChildWinInfo*); SFX_DECL_CHILDWINDOW(LeftPaneDrawChildWindow); }; @@ -84,7 +84,7 @@ class ToolPanelChildWindow :public PaneChildWindow public: ToolPanelChildWindow( ::Window* i_pParentWindow, - USHORT i_nId, + sal_uInt16 i_nId, SfxBindings* i_pBindings, SfxChildWinInfo* i_pChildWindowInfo ); diff --git a/sd/source/ui/inc/PresentationViewShell.hxx b/sd/source/ui/inc/PresentationViewShell.hxx index 366026fe2e06..75687665593f 100644..100755 --- a/sd/source/ui/inc/PresentationViewShell.hxx +++ b/sd/source/ui/inc/PresentationViewShell.hxx @@ -60,13 +60,13 @@ public: virtual void Resize (void); protected: - virtual SvxRuler* CreateHRuler(::sd::Window* pWin, BOOL bIsFirst); + virtual SvxRuler* CreateHRuler(::sd::Window* pWin, sal_Bool bIsFirst); virtual SvxRuler* CreateVRuler(::sd::Window* pWin); private: Rectangle maOldVisArea; - virtual void Activate (BOOL bIsMDIActivate); + virtual void Activate (sal_Bool bIsMDIActivate); virtual void Paint (const Rectangle& rRect, ::sd::Window* pWin); }; diff --git a/sd/source/ui/inc/Ruler.hxx b/sd/source/ui/inc/Ruler.hxx index 2c044f9ab176..8b319ca7f16f 100644..100755 --- a/sd/source/ui/inc/Ruler.hxx +++ b/sd/source/ui/inc/Ruler.hxx @@ -53,14 +53,14 @@ public: DrawViewShell& rViewSh, ::Window* pParent, ::sd::Window* pWin, - USHORT nRulerFlags, + sal_uInt16 nRulerFlags, SfxBindings& rBindings, WinBits nWinStyle); virtual ~Ruler (void); void SetNullOffset(const Point& rOffset); - BOOL IsHorizontal() const { return bHorz; } + sal_Bool IsHorizontal() const { return bHorz; } using ::Ruler::SetNullOffset; protected: @@ -68,7 +68,7 @@ protected: ::sd::Window* pSdWin; DrawViewShell* pDrViewShell; RulerCtrlItem* pCtrlItem; - BOOL bHorz; + sal_Bool bHorz; virtual void MouseButtonDown(const MouseEvent& rMEvt); virtual void MouseButtonUp(const MouseEvent& rMEvt); diff --git a/sd/source/ui/inc/SlideSorterChildWindow.hxx b/sd/source/ui/inc/SlideSorterChildWindow.hxx index 9f0f56a1b99d..06c06f2aab56 100644..100755 --- a/sd/source/ui/inc/SlideSorterChildWindow.hxx +++ b/sd/source/ui/inc/SlideSorterChildWindow.hxx @@ -43,7 +43,7 @@ class SlideSorterChildWindow public: SlideSorterChildWindow ( ::Window*, - USHORT, + sal_uInt16, SfxBindings*, SfxChildWinInfo*); diff --git a/sd/source/ui/inc/SlideSorterViewShell.hxx b/sd/source/ui/inc/SlideSorterViewShell.hxx index de1e1ebae006..2f0ebbcfd18e 100755 --- a/sd/source/ui/inc/SlideSorterViewShell.hxx +++ b/sd/source/ui/inc/SlideSorterViewShell.hxx @@ -118,7 +118,7 @@ public: */ virtual void ArrangeGUIElements (void); - virtual void Activate (BOOL IsMDIActivate); + virtual void Activate (sal_Bool IsMDIActivate); //===== Drag and Drop ===================================================== @@ -131,14 +131,14 @@ public: const AcceptDropEvent& rEvt, DropTargetHelper& rTargetHelper, ::sd::Window* pTargetWindow = NULL, - USHORT nPage = SDRPAGE_NOTFOUND, - USHORT nLayer = SDRPAGE_NOTFOUND ); + sal_uInt16 nPage = SDRPAGE_NOTFOUND, + sal_uInt16 nLayer = SDRPAGE_NOTFOUND ); virtual sal_Int8 ExecuteDrop ( const ExecuteDropEvent& rEvt, DropTargetHelper& rTargetHelper, ::sd::Window* pTargetWindow = NULL, - USHORT nPage = SDRPAGE_NOTFOUND, - USHORT nLayer = SDRPAGE_NOTFOUND); + sal_uInt16 nPage = SDRPAGE_NOTFOUND, + sal_uInt16 nLayer = SDRPAGE_NOTFOUND); typedef ::std::vector<SdPage*> PageSelection; diff --git a/sd/source/ui/inc/SlideView.hxx b/sd/source/ui/inc/SlideView.hxx index 17f7f17e3a9a..70427f5b79ce 100755 --- a/sd/source/ui/inc/SlideView.hxx +++ b/sd/source/ui/inc/SlideView.hxx @@ -70,35 +70,35 @@ public: SlideViewShell* pSlideVShell); virtual ~SlideView (void); - void Select( USHORT nSdPageNum, BOOL bSelect ); - void SelectAllSlides( BOOL bSelect ); + void Select( sal_uInt16 nSdPageNum, sal_Bool bSelect ); + void SelectAllSlides( sal_Bool bSelect ); void MoveFocus( SlideViewFocusMove eMove ); - USHORT GetFocusPage() const; - BOOL HasFocus() const; + sal_uInt16 GetFocusPage() const; + sal_Bool HasFocus() const; - USHORT ChangePagesPerRow( USHORT nNum ); - USHORT GetPagesPerRow() const { return nPagesPerRow; } + sal_uInt16 ChangePagesPerRow( sal_uInt16 nNum ); + sal_uInt16 GetPagesPerRow() const { return nPagesPerRow; } virtual void InvalidateOneWin( ::Window& rWin ); virtual void InvalidateOneWin( ::Window& rWin, const Rectangle& rRect ); - void SetAllowInvalidate( BOOL bFlag ); - BOOL IsInvalidateAllowed() const; + void SetAllowInvalidate( sal_Bool bFlag ); + sal_Bool IsInvalidateAllowed() const; void Paint(const Rectangle& rRect, OutputDevice* pOut); - void DrawSelectionRect(USHORT nPage); + void DrawSelectionRect(sal_uInt16 nPage); - Point CalcPagePos( USHORT nPageNo ) const; - Rectangle GetPageArea( USHORT nPageNo ) const; - ULONG GetPageGap() const; - Rectangle GetFadeIconArea( USHORT nPageNo ) const; + Point CalcPagePos( sal_uInt16 nPageNo ) const; + Rectangle GetPageArea( sal_uInt16 nPageNo ) const; + sal_uLong GetPageGap() const; + Rectangle GetFadeIconArea( sal_uInt16 nPageNo ) const; SdPage* GetHitPage( const Point& rPos ) const; SdPage* GetFadePage( const Point& rPos ) const; SdPage* GetNearestPage( const Point& rPos ) const; void DeleteMarked(); - void MoveMarked( USHORT nTargetPage ); + void MoveMarked( sal_uInt16 nTargetPage ); void AddToCache( SdPage* pPage, const Bitmap& rBitmap, long nZoom ); const GraphicObject* GetFromCache( SdPage* pPage, long& rZoom, long nZoomTolerance ) const; @@ -114,12 +114,12 @@ public: virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt, DropTargetHelper& rTargetHelper, ::sd::Window* pTargetWindow = NULL, - USHORT nPage = SDRPAGE_NOTFOUND, - USHORT nLayer = SDRPAGE_NOTFOUND ); + sal_uInt16 nPage = SDRPAGE_NOTFOUND, + sal_uInt16 nLayer = SDRPAGE_NOTFOUND ); virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt, DropTargetHelper& rTargetHelper, ::sd::Window* pTargetWindow = NULL, - USHORT nPage = SDRPAGE_NOTFOUND, - USHORT nLayer = SDRPAGE_NOTFOUND ); + sal_uInt16 nPage = SDRPAGE_NOTFOUND, + sal_uInt16 nLayer = SDRPAGE_NOTFOUND ); void UpdateAllPages(); @@ -129,14 +129,14 @@ private: SlideViewShell* pSlideViewShell; BitmapCache* pCache; VirtualDevice* mpVDev; - USHORT nAllowInvalidateSmph; - USHORT nPagesPerRow; - USHORT nFocusPage; - BOOL bInPaint; - BOOL bInDelayedPaint; + sal_uInt16 nAllowInvalidateSmph; + sal_uInt16 nPagesPerRow; + sal_uInt16 nFocusPage; + sal_Bool bInPaint; + sal_Bool bInDelayedPaint; DECL_LINK( PaintDelayed, Timer * ); - void CreateSlideTransferable (::Window* pWindow, BOOL bDrag); + void CreateSlideTransferable (::Window* pWindow, sal_Bool bDrag); }; } // end of namespace sd diff --git a/sd/source/ui/inc/SlideViewShell.hxx b/sd/source/ui/inc/SlideViewShell.hxx index 7cb9d27bde18..8b0dbf347098 100755 --- a/sd/source/ui/inc/SlideViewShell.hxx +++ b/sd/source/ui/inc/SlideViewShell.hxx @@ -88,7 +88,7 @@ public: virtual void AddWindow(::sd::Window* pWin) { pSlideView->AddWindowToPaintView((OutputDevice*) pWin); } virtual void RemoveWindow(::sd::Window* pWin) { pSlideView->DeleteWindowFromPaintView((OutputDevice*) pWin); } - virtual BOOL KeyInput(const KeyEvent& rKEvt, ::sd::Window* pWin); + virtual sal_Bool KeyInput(const KeyEvent& rKEvt, ::sd::Window* pWin); virtual void MouseMove(const MouseEvent& rMEvt, ::sd::Window* pWin); virtual void MouseButtonUp(const MouseEvent& rMEvt, ::sd::Window* pWin); virtual void MouseButtonDown(const MouseEvent& rMEvt, ::sd::Window* pWin); @@ -106,7 +106,7 @@ public: void GetMenuState(SfxItemSet &rSet); void GetAttrState(SfxItemSet &rSet); - void SetPagesPerRow( USHORT nPagesPerRow ); + void SetPagesPerRow( sal_uInt16 nPagesPerRow ); void ExecStatusBar(SfxRequest& rReq); void GetStatusBarState(SfxItemSet& rSet); @@ -121,7 +121,7 @@ public: virtual void SetZoom(long nZoom); virtual void SetZoomRect(const Rectangle& rZoomRect); - virtual BOOL HasSelection( BOOL bText = TRUE ) const; + virtual sal_Bool HasSelection( sal_Bool bText = sal_True ) const; /** Draw the rectangle arround the specified slide that indicates whether the slide is selected or not. When not selected the rectangle is @@ -133,8 +133,8 @@ public: @param nPage When the page number is invalid then the call is ignored. */ - void DrawSelectionRect( USHORT nPage ); - void DrawFocusRect( USHORT nPage ); + void DrawSelectionRect( sal_uInt16 nPage ); + void DrawFocusRect( sal_uInt16 nPage ); virtual void WriteUserDataSequence ( ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, sal_Bool bBrowse = sal_False ); virtual void ReadUserDataSequence ( const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, sal_Bool bBrowse = sal_False ); @@ -145,12 +145,12 @@ public: void SelectionHasChanged(); void PageLayoutHasChanged(); - void FocusHasChanged( USHORT nOldFocusPage, USHORT nNewFocusPage ); - void PageVisibilityHasChanged( USHORT nPage, BOOL bVisible ); + void FocusHasChanged( sal_uInt16 nOldFocusPage, sal_uInt16 nNewFocusPage ); + void PageVisibilityHasChanged( sal_uInt16 nPage, sal_Bool bVisible ); /** On activation the preview is turned off. */ - virtual void Activate (BOOL IsMDIActivate); + virtual void Activate (sal_Bool IsMDIActivate); protected: virtual Size GetOptimalSizePixel() const; @@ -162,12 +162,12 @@ private: SlideView* pSlideView; Point aDisplayPos; Size aDisplaySize; - USHORT nCurFocusPage; + sal_uInt16 nCurFocusPage; bool bSetInitialZoomFactor; bool bInitializeWinPos; void Construct(SdDrawDocument* pDoc); - void ImplDrawFocusRect( USHORT nPage, BOOL bVisible ); + void ImplDrawFocusRect( sal_uInt16 nPage, sal_Bool bVisible ); }; } // end of namespace sd diff --git a/sd/source/ui/inc/SpellDialogChildWindow.hxx b/sd/source/ui/inc/SpellDialogChildWindow.hxx index 4e08dd99b063..df9ee6aad98a 100755 --- a/sd/source/ui/inc/SpellDialogChildWindow.hxx +++ b/sd/source/ui/inc/SpellDialogChildWindow.hxx @@ -45,7 +45,7 @@ class SpellDialogChildWindow public: SpellDialogChildWindow ( ::Window* pParent, - USHORT nId, + sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo); virtual ~SpellDialogChildWindow (void); diff --git a/sd/source/ui/inc/TabControl.hxx b/sd/source/ui/inc/TabControl.hxx index 48de6910dece..7334a6e89362 100644..100755 --- a/sd/source/ui/inc/TabControl.hxx +++ b/sd/source/ui/inc/TabControl.hxx @@ -64,7 +64,7 @@ public: protected: DrawViewShell* pDrViewSh; - BOOL bInternalMove; + sal_Bool bInternalMove; // TabBar virtual void Select(); diff --git a/sd/source/ui/inc/TemplateScanner.hxx b/sd/source/ui/inc/TemplateScanner.hxx index 1c5f0cfe6f11..1c5f0cfe6f11 100644..100755 --- a/sd/source/ui/inc/TemplateScanner.hxx +++ b/sd/source/ui/inc/TemplateScanner.hxx diff --git a/sd/source/ui/inc/UpdateLockManager.hxx b/sd/source/ui/inc/UpdateLockManager.hxx index 9a0f6b65b259..9a0f6b65b259 100644..100755 --- a/sd/source/ui/inc/UpdateLockManager.hxx +++ b/sd/source/ui/inc/UpdateLockManager.hxx diff --git a/sd/source/ui/inc/View.hxx b/sd/source/ui/inc/View.hxx index f78051bdd719..766f0c072b63 100755 --- a/sd/source/ui/inc/View.hxx +++ b/sd/source/ui/inc/View.hxx @@ -87,8 +87,8 @@ public: void CompleteRedraw( OutputDevice* pOutDev, const Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector = 0L); - virtual BOOL GetAttributes( SfxItemSet& rTargetSet, BOOL bOnlyHardAttr=FALSE ) const; - virtual BOOL SetAttributes(const SfxItemSet& rSet, BOOL bReplaceAll = FALSE); + virtual sal_Bool GetAttributes( SfxItemSet& rTargetSet, sal_Bool bOnlyHardAttr=sal_False ) const; + virtual sal_Bool SetAttributes(const SfxItemSet& rSet, sal_Bool bReplaceAll = sal_False); virtual void MarkListHasChanged(); virtual void ModelHasChanged(); virtual void SelectAll(); @@ -96,21 +96,21 @@ public: virtual void DoCopy(::Window* pWindow=NULL); virtual void DoPaste(::Window* pWindow=NULL); virtual void DoConnect(SdrOle2Obj* pOleObj); - virtual BOOL SetStyleSheet(SfxStyleSheet* pStyleSheet, BOOL bDontRemoveHardAttr = FALSE); + virtual sal_Bool SetStyleSheet(SfxStyleSheet* pStyleSheet, sal_Bool bDontRemoveHardAttr = sal_False); virtual void StartDrag( const Point& rStartPos, ::Window* pWindow ); virtual void DragFinished( sal_Int8 nDropAction ); virtual sal_Int8 AcceptDrop ( const AcceptDropEvent& rEvt, DropTargetHelper& rTargetHelper, ::sd::Window* pTargetWindow = NULL, - USHORT nPage = SDRPAGE_NOTFOUND, - USHORT nLayer = SDRPAGE_NOTFOUND); + sal_uInt16 nPage = SDRPAGE_NOTFOUND, + sal_uInt16 nLayer = SDRPAGE_NOTFOUND); virtual sal_Int8 ExecuteDrop ( const ExecuteDropEvent& rEvt, DropTargetHelper& rTargetHelper, ::sd::Window* pTargetWindow = NULL, - USHORT nPage = SDRPAGE_NOTFOUND, - USHORT nLayer = SDRPAGE_NOTFOUND); + sal_uInt16 nPage = SDRPAGE_NOTFOUND, + sal_uInt16 nLayer = SDRPAGE_NOTFOUND); ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable> @@ -123,7 +123,7 @@ public: ::com::sun::star::datatransfer::XTransferable> CreateSelectionDataObject (::sd::View*, ::Window& rWindow); - void UpdateSelectionClipboard( BOOL bForceDeselect ); + void UpdateSelectionClipboard( sal_Bool bForceDeselect ); inline DrawDocShell* GetDocSh (void) const; inline SdDrawDocument* GetDoc (void) const; @@ -137,9 +137,9 @@ public: bool RestoreDefaultText( SdrTextObj* pTextObj ); - BOOL InsertData( const TransferableDataHelper& rDataHelper, - const Point& rPos, sal_Int8& rDnDAction, BOOL bDrag, - ULONG nFormat = 0, USHORT nPage = SDRPAGE_NOTFOUND, USHORT nLayer = SDRLAYER_NOTFOUND ); + sal_Bool InsertData( const TransferableDataHelper& rDataHelper, + const Point& rPos, sal_Int8& rDnDAction, sal_Bool bDrag, + sal_uLong nFormat = 0, sal_uInt16 nPage = SDRPAGE_NOTFOUND, sal_uInt16 nLayer = SDRLAYER_NOTFOUND ); /** gets the metafile from the given transferable helper and insert it as a graphic shape. @param bOptimize if set to true, the metafile is analyzed and if only one bitmap action is present, then is is inserted as a single graphic. @@ -154,25 +154,25 @@ public: SdrMediaObj* InsertMediaURL( const rtl::OUString& rMediaURL, sal_Int8& rAction, const Point& rPos, const Size& rSize ); - bool PasteRTFTable( SotStorageStreamRef xStm, SdrPage* pPage, ULONG nPasteOptions ); + bool PasteRTFTable( SotStorageStreamRef xStm, SdrPage* pPage, sal_uLong nPasteOptions ); - BOOL IsPresObjSelected(BOOL bOnPage=TRUE, BOOL bOnMasterPage=TRUE, BOOL bCheckPresObjListOnly=FALSE, BOOL bCheckLayoutOnly=FALSE) const; + sal_Bool IsPresObjSelected(sal_Bool bOnPage=sal_True, sal_Bool bOnMasterPage=sal_True, sal_Bool bCheckPresObjListOnly=sal_False, sal_Bool bCheckLayoutOnly=sal_False) const; void SetMarkedOriginalSize(); - void LockRedraw(BOOL bLock); + void LockRedraw(sal_Bool bLock); - BOOL IsMorphingAllowed() const; - BOOL IsVectorizeAllowed() const; + sal_Bool IsMorphingAllowed() const; + sal_Bool IsVectorizeAllowed() const; virtual SfxStyleSheet* GetStyleSheet() const; - BOOL GetExchangeList( List*& rpExchangeList, List* pBookmarkList, USHORT nType ); + sal_Bool GetExchangeList( List*& rpExchangeList, List* pBookmarkList, sal_uInt16 nType ); virtual void onAccessibilityOptionsChanged(); virtual SdrModel* GetMarkedObjModel() const; - virtual BOOL Paste(const SdrModel& rMod, const Point& rPos, SdrObjList* pLst=NULL, UINT32 nOptions=0); + virtual sal_Bool Paste(const SdrModel& rMod, const Point& rPos, SdrObjList* pLst=NULL, sal_uInt32 nOptions=0); using SdrExchangeView::Paste; /** returns true if we have an undo manager and there is an open list undo action */ @@ -185,14 +185,14 @@ public: void updateHandles(); virtual SdrViewContext GetContext() const; - virtual BOOL HasMarkablePoints() const; - virtual ULONG GetMarkablePointCount() const; - virtual BOOL HasMarkedPoints() const; - virtual ULONG GetMarkedPointCount() const; - virtual BOOL IsPointMarkable(const SdrHdl& rHdl) const; - virtual BOOL MarkPoint(SdrHdl& rHdl, BOOL bUnmark=FALSE); + virtual sal_Bool HasMarkablePoints() const; + virtual sal_uLong GetMarkablePointCount() const; + virtual sal_Bool HasMarkedPoints() const; + virtual sal_uLong GetMarkedPointCount() const; + virtual sal_Bool IsPointMarkable(const SdrHdl& rHdl) const; + virtual sal_Bool MarkPoint(SdrHdl& rHdl, sal_Bool bUnmark=sal_False); virtual void CheckPossibilities(); - virtual BOOL MarkPoints(const ::Rectangle* pRect, BOOL bUnmark); + virtual sal_Bool MarkPoints(const ::Rectangle* pRect, sal_Bool bUnmark); using SdrMarkView::MarkPoints; void SetPossibilitiesDirty() { bPossibilitiesDirty = true; } @@ -219,13 +219,13 @@ protected: SdrMarkList* mpDragSrcMarkList; SdrObject* mpDropMarkerObj; SdrDropMarkerOverlay* mpDropMarker; - USHORT mnDragSrcPgNum; + sal_uInt16 mnDragSrcPgNum; Point maDropPos; ::std::vector< String > maDropFileVector; sal_Int8 mnAction; Timer maDropErrorTimer; Timer maDropInsertFileTimer; - USHORT mnLockRedrawSmph; + sal_uInt16 mnLockRedrawSmph; List* mpLockedRedraws; bool mbIsDropAllowed; diff --git a/sd/source/ui/inc/ViewClipboard.hxx b/sd/source/ui/inc/ViewClipboard.hxx index 216c4e8c1dbe..00f68f6a4218 100644..100755 --- a/sd/source/ui/inc/ViewClipboard.hxx +++ b/sd/source/ui/inc/ViewClipboard.hxx @@ -70,7 +70,7 @@ protected: /** Return an index of a page after which the pages of the transferable are to be inserted into the target document. */ - virtual USHORT DetermineInsertPosition ( + virtual sal_uInt16 DetermineInsertPosition ( const SdTransferable& rTransferable); /** Insert the slides in the given transferable behind the last selected @@ -83,9 +83,9 @@ protected: @return Returns the number of inserted slides. */ - virtual USHORT InsertSlides ( + virtual sal_uInt16 InsertSlides ( const SdTransferable& rTransferable, - USHORT nInsertPosition); + sal_uInt16 nInsertPosition); }; } // end of namespace ::sd diff --git a/sd/source/ui/inc/ViewShell.hxx b/sd/source/ui/inc/ViewShell.hxx index 195e323f579d..fa4aed19b2ba 100755 --- a/sd/source/ui/inc/ViewShell.hxx +++ b/sd/source/ui/inc/ViewShell.hxx @@ -121,8 +121,8 @@ public: static const int MAX_VSPLIT_CNT = 1; static const int MIN_SCROLLBAR_SIZE = 50; - static const ULONG OUTPUT_DRAWMODE_COLOR = DRAWMODE_DEFAULT; - static const ULONG OUTPUT_DRAWMODE_GRAYSCALE + static const sal_uLong OUTPUT_DRAWMODE_COLOR = DRAWMODE_DEFAULT; + static const sal_uLong OUTPUT_DRAWMODE_GRAYSCALE = DRAWMODE_GRAYLINE | DRAWMODE_GRAYFILL | DRAWMODE_BLACKTEXT | DRAWMODE_GRAYBITMAP | DRAWMODE_GRAYGRADIENT; @@ -201,12 +201,12 @@ public: // Mouse- & Key-Events virtual void PrePaint(); virtual void Paint (const Rectangle& rRect, ::sd::Window* pWin); - virtual BOOL KeyInput(const KeyEvent& rKEvt, ::sd::Window* pWin); + virtual sal_Bool KeyInput(const KeyEvent& rKEvt, ::sd::Window* pWin); virtual void MouseMove(const MouseEvent& rMEvt, ::sd::Window* pWin); virtual void MouseButtonUp(const MouseEvent& rMEvt, ::sd::Window* pWin); virtual void MouseButtonDown(const MouseEvent& rMEvt, ::sd::Window* pWin); virtual void Command(const CommandEvent& rCEvt, ::sd::Window* pWin); - virtual BOOL RequestHelp( const HelpEvent& rEvt, ::sd::Window* pWin ); + virtual sal_Bool RequestHelp( const HelpEvent& rEvt, ::sd::Window* pWin ); virtual long Notify( NotifyEvent& rNEvt, ::sd::Window* pWin ); virtual bool HandleScrollCommand(const CommandEvent& rCEvt, ::sd::Window* pWin); @@ -214,10 +214,10 @@ public: virtual void Draw(OutputDevice &rDev, const Region &rReg); virtual void SetUIUnit(FieldUnit eUnit); - virtual void SetDefTabHRuler( UINT16 nDefTab ); + virtual void SetDefTabHRuler( sal_uInt16 nDefTab ); - BOOL HasRuler (void); - void SetRuler(BOOL bRuler); + sal_Bool HasRuler (void); + void SetRuler(sal_Bool bRuler); /** Set internal values of all scroll bars that determine thumb size and position. The external values like size and position of the scroll @@ -229,13 +229,13 @@ public: virtual void SetZoom(long nZoom); virtual void SetZoomRect(const Rectangle& rZoomRect); void InitWindows(const Point& rViewOrigin, const Size& rViewSize, - const Point& rWinPos, BOOL bUpdate = FALSE); + const Point& rWinPos, sal_Bool bUpdate = sal_False); void InvalidateWindows(); /** This method is still used by the OutlineViewShell to update the model according to the content of the outline view. This in turn updates the previews in the slide sorter. */ - virtual void UpdatePreview (SdPage* pPage, BOOL bInit = FALSE); + virtual void UpdatePreview (SdPage* pPage, sal_Bool bInit = sal_False); void DrawMarkRect(const Rectangle& rRect) const; @@ -255,7 +255,7 @@ public: virtual void WriteUserData(String& rString); virtual void ReadUserData(const String& rString); - virtual BOOL ActivateObject(SdrOle2Obj* pObj, long nVerb); + virtual sal_Bool ActivateObject(SdrOle2Obj* pObj, long nVerb); /** @returns current or selected page or 0. This method @@ -273,7 +273,7 @@ public: FunctionReference GetOldFunction() const { return mxOldFunction; } bool HasOldFunction() const { return mxOldFunction.is(); } FunctionReference GetCurrentFunction() const { return mxCurrentFunction; } - bool HasCurrentFunction( USHORT nSID ) { return mxCurrentFunction.is() && (mxCurrentFunction->GetSlotID() == nSID ); } + bool HasCurrentFunction( sal_uInt16 nSID ) { return mxCurrentFunction.is() && (mxCurrentFunction->GetSlotID() == nSID ); } bool HasCurrentFunction() { return mxCurrentFunction.is(); } void SetCurrentFunction(const FunctionReference& xFunction); @@ -282,26 +282,26 @@ public: void SetPageSizeAndBorder(PageKind ePageKind, const Size& rNewSize, long nLeft, long nRight, long nUpper, long nLower, - BOOL bScaleAll, Orientation eOrient, USHORT nPaperBin, - BOOL bBackgroundFullSize ); + sal_Bool bScaleAll, Orientation eOrient, sal_uInt16 nPaperBin, + sal_Bool bBackgroundFullSize ); - void SetStartShowWithDialog( BOOL bIn = TRUE ) { mbStartShowWithDialog = bIn; } - BOOL IsStartShowWithDialog() const { return mbStartShowWithDialog; } + void SetStartShowWithDialog( sal_Bool bIn = sal_True ) { mbStartShowWithDialog = bIn; } + sal_Bool IsStartShowWithDialog() const { return mbStartShowWithDialog; } - USHORT GetPrintedHandoutPageNum (void) const { return mnPrintedHandoutPageNum; } - void SetPrintedHandoutPageNum (USHORT nPageNumber) {mnPrintedHandoutPageNum=nPageNumber; } + sal_uInt16 GetPrintedHandoutPageNum (void) const { return mnPrintedHandoutPageNum; } + void SetPrintedHandoutPageNum (sal_uInt16 nPageNumber) {mnPrintedHandoutPageNum=nPageNumber; } - USHORT GetPrintedHandoutPageCount(void) const { return mnPrintedHandoutPageCount; } - void SetPrintedHandoutPageCount (USHORT nPageCount) {mnPrintedHandoutPageCount=nPageCount; } + sal_uInt16 GetPrintedHandoutPageCount(void) const { return mnPrintedHandoutPageCount; } + void SetPrintedHandoutPageCount (sal_uInt16 nPageCount) {mnPrintedHandoutPageCount=nPageCount; } - virtual USHORT PrepareClose( BOOL bUI = TRUE, BOOL bForBrowsing = FALSE ); + virtual sal_uInt16 PrepareClose( sal_Bool bUI = sal_True, sal_Bool bForBrowsing = sal_False ); void GetMenuState(SfxItemSet& rSet); virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt, DropTargetHelper& rTargetHelper, - ::sd::Window* pTargetWindow, USHORT nPage, USHORT nLayer ); + ::sd::Window* pTargetWindow, sal_uInt16 nPage, sal_uInt16 nLayer ); virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt, DropTargetHelper& rTargetHelper, - ::sd::Window* pTargetWindow, USHORT nPage, USHORT nLayer ); + ::sd::Window* pTargetWindow, sal_uInt16 nPage, sal_uInt16 nLayer ); virtual void WriteUserDataSequence ( ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, sal_Bool bBrowse = sal_False ); virtual void ReadUserDataSequence ( const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, sal_Bool bBrowse = sal_False ); @@ -430,7 +430,7 @@ public: As a result the border is adapted. */ virtual void ShowUIControls (bool bVisible = true); - BOOL IsPageFlipMode(void) const; + sal_Bool IsPageFlipMode(void) const; /** Set the given window as new parent window. This is not possible for all views, so the return value tells the caller if the relocation @@ -509,13 +509,13 @@ protected: Size maViewSize; Size maScrBarWH; - BOOL mbCenterAllowed; // wird an Fenster weitergegeben + sal_Bool mbCenterAllowed; // wird an Fenster weitergegeben - BOOL mbStartShowWithDialog; // Praesentation wurde ueber Dialog gestartet - USHORT mnPrintedHandoutPageNum; // Page number of the handout page that is to be printed. - USHORT mnPrintedHandoutPageCount; // Page count of the handout pages that are to be printed. + sal_Bool mbStartShowWithDialog; // Praesentation wurde ueber Dialog gestartet + sal_uInt16 mnPrintedHandoutPageNum; // Page number of the handout page that is to be printed. + sal_uInt16 mnPrintedHandoutPageCount; // Page count of the handout pages that are to be printed. - //af BOOL bPrintDirectSelected; // Print only selected objects in direct print + //af sal_Bool bPrintDirectSelected; // Print only selected objects in direct print //afString sPageRange; // pagerange if selected objects in direct print /** Area covered by all windows, i.e. the area of the parent window @@ -537,8 +537,8 @@ protected: virtual ::svl::IUndoManager* ImpGetUndoManager (void) const; void ImpGetUndoStrings(SfxItemSet &rSet) const; void ImpGetRedoStrings(SfxItemSet &rSet) const; - void ImpSidUndo(BOOL bDrawViewShell, SfxRequest& rReq); - void ImpSidRedo(BOOL bDrawViewShell, SfxRequest& rReq); + void ImpSidUndo(sal_Bool bDrawViewShell, SfxRequest& rReq); + void ImpSidRedo(sal_Bool bDrawViewShell, SfxRequest& rReq); DECL_LINK( HScrollHdl, ScrollBar * ); DECL_LINK( VScrollHdl, ScrollBar * ); @@ -548,7 +548,7 @@ protected: virtual long VirtVScrollHdl(ScrollBar* pVScroll); // virtuelle Funktionen fuer Lineal-Handling - virtual SvxRuler* CreateHRuler(::sd::Window* pWin, BOOL bIsFirst); + virtual SvxRuler* CreateHRuler(::sd::Window* pWin, sal_Bool bIsFirst); virtual SvxRuler* CreateVRuler(::sd::Window* pWin); virtual void UpdateHRuler(); virtual void UpdateVRuler(); @@ -557,8 +557,8 @@ protected: // abgeleiteter Klassen (z.B. ein TabBar) zurueckgeben virtual long GetHCtrlWidth(); - virtual void Activate(BOOL IsMDIActivate); - virtual void Deactivate(BOOL IsMDIActivate); + virtual void Activate(sal_Bool IsMDIActivate); + virtual void Deactivate(sal_Bool IsMDIActivate); virtual void SetZoomFactor( const Fraction &rZoomX, const Fraction &rZoomY ); diff --git a/sd/source/ui/inc/ViewShellBase.hxx b/sd/source/ui/inc/ViewShellBase.hxx index 2d1ae6404108..338dbce75beb 100755 --- a/sd/source/ui/inc/ViewShellBase.hxx +++ b/sd/source/ui/inc/ViewShellBase.hxx @@ -136,12 +136,12 @@ public: virtual com::sun::star::uno::Reference<com::sun::star::view::XRenderable> GetRenderable (void); /// Forwarded to the print manager. - virtual SfxPrinter* GetPrinter (BOOL bCreate = FALSE); + virtual SfxPrinter* GetPrinter (sal_Bool bCreate = sal_False); /// Forwarded to the print manager. - virtual USHORT SetPrinter ( + virtual sal_uInt16 SetPrinter ( SfxPrinter* pNewPrinter, - USHORT nDiffFlags = SFX_PRINTER_ALL, bool bIsApi=false); + sal_uInt16 nDiffFlags = SFX_PRINTER_ALL, bool bIsApi=false); /// Forwarded to the print manager. virtual SfxTabPage* CreatePrintOptionsPage ( @@ -165,14 +165,14 @@ public: virtual void UIActivating( SfxInPlaceClient* ); virtual void UIDeactivated( SfxInPlaceClient* ); - virtual void Activate (BOOL IsMDIActivate); - virtual void Deactivate (BOOL IsMDIActivate); + virtual void Activate (sal_Bool IsMDIActivate); + virtual void Deactivate (sal_Bool IsMDIActivate); virtual void SetZoomFactor ( const Fraction &rZoomX, const Fraction &rZoomY); - virtual USHORT PrepareClose (BOOL bUI = TRUE, BOOL bForBrowsing = FALSE); - virtual void WriteUserData (String&, BOOL bBrowse = FALSE); - virtual void ReadUserData (const String&, BOOL bBrowse = FALSE); + virtual sal_uInt16 PrepareClose (sal_Bool bUI = sal_True, sal_Bool bForBrowsing = sal_False); + virtual void WriteUserData (String&, sal_Bool bBrowse = sal_False); + virtual void ReadUserData (const String&, sal_Bool bBrowse = sal_False); virtual SdrView* GetDrawView (void) const; virtual void AdjustPosSizePixel (const Point &rOfs, const Size &rSize); diff --git a/sd/source/ui/inc/ViewTabControl.hxx b/sd/source/ui/inc/ViewTabControl.hxx index 4009edfd04d4..91ae38effa35 100644..100755 --- a/sd/source/ui/inc/ViewTabControl.hxx +++ b/sd/source/ui/inc/ViewTabControl.hxx @@ -64,7 +64,7 @@ public: protected: DrawViewShell* pDrViewSh; - BOOL bInternalMove; + sal_Bool bInternalMove; // TabBar virtual void Select(); diff --git a/sd/source/ui/inc/Window.hxx b/sd/source/ui/inc/Window.hxx index 8dd522d8212d..471f1f9dc6d5 100755 --- a/sd/source/ui/inc/Window.hxx +++ b/sd/source/ui/inc/Window.hxx @@ -139,7 +139,7 @@ public: larger than the view or the value of aWinPos in this direction is -1 then the window is centered in this direction. */ - void UpdateMapOrigin (BOOL bInvalidate = TRUE); + void UpdateMapOrigin (sal_Bool bInvalidate = sal_True); void UpdateMapMode (void); @@ -170,11 +170,11 @@ protected: Point maWinPos; Point maViewOrigin; Size maViewSize; - USHORT mnMinZoom; - USHORT mnMaxZoom; + sal_uInt16 mnMinZoom; + sal_uInt16 mnMaxZoom; /** This flag tells whether to re-calculate the minimal zoom factor depening on the current zoom factor. According to task #105436# its - default value is now FALSE. + default value is now sal_False. */ bool mbMinZoomAutoCalc; bool mbCalcMinZoomByMinSide; diff --git a/sd/source/ui/inc/animobjs.hxx b/sd/source/ui/inc/animobjs.hxx index 7a7a34362c48..030f0a3eb845 100755 --- a/sd/source/ui/inc/animobjs.hxx +++ b/sd/source/ui/inc/animobjs.hxx @@ -110,7 +110,7 @@ public: virtual void DataChanged( const DataChangedEvent& rDCEvt ); protected: - virtual BOOL Close(); + virtual sal_Bool Close(); virtual void Resize(); virtual void FillInfo( SfxChildWinInfo& ) const; @@ -150,8 +150,8 @@ private: Size aFltWinSize; Size aDisplaySize; Size aBmpSize; - BOOL bMovie; - BOOL bAllObjects; + sal_Bool bMovie; + sal_Bool bAllObjects; SfxBindings* pBindings; AnimationControllerItem* pControllerItem; @@ -170,9 +170,9 @@ private: DECL_LINK( ModifyBitmapHdl, void * ); DECL_LINK( ModifyTimeHdl, void * ); - void UpdateControl( ULONG nPos, BOOL bDisableCtrls = FALSE ); + void UpdateControl( sal_uLong nPos, sal_Bool bDisableCtrls = sal_False ); void ResetAttrs(); - void WaitInEffect( ULONG nMilliSeconds, ULONG nTime, + void WaitInEffect( sal_uLong nMilliSeconds, sal_uLong nTime, SfxProgress* pStbMgr ) const; Fraction GetScale(); }; @@ -187,10 +187,10 @@ class AnimationControllerItem : public SfxControllerItem { public: - AnimationControllerItem( USHORT, AnimationWindow*, SfxBindings* ); + AnimationControllerItem( sal_uInt16, AnimationWindow*, SfxBindings* ); protected: - virtual void StateChanged( USHORT nSId, SfxItemState eState, + virtual void StateChanged( sal_uInt16 nSId, SfxItemState eState, const SfxPoolItem* pState ); private: AnimationWindow* pAnimationWin; diff --git a/sd/source/ui/inc/bmcache.hxx b/sd/source/ui/inc/bmcache.hxx index c04f7d2ed2c4..7d845694fb6e 100755 --- a/sd/source/ui/inc/bmcache.hxx +++ b/sd/source/ui/inc/bmcache.hxx @@ -36,12 +36,12 @@ class GraphicObject; class BitmapCache { - ULONG nMaxSize; - ULONG nCurSize; + sal_uLong nMaxSize; + sal_uLong nCurSize; List aEntries; public: - BitmapCache(ULONG nMaxSizeKB) + BitmapCache(sal_uLong nMaxSizeKB) : nMaxSize(nMaxSizeKB), nCurSize(0) {} virtual ~BitmapCache(); diff --git a/sd/source/ui/inc/celltempl.hxx b/sd/source/ui/inc/celltempl.hxx index e0c6262d603a..b194f23fec63 100644..100755 --- a/sd/source/ui/inc/celltempl.hxx +++ b/sd/source/ui/inc/celltempl.hxx @@ -45,7 +45,7 @@ private: XHatchList* mpHatchingList; XBitmapList* mpBitmapList; - virtual void PageCreated( USHORT nId, SfxTabPage &rPage ); + virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ); virtual const SfxItemSet* GetRefreshedSet(); public: diff --git a/sd/source/ui/inc/custsdlg.hxx b/sd/source/ui/inc/custsdlg.hxx index 020232ddced3..764baccefd54 100644..100755 --- a/sd/source/ui/inc/custsdlg.hxx +++ b/sd/source/ui/inc/custsdlg.hxx @@ -59,7 +59,7 @@ private: SdDrawDocument& rDoc; List* pCustomShowList; SdCustomShow* pCustomShow; - BOOL bModified; + sal_Bool bModified; void CheckState(); @@ -70,8 +70,8 @@ public: SdCustomShowDlg( Window* pWindow, SdDrawDocument& rDrawDoc ); ~SdCustomShowDlg(); - BOOL IsModified() const { return( bModified ); } - BOOL IsCustomShow() const; + sal_Bool IsModified() const { return( bModified ); } + sal_Bool IsCustomShow() const; }; @@ -94,7 +94,7 @@ private: SdDrawDocument& rDoc; SdCustomShow*& rpCustomShow; - BOOL bModified; + sal_Bool bModified; String aOldName; void CheckState(); @@ -109,7 +109,7 @@ public: SdDrawDocument& rDrawDoc, SdCustomShow*& rpCS ); ~SdDefineCustomShowDlg(); - BOOL IsModified() const { return( bModified ); } + sal_Bool IsModified() const { return( bModified ); } }; #endif // _SD_CUSTSDLG_HXX diff --git a/sd/source/ui/inc/diactrl.hxx b/sd/source/ui/inc/diactrl.hxx index a5da8b4a10fc..182990a89690 100644..100755 --- a/sd/source/ui/inc/diactrl.hxx +++ b/sd/source/ui/inc/diactrl.hxx @@ -64,13 +64,13 @@ public: class SdTbxCtlDiaPages : public SfxToolBoxControl { public: - virtual void StateChanged( USHORT nSID, SfxItemState eState, + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); virtual Window* CreateItemWindow( Window *pParent ); SFX_DECL_TOOLBOX_CONTROL(); - SdTbxCtlDiaPages( USHORT nSlotId, USHORT nId, ToolBox& rTbx ); + SdTbxCtlDiaPages( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); ~SdTbxCtlDiaPages(); }; diff --git a/sd/source/ui/inc/dlg_char.hxx b/sd/source/ui/inc/dlg_char.hxx index a427157c997c..3ac15dc6ef1d 100644..100755 --- a/sd/source/ui/inc/dlg_char.hxx +++ b/sd/source/ui/inc/dlg_char.hxx @@ -48,7 +48,7 @@ private: const SfxItemSet& rOutAttrs; const SfxObjectShell& rDocShell; - virtual void PageCreated( USHORT nId, SfxTabPage &rPage ); + virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ); public: diff --git a/sd/source/ui/inc/dlgass.hxx b/sd/source/ui/inc/dlgass.hxx index 523b86cf66a8..c4d70ba6d127 100755 --- a/sd/source/ui/inc/dlgass.hxx +++ b/sd/source/ui/inc/dlgass.hxx @@ -58,19 +58,19 @@ private: AssistentDlgImpl* mpImpl; public: - AssistentDlg(Window* pParent, BOOL bAutoPilot); + AssistentDlg(Window* pParent, sal_Bool bAutoPilot); ~AssistentDlg(); DECL_LINK( FinishHdl, OKButton * ); SfxObjectShellLock GetDocument(); OutputType GetOutputMedium() const; - BOOL IsSummary() const; + sal_Bool IsSummary() const; StartType GetStartType() const; String GetDocPath() const; - BOOL GetStartWithFlag() const; + sal_Bool GetStartWithFlag() const; - BOOL IsDocEmpty() const; + sal_Bool IsDocEmpty() const; String GetPassword(); }; diff --git a/sd/source/ui/inc/dlgpage.hxx b/sd/source/ui/inc/dlgpage.hxx index 1b462f284386..3b12652b0ea2 100644..100755 --- a/sd/source/ui/inc/dlgpage.hxx +++ b/sd/source/ui/inc/dlgpage.hxx @@ -38,7 +38,7 @@ class XGradientList; class XHatchList; class XBitmapList; -typedef USHORT ChangeType; +typedef sal_uInt16 ChangeType; /************************************************************************* |* @@ -58,10 +58,10 @@ private: XBitmapList* mpBitmapList; public: - SdPageDlg( SfxObjectShell* pDocSh, Window* pParent, const SfxItemSet* pAttr, BOOL bAreaPage = TRUE ); + SdPageDlg( SfxObjectShell* pDocSh, Window* pParent, const SfxItemSet* pAttr, sal_Bool bAreaPage = sal_True ); ~SdPageDlg() {}; - virtual void PageCreated(USHORT nId, SfxTabPage& rPage); + virtual void PageCreated(sal_uInt16 nId, SfxTabPage& rPage); }; #endif // _SD_DLGPAGE_HXX diff --git a/sd/source/ui/inc/dlgsnap.hxx b/sd/source/ui/inc/dlgsnap.hxx index 6362d1e476a2..4ff9e92adcb5 100755 --- a/sd/source/ui/inc/dlgsnap.hxx +++ b/sd/source/ui/inc/dlgsnap.hxx @@ -93,7 +93,7 @@ public: void HideRadioGroup(); void HideDeleteBtn() { aBtnDelete.Hide(); } - void SetInputFields(BOOL bEnableX, BOOL bEnableY); + void SetInputFields(sal_Bool bEnableX, sal_Bool bEnableY); }; diff --git a/sd/source/ui/inc/docprev.hxx b/sd/source/ui/inc/docprev.hxx index 76b8fe06f318..de0b2e38fd78 100755 --- a/sd/source/ui/inc/docprev.hxx +++ b/sd/source/ui/inc/docprev.hxx @@ -49,7 +49,7 @@ class SD_DLLPUBLIC SdDocPreviewWin : public Control, public SfxListener { protected: GDIMetaFile* pMetaFile; - BOOL bInEffect; + sal_Bool bInEffect; Link aClickHdl; SfxObjectShell* mpObj; sal_uInt16 mnShowPage; diff --git a/sd/source/ui/inc/drawview.hxx b/sd/source/ui/inc/drawview.hxx index f2b621814c49..e4b5eb00cfbb 100644..100755 --- a/sd/source/ui/inc/drawview.hxx +++ b/sd/source/ui/inc/drawview.hxx @@ -60,14 +60,14 @@ public: virtual void MarkListHasChanged(); void CompleteRedraw(OutputDevice* pOutDev, const Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector = 0L); - virtual BOOL SetAttributes(const SfxItemSet& rSet, BOOL bReplaceAll = FALSE); + virtual sal_Bool SetAttributes(const SfxItemSet& rSet, sal_Bool bReplaceAll = sal_False); virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint); - void BlockPageOrderChangedHint(BOOL bBlock); + void BlockPageOrderChangedHint(sal_Bool bBlock); - BOOL SetStyleSheet(SfxStyleSheet* pStyleSheet, BOOL bDontRemoveHardAttr = FALSE); - virtual BOOL IsObjMarkable(SdrObject* pObj, SdrPageView* pPV) const; + sal_Bool SetStyleSheet(SfxStyleSheet* pStyleSheet, sal_Bool bDontRemoveHardAttr = sal_False); + virtual sal_Bool IsObjMarkable(SdrObject* pObj, SdrPageView* pPV) const; virtual void MakeVisible(const Rectangle& rRect, ::Window& rWin); virtual void HideSdrPage(); // SdrPageView* pPV); @@ -85,7 +85,7 @@ private: DrawViewShell* mpDrawViewShell; VirtualDevice* mpVDev; - USHORT mnPOCHSmph; // zum blockieren des PageOrderChangedHint + sal_uInt16 mnPOCHSmph; // zum blockieren des PageOrderChangedHint }; } // end of namespace sd diff --git a/sd/source/ui/inc/framework/Configuration.hxx b/sd/source/ui/inc/framework/Configuration.hxx index 57a6c838feab..57a6c838feab 100644..100755 --- a/sd/source/ui/inc/framework/Configuration.hxx +++ b/sd/source/ui/inc/framework/Configuration.hxx diff --git a/sd/source/ui/inc/framework/FrameworkHelper.hxx b/sd/source/ui/inc/framework/FrameworkHelper.hxx index 6ecdeaf31e7e..723cd9f4fabf 100755 --- a/sd/source/ui/inc/framework/FrameworkHelper.hxx +++ b/sd/source/ui/inc/framework/FrameworkHelper.hxx @@ -239,7 +239,7 @@ public: /** Process a slot call that requests a view shell change. */ void HandleModeChangeSlot ( - ULONG nSlotId, + sal_uLong nSlotId, SfxRequest& rRequest); /** Run the given callback when the specified event is notified by the diff --git a/sd/source/ui/inc/framework/Pane.hxx b/sd/source/ui/inc/framework/Pane.hxx index f12f0ca118f0..f12f0ca118f0 100644..100755 --- a/sd/source/ui/inc/framework/Pane.hxx +++ b/sd/source/ui/inc/framework/Pane.hxx diff --git a/sd/source/ui/inc/fucon3d.hxx b/sd/source/ui/inc/fucon3d.hxx index cb1f17d4131d..d5b47fd2bc28 100644..100755 --- a/sd/source/ui/inc/fucon3d.hxx +++ b/sd/source/ui/inc/fucon3d.hxx @@ -47,10 +47,10 @@ public: virtual void DoExecute( SfxRequest& rReq ); // Mouse- & Key-Events - virtual BOOL KeyInput(const KeyEvent& rKEvt); - virtual BOOL MouseMove(const MouseEvent& rMEvt); - virtual BOOL MouseButtonUp(const MouseEvent& rMEvt); - virtual BOOL MouseButtonDown(const MouseEvent& rMEvt); + virtual sal_Bool KeyInput(const KeyEvent& rKEvt); + virtual sal_Bool MouseMove(const MouseEvent& rMEvt); + virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt); + virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt); virtual void Activate(); // Function aktivieren virtual void Deactivate(); // Function deaktivieren diff --git a/sd/source/ui/inc/fuconarc.hxx b/sd/source/ui/inc/fuconarc.hxx index 24cf0d46e85f..6d333d96c0b3 100644..100755 --- a/sd/source/ui/inc/fuconarc.hxx +++ b/sd/source/ui/inc/fuconarc.hxx @@ -43,10 +43,10 @@ public: virtual void DoExecute( SfxRequest& rReq ); // Mouse- & Key-Events - virtual BOOL KeyInput(const KeyEvent& rKEvt); - virtual BOOL MouseMove(const MouseEvent& rMEvt); - virtual BOOL MouseButtonUp(const MouseEvent& rMEvt); - virtual BOOL MouseButtonDown(const MouseEvent& rMEvt); + virtual sal_Bool KeyInput(const KeyEvent& rKEvt); + virtual sal_Bool MouseMove(const MouseEvent& rMEvt); + virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt); + virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt); virtual void Activate(); // Function aktivieren virtual void Deactivate(); // Function deaktivieren diff --git a/sd/source/ui/inc/fuconbez.hxx b/sd/source/ui/inc/fuconbez.hxx index 0bf18a20a5da..f5597a7d9053 100644..100755 --- a/sd/source/ui/inc/fuconbez.hxx +++ b/sd/source/ui/inc/fuconbez.hxx @@ -50,18 +50,18 @@ public: virtual void DoExecute( SfxRequest& rReq ); // Mouse- & Key-Events - virtual BOOL KeyInput(const KeyEvent& rKEvt); - virtual BOOL MouseMove(const MouseEvent& rMEvt); - virtual BOOL MouseButtonUp(const MouseEvent& rMEvt); - virtual BOOL MouseButtonDown(const MouseEvent& rMEvt); + virtual sal_Bool KeyInput(const KeyEvent& rKEvt); + virtual sal_Bool MouseMove(const MouseEvent& rMEvt); + virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt); + virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt); virtual void Activate(); // Function aktivieren virtual void Deactivate(); // Function deaktivieren virtual void SelectionHasChanged(); - void SetEditMode(USHORT nMode); - USHORT GetEditMode() { return nEditMode; } + void SetEditMode(sal_uInt16 nMode); + sal_uInt16 GetEditMode() { return nEditMode; } // #97016# virtual SdrObject* CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rRectangle); @@ -74,7 +74,7 @@ protected: SdDrawDocument* pDoc, SfxRequest& rReq); - USHORT nEditMode; + sal_uInt16 nEditMode; ::com::sun::star::uno::Any maTargets; // used for creating a path for custom animations }; diff --git a/sd/source/ui/inc/fuconcs.hxx b/sd/source/ui/inc/fuconcs.hxx index da96a4d1ddfd..064461ff201a 100644..100755 --- a/sd/source/ui/inc/fuconcs.hxx +++ b/sd/source/ui/inc/fuconcs.hxx @@ -54,10 +54,10 @@ public: virtual void DoExecute( SfxRequest& rReq ); // Mouse- & Key-Events - virtual BOOL KeyInput(const KeyEvent& rKEvt); - virtual BOOL MouseMove(const MouseEvent& rMEvt); - virtual BOOL MouseButtonUp(const MouseEvent& rMEvt); - virtual BOOL MouseButtonDown(const MouseEvent& rMEvt); + virtual sal_Bool KeyInput(const KeyEvent& rKEvt); + virtual sal_Bool MouseMove(const MouseEvent& rMEvt); + virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt); + virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt); virtual void Activate(); // Function aktivieren diff --git a/sd/source/ui/inc/fuconrec.hxx b/sd/source/ui/inc/fuconrec.hxx index 3c2846c47037..b3b24cce37ed 100644..100755 --- a/sd/source/ui/inc/fuconrec.hxx +++ b/sd/source/ui/inc/fuconrec.hxx @@ -54,10 +54,10 @@ public: virtual void DoExecute( SfxRequest& rReq ); // Mouse- & Key-Events - virtual BOOL KeyInput(const KeyEvent& rKEvt); - virtual BOOL MouseMove(const MouseEvent& rMEvt); - virtual BOOL MouseButtonUp(const MouseEvent& rMEvt); - virtual BOOL MouseButtonDown(const MouseEvent& rMEvt); + virtual sal_Bool KeyInput(const KeyEvent& rKEvt); + virtual sal_Bool MouseMove(const MouseEvent& rMEvt); + virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt); + virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt); virtual void Activate(); // Function aktivieren virtual void Deactivate(); // Function deaktivieren diff --git a/sd/source/ui/inc/fuconstr.hxx b/sd/source/ui/inc/fuconstr.hxx index 390060a16e3c..e9fde8168233 100755 --- a/sd/source/ui/inc/fuconstr.hxx +++ b/sd/source/ui/inc/fuconstr.hxx @@ -53,15 +53,15 @@ public: virtual void DoExecute( SfxRequest& rReq ); // Mouse- & Key-Events - virtual BOOL KeyInput(const KeyEvent& rKEvt); - virtual BOOL MouseMove(const MouseEvent& rMEvt); - virtual BOOL MouseButtonUp(const MouseEvent& rMEvt); - virtual BOOL MouseButtonDown(const MouseEvent& rMEvt); + virtual sal_Bool KeyInput(const KeyEvent& rKEvt); + virtual sal_Bool MouseMove(const MouseEvent& rMEvt); + virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt); + virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt); virtual void Activate(); // Function aktivieren virtual void Deactivate(); // Function deaktivieren - virtual void SelectionHasChanged() { bSelectionChanged = TRUE; } + virtual void SelectionHasChanged() { bSelectionChanged = sal_True; } // SJ: setting stylesheet, the use of a filled or unfilled style // is determined by the member nSlotId : diff --git a/sd/source/ui/inc/fuconuno.hxx b/sd/source/ui/inc/fuconuno.hxx index be7e83065bc0..4b55f6f150c9 100644..100755 --- a/sd/source/ui/inc/fuconuno.hxx +++ b/sd/source/ui/inc/fuconuno.hxx @@ -49,10 +49,10 @@ public: virtual void DoExecute( SfxRequest& rReq ); // Mouse- & Key-Events - virtual BOOL KeyInput(const KeyEvent& rKEvt); - virtual BOOL MouseMove(const MouseEvent& rMEvt); - virtual BOOL MouseButtonUp(const MouseEvent& rMEvt); - virtual BOOL MouseButtonDown(const MouseEvent& rMEvt); + virtual sal_Bool KeyInput(const KeyEvent& rKEvt); + virtual sal_Bool MouseMove(const MouseEvent& rMEvt); + virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt); + virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt); virtual void Activate(); // Function aktivieren virtual void Deactivate(); // Function deaktivieren @@ -71,8 +71,8 @@ protected: String aOldLayer; private: - UINT32 nInventor; - UINT16 nIdentifier; + sal_uInt32 nInventor; + sal_uInt16 nIdentifier; }; } // end of namespace sd diff --git a/sd/source/ui/inc/fudraw.hxx b/sd/source/ui/inc/fudraw.hxx index 23f68eda327b..8a36ad16fcb4 100755 --- a/sd/source/ui/inc/fudraw.hxx +++ b/sd/source/ui/inc/fudraw.hxx @@ -50,11 +50,11 @@ class FuDraw public: TYPEINFO(); - virtual BOOL KeyInput(const KeyEvent& rKEvt); - virtual BOOL MouseMove(const MouseEvent& rMEvt); - virtual BOOL MouseButtonUp(const MouseEvent& rMEvt); - virtual BOOL MouseButtonDown(const MouseEvent& rMEvt); - virtual BOOL RequestHelp(const HelpEvent& rHEvt); + virtual sal_Bool KeyInput(const KeyEvent& rKEvt); + virtual sal_Bool MouseMove(const MouseEvent& rMEvt); + virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt); + virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt); + virtual sal_Bool RequestHelp(const HelpEvent& rHEvt); virtual void ScrollStart(); virtual void ScrollEnd(); @@ -66,10 +66,10 @@ public: virtual void DoubleClick(const MouseEvent& rMEvt); - BOOL SetPointer(SdrObject* pObj, const Point& rPos); - BOOL SetHelpText(SdrObject* pObj, const Point& rPos, const SdrViewEvent& rVEvt); + sal_Bool SetPointer(SdrObject* pObj, const Point& rPos); + sal_Bool SetHelpText(SdrObject* pObj, const Point& rPos, const SdrViewEvent& rVEvt); - void SetPermanent(BOOL bSet) { bPermanent = bSet; } + void SetPermanent(sal_Bool bSet) { bPermanent = bSet; } /** is called when the currenct function should be aborted. <p> This is used when a function gets a KEY_ESCAPE but can also @@ -90,10 +90,10 @@ protected: Pointer aNewPointer; Pointer aOldPointer; - BOOL bMBDown; - BOOL bDragHelpLine; - USHORT nHelpLine; - BOOL bPermanent; + sal_Bool bMBDown; + sal_Bool bDragHelpLine; + sal_uInt16 nHelpLine; + sal_Bool bPermanent; }; diff --git a/sd/source/ui/inc/fudspord.hxx b/sd/source/ui/inc/fudspord.hxx index 9ef00c2b7335..31719deccaaf 100644..100755 --- a/sd/source/ui/inc/fudspord.hxx +++ b/sd/source/ui/inc/fudspord.hxx @@ -52,9 +52,9 @@ public: static FunctionReference Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); // Mouse- & Key-Events - virtual BOOL MouseMove(const MouseEvent& rMEvt); - virtual BOOL MouseButtonUp(const MouseEvent& rMEvt); - virtual BOOL MouseButtonDown(const MouseEvent& rMEvt); + virtual sal_Bool MouseMove(const MouseEvent& rMEvt); + virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt); + virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt); virtual void Activate(); // Function aktivieren virtual void Deactivate(); // Function deaktivieren diff --git a/sd/source/ui/inc/fuediglu.hxx b/sd/source/ui/inc/fuediglu.hxx index badf58a1d631..3fcf51729bce 100644..100755 --- a/sd/source/ui/inc/fuediglu.hxx +++ b/sd/source/ui/inc/fuediglu.hxx @@ -48,11 +48,11 @@ public: virtual void DoExecute( SfxRequest& rReq ); // Mouse- & Key-Events - virtual BOOL KeyInput(const KeyEvent& rKEvt); - virtual BOOL MouseMove(const MouseEvent& rMEvt); - virtual BOOL MouseButtonUp(const MouseEvent& rMEvt); - virtual BOOL MouseButtonDown(const MouseEvent& rMEvt); - virtual BOOL Command(const CommandEvent& rCEvt); + virtual sal_Bool KeyInput(const KeyEvent& rKEvt); + virtual sal_Bool MouseMove(const MouseEvent& rMEvt); + virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt); + virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt); + virtual sal_Bool Command(const CommandEvent& rCEvt); virtual void ReceiveRequest(SfxRequest& rReq); virtual void Activate(); // Function aktivieren diff --git a/sd/source/ui/inc/fuformatpaintbrush.hxx b/sd/source/ui/inc/fuformatpaintbrush.hxx index 3e2524c98a2f..4d2f19f5fb65 100644..100755 --- a/sd/source/ui/inc/fuformatpaintbrush.hxx +++ b/sd/source/ui/inc/fuformatpaintbrush.hxx @@ -45,23 +45,23 @@ public: static FunctionReference Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); - virtual BOOL MouseMove(const MouseEvent& rMEvt); - virtual BOOL MouseButtonUp(const MouseEvent& rMEvt); - virtual BOOL MouseButtonDown(const MouseEvent& rMEvt); - virtual BOOL KeyInput(const KeyEvent& rKEvt); + virtual sal_Bool MouseMove(const MouseEvent& rMEvt); + virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt); + virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt); + virtual sal_Bool KeyInput(const KeyEvent& rKEvt); virtual void Activate(); virtual void Deactivate(); static void GetMenuState( DrawViewShell& rDrawViewShell, SfxItemSet &rSet ); - static bool CanCopyThisType( UINT32 nObjectInventor, UINT16 nObjectIdentifier ); + static bool CanCopyThisType( sal_uInt32 nObjectInventor, sal_uInt16 nObjectIdentifier ); private: FuFormatPaintBrush ( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq); void DoExecute( SfxRequest& rReq ); - bool HasContentForThisType( UINT32 nObjectInventor, UINT16 nObjectIdentifier ) const; + bool HasContentForThisType( sal_uInt32 nObjectInventor, sal_uInt16 nObjectIdentifier ) const; void Paste( bool, bool ); void implcancel(); diff --git a/sd/source/ui/inc/fuhhconv.hxx b/sd/source/ui/inc/fuhhconv.hxx index 6f8f9365ed1d..6bffd12f693c 100644..100755 --- a/sd/source/ui/inc/fuhhconv.hxx +++ b/sd/source/ui/inc/fuhhconv.hxx @@ -44,12 +44,12 @@ class FuHangulHanjaConversion : public FuPoor static FunctionReference Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); - void StartConversion( INT16 nSourceLanguage, INT16 nTargetLanguage, - const Font *pTargetFont, INT32 nOptions, BOOL bIsInteractive ); + void StartConversion( sal_Int16 nSourceLanguage, sal_Int16 nTargetLanguage, + const Font *pTargetFont, sal_Int32 nOptions, sal_Bool bIsInteractive ); void StartChineseConversion(); - void ConvertStyles( INT16 nTargetLanguage, const Font *pTargetFont ); + void ConvertStyles( sal_Int16 nTargetLanguage, const Font *pTargetFont ); Outliner* GetOutliner() const { return pSdOutliner; } @@ -57,7 +57,7 @@ class FuHangulHanjaConversion : public FuPoor ~FuHangulHanjaConversion(); Outliner* pSdOutliner; - BOOL bOwnOutliner; + sal_Bool bOwnOutliner; private: FuHangulHanjaConversion ( diff --git a/sd/source/ui/inc/fuinsfil.hxx b/sd/source/ui/inc/fuinsfil.hxx index b9f5589c5d2f..51964de71c54 100644..100755 --- a/sd/source/ui/inc/fuinsfil.hxx +++ b/sd/source/ui/inc/fuinsfil.hxx @@ -60,9 +60,9 @@ private: String aFile; // gewaehlter Dateiname void InsTextOrRTFinOlMode(SfxMedium* pMedium); - BOOL InsSDDinOlMode(SfxMedium* pMedium); + sal_Bool InsSDDinOlMode(SfxMedium* pMedium); void InsTextOrRTFinDrMode(SfxMedium* pMedium); - BOOL InsSDDinDrMode(SfxMedium* pMedium); + sal_Bool InsSDDinDrMode(SfxMedium* pMedium); }; } // end of namespace sd diff --git a/sd/source/ui/inc/fumorph.hxx b/sd/source/ui/inc/fumorph.hxx index 754fc81b1c92..53c84487d266 100644..100755 --- a/sd/source/ui/inc/fumorph.hxx +++ b/sd/source/ui/inc/fumorph.hxx @@ -61,7 +61,7 @@ private: SdDrawDocument* pDoc, SfxRequest& rReq); - void ImpInsertPolygons(List& rPolyPolyList3D, BOOL bAttributeFade, + void ImpInsertPolygons(List& rPolyPolyList3D, sal_Bool bAttributeFade, const SdrObject* pObj1, const SdrObject* pObj2); ::basegfx::B2DPolyPolygon* ImpCreateMorphedPolygon( const ::basegfx::B2DPolyPolygon& rPolyPolyStart, diff --git a/sd/source/ui/inc/fuoltext.hxx b/sd/source/ui/inc/fuoltext.hxx index 0a97767cedba..2ff04c77f922 100644..100755 --- a/sd/source/ui/inc/fuoltext.hxx +++ b/sd/source/ui/inc/fuoltext.hxx @@ -52,10 +52,10 @@ public: static FunctionReference Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); - virtual BOOL KeyInput(const KeyEvent& rKEvt); - virtual BOOL MouseMove(const MouseEvent& rMEvt); - virtual BOOL MouseButtonUp(const MouseEvent& rMEvt); - virtual BOOL MouseButtonDown(const MouseEvent& rMEvt); + virtual sal_Bool KeyInput(const KeyEvent& rKEvt); + virtual sal_Bool MouseMove(const MouseEvent& rMEvt); + virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt); + virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt); virtual void DoCut(); virtual void DoCopy(); diff --git a/sd/source/ui/inc/fuoutl.hxx b/sd/source/ui/inc/fuoutl.hxx index 92299387849a..6b1674654ff1 100755 --- a/sd/source/ui/inc/fuoutl.hxx +++ b/sd/source/ui/inc/fuoutl.hxx @@ -54,7 +54,7 @@ class FuOutline public: TYPEINFO(); - virtual BOOL Command(const CommandEvent& rCEvt); + virtual sal_Bool Command(const CommandEvent& rCEvt); virtual void ScrollStart(); virtual void ScrollEnd(); diff --git a/sd/source/ui/inc/fupoor.hxx b/sd/source/ui/inc/fupoor.hxx index 2650e99767b5..38469208b44e 100755 --- a/sd/source/ui/inc/fupoor.hxx +++ b/sd/source/ui/inc/fupoor.hxx @@ -78,16 +78,16 @@ public: virtual void DoCopy(); virtual void DoPaste(); - // Mouse- & Key-Events; Returnwert=TRUE: Event wurde bearbeitet - virtual BOOL KeyInput(const KeyEvent& rKEvt); - virtual BOOL MouseMove(const MouseEvent& ); - virtual BOOL MouseButtonUp(const MouseEvent& rMEvt); + // Mouse- & Key-Events; Returnwert=sal_True: Event wurde bearbeitet + virtual sal_Bool KeyInput(const KeyEvent& rKEvt); + virtual sal_Bool MouseMove(const MouseEvent& ); + virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt); // #95491# moved from inline to *.cxx - virtual BOOL MouseButtonDown(const MouseEvent& rMEvt); + virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt); - virtual BOOL Command(const CommandEvent& rCEvt); - virtual BOOL RequestHelp(const HelpEvent& rHEvt); + virtual sal_Bool Command(const CommandEvent& rCEvt); + virtual sal_Bool RequestHelp(const HelpEvent& rHEvt); virtual void Paint(const Rectangle&, ::sd::Window* ); virtual void ReceiveRequest(SfxRequest& rReq); @@ -102,10 +102,10 @@ public: // #97016# II virtual void SelectionHasChanged(); - USHORT GetSlotID() const { return( nSlotId ); } - USHORT GetSlotValue() const { return( nSlotValue ); } + sal_uInt16 GetSlotID() const { return( nSlotId ); } + sal_uInt16 GetSlotValue() const { return( nSlotValue ); } - void SetNoScrollUntilInside(BOOL bNoScroll = TRUE) + void SetNoScrollUntilInside(sal_Bool bNoScroll = sal_True) { bNoScrollUntilInside = bNoScroll; } void StartDelayToScrollTimer (); @@ -171,8 +171,8 @@ protected: DrawDocShell* mpDocSh; SdDrawDocument* mpDoc; - USHORT nSlotId; - USHORT nSlotValue; + sal_uInt16 nSlotId; + sal_uInt16 nSlotValue; Dialog* pDialog; @@ -182,19 +182,19 @@ protected: Timer aDragTimer; // fuer Drag&Drop DECL_LINK( DragHdl, Timer * ); - BOOL bIsInDragMode; + sal_Bool bIsInDragMode; Point aMDPos; // Position von MouseButtonDown // Flag, um AutoScrolling zu verhindern, bis von ausserhalb in das // Fenster hinein gedragt wurde - BOOL bNoScrollUntilInside; + sal_Bool bNoScrollUntilInside; // Timer um das scrolling zu verzoegern, wenn aus dem fenster // herausgedraggt wird (ca. 1 sec.) Timer aDelayToScrollTimer; // fuer Verzoegerung bis scroll - BOOL bScrollable; - BOOL bDelayActive; - BOOL bFirstMouseMove; + sal_Bool bScrollable; + sal_Bool bDelayActive; + sal_Bool bFirstMouseMove; // #95491# member to hold state of the mouse buttons for creation // of own MouseEvents (like in ScrollHdl) diff --git a/sd/source/ui/inc/fusearch.hxx b/sd/source/ui/inc/fusearch.hxx index fdba497f262c..661280e4652c 100644..100755 --- a/sd/source/ui/inc/fusearch.hxx +++ b/sd/source/ui/inc/fusearch.hxx @@ -53,7 +53,7 @@ protected: virtual ~FuSearch (void); ::sd::Outliner* pSdOutliner; - BOOL bOwnOutliner; + sal_Bool bOwnOutliner; private: FuSearch ( diff --git a/sd/source/ui/inc/fusel.hxx b/sd/source/ui/inc/fusel.hxx index c1e43c2467e9..e0d4c72ef28c 100644..100755 --- a/sd/source/ui/inc/fusel.hxx +++ b/sd/source/ui/inc/fusel.hxx @@ -49,20 +49,20 @@ public: virtual void DoExecute( SfxRequest& rReq ); // Mouse- & Key-Events - virtual BOOL KeyInput(const KeyEvent& rKEvt); - virtual BOOL MouseMove(const MouseEvent& rMEvt); - virtual BOOL MouseButtonUp(const MouseEvent& rMEvt); - virtual BOOL MouseButtonDown(const MouseEvent& rMEvt); + virtual sal_Bool KeyInput(const KeyEvent& rKEvt); + virtual sal_Bool MouseMove(const MouseEvent& rMEvt); + virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt); + virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt); virtual void Activate(); // Function aktivieren virtual void Deactivate(); // Function deaktivieren virtual void SelectionHasChanged(); - void SetEditMode(USHORT nMode); - USHORT GetEditMode() { return nEditMode; } + void SetEditMode(sal_uInt16 nMode); + sal_uInt16 GetEditMode() { return nEditMode; } - BOOL AnimateObj(SdrObject* pObj, const Point& rPos); + sal_Bool AnimateObj(SdrObject* pObj, const Point& rPos); /** is called when the currenct function should be aborted. <p> This is used when a function gets a KEY_ESCAPE but can also @@ -81,13 +81,13 @@ protected: virtual ~FuSelection(); - BOOL bTempRotation; - BOOL bSelectionChanged; - BOOL bHideAndAnimate; + sal_Bool bTempRotation; + sal_Bool bSelectionChanged; + sal_Bool bHideAndAnimate; SdrHdl* pHdl; - BOOL bSuppressChangesOfSelection; - BOOL bMirrorSide0; - USHORT nEditMode; + sal_Bool bSuppressChangesOfSelection; + sal_Bool bMirrorSide0; + sal_uInt16 nEditMode; ::com::sun::star::uno::Reference< ::com::sun::star::media::XPlayer > mxPlayer; private: diff --git a/sd/source/ui/inc/fuslid.hxx b/sd/source/ui/inc/fuslid.hxx index a6de8d720411..e97ceddd548b 100644..100755 --- a/sd/source/ui/inc/fuslid.hxx +++ b/sd/source/ui/inc/fuslid.hxx @@ -53,9 +53,9 @@ public: static FunctionReference Create( SlideViewShell* pViewSh, ::sd::Window* pWin, SlideView* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); - virtual BOOL MouseMove(const MouseEvent& rMEvt); - virtual BOOL MouseButtonUp(const MouseEvent& rMEvt); - virtual BOOL MouseButtonDown(const MouseEvent& rMEvt); + virtual sal_Bool MouseMove(const MouseEvent& rMEvt); + virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt); + virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt); virtual void ScrollStart(); virtual void ScrollEnd(); diff --git a/sd/source/ui/inc/fuslsel.hxx b/sd/source/ui/inc/fuslsel.hxx index 2890f3faf98a..16cf5257ee2c 100644..100755 --- a/sd/source/ui/inc/fuslsel.hxx +++ b/sd/source/ui/inc/fuslsel.hxx @@ -42,8 +42,8 @@ class Window; struct FSS_IsShowingEffectInfo { - BOOL bIsShowingEffect; // TRUE while we show a fade effect one the slide view - BOOL bDisposed; // TRUE if the FuSlideSelection was deleted during fade effect + sal_Bool bIsShowingEffect; // sal_True while we show a fade effect one the slide view + sal_Bool bDisposed; // sal_True if the FuSlideSelection was deleted during fade effect }; @@ -57,10 +57,10 @@ public: virtual void DoExecute( SfxRequest& rReq ); // Mouse- & Key-Events - virtual BOOL KeyInput(const KeyEvent& rKEvt); - virtual BOOL MouseMove(const MouseEvent& rMEvt); - virtual BOOL MouseButtonUp(const MouseEvent& rMEvt); - virtual BOOL MouseButtonDown(const MouseEvent& rMEvt); + virtual sal_Bool KeyInput(const KeyEvent& rKEvt); + virtual sal_Bool MouseMove(const MouseEvent& rMEvt); + virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt); + virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt); virtual void Paint(const Rectangle& rRect, ::sd::Window* pWin); virtual void Activate(); // Function aktivieren @@ -69,7 +69,7 @@ public: virtual void ScrollStart(); virtual void ScrollEnd(); - BOOL IsShowingEffect() const { return pIsShowingEffectInfo && pIsShowingEffectInfo->bIsShowingEffect; } + sal_Bool IsShowingEffect() const { return pIsShowingEffectInfo && pIsShowingEffectInfo->bIsShowingEffect; } /** is called when the currenct function should be aborted. <p> This is used when a function gets a KEY_ESCAPE but can also @@ -89,27 +89,27 @@ protected: virtual ~FuSlideSelection (void); private: - BOOL bSubstShown; - BOOL bPageHit; + sal_Bool bSubstShown; + sal_Bool bPageHit; List aSubstList; // Liste mit Ertsatzdarstellungen Point aDragPos; // hier wird die Seite angefasst - BOOL bDragSelection; + sal_Bool bDragSelection; Point aDragSelRectAnchor; // fester Punkt des Selektionsrechtecks Rectangle aDragSelRect; Point aPosOfInsertMarker; FSS_IsShowingEffectInfo* pIsShowingEffectInfo; - void DrawInsertMarker(BOOL bShow); + void DrawInsertMarker(sal_Bool bShow); Point CalcPosOfInsertMarker(const Point& rPoint); - USHORT GetTargetPage(const Point& rPoint) const; + sal_uInt16 GetTargetPage(const Point& rPoint) const; void CreateSubst(); void DeleteSubst(); void DrawSubst() const; void ChangeSubstPos(const Point& rVector); void DrawDragSelectionRect() const; - void ShowEffect(USHORT nPageNo); + void ShowEffect(sal_uInt16 nPageNo); DECL_LINK( DragSlideHdl, Timer* ); }; diff --git a/sd/source/ui/inc/futext.hxx b/sd/source/ui/inc/futext.hxx index 052f4099ef21..6784dbb175f7 100644..100755 --- a/sd/source/ui/inc/futext.hxx +++ b/sd/source/ui/inc/futext.hxx @@ -57,20 +57,20 @@ public: static FunctionReference Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); virtual void DoExecute( SfxRequest& rReq ); - virtual BOOL KeyInput(const KeyEvent& rKEvt); - virtual BOOL MouseMove(const MouseEvent& rMEvt); - virtual BOOL MouseButtonUp(const MouseEvent& rMEvt); - virtual BOOL MouseButtonDown(const MouseEvent& rMEvt); - virtual BOOL Command(const CommandEvent& rCEvt); - virtual BOOL RequestHelp(const HelpEvent& rHEvt); + virtual sal_Bool KeyInput(const KeyEvent& rKEvt); + virtual sal_Bool MouseMove(const MouseEvent& rMEvt); + virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt); + virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt); + virtual sal_Bool Command(const CommandEvent& rCEvt); + virtual sal_Bool RequestHelp(const HelpEvent& rHEvt); virtual void ReceiveRequest(SfxRequest& rReq); virtual void DoubleClick(const MouseEvent& rMEvt); virtual void Activate(); // Function aktivieren virtual void Deactivate(); // Function deaktivieren - void SetInEditMode(const MouseEvent& rMEvt, BOOL bQuickDrag); - BOOL DeleteDefaultText(); + void SetInEditMode(const MouseEvent& rMEvt, sal_Bool bQuickDrag); + sal_Bool DeleteDefaultText(); SdrTextObj* GetTextObj() { return static_cast< SdrTextObj* >( mxTextObj.get() ); } DECL_LINK(SpellError, void* ); @@ -99,7 +99,7 @@ protected: SdrObjectWeakRef mxTextObj; Link aOldLink; - BOOL bFirstObjCreated; + sal_Bool bFirstObjCreated; SfxRequest& rRequest; diff --git a/sd/source/ui/inc/fuzoom.hxx b/sd/source/ui/inc/fuzoom.hxx index 31d465646a96..b2436639336b 100644..100755 --- a/sd/source/ui/inc/fuzoom.hxx +++ b/sd/source/ui/inc/fuzoom.hxx @@ -35,7 +35,7 @@ namespace sd { -extern USHORT SidArrayZoom[]; +extern sal_uInt16 SidArrayZoom[]; class FuZoom : public FuPoor @@ -46,9 +46,9 @@ public: static FunctionReference Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); // Mouse- & Key-Events - virtual BOOL MouseMove(const MouseEvent& rMEvt); - virtual BOOL MouseButtonUp(const MouseEvent& rMEvt); - virtual BOOL MouseButtonDown(const MouseEvent& rMEvt); + virtual sal_Bool MouseMove(const MouseEvent& rMEvt); + virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt); + virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt); virtual void Activate(); // Function aktivieren virtual void Deactivate(); // Function deaktivieren @@ -60,8 +60,8 @@ protected: Point aBeginPos; Point aEndPos; Rectangle aZoomRect; - BOOL bVisible; - BOOL bStartDrag; + sal_Bool bVisible; + sal_Bool bStartDrag; Pointer aPtr; private: diff --git a/sd/source/ui/inc/gluectrl.hxx b/sd/source/ui/inc/gluectrl.hxx index 8f8b0609304a..f2fbe1ab307a 100644..100755 --- a/sd/source/ui/inc/gluectrl.hxx +++ b/sd/source/ui/inc/gluectrl.hxx @@ -59,16 +59,16 @@ public: class SdTbxCtlGlueEscDir: public SfxToolBoxControl { private: - UINT16 GetEscDirPos( UINT16 nEscDir ); + sal_uInt16 GetEscDirPos( sal_uInt16 nEscDir ); public: - virtual void StateChanged( USHORT nSId, SfxItemState eState, + virtual void StateChanged( sal_uInt16 nSId, SfxItemState eState, const SfxPoolItem* pState ); virtual Window* CreateItemWindow( Window *pParent ); SFX_DECL_TOOLBOX_CONTROL(); - SdTbxCtlGlueEscDir( USHORT nSlotId, USHORT nId, ToolBox& rTbx ); + SdTbxCtlGlueEscDir( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); ~SdTbxCtlGlueEscDir() {} }; diff --git a/sd/source/ui/inc/ins_paste.hxx b/sd/source/ui/inc/ins_paste.hxx index 6feab297f0e4..d2aacd9d992e 100644..100755 --- a/sd/source/ui/inc/ins_paste.hxx +++ b/sd/source/ui/inc/ins_paste.hxx @@ -53,7 +53,7 @@ public: SdInsertPasteDlg( Window* pWindow ); ~SdInsertPasteDlg(); - BOOL IsInsertBefore() const; + sal_Bool IsInsertBefore() const; }; #endif // _SD_INS_PASTE_HXX_ diff --git a/sd/source/ui/inc/inspagob.hxx b/sd/source/ui/inc/inspagob.hxx index 3f8046462df7..3229d29a3c90 100644..100755 --- a/sd/source/ui/inc/inspagob.hxx +++ b/sd/source/ui/inc/inspagob.hxx @@ -62,9 +62,9 @@ public: const String& rFileName ); ~SdInsertPagesObjsDlg(); - List* GetList( USHORT nType ); - BOOL IsLink(); - BOOL IsRemoveUnnessesaryMasterPages() const; + List* GetList( sal_uInt16 nType ); + sal_Bool IsLink(); + sal_Bool IsRemoveUnnessesaryMasterPages() const; }; diff --git a/sd/source/ui/inc/masterlayoutdlg.hxx b/sd/source/ui/inc/masterlayoutdlg.hxx index a7b5908367fc..f75635ad2755 100644..100755 --- a/sd/source/ui/inc/masterlayoutdlg.hxx +++ b/sd/source/ui/inc/masterlayoutdlg.hxx @@ -56,10 +56,10 @@ private: OKButton maPBOK; CancelButton maPBCancel; - BOOL mbOldHeader; - BOOL mbOldFooter; - BOOL mbOldDate; - BOOL mbOldPageNumber; + sal_Bool mbOldHeader; + sal_Bool mbOldFooter; + sal_Bool mbOldDate; + sal_Bool mbOldPageNumber; void applyChanges(); void remove( PresObjKind eKind ); diff --git a/sd/source/ui/inc/morphdlg.hxx b/sd/source/ui/inc/morphdlg.hxx index ca431d1d74b9..85f18f4c8787 100755 --- a/sd/source/ui/inc/morphdlg.hxx +++ b/sd/source/ui/inc/morphdlg.hxx @@ -55,9 +55,9 @@ public: virtual ~MorphDlg (void); void SaveSettings() const; - USHORT GetFadeSteps() const { return (USHORT) aMtfSteps.GetValue(); } - BOOL IsAttributeFade() const { return aCbxAttributes.IsChecked(); } - BOOL IsOrientationFade() const { return aCbxOrientation.IsChecked(); } + sal_uInt16 GetFadeSteps() const { return (sal_uInt16) aMtfSteps.GetValue(); } + sal_Bool IsAttributeFade() const { return aCbxAttributes.IsChecked(); } + sal_Bool IsOrientationFade() const { return aCbxOrientation.IsChecked(); } private: FixedLine aGrpPreset; diff --git a/sd/source/ui/inc/navigatr.hxx b/sd/source/ui/inc/navigatr.hxx index aa5feddd4c23..ccbbe1dfad3b 100644..100755 --- a/sd/source/ui/inc/navigatr.hxx +++ b/sd/source/ui/inc/navigatr.hxx @@ -73,16 +73,16 @@ class NavDocInfo public: NavDocInfo() { mpDocShell = NULL; } - BOOL HasName() { return( (BOOL) bName ); } - BOOL IsActive() { return( (BOOL) bActive ); } + sal_Bool HasName() { return( (sal_Bool) bName ); } + sal_Bool IsActive() { return( (sal_Bool) bActive ); } - void SetName( BOOL bOn = TRUE ) { bName = bOn; } - void SetActive( BOOL bOn = TRUE ) { bActive = bOn; } + void SetName( sal_Bool bOn = sal_True ) { bName = bOn; } + void SetActive( sal_Bool bOn = sal_True ) { bActive = bOn; } private: friend class SdNavigatorWin; - BOOL bName : 1; - BOOL bActive : 1; + sal_Bool bName : 1; + sal_Bool bActive : 1; ::sd::DrawDocShell* mpDocShell; }; @@ -104,7 +104,7 @@ public: void InitTreeLB( const SdDrawDocument* pDoc ); void RefreshDocumentLB( const String* pDocName = NULL ); - BOOL InsertFile(const String& rFileName); + sal_Bool InsertFile(const String& rFileName); NavigatorDragType GetNavigatorDragType(); void SetNavigatorDragType(NavigatorDragType eType) { meDragType = eType; } @@ -127,7 +127,7 @@ private: Size maSize; Size maMinSize; // Size maFltWinSize; - BOOL mbDocImported; + sal_Bool mbDocImported; String maDropFileName; NavigatorDragType meDragType; List* mpDocList; @@ -143,7 +143,7 @@ private: */ bool mbShowAllShapes; - USHORT GetDragTypeSdResId( NavigatorDragType eDT, BOOL bImage = FALSE ); + sal_uInt16 GetDragTypeSdResId( NavigatorDragType eDT, sal_Bool bImage = sal_False ); NavDocInfo* GetDocInfo(); DECL_LINK( GetFocusObjectsHdl, void * ); @@ -173,10 +173,10 @@ private: class SdNavigatorControllerItem : public SfxControllerItem { public: - SdNavigatorControllerItem( USHORT, SdNavigatorWin*, SfxBindings* ); + SdNavigatorControllerItem( sal_uInt16, SdNavigatorWin*, SfxBindings* ); protected: - virtual void StateChanged( USHORT nSId, SfxItemState eState, + virtual void StateChanged( sal_uInt16 nSId, SfxItemState eState, const SfxPoolItem* pState ); private: @@ -194,10 +194,10 @@ private: class SdPageNameControllerItem : public SfxControllerItem { public: - SdPageNameControllerItem( USHORT, SdNavigatorWin*, SfxBindings* ); + SdPageNameControllerItem( sal_uInt16, SdNavigatorWin*, SfxBindings* ); protected: - virtual void StateChanged( USHORT nSId, SfxItemState eState, + virtual void StateChanged( sal_uInt16 nSId, SfxItemState eState, const SfxPoolItem* pState ); private: diff --git a/sd/source/ui/inc/optdlg.hxx b/sd/source/ui/inc/optdlg.hxx index 5a2644bd186a..4cba8494261a 100644..100755 --- a/sd/source/ui/inc/optdlg.hxx +++ b/sd/source/ui/inc/optdlg.hxx @@ -46,8 +46,8 @@ public: protected: - virtual void PageCreated( USHORT nId, SfxTabPage &rPage ); -// virtual SfxItemSet* CreateInputItemSet( USHORT nPageId ); + virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ); +// virtual SfxItemSet* CreateInputItemSet( sal_uInt16 nPageId ); }; diff --git a/sd/source/ui/inc/optsitem.hxx b/sd/source/ui/inc/optsitem.hxx index 419f661b1405..bcc225a91621 100755 --- a/sd/source/ui/inc/optsitem.hxx +++ b/sd/source/ui/inc/optsitem.hxx @@ -103,9 +103,9 @@ private: ::rtl::OUString maSubTree; SdOptionsItem* mpCfgItem; - USHORT mnConfigId; - BOOL mbInit : 1; - BOOL mbEnableModify : 1; + sal_uInt16 mnConfigId; + sal_Bool mbInit : 1; + sal_Bool mbEnableModify : 1; SD_DLLPRIVATE void Commit( SdOptionsItem& rCfgItem ) const; SD_DLLPRIVATE ::com::sun::star::uno::Sequence< ::rtl::OUString > GetPropertyNames() const; @@ -117,19 +117,19 @@ protected: protected: - virtual void GetPropNameArray( const char**& ppNames, ULONG& rCount ) const = 0; - virtual BOOL ReadData( const ::com::sun::star::uno::Any* pValues ) = 0; - virtual BOOL WriteData( ::com::sun::star::uno::Any* pValues ) const = 0; + virtual void GetPropNameArray( const char**& ppNames, sal_uLong& rCount ) const = 0; + virtual sal_Bool ReadData( const ::com::sun::star::uno::Any* pValues ) = 0; + virtual sal_Bool WriteData( ::com::sun::star::uno::Any* pValues ) const = 0; public: - SdOptionsGeneric( USHORT nConfigId, const ::rtl::OUString& rSubTree ); + SdOptionsGeneric( sal_uInt16 nConfigId, const ::rtl::OUString& rSubTree ); virtual ~SdOptionsGeneric(); const ::rtl::OUString& GetSubTree() const { return maSubTree; } - USHORT GetConfigId() const { return mnConfigId; } + sal_uInt16 GetConfigId() const { return mnConfigId; } - void EnableModify( BOOL bModify ) { mbEnableModify = bModify; } + void EnableModify( sal_Bool bModify ) { mbEnableModify = bModify; } void Store(); @@ -145,41 +145,41 @@ class SD_DLLPUBLIC SdOptionsLayout : public SdOptionsGeneric { private: - BOOL bRuler : 1; // Layout/Display/Ruler - BOOL bMoveOutline : 1; // Layout/Display/Contur - BOOL bDragStripes : 1; // Layout/Display/Guide - BOOL bHandlesBezier : 1; // Layout/Display/Bezier - BOOL bHelplines : 1; // Layout/Display/Helpline - UINT16 nMetric; // Layout/Other/MeasureUnit - UINT16 nDefTab; // Layout/Other/TabStop + sal_Bool bRuler : 1; // Layout/Display/Ruler + sal_Bool bMoveOutline : 1; // Layout/Display/Contur + sal_Bool bDragStripes : 1; // Layout/Display/Guide + sal_Bool bHandlesBezier : 1; // Layout/Display/Bezier + sal_Bool bHelplines : 1; // Layout/Display/Helpline + sal_uInt16 nMetric; // Layout/Other/MeasureUnit + sal_uInt16 nDefTab; // Layout/Other/TabStop protected: - virtual void GetPropNameArray( const char**& ppNames, ULONG& rCount ) const; - virtual BOOL ReadData( const ::com::sun::star::uno::Any* pValues ); - virtual BOOL WriteData( ::com::sun::star::uno::Any* pValues ) const; + virtual void GetPropNameArray( const char**& ppNames, sal_uLong& rCount ) const; + virtual sal_Bool ReadData( const ::com::sun::star::uno::Any* pValues ); + virtual sal_Bool WriteData( ::com::sun::star::uno::Any* pValues ) const; public: - SdOptionsLayout( USHORT nConfigId, BOOL bUseConfig ); + SdOptionsLayout( sal_uInt16 nConfigId, sal_Bool bUseConfig ); virtual ~SdOptionsLayout() {} - BOOL operator==( const SdOptionsLayout& rOpt ) const; - - BOOL IsRulerVisible() const { Init(); return (BOOL) bRuler; } - BOOL IsMoveOutline() const { Init(); return (BOOL) bMoveOutline; } - BOOL IsDragStripes() const { Init(); return (BOOL) bDragStripes; } - BOOL IsHandlesBezier() const { Init(); return (BOOL) bHandlesBezier; } - BOOL IsHelplines() const { Init(); return (BOOL) bHelplines; } - UINT16 GetMetric() const { Init(); return( ( 0xffff == nMetric ) ? (UINT16)SfxModule::GetCurrentFieldUnit() : nMetric ); } - UINT16 GetDefTab() const { Init(); return nDefTab; } - - void SetRulerVisible( BOOL bOn = TRUE ) { if( bRuler != bOn ) { OptionsChanged(); bRuler = bOn; } } - void SetMoveOutline( BOOL bOn = TRUE ) { if( bMoveOutline != bOn ) { OptionsChanged(); bMoveOutline = bOn; } } - void SetDragStripes( BOOL bOn = TRUE ) { if( bDragStripes != bOn ) { OptionsChanged(); bDragStripes = bOn; } } - void SetHandlesBezier( BOOL bOn = TRUE ) { if( bHandlesBezier != bOn ) { OptionsChanged(); bHandlesBezier = bOn; } } - void SetHelplines( BOOL bOn = TRUE ) { if( bHelplines != bOn ) { OptionsChanged(); bHelplines = bOn; } } - void SetMetric( UINT16 nInMetric ) { if( nMetric != nInMetric ) { OptionsChanged(); nMetric = nInMetric; } } - void SetDefTab( UINT16 nTab ) { if( nDefTab != nTab ) { OptionsChanged(); nDefTab = nTab; } } + sal_Bool operator==( const SdOptionsLayout& rOpt ) const; + + sal_Bool IsRulerVisible() const { Init(); return (sal_Bool) bRuler; } + sal_Bool IsMoveOutline() const { Init(); return (sal_Bool) bMoveOutline; } + sal_Bool IsDragStripes() const { Init(); return (sal_Bool) bDragStripes; } + sal_Bool IsHandlesBezier() const { Init(); return (sal_Bool) bHandlesBezier; } + sal_Bool IsHelplines() const { Init(); return (sal_Bool) bHelplines; } + sal_uInt16 GetMetric() const { Init(); return( ( 0xffff == nMetric ) ? (sal_uInt16)SfxModule::GetCurrentFieldUnit() : nMetric ); } + sal_uInt16 GetDefTab() const { Init(); return nDefTab; } + + void SetRulerVisible( sal_Bool bOn = sal_True ) { if( bRuler != bOn ) { OptionsChanged(); bRuler = bOn; } } + void SetMoveOutline( sal_Bool bOn = sal_True ) { if( bMoveOutline != bOn ) { OptionsChanged(); bMoveOutline = bOn; } } + void SetDragStripes( sal_Bool bOn = sal_True ) { if( bDragStripes != bOn ) { OptionsChanged(); bDragStripes = bOn; } } + void SetHandlesBezier( sal_Bool bOn = sal_True ) { if( bHandlesBezier != bOn ) { OptionsChanged(); bHandlesBezier = bOn; } } + void SetHelplines( sal_Bool bOn = sal_True ) { if( bHelplines != bOn ) { OptionsChanged(); bHelplines = bOn; } } + void SetMetric( sal_uInt16 nInMetric ) { if( nMetric != nInMetric ) { OptionsChanged(); nMetric = nInMetric; } } + void SetDefTab( sal_uInt16 nTab ) { if( nDefTab != nTab ) { OptionsChanged(); nDefTab = nTab; } } }; // ----------------------------------------------------------------------------- @@ -188,8 +188,8 @@ class SD_DLLPUBLIC SdOptionsLayoutItem : public SfxPoolItem { public: - SdOptionsLayoutItem( USHORT nWhich); - SdOptionsLayoutItem( USHORT nWhich, SdOptions* pOpts, ::sd::FrameView* pView = NULL ); + SdOptionsLayoutItem( sal_uInt16 nWhich); + SdOptionsLayoutItem( sal_uInt16 nWhich, SdOptions* pOpts, ::sd::FrameView* pView = NULL ); virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual int operator==( const SfxPoolItem& ) const; @@ -210,16 +210,16 @@ class SD_DLLPUBLIC SdOptionsContents : public SdOptionsGeneric private: protected: - virtual void GetPropNameArray( const char**& ppNames, ULONG& rCount ) const; - virtual BOOL ReadData( const ::com::sun::star::uno::Any* pValues ); - virtual BOOL WriteData( ::com::sun::star::uno::Any* pValues ) const; + virtual void GetPropNameArray( const char**& ppNames, sal_uLong& rCount ) const; + virtual sal_Bool ReadData( const ::com::sun::star::uno::Any* pValues ); + virtual sal_Bool WriteData( ::com::sun::star::uno::Any* pValues ) const; public: - SdOptionsContents( USHORT nConfigId, BOOL bUseConfig ); + SdOptionsContents( sal_uInt16 nConfigId, sal_Bool bUseConfig ); virtual ~SdOptionsContents() {} - BOOL operator==( const SdOptionsContents& rOpt ) const; + sal_Bool operator==( const SdOptionsContents& rOpt ) const; }; // ----------------------------------------------------------------------------- @@ -228,7 +228,7 @@ class SD_DLLPUBLIC SdOptionsContentsItem : public SfxPoolItem { public: - SdOptionsContentsItem( USHORT nWhich, SdOptions* pOpts, ::sd::FrameView* pView = NULL ); + SdOptionsContentsItem( sal_uInt16 nWhich, SdOptions* pOpts, ::sd::FrameView* pView = NULL ); virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual int operator==( const SfxPoolItem& ) const; @@ -249,29 +249,29 @@ class SD_DLLPUBLIC SdOptionsMisc : public SdOptionsGeneric private: // #97016# - ULONG nDefaultObjectSizeWidth; - ULONG nDefaultObjectSizeHeight; - - BOOL bStartWithTemplate : 1; // Misc/NewDoc/AutoPilot - BOOL bMarkedHitMovesAlways : 1; // Misc/ObjectMoveable - BOOL bMoveOnlyDragging : 1; // Currently, not in use !!! - BOOL bCrookNoContortion : 1; // Misc/NoDistort - BOOL bQuickEdit : 1; // Misc/TextObject/QuickEditing - BOOL bMasterPageCache : 1; // Misc/BackgroundCache - BOOL bDragWithCopy : 1; // Misc/CopyWhileMoving - BOOL bPickThrough : 1; // Misc/TextObject/Selectable - BOOL bBigHandles : 1; // Misc/BigHandles - BOOL bDoubleClickTextEdit : 1; // Misc/DclickTextedit - BOOL bClickChangeRotation : 1; // Misc/RotateClick - BOOL bStartWithActualPage : 1; // Misc/Start/CurrentPage - BOOL bSolidDragging : 1; // Misc/ModifyWithAttributes - BOOL bSolidMarkHdl : 1; // /Misc/SimpleHandles - BOOL bSummationOfParagraphs : 1; // misc/SummationOfParagraphs + sal_uLong nDefaultObjectSizeWidth; + sal_uLong nDefaultObjectSizeHeight; + + sal_Bool bStartWithTemplate : 1; // Misc/NewDoc/AutoPilot + sal_Bool bMarkedHitMovesAlways : 1; // Misc/ObjectMoveable + sal_Bool bMoveOnlyDragging : 1; // Currently, not in use !!! + sal_Bool bCrookNoContortion : 1; // Misc/NoDistort + sal_Bool bQuickEdit : 1; // Misc/TextObject/QuickEditing + sal_Bool bMasterPageCache : 1; // Misc/BackgroundCache + sal_Bool bDragWithCopy : 1; // Misc/CopyWhileMoving + sal_Bool bPickThrough : 1; // Misc/TextObject/Selectable + sal_Bool bBigHandles : 1; // Misc/BigHandles + sal_Bool bDoubleClickTextEdit : 1; // Misc/DclickTextedit + sal_Bool bClickChangeRotation : 1; // Misc/RotateClick + sal_Bool bStartWithActualPage : 1; // Misc/Start/CurrentPage + sal_Bool bSolidDragging : 1; // Misc/ModifyWithAttributes + sal_Bool bSolidMarkHdl : 1; // /Misc/SimpleHandles + sal_Bool bSummationOfParagraphs : 1; // misc/SummationOfParagraphs // #90356# - BOOL bShowUndoDeleteWarning : 1; // Misc/ShowUndoDeleteWarning + sal_Bool bShowUndoDeleteWarning : 1; // Misc/ShowUndoDeleteWarning // #i75315# - BOOL bSlideshowRespectZOrder : 1; // Misc/SlideshowRespectZOrder - BOOL bShowComments : 1; // Misc/ShowComments + sal_Bool bSlideshowRespectZOrder : 1; // Misc/SlideshowRespectZOrder + sal_Bool bShowComments : 1; // Misc/ShowComments sal_Bool bPreviewNewEffects; sal_Bool bPreviewChangedEffects; @@ -287,50 +287,50 @@ private: for the printer independent virtual device the can be retrieved from the modules. */ - USHORT mnPrinterIndependentLayout; // Misc/Compatibility/PrinterIndependentLayout + sal_uInt16 mnPrinterIndependentLayout; // Misc/Compatibility/PrinterIndependentLayout // Misc protected: - virtual void GetPropNameArray( const char**& ppNames, ULONG& rCount ) const; - virtual BOOL ReadData( const ::com::sun::star::uno::Any* pValues ); - virtual BOOL WriteData( ::com::sun::star::uno::Any* pValues ) const; + virtual void GetPropNameArray( const char**& ppNames, sal_uLong& rCount ) const; + virtual sal_Bool ReadData( const ::com::sun::star::uno::Any* pValues ); + virtual sal_Bool WriteData( ::com::sun::star::uno::Any* pValues ) const; public: - SdOptionsMisc( USHORT nConfigId, BOOL bUseConfig ); + SdOptionsMisc( sal_uInt16 nConfigId, sal_Bool bUseConfig ); virtual ~SdOptionsMisc() {} - BOOL operator==( const SdOptionsMisc& rOpt ) const; - - BOOL IsStartWithTemplate() const { Init(); return (BOOL) bStartWithTemplate; } - BOOL IsMarkedHitMovesAlways() const { Init(); return (BOOL) bMarkedHitMovesAlways; } - BOOL IsMoveOnlyDragging() const { Init(); return (BOOL) bMoveOnlyDragging; } - BOOL IsCrookNoContortion() const { Init(); return (BOOL) bCrookNoContortion; } - BOOL IsQuickEdit() const { Init(); return (BOOL) bQuickEdit; } - BOOL IsMasterPagePaintCaching() const { Init(); return (BOOL) bMasterPageCache; } - BOOL IsDragWithCopy() const { Init(); return (BOOL) bDragWithCopy; } - BOOL IsPickThrough() const { Init(); return (BOOL) bPickThrough; } - BOOL IsBigHandles() const { Init(); return (BOOL) bBigHandles; } - BOOL IsDoubleClickTextEdit() const { Init(); return (BOOL) bDoubleClickTextEdit; } - BOOL IsClickChangeRotation() const { Init(); return (BOOL) bClickChangeRotation; } - BOOL IsStartWithActualPage() const { Init(); return (BOOL) bStartWithActualPage; } - BOOL IsSolidDragging() const { Init(); return (BOOL) bSolidDragging; } - BOOL IsSolidMarkHdl() const { Init(); return (BOOL) bSolidMarkHdl; } - BOOL IsSummationOfParagraphs() const { Init(); return bSummationOfParagraphs != 0; }; + sal_Bool operator==( const SdOptionsMisc& rOpt ) const; + + sal_Bool IsStartWithTemplate() const { Init(); return (sal_Bool) bStartWithTemplate; } + sal_Bool IsMarkedHitMovesAlways() const { Init(); return (sal_Bool) bMarkedHitMovesAlways; } + sal_Bool IsMoveOnlyDragging() const { Init(); return (sal_Bool) bMoveOnlyDragging; } + sal_Bool IsCrookNoContortion() const { Init(); return (sal_Bool) bCrookNoContortion; } + sal_Bool IsQuickEdit() const { Init(); return (sal_Bool) bQuickEdit; } + sal_Bool IsMasterPagePaintCaching() const { Init(); return (sal_Bool) bMasterPageCache; } + sal_Bool IsDragWithCopy() const { Init(); return (sal_Bool) bDragWithCopy; } + sal_Bool IsPickThrough() const { Init(); return (sal_Bool) bPickThrough; } + sal_Bool IsBigHandles() const { Init(); return (sal_Bool) bBigHandles; } + sal_Bool IsDoubleClickTextEdit() const { Init(); return (sal_Bool) bDoubleClickTextEdit; } + sal_Bool IsClickChangeRotation() const { Init(); return (sal_Bool) bClickChangeRotation; } + sal_Bool IsStartWithActualPage() const { Init(); return (sal_Bool) bStartWithActualPage; } + sal_Bool IsSolidDragging() const { Init(); return (sal_Bool) bSolidDragging; } + sal_Bool IsSolidMarkHdl() const { Init(); return (sal_Bool) bSolidMarkHdl; } + sal_Bool IsSummationOfParagraphs() const { Init(); return bSummationOfParagraphs != 0; }; /** Return the currently selected printer independent layout mode. @return Returns 1 for printer independent layout enabled and 0 when it is disabled. Other values are reserved for future use. */ - USHORT GetPrinterIndependentLayout() const { Init(); return mnPrinterIndependentLayout; }; + sal_uInt16 GetPrinterIndependentLayout() const { Init(); return mnPrinterIndependentLayout; }; // #90356# - BOOL IsShowUndoDeleteWarning() const { Init(); return (BOOL) bShowUndoDeleteWarning; } - BOOL IsSlideshowRespectZOrder() const { Init(); return (BOOL) bSlideshowRespectZOrder; } + sal_Bool IsShowUndoDeleteWarning() const { Init(); return (sal_Bool) bShowUndoDeleteWarning; } + sal_Bool IsSlideshowRespectZOrder() const { Init(); return (sal_Bool) bSlideshowRespectZOrder; } // #97016# - ULONG GetDefaultObjectSizeWidth() const { Init(); return nDefaultObjectSizeWidth; } - ULONG GetDefaultObjectSizeHeight() const { Init(); return nDefaultObjectSizeHeight; } + sal_uLong GetDefaultObjectSizeWidth() const { Init(); return nDefaultObjectSizeWidth; } + sal_uLong GetDefaultObjectSizeHeight() const { Init(); return nDefaultObjectSizeHeight; } sal_Bool IsPreviewNewEffects() const { Init(); return bPreviewNewEffects; } sal_Bool IsPreviewChangedEffects() const { Init(); return bPreviewChangedEffects; } @@ -345,41 +345,41 @@ public: double GetPresentationPenWidth() const { Init(); return mnPenWidth; } void SetPresentationPenWidth( double nPenWidth ) { if( mnPenWidth != nPenWidth ) { OptionsChanged(); mnPenWidth = nPenWidth; } } - void SetStartWithTemplate( BOOL bOn = TRUE ) { if( bStartWithTemplate != bOn ) { OptionsChanged(); bStartWithTemplate = bOn; } } - void SetMarkedHitMovesAlways( BOOL bOn = TRUE ) { if( bMarkedHitMovesAlways != bOn ) { OptionsChanged(); bMarkedHitMovesAlways = bOn; } } - void SetMoveOnlyDragging( BOOL bOn = TRUE ) { if( bMoveOnlyDragging != bOn ) { OptionsChanged(); bMoveOnlyDragging = bOn; } } - void SetCrookNoContortion( BOOL bOn = TRUE ) { if( bCrookNoContortion != bOn ) { OptionsChanged(); bCrookNoContortion = bOn; } } - void SetQuickEdit( BOOL bOn = TRUE ) { if( bQuickEdit != bOn ) { OptionsChanged(); bQuickEdit = bOn; } } - void SetMasterPagePaintCaching( BOOL bOn = TRUE ) { if( bMasterPageCache != bOn ) { OptionsChanged(); bMasterPageCache = bOn; } } - void SetDragWithCopy( BOOL bOn = TRUE ) { if( bDragWithCopy != bOn ) { OptionsChanged(); bDragWithCopy = bOn; } } - void SetPickThrough( BOOL bOn = TRUE ) { if( bPickThrough != bOn ) { OptionsChanged(); bPickThrough = bOn; } } - void SetBigHandles( BOOL bOn = TRUE ) { if( bBigHandles != bOn ) { OptionsChanged(); bBigHandles = bOn; } } - void SetDoubleClickTextEdit( BOOL bOn = TRUE ) { if( bDoubleClickTextEdit != bOn ) { OptionsChanged(); bDoubleClickTextEdit = bOn; } } - void SetClickChangeRotation( BOOL bOn = TRUE ) { if( bClickChangeRotation != bOn ) { OptionsChanged(); bClickChangeRotation = bOn; } } - void SetStartWithActualPage( BOOL bOn = TRUE ) { if( bStartWithActualPage != bOn ) { OptionsChanged(); bStartWithActualPage = bOn; } } - void SetSummationOfParagraphs( BOOL bOn = TRUE ){ if ( bOn != bSummationOfParagraphs ) { OptionsChanged(); bSummationOfParagraphs = bOn; } } + void SetStartWithTemplate( sal_Bool bOn = sal_True ) { if( bStartWithTemplate != bOn ) { OptionsChanged(); bStartWithTemplate = bOn; } } + void SetMarkedHitMovesAlways( sal_Bool bOn = sal_True ) { if( bMarkedHitMovesAlways != bOn ) { OptionsChanged(); bMarkedHitMovesAlways = bOn; } } + void SetMoveOnlyDragging( sal_Bool bOn = sal_True ) { if( bMoveOnlyDragging != bOn ) { OptionsChanged(); bMoveOnlyDragging = bOn; } } + void SetCrookNoContortion( sal_Bool bOn = sal_True ) { if( bCrookNoContortion != bOn ) { OptionsChanged(); bCrookNoContortion = bOn; } } + void SetQuickEdit( sal_Bool bOn = sal_True ) { if( bQuickEdit != bOn ) { OptionsChanged(); bQuickEdit = bOn; } } + void SetMasterPagePaintCaching( sal_Bool bOn = sal_True ) { if( bMasterPageCache != bOn ) { OptionsChanged(); bMasterPageCache = bOn; } } + void SetDragWithCopy( sal_Bool bOn = sal_True ) { if( bDragWithCopy != bOn ) { OptionsChanged(); bDragWithCopy = bOn; } } + void SetPickThrough( sal_Bool bOn = sal_True ) { if( bPickThrough != bOn ) { OptionsChanged(); bPickThrough = bOn; } } + void SetBigHandles( sal_Bool bOn = sal_True ) { if( bBigHandles != bOn ) { OptionsChanged(); bBigHandles = bOn; } } + void SetDoubleClickTextEdit( sal_Bool bOn = sal_True ) { if( bDoubleClickTextEdit != bOn ) { OptionsChanged(); bDoubleClickTextEdit = bOn; } } + void SetClickChangeRotation( sal_Bool bOn = sal_True ) { if( bClickChangeRotation != bOn ) { OptionsChanged(); bClickChangeRotation = bOn; } } + void SetStartWithActualPage( sal_Bool bOn = sal_True ) { if( bStartWithActualPage != bOn ) { OptionsChanged(); bStartWithActualPage = bOn; } } + void SetSummationOfParagraphs( sal_Bool bOn = sal_True ){ if ( bOn != bSummationOfParagraphs ) { OptionsChanged(); bSummationOfParagraphs = bOn; } } /** Set the printer independent layout mode. @param nOn The default value is to switch printer independent layout on, hence the parameters name. Use 0 for turning it off. Other values are reserved for future use. */ - void SetPrinterIndependentLayout (USHORT nOn = 1 ){ if ( nOn != mnPrinterIndependentLayout ) { OptionsChanged(); mnPrinterIndependentLayout = nOn; } } - void SetSolidDragging( BOOL bOn = TRUE ) { if( bSolidDragging != bOn ) { OptionsChanged(); bSolidDragging = bOn; } } - void SetSolidMarkHdl( BOOL bOn = TRUE ) { if( bSolidMarkHdl != bOn ) { OptionsChanged(); bSolidMarkHdl = bOn; } } + void SetPrinterIndependentLayout (sal_uInt16 nOn = 1 ){ if ( nOn != mnPrinterIndependentLayout ) { OptionsChanged(); mnPrinterIndependentLayout = nOn; } } + void SetSolidDragging( sal_Bool bOn = sal_True ) { if( bSolidDragging != bOn ) { OptionsChanged(); bSolidDragging = bOn; } } + void SetSolidMarkHdl( sal_Bool bOn = sal_True ) { if( bSolidMarkHdl != bOn ) { OptionsChanged(); bSolidMarkHdl = bOn; } } // #90356# - void SetShowUndoDeleteWarning( BOOL bOn = TRUE ) { if( bShowUndoDeleteWarning != bOn ) { OptionsChanged(); bShowUndoDeleteWarning = bOn; } } - void SetSlideshowRespectZOrder( BOOL bOn = TRUE ) { if( bSlideshowRespectZOrder != bOn ) { OptionsChanged(); bSlideshowRespectZOrder = bOn; } } + void SetShowUndoDeleteWarning( sal_Bool bOn = sal_True ) { if( bShowUndoDeleteWarning != bOn ) { OptionsChanged(); bShowUndoDeleteWarning = bOn; } } + void SetSlideshowRespectZOrder( sal_Bool bOn = sal_True ) { if( bSlideshowRespectZOrder != bOn ) { OptionsChanged(); bSlideshowRespectZOrder = bOn; } } // #97016# - void SetDefaultObjectSizeWidth( ULONG nWidth ) { if( nDefaultObjectSizeWidth != nWidth ) { OptionsChanged(); nDefaultObjectSizeWidth = nWidth; } } - void SetDefaultObjectSizeHeight( ULONG nHeight ) { if( nDefaultObjectSizeHeight != nHeight ) { OptionsChanged(); nDefaultObjectSizeHeight = nHeight; } } + void SetDefaultObjectSizeWidth( sal_uLong nWidth ) { if( nDefaultObjectSizeWidth != nWidth ) { OptionsChanged(); nDefaultObjectSizeWidth = nWidth; } } + void SetDefaultObjectSizeHeight( sal_uLong nHeight ) { if( nDefaultObjectSizeHeight != nHeight ) { OptionsChanged(); nDefaultObjectSizeHeight = nHeight; } } void SetPreviewNewEffects( sal_Bool bOn ) { if( bPreviewNewEffects != bOn ) { OptionsChanged(); bPreviewNewEffects = bOn; } } void SetPreviewChangedEffects( sal_Bool bOn ) { if( bPreviewChangedEffects != bOn ) { OptionsChanged(); bPreviewChangedEffects = bOn; } } void SetPreviewTransitions( sal_Bool bOn ) { if( bPreviewTransitions != bOn ) { OptionsChanged(); bPreviewTransitions = bOn; } } - BOOL IsShowComments() const { Init(); return bShowComments; } - void SetShowComments( BOOL bShow ) { if( bShowComments != bShow ) { OptionsChanged(); bShowComments = bShow; } } + sal_Bool IsShowComments() const { Init(); return bShowComments; } + void SetShowComments( sal_Bool bShow ) { if( bShowComments != bShow ) { OptionsChanged(); bShowComments = bShow; } } }; // ----------------------------------------------------------------------------- @@ -388,8 +388,8 @@ class SD_DLLPUBLIC SdOptionsMiscItem : public SfxPoolItem { public: - SdOptionsMiscItem( USHORT nWhich); - SdOptionsMiscItem( USHORT nWhich, SdOptions* pOpts, ::sd::FrameView* pView = NULL ); + SdOptionsMiscItem( sal_uInt16 nWhich); + SdOptionsMiscItem( sal_uInt16 nWhich, SdOptions* pOpts, ::sd::FrameView* pView = NULL ); virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual int operator==( const SfxPoolItem& ) const; @@ -410,51 +410,51 @@ class SD_DLLPUBLIC SdOptionsSnap : public SdOptionsGeneric { private: - BOOL bSnapHelplines : 1; // Snap/Object/SnapLine - BOOL bSnapBorder : 1; // Snap/Object/PageMargin - BOOL bSnapFrame : 1; // Snap/Object/ObjectFrame - BOOL bSnapPoints : 1; // Snap/Object/ObjectPoint - BOOL bOrtho : 1; // Snap/Position/CreatingMoving - BOOL bBigOrtho : 1; // Snap/Position/ExtendEdges - BOOL bRotate : 1; // Snap/Position/Rotating - INT16 nSnapArea; // Snap/Object/Range - INT16 nAngle; // Snap/Position/RotatingValue - INT16 nBezAngle; // Snap/Position/PointReduction + sal_Bool bSnapHelplines : 1; // Snap/Object/SnapLine + sal_Bool bSnapBorder : 1; // Snap/Object/PageMargin + sal_Bool bSnapFrame : 1; // Snap/Object/ObjectFrame + sal_Bool bSnapPoints : 1; // Snap/Object/ObjectPoint + sal_Bool bOrtho : 1; // Snap/Position/CreatingMoving + sal_Bool bBigOrtho : 1; // Snap/Position/ExtendEdges + sal_Bool bRotate : 1; // Snap/Position/Rotating + sal_Int16 nSnapArea; // Snap/Object/Range + sal_Int16 nAngle; // Snap/Position/RotatingValue + sal_Int16 nBezAngle; // Snap/Position/PointReduction protected: - virtual void GetPropNameArray( const char**& ppNames, ULONG& rCount ) const; - virtual BOOL ReadData( const ::com::sun::star::uno::Any* pValues ); - virtual BOOL WriteData( ::com::sun::star::uno::Any* pValues ) const; + virtual void GetPropNameArray( const char**& ppNames, sal_uLong& rCount ) const; + virtual sal_Bool ReadData( const ::com::sun::star::uno::Any* pValues ); + virtual sal_Bool WriteData( ::com::sun::star::uno::Any* pValues ) const; public: - SdOptionsSnap( USHORT nConfigId, BOOL bUseConfig ); + SdOptionsSnap( sal_uInt16 nConfigId, sal_Bool bUseConfig ); virtual ~SdOptionsSnap() {} - BOOL operator==( const SdOptionsSnap& rOpt ) const; - - BOOL IsSnapHelplines() const { Init(); return (BOOL) bSnapHelplines; } - BOOL IsSnapBorder() const { Init(); return (BOOL) bSnapBorder; } - BOOL IsSnapFrame() const { Init(); return (BOOL) bSnapFrame; } - BOOL IsSnapPoints() const { Init(); return (BOOL) bSnapPoints; } - BOOL IsOrtho() const { Init(); return (BOOL) bOrtho; } - BOOL IsBigOrtho() const { Init(); return (BOOL) bBigOrtho; } - BOOL IsRotate() const { Init(); return (BOOL) bRotate; } - INT16 GetSnapArea() const { Init(); return nSnapArea; } - INT16 GetAngle() const { Init(); return nAngle; } - INT16 GetEliminatePolyPointLimitAngle() const { Init(); return nBezAngle; } - - void SetSnapHelplines( BOOL bOn = TRUE ) { if( bSnapHelplines != bOn ) { OptionsChanged(); bSnapHelplines = bOn; } } - void SetSnapBorder( BOOL bOn = TRUE ) { if( bSnapBorder != bOn ) { OptionsChanged(); bSnapBorder = bOn; } } - void SetSnapFrame( BOOL bOn = TRUE ) { if( bSnapFrame != bOn ) { OptionsChanged(); bSnapFrame = bOn; } } - void SetSnapPoints( BOOL bOn = TRUE ) { if( bSnapPoints != bOn ) { OptionsChanged(); bSnapPoints = bOn; } } - void SetOrtho( BOOL bOn = TRUE ) { if( bOrtho != bOn ) { OptionsChanged(); bOrtho = bOn; } } - void SetBigOrtho( BOOL bOn = TRUE ) { if( bBigOrtho != bOn ) { OptionsChanged(); bBigOrtho = bOn; } } - void SetRotate( BOOL bOn = TRUE ) { if( bRotate != bOn ) { OptionsChanged(); bRotate = bOn; } } - void SetSnapArea( INT16 nIn ) { if( nSnapArea != nIn ) { OptionsChanged(); nSnapArea = nIn; } } - void SetAngle( INT16 nIn ) { if( nAngle != nIn ) { OptionsChanged(); nAngle = nIn; } } - void SetEliminatePolyPointLimitAngle( INT16 nIn ) { if( nBezAngle != nIn ) { OptionsChanged(); nBezAngle = nIn; } } + sal_Bool operator==( const SdOptionsSnap& rOpt ) const; + + sal_Bool IsSnapHelplines() const { Init(); return (sal_Bool) bSnapHelplines; } + sal_Bool IsSnapBorder() const { Init(); return (sal_Bool) bSnapBorder; } + sal_Bool IsSnapFrame() const { Init(); return (sal_Bool) bSnapFrame; } + sal_Bool IsSnapPoints() const { Init(); return (sal_Bool) bSnapPoints; } + sal_Bool IsOrtho() const { Init(); return (sal_Bool) bOrtho; } + sal_Bool IsBigOrtho() const { Init(); return (sal_Bool) bBigOrtho; } + sal_Bool IsRotate() const { Init(); return (sal_Bool) bRotate; } + sal_Int16 GetSnapArea() const { Init(); return nSnapArea; } + sal_Int16 GetAngle() const { Init(); return nAngle; } + sal_Int16 GetEliminatePolyPointLimitAngle() const { Init(); return nBezAngle; } + + void SetSnapHelplines( sal_Bool bOn = sal_True ) { if( bSnapHelplines != bOn ) { OptionsChanged(); bSnapHelplines = bOn; } } + void SetSnapBorder( sal_Bool bOn = sal_True ) { if( bSnapBorder != bOn ) { OptionsChanged(); bSnapBorder = bOn; } } + void SetSnapFrame( sal_Bool bOn = sal_True ) { if( bSnapFrame != bOn ) { OptionsChanged(); bSnapFrame = bOn; } } + void SetSnapPoints( sal_Bool bOn = sal_True ) { if( bSnapPoints != bOn ) { OptionsChanged(); bSnapPoints = bOn; } } + void SetOrtho( sal_Bool bOn = sal_True ) { if( bOrtho != bOn ) { OptionsChanged(); bOrtho = bOn; } } + void SetBigOrtho( sal_Bool bOn = sal_True ) { if( bBigOrtho != bOn ) { OptionsChanged(); bBigOrtho = bOn; } } + void SetRotate( sal_Bool bOn = sal_True ) { if( bRotate != bOn ) { OptionsChanged(); bRotate = bOn; } } + void SetSnapArea( sal_Int16 nIn ) { if( nSnapArea != nIn ) { OptionsChanged(); nSnapArea = nIn; } } + void SetAngle( sal_Int16 nIn ) { if( nAngle != nIn ) { OptionsChanged(); nAngle = nIn; } } + void SetEliminatePolyPointLimitAngle( sal_Int16 nIn ) { if( nBezAngle != nIn ) { OptionsChanged(); nBezAngle = nIn; } } }; // ----------------------------------------------------------------------------- @@ -463,8 +463,8 @@ class SD_DLLPUBLIC SdOptionsSnapItem : public SfxPoolItem { public: - SdOptionsSnapItem( USHORT nWhich); - SdOptionsSnapItem( USHORT nWhich, SdOptions* pOpts, ::sd::FrameView* pView = NULL ); + SdOptionsSnapItem( sal_uInt16 nWhich); + SdOptionsSnapItem( sal_uInt16 nWhich, SdOptions* pOpts, ::sd::FrameView* pView = NULL ); virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual int operator==( const SfxPoolItem& ) const; @@ -484,24 +484,24 @@ class SdOptionsZoom : public SdOptionsGeneric { private: - INT32 nX; // Zoom/ScaleX - INT32 nY; // Zoom/ScaleY + sal_Int32 nX; // Zoom/ScaleX + sal_Int32 nY; // Zoom/ScaleY protected: - virtual void GetPropNameArray( const char**& ppNames, ULONG& rCount ) const; - virtual BOOL ReadData( const ::com::sun::star::uno::Any* pValues ); - virtual BOOL WriteData( ::com::sun::star::uno::Any* pValues ) const; + virtual void GetPropNameArray( const char**& ppNames, sal_uLong& rCount ) const; + virtual sal_Bool ReadData( const ::com::sun::star::uno::Any* pValues ); + virtual sal_Bool WriteData( ::com::sun::star::uno::Any* pValues ) const; public: - SdOptionsZoom( USHORT nConfigId, BOOL bUseConfig ); + SdOptionsZoom( sal_uInt16 nConfigId, sal_Bool bUseConfig ); virtual ~SdOptionsZoom() {} - BOOL operator==( const SdOptionsZoom& rOpt ) const; + sal_Bool operator==( const SdOptionsZoom& rOpt ) const; - void GetScale( INT32& rX, INT32& rY ) const { Init(); rX = nX; rY = nY; } - void SetScale( INT32 nInX, INT32 nInY ) { if( nX != nInX || nY != nInY ) { OptionsChanged(); nX = nInX; nY = nInY; } } + void GetScale( sal_Int32& rX, sal_Int32& rY ) const { Init(); rX = nX; rY = nY; } + void SetScale( sal_Int32 nInX, sal_Int32 nInY ) { if( nX != nInX || nY != nInY ) { OptionsChanged(); nX = nInX; nY = nInY; } } }; // ----------------------------------------------------------------------------- @@ -514,39 +514,39 @@ class SdOptionsGrid : public SdOptionsGeneric, public SvxOptionsGrid { protected: - virtual void GetPropNameArray( const char**& ppNames, ULONG& rCount ) const; - virtual BOOL ReadData( const ::com::sun::star::uno::Any* pValues ); - virtual BOOL WriteData( ::com::sun::star::uno::Any* pValues ) const; + virtual void GetPropNameArray( const char**& ppNames, sal_uLong& rCount ) const; + virtual sal_Bool ReadData( const ::com::sun::star::uno::Any* pValues ); + virtual sal_Bool WriteData( ::com::sun::star::uno::Any* pValues ) const; public: - SdOptionsGrid( USHORT nConfigId, BOOL bUseConfig ); + SdOptionsGrid( sal_uInt16 nConfigId, sal_Bool bUseConfig ); virtual ~SdOptionsGrid(); void SetDefaults(); - BOOL operator==( const SdOptionsGrid& rOpt ) const; - - UINT32 GetFldDrawX() const { Init(); return SvxOptionsGrid::GetFldDrawX(); } - UINT32 GetFldDivisionX() const { Init(); return SvxOptionsGrid::GetFldDivisionX(); } - UINT32 GetFldDrawY() const { Init(); return SvxOptionsGrid::GetFldDrawY(); } - UINT32 GetFldDivisionY() const { Init(); return SvxOptionsGrid::GetFldDivisionY(); } - UINT32 GetFldSnapX() const { Init(); return SvxOptionsGrid::GetFldSnapX(); } - UINT32 GetFldSnapY() const { Init(); return SvxOptionsGrid::GetFldSnapY(); } - BOOL IsUseGridSnap() const { Init(); return SvxOptionsGrid::GetUseGridSnap(); } - BOOL IsSynchronize() const { Init(); return SvxOptionsGrid::GetSynchronize(); } - BOOL IsGridVisible() const { Init(); return SvxOptionsGrid::GetGridVisible(); } - BOOL IsEqualGrid() const { Init(); return SvxOptionsGrid::GetEqualGrid(); } - - void SetFldDrawX( UINT32 nSet ) { if( nSet != SvxOptionsGrid::GetFldDrawX() ) { OptionsChanged(); SvxOptionsGrid::SetFldDrawX( nSet ); } } - void SetFldDivisionX( UINT32 nSet ) { if( nSet != SvxOptionsGrid::GetFldDivisionX() ) { OptionsChanged(); SvxOptionsGrid::SetFldDivisionX( nSet ); } } - void SetFldDrawY( UINT32 nSet ) { if( nSet != SvxOptionsGrid::GetFldDrawY() ) { OptionsChanged(); SvxOptionsGrid::SetFldDrawY( nSet ); } } - void SetFldDivisionY( UINT32 nSet ) { if( nSet != SvxOptionsGrid::GetFldDivisionY() ) { OptionsChanged(); SvxOptionsGrid::SetFldDivisionY( nSet ); } } - void SetFldSnapX( UINT32 nSet ) { if( nSet != SvxOptionsGrid::GetFldSnapX() ) { OptionsChanged(); SvxOptionsGrid::SetFldSnapX( nSet ); } } - void SetFldSnapY( UINT32 nSet ) { if( nSet != SvxOptionsGrid::GetFldSnapY() ) { OptionsChanged(); SvxOptionsGrid::SetFldSnapY( nSet ); } } - void SetUseGridSnap( BOOL bSet ) { if( bSet != SvxOptionsGrid::GetUseGridSnap() ) { OptionsChanged(); SvxOptionsGrid::SetUseGridSnap( bSet ); } } - void SetSynchronize( BOOL bSet ) { if( bSet != SvxOptionsGrid::GetSynchronize() ) { OptionsChanged(); SvxOptionsGrid::SetSynchronize( bSet ); } } - void SetGridVisible( BOOL bSet ) { if( bSet != SvxOptionsGrid::GetGridVisible() ) { OptionsChanged(); SvxOptionsGrid::SetGridVisible( bSet ); } } - void SetEqualGrid( BOOL bSet ) { if( bSet != SvxOptionsGrid::GetEqualGrid() ) { OptionsChanged(); SvxOptionsGrid::SetEqualGrid( bSet ); } } + sal_Bool operator==( const SdOptionsGrid& rOpt ) const; + + sal_uInt32 GetFldDrawX() const { Init(); return SvxOptionsGrid::GetFldDrawX(); } + sal_uInt32 GetFldDivisionX() const { Init(); return SvxOptionsGrid::GetFldDivisionX(); } + sal_uInt32 GetFldDrawY() const { Init(); return SvxOptionsGrid::GetFldDrawY(); } + sal_uInt32 GetFldDivisionY() const { Init(); return SvxOptionsGrid::GetFldDivisionY(); } + sal_uInt32 GetFldSnapX() const { Init(); return SvxOptionsGrid::GetFldSnapX(); } + sal_uInt32 GetFldSnapY() const { Init(); return SvxOptionsGrid::GetFldSnapY(); } + sal_Bool IsUseGridSnap() const { Init(); return SvxOptionsGrid::GetUseGridSnap(); } + sal_Bool IsSynchronize() const { Init(); return SvxOptionsGrid::GetSynchronize(); } + sal_Bool IsGridVisible() const { Init(); return SvxOptionsGrid::GetGridVisible(); } + sal_Bool IsEqualGrid() const { Init(); return SvxOptionsGrid::GetEqualGrid(); } + + void SetFldDrawX( sal_uInt32 nSet ) { if( nSet != SvxOptionsGrid::GetFldDrawX() ) { OptionsChanged(); SvxOptionsGrid::SetFldDrawX( nSet ); } } + void SetFldDivisionX( sal_uInt32 nSet ) { if( nSet != SvxOptionsGrid::GetFldDivisionX() ) { OptionsChanged(); SvxOptionsGrid::SetFldDivisionX( nSet ); } } + void SetFldDrawY( sal_uInt32 nSet ) { if( nSet != SvxOptionsGrid::GetFldDrawY() ) { OptionsChanged(); SvxOptionsGrid::SetFldDrawY( nSet ); } } + void SetFldDivisionY( sal_uInt32 nSet ) { if( nSet != SvxOptionsGrid::GetFldDivisionY() ) { OptionsChanged(); SvxOptionsGrid::SetFldDivisionY( nSet ); } } + void SetFldSnapX( sal_uInt32 nSet ) { if( nSet != SvxOptionsGrid::GetFldSnapX() ) { OptionsChanged(); SvxOptionsGrid::SetFldSnapX( nSet ); } } + void SetFldSnapY( sal_uInt32 nSet ) { if( nSet != SvxOptionsGrid::GetFldSnapY() ) { OptionsChanged(); SvxOptionsGrid::SetFldSnapY( nSet ); } } + void SetUseGridSnap( sal_Bool bSet ) { if( bSet != SvxOptionsGrid::GetUseGridSnap() ) { OptionsChanged(); SvxOptionsGrid::SetUseGridSnap( bSet ); } } + void SetSynchronize( sal_Bool bSet ) { if( bSet != SvxOptionsGrid::GetSynchronize() ) { OptionsChanged(); SvxOptionsGrid::SetSynchronize( bSet ); } } + void SetGridVisible( sal_Bool bSet ) { if( bSet != SvxOptionsGrid::GetGridVisible() ) { OptionsChanged(); SvxOptionsGrid::SetGridVisible( bSet ); } } + void SetEqualGrid( sal_Bool bSet ) { if( bSet != SvxOptionsGrid::GetEqualGrid() ) { OptionsChanged(); SvxOptionsGrid::SetEqualGrid( bSet ); } } }; // ----------------------------------------------- @@ -555,7 +555,7 @@ class SdOptionsGridItem : public SvxGridItem { public: - SdOptionsGridItem( USHORT nWhich, SdOptions* pOpts, ::sd::FrameView* pView = NULL ); + SdOptionsGridItem( sal_uInt16 nWhich, SdOptions* pOpts, ::sd::FrameView* pView = NULL ); void SetOptions( SdOptions* pOpts ) const; }; @@ -568,84 +568,84 @@ class SD_DLLPUBLIC SdOptionsPrint : public SdOptionsGeneric { private: - BOOL bDraw : 1; // Print/Content/Drawing - BOOL bNotes : 1; // Print/Content/Note - BOOL bHandout : 1; // Print/Content/Handout - BOOL bOutline : 1; // Print/Content/Outline - BOOL bDate : 1; // Print/Other/Date - BOOL bTime : 1; // Print/Other/Time - BOOL bPagename : 1; // Print/Other/PageName - BOOL bHiddenPages : 1; // Print/Other/HiddenPage - BOOL bPagesize : 1; // Print/Page/PageSize - BOOL bPagetile : 1; // Print/Page/PageTile - BOOL bWarningPrinter : 1; // These flags you get - BOOL bWarningSize : 1; // from the common options, - BOOL bWarningOrientation : 1; // currently org.openoffice.Office.Common.xml (class OfaMiscCfg ; sfx2/misccfg.hxx ) - BOOL bBooklet : 1; // Print/Page/Booklet - BOOL bFront : 1; // Print/Page/BookletFront - BOOL bBack : 1; // Print/Page/BookletFront - BOOL bCutPage : 1; // NOT persistent !!! - BOOL bPaperbin : 1; // Print/Other/FromPrinterSetup - BOOL mbHandoutHorizontal : 1; // Order Page previews on Handout Pages horizontal - UINT16 mnHandoutPages; // Number of page previews on handout page (only 1/2/4/6/9 are supported) - UINT16 nQuality; // Print/Other/Quality + sal_Bool bDraw : 1; // Print/Content/Drawing + sal_Bool bNotes : 1; // Print/Content/Note + sal_Bool bHandout : 1; // Print/Content/Handout + sal_Bool bOutline : 1; // Print/Content/Outline + sal_Bool bDate : 1; // Print/Other/Date + sal_Bool bTime : 1; // Print/Other/Time + sal_Bool bPagename : 1; // Print/Other/PageName + sal_Bool bHiddenPages : 1; // Print/Other/HiddenPage + sal_Bool bPagesize : 1; // Print/Page/PageSize + sal_Bool bPagetile : 1; // Print/Page/PageTile + sal_Bool bWarningPrinter : 1; // These flags you get + sal_Bool bWarningSize : 1; // from the common options, + sal_Bool bWarningOrientation : 1; // currently org.openoffice.Office.Common.xml (class OfaMiscCfg ; sfx2/misccfg.hxx ) + sal_Bool bBooklet : 1; // Print/Page/Booklet + sal_Bool bFront : 1; // Print/Page/BookletFront + sal_Bool bBack : 1; // Print/Page/BookletFront + sal_Bool bCutPage : 1; // NOT persistent !!! + sal_Bool bPaperbin : 1; // Print/Other/FromPrinterSetup + sal_Bool mbHandoutHorizontal : 1; // Order Page previews on Handout Pages horizontal + sal_uInt16 mnHandoutPages; // Number of page previews on handout page (only 1/2/4/6/9 are supported) + sal_uInt16 nQuality; // Print/Other/Quality protected: - virtual void GetPropNameArray( const char**& ppNames, ULONG& rCount ) const; - virtual BOOL ReadData( const ::com::sun::star::uno::Any* pValues ); - virtual BOOL WriteData( ::com::sun::star::uno::Any* pValues ) const; + virtual void GetPropNameArray( const char**& ppNames, sal_uLong& rCount ) const; + virtual sal_Bool ReadData( const ::com::sun::star::uno::Any* pValues ); + virtual sal_Bool WriteData( ::com::sun::star::uno::Any* pValues ) const; public: - SdOptionsPrint( USHORT nConfigId, BOOL bUseConfig ); + SdOptionsPrint( sal_uInt16 nConfigId, sal_Bool bUseConfig ); virtual ~SdOptionsPrint() {} - BOOL operator==( const SdOptionsPrint& rOpt ) const; - - BOOL IsDraw() const { Init(); return (BOOL) bDraw; } - BOOL IsNotes() const { Init(); return (BOOL) bNotes; } - BOOL IsHandout() const { Init(); return (BOOL) bHandout; } - BOOL IsOutline() const { Init(); return (BOOL) bOutline; } - BOOL IsDate() const { Init(); return (BOOL) bDate; } - BOOL IsTime() const { Init(); return (BOOL) bTime; } - BOOL IsPagename() const { Init(); return (BOOL) bPagename; } - BOOL IsHiddenPages() const { Init(); return (BOOL) bHiddenPages; } - BOOL IsPagesize() const { Init(); return (BOOL) bPagesize; } - BOOL IsPagetile() const { Init(); return (BOOL) bPagetile; } - BOOL IsWarningPrinter() const { Init(); return (BOOL) bWarningPrinter; } - BOOL IsWarningSize() const { Init(); return (BOOL) bWarningSize; } - BOOL IsWarningOrientation() const { Init(); return (BOOL) bWarningOrientation; } - BOOL IsBooklet() const { Init(); return (BOOL) bBooklet; } - BOOL IsFrontPage() const { Init(); return (BOOL) bFront; } - BOOL IsBackPage() const { Init(); return (BOOL) bBack; } - BOOL IsCutPage() const { Init(); return (BOOL) bCutPage; } - BOOL IsPaperbin() const { Init(); return (BOOL) bPaperbin; } - UINT16 GetOutputQuality() const { Init(); return nQuality; } - BOOL IsHandoutHorizontal() const { Init(); return mbHandoutHorizontal; } - UINT16 GetHandoutPages() const { Init(); return mnHandoutPages; } - - void SetDraw( BOOL bOn = TRUE ) { if( bDraw != bOn ) { OptionsChanged(); bDraw = bOn; } } - void SetNotes( BOOL bOn = TRUE ) { if( bNotes != bOn ) { OptionsChanged(); bNotes = bOn; } } - void SetHandout( BOOL bOn = TRUE ) { if( bHandout != bOn ) { OptionsChanged(); bHandout = bOn; } } - void SetOutline( BOOL bOn = TRUE ) { if( bOutline != bOn ) { OptionsChanged(); bOutline = bOn; } } - void SetDate( BOOL bOn = TRUE ) { if( bDate != bOn ) { OptionsChanged(); bDate = bOn; } } - void SetTime( BOOL bOn = TRUE ) { if( bTime != bOn ) { OptionsChanged(); bTime = bOn; } } - void SetPagename( BOOL bOn = TRUE ) { if( bPagename != bOn ) { OptionsChanged(); bPagename = bOn; } } - void SetHiddenPages( BOOL bOn = TRUE ) { if( bHiddenPages != bOn ) { OptionsChanged(); bHiddenPages = bOn; } } - void SetPagesize( BOOL bOn = TRUE ) { if( bPagesize != bOn ) { OptionsChanged(); bPagesize = bOn; } } - void SetPagetile( BOOL bOn = TRUE ) { if( bPagetile != bOn ) { OptionsChanged(); bPagetile = bOn; } } - void SetWarningPrinter( BOOL bOn = TRUE ) { if( bWarningPrinter != bOn ) { OptionsChanged(); bWarningPrinter = bOn; } } - void SetWarningSize( BOOL bOn = TRUE ) { if( bWarningSize != bOn ) { OptionsChanged(); bWarningSize = bOn; } } - void SetWarningOrientation( BOOL bOn = TRUE ) { if( bWarningOrientation != bOn ) { OptionsChanged(); bWarningOrientation = bOn; } } - void SetBooklet( BOOL bOn = TRUE ) { if( bBooklet != bOn ) { OptionsChanged(); bBooklet = bOn; } } - void SetFrontPage( BOOL bOn = TRUE ) { if( bFront != bOn ) { OptionsChanged(); bFront = bOn; } } - void SetBackPage( BOOL bOn = TRUE ) { if( bBack != bOn ) { OptionsChanged(); bBack = bOn; } } - void SetCutPage( BOOL bOn = TRUE ) { if( bCutPage != bOn ) { OptionsChanged(); bCutPage = bOn; } } - void SetPaperbin( BOOL bOn = TRUE ) { if( bPaperbin != bOn ) { OptionsChanged(); bPaperbin = bOn; } } - void SetOutputQuality( UINT16 nInQuality ) { if( nQuality != nInQuality ) { OptionsChanged(); nQuality = nInQuality; } } - void SetHandoutHorizontal( BOOL bHandoutHorizontal ) { if( mbHandoutHorizontal != bHandoutHorizontal ) { OptionsChanged(); mbHandoutHorizontal = bHandoutHorizontal; } } - void SetHandoutPages( UINT16 nHandoutPages ) { if( nHandoutPages != mnHandoutPages ) { OptionsChanged(); mnHandoutPages = nHandoutPages; } } + sal_Bool operator==( const SdOptionsPrint& rOpt ) const; + + sal_Bool IsDraw() const { Init(); return (sal_Bool) bDraw; } + sal_Bool IsNotes() const { Init(); return (sal_Bool) bNotes; } + sal_Bool IsHandout() const { Init(); return (sal_Bool) bHandout; } + sal_Bool IsOutline() const { Init(); return (sal_Bool) bOutline; } + sal_Bool IsDate() const { Init(); return (sal_Bool) bDate; } + sal_Bool IsTime() const { Init(); return (sal_Bool) bTime; } + sal_Bool IsPagename() const { Init(); return (sal_Bool) bPagename; } + sal_Bool IsHiddenPages() const { Init(); return (sal_Bool) bHiddenPages; } + sal_Bool IsPagesize() const { Init(); return (sal_Bool) bPagesize; } + sal_Bool IsPagetile() const { Init(); return (sal_Bool) bPagetile; } + sal_Bool IsWarningPrinter() const { Init(); return (sal_Bool) bWarningPrinter; } + sal_Bool IsWarningSize() const { Init(); return (sal_Bool) bWarningSize; } + sal_Bool IsWarningOrientation() const { Init(); return (sal_Bool) bWarningOrientation; } + sal_Bool IsBooklet() const { Init(); return (sal_Bool) bBooklet; } + sal_Bool IsFrontPage() const { Init(); return (sal_Bool) bFront; } + sal_Bool IsBackPage() const { Init(); return (sal_Bool) bBack; } + sal_Bool IsCutPage() const { Init(); return (sal_Bool) bCutPage; } + sal_Bool IsPaperbin() const { Init(); return (sal_Bool) bPaperbin; } + sal_uInt16 GetOutputQuality() const { Init(); return nQuality; } + sal_Bool IsHandoutHorizontal() const { Init(); return mbHandoutHorizontal; } + sal_uInt16 GetHandoutPages() const { Init(); return mnHandoutPages; } + + void SetDraw( sal_Bool bOn = sal_True ) { if( bDraw != bOn ) { OptionsChanged(); bDraw = bOn; } } + void SetNotes( sal_Bool bOn = sal_True ) { if( bNotes != bOn ) { OptionsChanged(); bNotes = bOn; } } + void SetHandout( sal_Bool bOn = sal_True ) { if( bHandout != bOn ) { OptionsChanged(); bHandout = bOn; } } + void SetOutline( sal_Bool bOn = sal_True ) { if( bOutline != bOn ) { OptionsChanged(); bOutline = bOn; } } + void SetDate( sal_Bool bOn = sal_True ) { if( bDate != bOn ) { OptionsChanged(); bDate = bOn; } } + void SetTime( sal_Bool bOn = sal_True ) { if( bTime != bOn ) { OptionsChanged(); bTime = bOn; } } + void SetPagename( sal_Bool bOn = sal_True ) { if( bPagename != bOn ) { OptionsChanged(); bPagename = bOn; } } + void SetHiddenPages( sal_Bool bOn = sal_True ) { if( bHiddenPages != bOn ) { OptionsChanged(); bHiddenPages = bOn; } } + void SetPagesize( sal_Bool bOn = sal_True ) { if( bPagesize != bOn ) { OptionsChanged(); bPagesize = bOn; } } + void SetPagetile( sal_Bool bOn = sal_True ) { if( bPagetile != bOn ) { OptionsChanged(); bPagetile = bOn; } } + void SetWarningPrinter( sal_Bool bOn = sal_True ) { if( bWarningPrinter != bOn ) { OptionsChanged(); bWarningPrinter = bOn; } } + void SetWarningSize( sal_Bool bOn = sal_True ) { if( bWarningSize != bOn ) { OptionsChanged(); bWarningSize = bOn; } } + void SetWarningOrientation( sal_Bool bOn = sal_True ) { if( bWarningOrientation != bOn ) { OptionsChanged(); bWarningOrientation = bOn; } } + void SetBooklet( sal_Bool bOn = sal_True ) { if( bBooklet != bOn ) { OptionsChanged(); bBooklet = bOn; } } + void SetFrontPage( sal_Bool bOn = sal_True ) { if( bFront != bOn ) { OptionsChanged(); bFront = bOn; } } + void SetBackPage( sal_Bool bOn = sal_True ) { if( bBack != bOn ) { OptionsChanged(); bBack = bOn; } } + void SetCutPage( sal_Bool bOn = sal_True ) { if( bCutPage != bOn ) { OptionsChanged(); bCutPage = bOn; } } + void SetPaperbin( sal_Bool bOn = sal_True ) { if( bPaperbin != bOn ) { OptionsChanged(); bPaperbin = bOn; } } + void SetOutputQuality( sal_uInt16 nInQuality ) { if( nQuality != nInQuality ) { OptionsChanged(); nQuality = nInQuality; } } + void SetHandoutHorizontal( sal_Bool bHandoutHorizontal ) { if( mbHandoutHorizontal != bHandoutHorizontal ) { OptionsChanged(); mbHandoutHorizontal = bHandoutHorizontal; } } + void SetHandoutPages( sal_uInt16 nHandoutPages ) { if( nHandoutPages != mnHandoutPages ) { OptionsChanged(); mnHandoutPages = nHandoutPages; } } }; // ----------------------------------------------------------------------------- @@ -654,8 +654,8 @@ class SD_DLLPUBLIC SdOptionsPrintItem : public SfxPoolItem { public: - SdOptionsPrintItem( USHORT nWhich); - SdOptionsPrintItem( USHORT nWhich, SdOptions* pOpts, ::sd::FrameView* pView = NULL ); + SdOptionsPrintItem( sal_uInt16 nWhich); + SdOptionsPrintItem( sal_uInt16 nWhich, SdOptions* pOpts, ::sd::FrameView* pView = NULL ); virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual int operator==( const SfxPoolItem& ) const; @@ -679,10 +679,10 @@ class SdOptions : public SdOptionsLayout, public SdOptionsContents, { public: - SdOptions( USHORT nConfigId ); + SdOptions( sal_uInt16 nConfigId ); virtual ~SdOptions(); - void StoreConfig( ULONG nOptionRange = SD_OPTIONS_ALL ); + void StoreConfig( sal_uLong nOptionRange = SD_OPTIONS_ALL ); }; #endif // _SD_OPTSITEM_HXX diff --git a/sd/source/ui/inc/prltempl.hxx b/sd/source/ui/inc/prltempl.hxx index 33a7df247c7e..5e8479ce4562 100644..100755 --- a/sd/source/ui/inc/prltempl.hxx +++ b/sd/source/ui/inc/prltempl.hxx @@ -65,9 +65,9 @@ private: XDashList* pDashList; XLineEndList* pLineEndList; - USHORT nPageType; - USHORT nDlgType; - USHORT nPos; + sal_uInt16 nPageType; + sal_uInt16 nDlgType; + sal_uInt16 nPos; ChangeType nColorTableState; ChangeType nBitmapListState; @@ -78,14 +78,14 @@ private: PresentationObjects ePO; - virtual void PageCreated( USHORT nId, SfxTabPage &rPage ); + virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ); // fuers Maping mit dem neuen SvxNumBulletItem SfxItemSet aInputSet; SfxItemSet* pOutSet; const SfxItemSet* pOrgSet; - USHORT GetOutlineLevel() const; + sal_uInt16 GetOutlineLevel() const; using SfxTabDialog::GetOutputItemSet; diff --git a/sd/source/ui/inc/prntopts.hxx b/sd/source/ui/inc/prntopts.hxx index da9bc20c02d6..9ee90a522ac7 100755 --- a/sd/source/ui/inc/prntopts.hxx +++ b/sd/source/ui/inc/prntopts.hxx @@ -95,7 +95,7 @@ public: static SfxTabPage* Create( Window*, const SfxItemSet& ); - virtual BOOL FillItemSet( SfxItemSet& ); + virtual sal_Bool FillItemSet( SfxItemSet& ); virtual void Reset( const SfxItemSet & ); void SetDrawMode(); diff --git a/sd/source/ui/inc/pubdlg.hxx b/sd/source/ui/inc/pubdlg.hxx index dbdddfd5d112..2f14066021ed 100644..100755 --- a/sd/source/ui/inc/pubdlg.hxx +++ b/sd/source/ui/inc/pubdlg.hxx @@ -184,8 +184,8 @@ private: Assistent aAssistentFunc; - BOOL m_bImpress; - BOOL m_bButtonsDirty; + sal_Bool m_bImpress; + sal_Bool m_bButtonsDirty; void SetDefaults(); void CreatePages(); @@ -198,10 +198,10 @@ private: void UpdatePage(); List* m_pDesignList; - BOOL m_bDesignListDirty; + sal_Bool m_bDesignListDirty; SdPublishingDesign* m_pDesign; - BOOL Load(); - BOOL Save(); + sal_Bool Load(); + sal_Bool Save(); void GetDesign( SdPublishingDesign* pDesign ); void SetDesign( SdPublishingDesign* pDesign ); diff --git a/sd/source/ui/inc/sdtreelb.hxx b/sd/source/ui/inc/sdtreelb.hxx index 1aea2d34156e..9681e9ba4230 100755 --- a/sd/source/ui/inc/sdtreelb.hxx +++ b/sd/source/ui/inc/sdtreelb.hxx @@ -68,7 +68,7 @@ class SD_DLLPUBLIC SdPageObjsTLB : public SvTreeListBox { private: - static BOOL SD_DLLPRIVATE bIsInDrag; // static, falls der Navigator im ExecuteDrag geloescht wird + static sal_Bool SD_DLLPRIVATE bIsInDrag; // static, falls der Navigator im ExecuteDrag geloescht wird public: @@ -138,8 +138,8 @@ protected: Image maImgGraphic; Image maImgOleH; Image maImgGraphicH; - BOOL mbLinkableSelected; - BOOL mbDragEnabled; + sal_Bool mbLinkableSelected; + sal_Bool mbDragEnabled; String maDocName; ::sd::DrawDocShellRef mxBookmarkDocShRef; // Zum Laden von Bookmarks ::sd::DrawDocShell* mpDropDocSh; @@ -181,11 +181,11 @@ protected: reorders both the involved shapes in their page as well as the associated list box entries. */ - virtual BOOL NotifyMoving( + virtual sal_Bool NotifyMoving( SvLBoxEntry* pTarget, SvLBoxEntry* pEntry, SvLBoxEntry*& rpNewParent, - ULONG& rNewChildPos); + sal_uLong& rNewChildPos); using Window::GetDropTarget; virtual SvLBoxEntry* GetDropTarget (const Point& rLocation); @@ -201,21 +201,21 @@ public: void SetViewFrame( SfxViewFrame* pViewFrame ) { mpFrame = pViewFrame; } SfxViewFrame* GetViewFrame() const { return mpFrame; } - void Fill( const SdDrawDocument*, BOOL bAllPages, const String& rDocName ); + void Fill( const SdDrawDocument*, sal_Bool bAllPages, const String& rDocName ); void Fill( const SdDrawDocument*, SfxMedium* pSfxMedium, const String& rDocName ); void SetShowAllShapes (const bool bShowAllShapes, const bool bFill); bool GetShowAllShapes (void) const; - BOOL IsEqualToDoc( const SdDrawDocument* pInDoc = NULL ); - BOOL HasSelectedChilds( const String& rName ); - BOOL SelectEntry( const String& rName ); + sal_Bool IsEqualToDoc( const SdDrawDocument* pInDoc = NULL ); + sal_Bool HasSelectedChilds( const String& rName ); + sal_Bool SelectEntry( const String& rName ); String GetSelectEntry(); - List* GetSelectEntryList( USHORT nDepth ); + List* GetSelectEntryList( sal_uInt16 nDepth ); SdDrawDocument* GetBookmarkDoc(SfxMedium* pMedium = NULL); ::sd::DrawDocShell* GetDropDocSh() { return(mpDropDocSh); } - BOOL IsLinkableSelected() const { return mbLinkableSelected; } + sal_Bool IsLinkableSelected() const { return mbLinkableSelected; } - static BOOL IsInDrag(); + static sal_Bool IsInDrag(); using SvLBox::ExecuteDrop; using SvTreeListBox::SelectEntry; diff --git a/sd/source/ui/inc/sdundogr.hxx b/sd/source/ui/inc/sdundogr.hxx index f02977234475..5bc8da7c0ec3 100755 --- a/sd/source/ui/inc/sdundogr.hxx +++ b/sd/source/ui/inc/sdundogr.hxx @@ -42,13 +42,13 @@ public: aCtn(16, 16, 16) {} virtual ~SdUndoGroup(); - virtual BOOL Merge( SfxUndoAction* pNextAction ); + virtual sal_Bool Merge( SfxUndoAction* pNextAction ); virtual void Undo(); virtual void Redo(); void AddAction(SdUndoAction* pAction); - ULONG Count() const { return aCtn.Count(); } + sal_uLong Count() const { return aCtn.Count(); } }; diff --git a/sd/source/ui/inc/sdxfer.hxx b/sd/source/ui/inc/sdxfer.hxx index d79e5d653ab4..f29b1d28936a 100644..100755 --- a/sd/source/ui/inc/sdxfer.hxx +++ b/sd/source/ui/inc/sdxfer.hxx @@ -53,7 +53,7 @@ class SdTransferable : public TransferableHelper, public SfxListener { public: - SdTransferable( SdDrawDocument* pSrcDoc, ::sd::View* pWorkView, BOOL bInitOnGetData ); + SdTransferable( SdDrawDocument* pSrcDoc, ::sd::View* pWorkView, sal_Bool bInitOnGetData ); ~SdTransferable(); void SetDocShell( const SfxObjectShellRef& rRef ) { maDocShellRef = rRef; } @@ -70,14 +70,14 @@ public: void SetStartPos( const Point& rStartPos ) { maStartPos = rStartPos; } const Point& GetStartPos() const { return maStartPos; } - void SetInternalMove( BOOL bSet ) { mbInternalMove = bSet; } - BOOL IsInternalMove() const { return mbInternalMove; } + void SetInternalMove( sal_Bool bSet ) { mbInternalMove = bSet; } + sal_Bool IsInternalMove() const { return mbInternalMove; } - BOOL HasSourceDoc( const SdDrawDocument* pDoc ) const { return( mpSourceDoc == pDoc ); } + sal_Bool HasSourceDoc( const SdDrawDocument* pDoc ) const { return( mpSourceDoc == pDoc ); } - void SetPageBookmarks( const List& rPageBookmarks, BOOL bPersistent ); - BOOL IsPageTransferable() const { return mbPageTransferable; } - BOOL HasPageBookmarks() const { return( mpPageDocShell && ( maPageBookmarks.Count() > 0 ) ); } + void SetPageBookmarks( const List& rPageBookmarks, sal_Bool bPersistent ); + sal_Bool IsPageTransferable() const { return mbPageTransferable; } + sal_Bool HasPageBookmarks() const { return( mpPageDocShell && ( maPageBookmarks.Count() > 0 ) ); } const List& GetPageBookmarks() const { return maPageBookmarks; } ::sd::DrawDocShell* GetPageDocShell() const { return mpPageDocShell; } @@ -117,12 +117,12 @@ private: ImageMap* mpImageMap; Rectangle maVisArea; Point maStartPos; - BOOL mbInternalMove : 1; - BOOL mbOwnDocument : 1; - BOOL mbOwnView : 1; - BOOL mbLateInit : 1; - BOOL mbPageTransferable : 1; - BOOL mbPageTransferablePersistent : 1; + sal_Bool mbInternalMove : 1; + sal_Bool mbOwnDocument : 1; + sal_Bool mbOwnView : 1; + sal_Bool mbLateInit : 1; + sal_Bool mbPageTransferable : 1; + sal_Bool mbPageTransferablePersistent : 1; bool mbIsUnoObj : 1; // not available diff --git a/sd/source/ui/inc/smarttag.hxx b/sd/source/ui/inc/smarttag.hxx index 15544c2b5221..f24de66f144d 100755 --- a/sd/source/ui/inc/smarttag.hxx +++ b/sd/source/ui/inc/smarttag.hxx @@ -76,11 +76,11 @@ public: ::sd::View& getView() const { return mrView; } protected: - virtual ULONG GetMarkablePointCount() const; - virtual ULONG GetMarkedPointCount() const; - virtual BOOL MarkPoint(SdrHdl& rHdl, BOOL bUnmark=FALSE); + virtual sal_uLong GetMarkablePointCount() const; + virtual sal_uLong GetMarkedPointCount() const; + virtual sal_Bool MarkPoint(SdrHdl& rHdl, sal_Bool bUnmark=sal_False); virtual void CheckPossibilities(); - virtual BOOL MarkPoints(const Rectangle* pRect, BOOL bUnmark); + virtual sal_Bool MarkPoints(const Rectangle* pRect, sal_Bool bUnmark); virtual void addCustomHandles( SdrHdlList& rHandlerList ); virtual void select(); @@ -139,13 +139,13 @@ public: bool getContext( SdrViewContext& rContext ) const; // support point editing - BOOL HasMarkablePoints() const; - ULONG GetMarkablePointCount() const; - BOOL HasMarkedPoints() const; - ULONG GetMarkedPointCount() const; - BOOL IsPointMarkable(const SdrHdl& rHdl) const; - BOOL MarkPoint(SdrHdl& rHdl, BOOL bUnmark=FALSE); - BOOL MarkPoints(const Rectangle* pRect, BOOL bUnmark); + sal_Bool HasMarkablePoints() const; + sal_uLong GetMarkablePointCount() const; + sal_Bool HasMarkedPoints() const; + sal_uLong GetMarkedPointCount() const; + sal_Bool IsPointMarkable(const SdrHdl& rHdl) const; + sal_Bool MarkPoint(SdrHdl& rHdl, sal_Bool bUnmark=sal_False); + sal_Bool MarkPoints(const Rectangle* pRect, sal_Bool bUnmark); void CheckPossibilities(); diff --git a/sd/source/ui/inc/sprite.hxx b/sd/source/ui/inc/sprite.hxx index 782e4ed0fb4a..9df19b96501e 100644..100755 --- a/sd/source/ui/inc/sprite.hxx +++ b/sd/source/ui/inc/sprite.hxx @@ -50,7 +50,7 @@ public: Sprite( List* pListOfBmpEx ); ~Sprite(); - BOOL StartMoving( OutputDevice* pOut, + sal_Bool StartMoving( OutputDevice* pOut, OutputDevice* pBottomLayer = NULL, BitmapEx* pTopLayer = NULL, MetaFile** ppTopMtf = NULL, @@ -75,10 +75,10 @@ protected: Marker* pObjStartMarker; Marker* pObjEndMarker; List* pListOfBmpEx; - ULONG nLastTime; - BOOL bClipRegion; + sal_uLong nLastTime; + sal_Bool bClipRegion; - BOOL ImplPrepareMoveTo(); + sal_Bool ImplPrepareMoveTo(); void ImplDrawSprite( OutputDevice* pOut, const Point& rPt, const Size& rSz ); }; diff --git a/sd/source/ui/inc/tabtempl.hxx b/sd/source/ui/inc/tabtempl.hxx index b96231dd3969..3637ee3565fc 100644..100755 --- a/sd/source/ui/inc/tabtempl.hxx +++ b/sd/source/ui/inc/tabtempl.hxx @@ -60,15 +60,15 @@ private: XDashList* pDashList; XLineEndList* pLineEndList; - USHORT nPageType; - USHORT nDlgType; - USHORT nPos; + sal_uInt16 nPageType; + sal_uInt16 nDlgType; + sal_uInt16 nPos; ChangeType nColorTableState; ChangeType nBitmapListState; ChangeType nGradientListState; ChangeType nHatchingListState; - virtual void PageCreated( USHORT nId, SfxTabPage &rPage ); + virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ); virtual const SfxItemSet* GetRefreshedSet(); public: diff --git a/sd/source/ui/inc/taskpane/TitleBar.hxx b/sd/source/ui/inc/taskpane/TitleBar.hxx index 995117516529..466330ff86cc 100755 --- a/sd/source/ui/inc/taskpane/TitleBar.hxx +++ b/sd/source/ui/inc/taskpane/TitleBar.hxx @@ -152,7 +152,7 @@ private: void PaintText (const Rectangle& rTextBox); - USHORT GetTextStyle (void); + sal_uInt16 GetTextStyle (void); const static int snIndentationWidth; diff --git a/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx b/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx index fb9d31aa04a1..431932fc01f6 100644 --- a/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx +++ b/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx @@ -145,7 +145,7 @@ private: /** The id of the menu in the menu bar/tool box of the parent docking window. */ - USHORT mnMenuId; + sal_uInt16 mnMenuId; /** Create a popup menu. it contains two sections, one for docking or un-docking the tool panel, one for toggling the diff --git a/sd/source/ui/inc/tbx_ww.hxx b/sd/source/ui/inc/tbx_ww.hxx index e8c3b93a7fa2..b59290883328 100644..100755 --- a/sd/source/ui/inc/tbx_ww.hxx +++ b/sd/source/ui/inc/tbx_ww.hxx @@ -47,7 +47,7 @@ private: DECL_LINK( TbxSelectHdl, ToolBox * ); public: - SdPopupWindowTbx( USHORT nId, WindowAlign eAlign, + SdPopupWindowTbx( sal_uInt16 nId, WindowAlign eAlign, SdResId aRIdWin, SdResId aRIdTbx, SfxBindings& rBindings ); ~SdPopupWindowTbx(); @@ -71,17 +71,17 @@ private: class SdTbxControl : public SfxToolBoxControl { private: - BOOL IsCheckable( USHORT nSId ); + sal_Bool IsCheckable( sal_uInt16 nSId ); public: SFX_DECL_TOOLBOX_CONTROL(); - SdTbxControl(USHORT nSlotId, USHORT nId, ToolBox& rTbx ); + SdTbxControl(sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); ~SdTbxControl() {} virtual SfxPopupWindowType GetPopupWindowType() const; virtual SfxPopupWindow* CreatePopupWindow(); - virtual void StateChanged( USHORT nSId, SfxItemState eState, + virtual void StateChanged( sal_uInt16 nSId, SfxItemState eState, const SfxPoolItem* pState ); }; diff --git a/sd/source/ui/inc/tmplctrl.hxx b/sd/source/ui/inc/tmplctrl.hxx index 6a85b0f7b4fb..ab0aac07dabe 100644..100755 --- a/sd/source/ui/inc/tmplctrl.hxx +++ b/sd/source/ui/inc/tmplctrl.hxx @@ -33,10 +33,10 @@ class SdTemplateControl : public SfxStatusBarControl { public: - SdTemplateControl( USHORT nSlotId, USHORT nId, StatusBar& rStb ); + SdTemplateControl( sal_uInt16 nSlotId, sal_uInt16 nId, StatusBar& rStb ); ~SdTemplateControl(); - virtual void StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState ); + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); virtual void Paint( const UserDrawEvent& rEvt ); SFX_DECL_STATUSBAR_CONTROL(); diff --git a/sd/source/ui/inc/tools/AsynchronousTask.hxx b/sd/source/ui/inc/tools/AsynchronousTask.hxx index f3135d3fcce7..f3135d3fcce7 100644..100755 --- a/sd/source/ui/inc/tools/AsynchronousTask.hxx +++ b/sd/source/ui/inc/tools/AsynchronousTask.hxx diff --git a/sd/source/ui/inc/tools/IconCache.hxx b/sd/source/ui/inc/tools/IconCache.hxx index 008e99639849..b0619ea4b2d7 100644..100755 --- a/sd/source/ui/inc/tools/IconCache.hxx +++ b/sd/source/ui/inc/tools/IconCache.hxx @@ -57,7 +57,7 @@ public: given id or an error occured. Should not happen under normal circumstances. */ - Image GetIcon (USHORT nResourceId); + Image GetIcon (sal_uInt16 nResourceId); private: class Implementation; diff --git a/sd/source/ui/inc/tools/TimerBasedTaskExecution.hxx b/sd/source/ui/inc/tools/TimerBasedTaskExecution.hxx index 33ec3ccd9993..33ec3ccd9993 100644..100755 --- a/sd/source/ui/inc/tools/TimerBasedTaskExecution.hxx +++ b/sd/source/ui/inc/tools/TimerBasedTaskExecution.hxx diff --git a/sd/source/ui/inc/tpaction.hxx b/sd/source/ui/inc/tpaction.hxx index 2ee8bbe6771a..d4b746762def 100755 --- a/sd/source/ui/inc/tpaction.hxx +++ b/sd/source/ui/inc/tpaction.hxx @@ -95,7 +95,7 @@ private: SdDrawDocument* mpDoc; XColorTable* pColTab; - BOOL bTreeUpdated; + sal_Bool bTreeUpdated; List* pCurrentActions; String aLastFile; ::std::vector< long > aVerbVector; @@ -113,9 +113,9 @@ private: void SetActualClickAction( ::com::sun::star::presentation::ClickAction eCA ); void SetActualAnimationEffect( ::com::sun::star::presentation::AnimationEffect eAE ); void SetEditText( String const & rStr ); - String GetEditText( BOOL bURL = FALSE ); - USHORT GetClickActionSdResId( ::com::sun::star::presentation::ClickAction eCA ); - USHORT GetAnimationEffectSdResId( ::com::sun::star::presentation::AnimationEffect eAE ); + String GetEditText( sal_Bool bURL = sal_False ); + sal_uInt16 GetClickActionSdResId( ::com::sun::star::presentation::ClickAction eCA ); + sal_uInt16 GetAnimationEffectSdResId( ::com::sun::star::presentation::AnimationEffect eAE ); public: SdTPAction( Window* pParent, const SfxItemSet& rInAttrs ); @@ -123,7 +123,7 @@ public: static SfxTabPage* Create( Window*, const SfxItemSet& ); - virtual BOOL FillItemSet( SfxItemSet& ); + virtual sal_Bool FillItemSet( SfxItemSet& ); virtual void Reset( const SfxItemSet & ); virtual void ActivatePage( const SfxItemSet& rSet ); diff --git a/sd/source/ui/inc/tpoption.hxx b/sd/source/ui/inc/tpoption.hxx index e8e17f335a76..83d8479b29c5 100644..100755 --- a/sd/source/ui/inc/tpoption.hxx +++ b/sd/source/ui/inc/tpoption.hxx @@ -60,7 +60,7 @@ public: ~SdTpOptionsSnap(); static SfxTabPage* Create( Window*, const SfxItemSet& ); - virtual BOOL FillItemSet( SfxItemSet& ); + virtual sal_Bool FillItemSet( SfxItemSet& ); virtual void Reset( const SfxItemSet & ); // virtual void ActivatePage( const SfxItemSet& rSet ); @@ -86,7 +86,7 @@ public: ~SdTpOptionsContents(); static SfxTabPage* Create( Window*, const SfxItemSet& ); - virtual BOOL FillItemSet( SfxItemSet& ); + virtual sal_Bool FillItemSet( SfxItemSet& ); virtual void Reset( const SfxItemSet & ); }; @@ -145,15 +145,15 @@ private: MetricField aMtrFldInfo1; MetricField aMtrFldInfo2; - UINT32 nWidth; - UINT32 nHeight; + sal_uInt32 nWidth; + sal_uInt32 nHeight; String aInfo1; String aInfo2; SfxMapUnit ePoolUnit; - String GetScale( INT32 nX, INT32 nY ); - BOOL SetScale( const String& aScale, INT32& rX, INT32& rY ); + String GetScale( sal_Int32 nX, sal_Int32 nY ); + sal_Bool SetScale( const String& aScale, sal_Int32& rX, sal_Int32& rY ); DECL_LINK( ModifyScaleHdl, void * ); DECL_LINK( ModifyOriginalScaleHdl, void * ); @@ -174,7 +174,7 @@ public: ~SdTpOptionsMisc(); static SfxTabPage* Create( Window*, const SfxItemSet& ); - virtual BOOL FillItemSet( SfxItemSet& ); + virtual sal_Bool FillItemSet( SfxItemSet& ); virtual void Reset( const SfxItemSet & ); /** Hide Impress specific controls, make Draw specific controls visible diff --git a/sd/source/ui/inc/undopage.hxx b/sd/source/ui/inc/undopage.hxx index fc6a1770f6be..4cb695cb98f8 100644..100755 --- a/sd/source/ui/inc/undopage.hxx +++ b/sd/source/ui/inc/undopage.hxx @@ -43,48 +43,48 @@ class SdPageFormatUndoAction : public SdUndoAction SdPage* mpPage; Size maOldSize; - INT32 mnOldLeft; - INT32 mnOldRight; - INT32 mnOldUpper; - INT32 mnOldLower; - BOOL mbOldScale; + sal_Int32 mnOldLeft; + sal_Int32 mnOldRight; + sal_Int32 mnOldUpper; + sal_Int32 mnOldLower; + sal_Bool mbOldScale; Orientation meOldOrientation; - USHORT mnOldPaperBin; - BOOL mbOldFullSize; + sal_uInt16 mnOldPaperBin; + sal_Bool mbOldFullSize; Size maNewSize; - INT32 mnNewLeft; - INT32 mnNewRight; - INT32 mnNewUpper; - INT32 mnNewLower; - BOOL mbNewScale; + sal_Int32 mnNewLeft; + sal_Int32 mnNewRight; + sal_Int32 mnNewUpper; + sal_Int32 mnNewLower; + sal_Bool mbNewScale; Orientation meNewOrientation; - USHORT mnNewPaperBin; - BOOL mbNewFullSize; + sal_uInt16 mnNewPaperBin; + sal_Bool mbNewFullSize; public: TYPEINFO(); SdPageFormatUndoAction( SdDrawDocument* pDoc, SdPage* pThePage, const Size& rOldSz, - INT32 nOldLft, - INT32 nOldRgt, - INT32 nOldUpr, - INT32 nOldLwr, - BOOL bOldScl, + sal_Int32 nOldLft, + sal_Int32 nOldRgt, + sal_Int32 nOldUpr, + sal_Int32 nOldLwr, + sal_Bool bOldScl, Orientation eOldOrient, - USHORT nOPaperBin, - BOOL bOFullSize, + sal_uInt16 nOPaperBin, + sal_Bool bOFullSize, const Size& rNewSz, - INT32 nNewLft, - INT32 nNewRgt, - INT32 nNewUpr, - INT32 nNewLwr, - BOOL bNewScl, + sal_Int32 nNewLft, + sal_Int32 nNewRgt, + sal_Int32 nNewUpr, + sal_Int32 nNewLwr, + sal_Bool bNewScl, Orientation eNewOrient, - USHORT nNPaperBin, - BOOL bNFullSize + sal_uInt16 nNPaperBin, + sal_Bool bNFullSize ) : SdUndoAction(pDoc), mpPage (pThePage), @@ -122,16 +122,16 @@ class SdPageLRUndoAction : public SdUndoAction { SdPage* mpPage; - INT32 mnOldLeft; - INT32 mnOldRight; - INT32 mnNewLeft; - INT32 mnNewRight; + sal_Int32 mnOldLeft; + sal_Int32 mnOldRight; + sal_Int32 mnNewLeft; + sal_Int32 mnNewRight; public: TYPEINFO(); SdPageLRUndoAction( SdDrawDocument* pDoc, SdPage* pThePage, - INT32 nOldLft, INT32 nOldRgt, - INT32 nNewLft, INT32 nNewRgt ) : + sal_Int32 nOldLft, sal_Int32 nOldRgt, + sal_Int32 nNewLft, sal_Int32 nNewRgt ) : SdUndoAction(pDoc), mpPage (pThePage), mnOldLeft (nOldLft), @@ -151,16 +151,16 @@ class SdPageULUndoAction : public SdUndoAction { SdPage* mpPage; - INT32 mnOldUpper; - INT32 mnOldLower; - INT32 mnNewUpper; - INT32 mnNewLower; + sal_Int32 mnOldUpper; + sal_Int32 mnOldLower; + sal_Int32 mnNewUpper; + sal_Int32 mnNewLower; public: TYPEINFO(); SdPageULUndoAction( SdDrawDocument* pDoc, SdPage* pThePage, - INT32 nOldUpr, INT32 nOldLwr, - INT32 nNewUpr, INT32 nNewLwr ) : + sal_Int32 nOldUpr, sal_Int32 nOldLwr, + sal_Int32 nNewUpr, sal_Int32 nNewLwr ) : SdUndoAction(pDoc), mpPage (pThePage), mnOldUpper (nOldUpr), diff --git a/sd/source/ui/inc/unmodpg.hxx b/sd/source/ui/inc/unmodpg.hxx index 9a811b445f42..ceafa4cd8992 100755 --- a/sd/source/ui/inc/unmodpg.hxx +++ b/sd/source/ui/inc/unmodpg.hxx @@ -41,10 +41,10 @@ class ModifyPageUndoAction : public SdUndoAction String maNewName; AutoLayout meOldAutoLayout; AutoLayout meNewAutoLayout; - BOOL mbOldBckgrndVisible; - BOOL mbNewBckgrndVisible; - BOOL mbOldBckgrndObjsVisible; - BOOL mbNewBckgrndObjsVisible; + sal_Bool mbOldBckgrndVisible; + sal_Bool mbNewBckgrndVisible; + sal_Bool mbOldBckgrndObjsVisible; + sal_Bool mbNewBckgrndObjsVisible; String maComment; @@ -55,8 +55,8 @@ public: SdPage* pThePage, String aTheNewName, AutoLayout eTheNewAutoLayout, - BOOL bTheNewBckgrndVisible, - BOOL bTheNewBckgrndObjsVisible); + sal_Bool bTheNewBckgrndVisible, + sal_Bool bTheNewBckgrndObjsVisible); virtual ~ModifyPageUndoAction(); virtual void Undo(); diff --git a/sd/source/ui/inc/unoaprms.hxx b/sd/source/ui/inc/unoaprms.hxx index a2a80963ad63..7ad39a7d37b1 100755 --- a/sd/source/ui/inc/unoaprms.hxx +++ b/sd/source/ui/inc/unoaprms.hxx @@ -43,20 +43,20 @@ class SdrObject; class SdAnimationPrmsUndoAction : public SdUndoAction { SdrObject* pObject; - BOOL bOldActive; - BOOL bNewActive; - BOOL bOldDimPrevious; - BOOL bNewDimPrevious; - BOOL bOldDimHide; - BOOL bNewDimHide; - BOOL bOldSoundOn; - BOOL bNewSoundOn; - BOOL bOldSecondSoundOn; - BOOL bNewSecondSoundOn; - BOOL bOldPlayFull; - BOOL bNewPlayFull; - BOOL bOldSecondPlayFull; - BOOL bNewSecondPlayFull; + sal_Bool bOldActive; + sal_Bool bNewActive; + sal_Bool bOldDimPrevious; + sal_Bool bNewDimPrevious; + sal_Bool bOldDimHide; + sal_Bool bNewDimHide; + sal_Bool bOldSoundOn; + sal_Bool bNewSoundOn; + sal_Bool bOldSecondSoundOn; + sal_Bool bNewSecondSoundOn; + sal_Bool bOldPlayFull; + sal_Bool bNewPlayFull; + sal_Bool bOldSecondPlayFull; + sal_Bool bNewSecondPlayFull; ::com::sun::star::presentation::AnimationEffect eOldEffect; ::com::sun::star::presentation::AnimationEffect eNewEffect; ::com::sun::star::presentation::AnimationEffect eOldTextEffect; @@ -79,25 +79,25 @@ class SdAnimationPrmsUndoAction : public SdUndoAction ::com::sun::star::presentation::ClickAction eNewClickAction; String aOldBookmark; String aNewBookmark; - BOOL bOldInvisibleInPres; - BOOL bNewInvisibleInPres; - USHORT nOldVerb; - USHORT nNewVerb; - ULONG nOldPresOrder; - ULONG nNewPresOrder; + sal_Bool bOldInvisibleInPres; + sal_Bool bNewInvisibleInPres; + sal_uInt16 nOldVerb; + sal_uInt16 nNewVerb; + sal_uLong nOldPresOrder; + sal_uLong nNewPresOrder; - BOOL bInfoCreated; + sal_Bool bInfoCreated; public: TYPEINFO(); SdAnimationPrmsUndoAction(SdDrawDocument* pTheDoc, SdrObject* pObj, - BOOL bCreated): + sal_Bool bCreated): SdUndoAction (pTheDoc), pObject (pObj), bInfoCreated (bCreated) {} - void SetActive(BOOL bTheOldActive, BOOL bTheNewActive) + void SetActive(sal_Bool bTheOldActive, sal_Bool bTheNewActive) { bOldActive = bTheOldActive; bNewActive = bTheNewActive; } void SetEffect(::com::sun::star::presentation::AnimationEffect eTheOldEffect, ::com::sun::star::presentation::AnimationEffect eTheNewEffect) { eOldEffect = eTheOldEffect; eNewEffect = eTheNewEffect; } @@ -105,19 +105,19 @@ public: { eOldTextEffect = eTheOldEffect; eNewTextEffect = eTheNewEffect; } void SetSpeed(::com::sun::star::presentation::AnimationSpeed eTheOldSpeed, ::com::sun::star::presentation::AnimationSpeed eTheNewSpeed) { eOldSpeed = eTheOldSpeed; eNewSpeed = eTheNewSpeed; } - void SetDim(BOOL bTheOldDim, BOOL bTheNewDim) + void SetDim(sal_Bool bTheOldDim, sal_Bool bTheNewDim) { bOldDimPrevious = bTheOldDim; bNewDimPrevious = bTheNewDim; } void SetDimColor(Color aTheOldDimColor, Color aTheNewDimColor) { aOldDimColor = aTheOldDimColor; aNewDimColor = aTheNewDimColor; } - void SetDimHide(BOOL bTheOldDimHide, BOOL bTheNewDimHide) + void SetDimHide(sal_Bool bTheOldDimHide, sal_Bool bTheNewDimHide) { bOldDimHide = bTheOldDimHide; bNewDimHide = bTheNewDimHide; } - void SetSoundOn(BOOL bTheOldSoundOn, BOOL bTheNewSoundOn) + void SetSoundOn(sal_Bool bTheOldSoundOn, sal_Bool bTheNewSoundOn) { bOldSoundOn = bTheOldSoundOn; bNewSoundOn = bTheNewSoundOn; } void SetSound(String aTheOldSound, String aTheNewSound) { aOldSoundFile = aTheOldSound; aNewSoundFile = aTheNewSound; } void SetBlueScreen(Color aTheOldBlueScreen, Color aTheNewBlueScreen) { aOldBlueScreen = aTheOldBlueScreen; aNewBlueScreen = aTheNewBlueScreen; } - void SetPlayFull(BOOL bTheOldPlayFull, BOOL bTheNewPlayFull) + void SetPlayFull(sal_Bool bTheOldPlayFull, sal_Bool bTheNewPlayFull) { bOldPlayFull = bTheOldPlayFull; bNewPlayFull = bTheNewPlayFull; } void SetPathObj(SdrPathObj* pTheOldPath, SdrPathObj* pTheNewPath) { pOldPathObj = pTheOldPath; pNewPathObj = pTheNewPath; } @@ -125,19 +125,19 @@ public: { eOldClickAction = eTheOldAction; eNewClickAction = eTheNewAction; } void SetBookmark(String aTheOldBookmark, String aTheNewBookmark) { aOldBookmark = aTheOldBookmark; aNewBookmark = aTheNewBookmark; } - void SetInvisibleInPres(BOOL bTheOldInvisibleInPres, BOOL bTheNewInvisibleInPres) + void SetInvisibleInPres(sal_Bool bTheOldInvisibleInPres, sal_Bool bTheNewInvisibleInPres) { bOldInvisibleInPres = bTheOldInvisibleInPres; bNewInvisibleInPres = bTheNewInvisibleInPres; } - void SetVerb(USHORT nTheOldVerb, USHORT nTheNewVerb) + void SetVerb(sal_uInt16 nTheOldVerb, sal_uInt16 nTheNewVerb) { nOldVerb = nTheOldVerb; nNewVerb = nTheNewVerb; } void SetSecondEffect(::com::sun::star::presentation::AnimationEffect eTheOldEffect, ::com::sun::star::presentation::AnimationEffect eTheNewEffect) { eOldSecondEffect = eTheOldEffect; eNewSecondEffect = eTheNewEffect; } void SetSecondSpeed(::com::sun::star::presentation::AnimationSpeed eTheOldSpeed, ::com::sun::star::presentation::AnimationSpeed eTheNewSpeed) { eOldSecondSpeed = eTheOldSpeed; eNewSecondSpeed = eTheNewSpeed; } - void SetSecondSoundOn(BOOL bTheOldSoundOn, BOOL bTheNewSoundOn) + void SetSecondSoundOn(sal_Bool bTheOldSoundOn, sal_Bool bTheNewSoundOn) { bOldSecondSoundOn = bTheOldSoundOn; bNewSecondSoundOn = bTheNewSoundOn; } - void SetSecondPlayFull(BOOL bTheOldPlayFull, BOOL bTheNewPlayFull) + void SetSecondPlayFull(sal_Bool bTheOldPlayFull, sal_Bool bTheNewPlayFull) { bOldSecondPlayFull = bTheOldPlayFull; bNewSecondPlayFull = bTheNewPlayFull; } - void SetPresOrder(ULONG nTheOldPresOrder, ULONG nTheNewPresOrder) + void SetPresOrder(sal_uLong nTheOldPresOrder, sal_uLong nTheNewPresOrder) { nOldPresOrder = nTheOldPresOrder; nNewPresOrder = nTheNewPresOrder; } virtual ~SdAnimationPrmsUndoAction(); diff --git a/sd/source/ui/inc/unprlout.hxx b/sd/source/ui/inc/unprlout.hxx index d0c22946b46b..de4fce3ea988 100644..100755 --- a/sd/source/ui/inc/unprlout.hxx +++ b/sd/source/ui/inc/unprlout.hxx @@ -40,7 +40,7 @@ class SdPresentationLayoutUndoAction : public SdUndoAction String aNewLayoutName; AutoLayout eOldAutoLayout; AutoLayout eNewAutoLayout; - BOOL bSetAutoLayout; // TRUE: AutoLayout aendern + sal_Bool bSetAutoLayout; // sal_True: AutoLayout aendern SdPage* pPage; String aComment; @@ -51,7 +51,7 @@ public: String aTheNewLayoutName, AutoLayout eTheOldAutoLayout, AutoLayout eTheNewAutoLayout, - BOOL bSet, + sal_Bool bSet, SdPage* pThePage); virtual ~SdPresentationLayoutUndoAction(); diff --git a/sd/source/ui/inc/view/viewoverlaymanager.hxx b/sd/source/ui/inc/view/viewoverlaymanager.hxx index 9b56267ff327..7702dafa4d80 100755 --- a/sd/source/ui/inc/view/viewoverlaymanager.hxx +++ b/sd/source/ui/inc/view/viewoverlaymanager.hxx @@ -61,7 +61,7 @@ public: private: ViewShellBase& mrBase; - ULONG mnUpdateTagsEvent; + sal_uLong mnUpdateTagsEvent; ViewTagVector maTagVector; }; diff --git a/sd/source/ui/inc/zoomlist.hxx b/sd/source/ui/inc/zoomlist.hxx index 6957bfed25ce..13f3d6fe83bb 100755 --- a/sd/source/ui/inc/zoomlist.hxx +++ b/sd/source/ui/inc/zoomlist.hxx @@ -46,12 +46,12 @@ public: void InsertZoomRect(const Rectangle& rRect); Rectangle GetNextZoomRect(); Rectangle GetPreviousZoomRect(); - BOOL IsNextPossible() const; - BOOL IsPreviousPossible() const; + sal_Bool IsNextPossible() const; + sal_Bool IsPreviousPossible() const; private: ViewShell* mpViewShell; - ULONG mnCurPos; + sal_uLong mnCurPos; }; } // end of namespace sd diff --git a/sd/source/ui/notes/EditWindow.cxx b/sd/source/ui/notes/EditWindow.cxx index 54e3589bc87e..8883a319c4bf 100755 --- a/sd/source/ui/notes/EditWindow.cxx +++ b/sd/source/ui/notes/EditWindow.cxx @@ -113,7 +113,7 @@ EditWindow::~EditWindow (void) void SmGetLeftSelectionPart(const ESelection aSel, - USHORT &nPara, USHORT &nPos) + sal_uInt16 &nPara, sal_uInt16 &nPos) // returns paragraph number and position of the selections left part { // compare start and end of selection and use the one that comes first @@ -157,10 +157,10 @@ EditEngine* EditWindow::CreateEditEngine (void) SvtLinguConfig().GetOptions( aOpt ); // struct FontDta { - INT16 nFallbackLang; - INT16 nLang; - USHORT nFontType; - USHORT nFontInfoId; + sal_Int16 nFallbackLang; + sal_Int16 nLang; + sal_uInt16 nFontType; + sal_uInt16 nFontInfoId; } aTable[3] = { // info to get western font to be used @@ -207,8 +207,8 @@ EditEngine* EditWindow::CreateEditEngine (void) pEditEngine = new EditEngine (mpEditEngineItemPool); - pEditEngine->EnableUndo (TRUE); - pEditEngine->SetDefTab (USHORT( + pEditEngine->EnableUndo (sal_True); + pEditEngine->SetDefTab (sal_uInt16( Application::GetDefaultDevice()->GetTextWidth( UniString::CreateFromAscii("XXXX")))); @@ -249,9 +249,9 @@ void EditWindow::DataChanged (const DataChangedEvent&) //! see also SmDocShell::GetEditEngine() ! //! - // pEditEngine->SetDefTab( USHORT( GetTextWidth( C2S("XXXX") ) ) ); + // pEditEngine->SetDefTab( sal_uInt16( GetTextWidth( C2S("XXXX") ) ) ); - USHORT aFntInfoId[3] = { + sal_uInt16 aFntInfoId[3] = { EE_CHAR_FONTINFO, EE_CHAR_FONTINFO_CJK, EE_CHAR_FONTINFO_CTL }; for (int i = 0; i < 3; ++i) { @@ -402,7 +402,7 @@ void EditWindow::KeyInput(const KeyEvent& ) { /* if (rKEvt.GetKeyCode().GetCode() == KEY_ESCAPE) { - BOOL bCallBase = TRUE; + sal_Bool bCallBase = sal_True; SfxViewShell* pViewShell = SfxViewShell::Current(); if ( pViewShell && pViewShell->ISA(SmViewShell) ) { @@ -410,8 +410,8 @@ void EditWindow::KeyInput(const KeyEvent& ) if (pDocSh) { // fuert zum (sofortigen) Zerstoeren von this! - pDocSh->DoInPlaceActivate( FALSE ); - bCallBase = FALSE; + pDocSh->DoInPlaceActivate( sal_False ); + bCallBase = sal_False; } } if ( bCallBase ) @@ -503,7 +503,7 @@ void EditWindow::CreateEditView (void) mpEditView->SetSelection(eSelection); Update(); - mpEditView->ShowCursor(TRUE, TRUE); + mpEditView->ShowCursor(sal_True, sal_True); pEditEngine->SetStatusEventHdl( LINK(this, EditWindow, EditStatusHdl)); @@ -673,16 +673,16 @@ void EditWindow::LoseFocus() } -BOOL EditWindow::IsAllSelected() const +sal_Bool EditWindow::IsAllSelected() const { - BOOL bRes = FALSE; + sal_Bool bRes = sal_False; EditEngine *pEditEngine = ((EditWindow *) this)->GetEditEngine(); DBG_ASSERT( mpEditView, "NULL pointer" ); DBG_ASSERT( pEditEngine, "NULL pointer" ); if (pEditEngine && mpEditView) { ESelection eSelection( mpEditView->GetSelection() ); - INT32 nParaCnt = pEditEngine->GetParagraphCount(); + sal_Int32 nParaCnt = pEditEngine->GetParagraphCount(); if (!(nParaCnt - 1)) { String Text( pEditEngine->GetText( LINEEND_LF ) ); @@ -715,7 +715,7 @@ void EditWindow::MarkError(const Point &rPos) const int Col = rPos.X(); const int Row = rPos.Y() - 1; - mpEditView->SetSelection(ESelection ( (USHORT)Row, (USHORT)(Col - 1), (USHORT)Row, (USHORT)Col)); + mpEditView->SetSelection(ESelection ( (sal_uInt16)Row, (sal_uInt16)(Col - 1), (sal_uInt16)Row, (sal_uInt16)Col)); GrabFocus(); } } @@ -728,10 +728,10 @@ void EditWindow::SelNextMark() if (pEditEngine && mpEditView) { ESelection eSelection = mpEditView->GetSelection(); - USHORT Pos = eSelection.nEndPos; + sal_uInt16 Pos = eSelection.nEndPos; String aMark (UniString::CreateFromAscii("<?>")); String aText; - USHORT nCounts = pEditEngine->GetParagraphCount(); + sal_uInt16 nCounts = pEditEngine->GetParagraphCount(); while (eSelection.nEndPara < nCounts) { @@ -758,15 +758,15 @@ void EditWindow::SelPrevMark() if (pEditEngine && mpEditView) { ESelection eSelection = mpEditView->GetSelection(); - USHORT Pos = STRING_NOTFOUND; + sal_uInt16 Pos = STRING_NOTFOUND; xub_StrLen Max = eSelection.nStartPos; String Text( pEditEngine->GetText( eSelection.nStartPara ) ); String aMark (UniString::CreateFromAscii("<?>")); - USHORT nCounts = pEditEngine->GetParagraphCount(); + sal_uInt16 nCounts = pEditEngine->GetParagraphCount(); do { - USHORT Fnd = Text.Search(aMark, 0); + sal_uInt16 Fnd = Text.Search(aMark, 0); while ((Fnd < Max) && (Fnd != STRING_NOTFOUND)) { @@ -791,7 +791,7 @@ void EditWindow::SelPrevMark() } } -BOOL EditWindow::HasMark(const String& rText) const +sal_Bool EditWindow::HasMark(const String& rText) const // returns true iff 'rText' contains a mark { return rText.SearchAscii("<?>", 0) != STRING_NOTFOUND; @@ -831,15 +831,15 @@ void EditWindow::SetSelection(const ESelection &rSel) mpEditView->SetSelection(rSel); } -BOOL EditWindow::IsEmpty() const +sal_Bool EditWindow::IsEmpty() const { EditEngine *pEditEngine = ((EditWindow *) this)->GetEditEngine(); - return (pEditEngine && (pEditEngine->GetTextLen() == 0)) ? TRUE : FALSE; + return (pEditEngine && (pEditEngine->GetTextLen() == 0)) ? sal_True : sal_False; } -BOOL EditWindow::IsSelected() const +sal_Bool EditWindow::IsSelected() const { - return mpEditView ? mpEditView->HasSelection() : FALSE; + return mpEditView ? mpEditView->HasSelection() : sal_False; } void EditWindow::Cut() diff --git a/sd/source/ui/notes/EditWindow.hxx b/sd/source/ui/notes/EditWindow.hxx index 010a6bd09697..ce626df74d85 100755 --- a/sd/source/ui/notes/EditWindow.hxx +++ b/sd/source/ui/notes/EditWindow.hxx @@ -106,9 +106,9 @@ private: ESelection GetSelection() const; void SetSelection(const ESelection &rSel); - BOOL IsEmpty() const; - BOOL IsSelected() const; - BOOL IsAllSelected() const; + sal_Bool IsEmpty() const; + sal_Bool IsSelected() const; + sal_Bool IsAllSelected() const; void Cut(); void Copy(); void Paste(); @@ -117,7 +117,7 @@ private: void MarkError(const Point &rPos); void SelNextMark(); void SelPrevMark(); - BOOL HasMark(const String &rText) const; + sal_Bool HasMark(const String &rText) const; void ApplyColorConfigValues( const svtools::ColorConfig &rColorCfg ); }; diff --git a/sd/source/ui/notes/NotesChildWindow.cxx b/sd/source/ui/notes/NotesChildWindow.cxx index d62fc2f25e4b..ae186e964193 100755 --- a/sd/source/ui/notes/NotesChildWindow.cxx +++ b/sd/source/ui/notes/NotesChildWindow.cxx @@ -39,7 +39,7 @@ namespace sd { namespace notes { NotesChildWindow::NotesChildWindow ( ::Window* _pParent, - USHORT nId, + sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo) : SfxChildWindow (_pParent, nId) diff --git a/sd/source/ui/notes/TextLogger.cxx b/sd/source/ui/notes/TextLogger.cxx index bf73b67aad23..dfbce2daa221 100755 --- a/sd/source/ui/notes/TextLogger.cxx +++ b/sd/source/ui/notes/TextLogger.cxx @@ -122,7 +122,7 @@ IMPL_LINK(TextLogger, WindowEventHandler, VclWindowEvent*, pEvent) break; } } - return TRUE; + return sal_True; } diff --git a/sd/source/ui/presenter/CanvasUpdateRequester.hxx b/sd/source/ui/presenter/CanvasUpdateRequester.hxx index 6a93f5e85d27..8e3e2e6b5163 100644..100755 --- a/sd/source/ui/presenter/CanvasUpdateRequester.hxx +++ b/sd/source/ui/presenter/CanvasUpdateRequester.hxx @@ -70,7 +70,7 @@ private: static RequesterMap maRequesterMap; css::uno::Reference<css::rendering::XSpriteCanvas> mxCanvas; - ULONG mnUserEventId; + sal_uLong mnUserEventId; sal_Bool mbUpdateFlag; DECL_LINK(Callback, void*); }; diff --git a/sd/source/ui/presenter/PresenterHelper.cxx b/sd/source/ui/presenter/PresenterHelper.cxx index 6157c47c0d66..435abc8dfeb1 100644..100755 --- a/sd/source/ui/presenter/PresenterHelper.cxx +++ b/sd/source/ui/presenter/PresenterHelper.cxx @@ -135,7 +135,7 @@ Reference<awt::XWindow> SAL_CALL PresenterHelper::createWindow ( // Make the frame window transparent and make the parent able to // draw behind it. if (pParentWindow != NULL) - pParentWindow->EnableChildTransparentMode(TRUE); + pParentWindow->EnableChildTransparentMode(sal_True); } if (pWindow != NULL) @@ -147,12 +147,12 @@ Reference<awt::XWindow> SAL_CALL PresenterHelper::createWindow ( if ( ! bEnableParentClip) { pWindow->SetParentClipMode(PARENTCLIPMODE_NOCLIP); - pWindow->SetPaintTransparent(TRUE); + pWindow->SetPaintTransparent(sal_True); } else { pWindow->SetParentClipMode(PARENTCLIPMODE_CLIP); - pWindow->SetPaintTransparent(FALSE); + pWindow->SetPaintTransparent(sal_False); } } diff --git a/sd/source/ui/presenter/PresenterTextView.cxx b/sd/source/ui/presenter/PresenterTextView.cxx index ba90a92939ca..991beade0f2f 100755 --- a/sd/source/ui/presenter/PresenterTextView.cxx +++ b/sd/source/ui/presenter/PresenterTextView.cxx @@ -363,10 +363,10 @@ EditEngine* PresenterTextView::Implementation::CreateEditEngine (void) SvtLinguConfig().GetOptions( aOpt ); // struct FontDta { - INT16 nFallbackLang; - INT16 nLang; - USHORT nFontType; - USHORT nFontInfoId; + sal_Int16 nFallbackLang; + sal_Int16 nLang; + sal_uInt16 nFontType; + sal_uInt16 nFontInfoId; } aTable[3] = { // info to get western font to be used @@ -403,8 +403,8 @@ EditEngine* PresenterTextView::Implementation::CreateEditEngine (void) pEditEngine = new EditEngine (mpEditEngineItemPool); - pEditEngine->EnableUndo (TRUE); - pEditEngine->SetDefTab (USHORT( + pEditEngine->EnableUndo (sal_True); + pEditEngine->SetDefTab (sal_uInt16( Application::GetDefaultDevice()->GetTextWidth( UniString::CreateFromAscii("XXXX")))); @@ -458,8 +458,8 @@ void PresenterTextView::Implementation::SetBackgroundColor (const Color aColor) DBG_ASSERT(mpEditEngine!=NULL, "EditEngine missing"); DBG_ASSERT(mpEditEngineItemPool!=NULL, "EditEngineItemPool missing"); mpEditEngine->SetBackgroundColor(aColor); - mpEditEngine->EnableAutoColor(FALSE); - mpEditEngine->ForceAutoColor(FALSE); + mpEditEngine->EnableAutoColor(sal_False); + mpEditEngine->ForceAutoColor(sal_False); } @@ -576,7 +576,7 @@ Reference<rendering::XBitmap> PresenterTextView::Implementation::GetBitmap (void delete mpOutputDevice; mpOutputDevice = new VirtualDevice(*Application::GetDefaultDevice(), 0, 0); mpOutputDevice->SetMapMode(MAP_PIXEL); - mpOutputDevice->SetOutputSizePixel(maSize, TRUE); + mpOutputDevice->SetOutputSizePixel(maSize, sal_True); mpOutputDevice->SetLineColor(); mpOutputDevice->SetFillColor(); mpOutputDevice->SetBackground(Wallpaper()); diff --git a/sd/source/ui/slideshow/showwin.cxx b/sd/source/ui/slideshow/showwin.cxx index fe6f9483b8b6..21c07967e4ba 100644..100755 --- a/sd/source/ui/slideshow/showwin.cxx +++ b/sd/source/ui/slideshow/showwin.cxx @@ -49,8 +49,8 @@ using namespace ::com::sun::star; namespace sd { -static const ULONG HIDE_MOUSE_TIMEOUT = 10000; -static const ULONG SHOW_MOUSE_TIMEOUT = 1000; +static const sal_uLong HIDE_MOUSE_TIMEOUT = 10000; +static const sal_uLong SHOW_MOUSE_TIMEOUT = 1000; // ============================================================================= @@ -59,7 +59,7 @@ ShowWindow::ShowWindow( const ::rtl::Reference< SlideshowImpl >& xController, :: , mnPauseTimeout( SLIDE_NO_TIMEOUT ) , mnRestartPageIndex( PAGE_NO_END ) , meShowWindowMode(SHOWWINDOWMODE_NORMAL) -, mbShowNavigatorAfterSpecialMode( FALSE ) +, mbShowNavigatorAfterSpecialMode( sal_False ) , mbMouseAutoHide(true) , mbMouseCursorHidden(false) , mnFirstMouseMove(0) @@ -69,7 +69,7 @@ ShowWindow::ShowWindow( const ::rtl::Reference< SlideshowImpl >& xController, :: // Do never mirror the preview window. This explicitly includes right // to left writing environments. - EnableRTL (FALSE); + EnableRTL (sal_False); MapMode aMap(GetMapMode()); aMap.SetMapUnit(MAP_100TH_MM); @@ -105,7 +105,7 @@ ShowWindow::~ShowWindow(void) void ShowWindow::KeyInput(const KeyEvent& rKEvt) { - BOOL bReturn = FALSE; + sal_Bool bReturn = sal_False; if( SHOWWINDOWMODE_PREVIEW == meShowWindowMode ) { @@ -219,10 +219,10 @@ void ShowWindow::MouseMove(const MouseEvent& /*rMEvt*/) { // if this is not the first mouse move while hidden, see if // enough time has pasted to show mouse pointer again - ULONG nTime = Time::GetSystemTicks(); + sal_uLong nTime = Time::GetSystemTicks(); if( (nTime - mnFirstMouseMove) >= SHOW_MOUSE_TIMEOUT ) { - ShowPointer( TRUE ); + ShowPointer( sal_True ); mnFirstMouseMove = 0; mbMouseCursorHidden = false; maMouseTimer.SetTimeout( HIDE_MOUSE_TIMEOUT ); @@ -318,7 +318,7 @@ void ShowWindow::Paint(const Rectangle& rRect) } else if( SHOWWINDOWMODE_PAUSE == meShowWindowMode ) { - DrawPauseScene( FALSE ); + DrawPauseScene( sal_False ); } else if( SHOWWINDOWMODE_BLANK == meShowWindowMode ) { @@ -335,7 +335,7 @@ void ShowWindow::Paint(const Rectangle& rRect) long ShowWindow::Notify(NotifyEvent& rNEvt) { - long nOK = FALSE; + long nOK = sal_False; /* if( mpViewShell && rNEvt.GetType() == EVENT_GETFOCUS ) { @@ -391,7 +391,7 @@ void ShowWindow::Move() // ----------------------------------------------------------------------------- -BOOL ShowWindow::SetEndMode() +sal_Bool ShowWindow::SetEndMode() { if( ( SHOWWINDOWMODE_NORMAL == meShowWindowMode ) && mpViewShell && mpViewShell->GetView() ) { @@ -404,8 +404,8 @@ BOOL ShowWindow::SetEndMode() // hide navigator if it is visible if( mpViewShell->GetViewFrame()->GetChildWindow( SID_NAVIGATOR ) ) { - mpViewShell->GetViewFrame()->ShowChildWindow( SID_NAVIGATOR, FALSE ); - mbShowNavigatorAfterSpecialMode = TRUE; + mpViewShell->GetViewFrame()->ShowChildWindow( SID_NAVIGATOR, sal_False ); + mbShowNavigatorAfterSpecialMode = sal_True; } Invalidate(); @@ -416,7 +416,7 @@ BOOL ShowWindow::SetEndMode() // ----------------------------------------------------------------------------- -BOOL ShowWindow::SetPauseMode( sal_Int32 nPageIndexToRestart, sal_Int32 nTimeout, Graphic* pLogo ) +sal_Bool ShowWindow::SetPauseMode( sal_Int32 nPageIndexToRestart, sal_Int32 nTimeout, Graphic* pLogo ) { rtl::Reference< SlideShow > xSlideShow; @@ -440,8 +440,8 @@ BOOL ShowWindow::SetPauseMode( sal_Int32 nPageIndexToRestart, sal_Int32 nTimeout // hide navigator if it is visible if( mpViewShell->GetViewFrame()->GetChildWindow( SID_NAVIGATOR ) ) { - mpViewShell->GetViewFrame()->ShowChildWindow( SID_NAVIGATOR, FALSE ); - mbShowNavigatorAfterSpecialMode = TRUE; + mpViewShell->GetViewFrame()->ShowChildWindow( SID_NAVIGATOR, sal_False ); + mbShowNavigatorAfterSpecialMode = sal_True; } if( pLogo ) @@ -458,7 +458,7 @@ BOOL ShowWindow::SetPauseMode( sal_Int32 nPageIndexToRestart, sal_Int32 nTimeout // ----------------------------------------------------------------------------- -BOOL ShowWindow::SetBlankMode( sal_Int32 nPageIndexToRestart, const Color& rBlankColor ) +sal_Bool ShowWindow::SetBlankMode( sal_Int32 nPageIndexToRestart, const Color& rBlankColor ) { if( ( SHOWWINDOWMODE_NORMAL == meShowWindowMode ) && mpViewShell && mpViewShell->GetView() ) { @@ -472,8 +472,8 @@ BOOL ShowWindow::SetBlankMode( sal_Int32 nPageIndexToRestart, const Color& rBlan // hide navigator if it is visible if( mpViewShell->GetViewFrame()->GetChildWindow( SID_NAVIGATOR ) ) { - mpViewShell->GetViewFrame()->ShowChildWindow( SID_NAVIGATOR, FALSE ); - mbShowNavigatorAfterSpecialMode = TRUE; + mpViewShell->GetViewFrame()->ShowChildWindow( SID_NAVIGATOR, sal_False ); + mbShowNavigatorAfterSpecialMode = sal_True; } Invalidate(); @@ -507,8 +507,8 @@ void ShowWindow::TerminateShow() // show navigator? if( mbShowNavigatorAfterSpecialMode ) { - mpViewShell->GetViewFrame()->ShowChildWindow( SID_NAVIGATOR, TRUE ); - mbShowNavigatorAfterSpecialMode = FALSE; + mpViewShell->GetViewFrame()->ShowChildWindow( SID_NAVIGATOR, sal_True ); + mbShowNavigatorAfterSpecialMode = sal_False; } } @@ -565,14 +565,14 @@ void ShowWindow::RestartShow( sal_Int32 nPageIndexToRestart ) // show navigator? if( mbShowNavigatorAfterSpecialMode ) { - mpViewShell->GetViewFrame()->ShowChildWindow( SID_NAVIGATOR, TRUE ); - mbShowNavigatorAfterSpecialMode = FALSE; + mpViewShell->GetViewFrame()->ShowChildWindow( SID_NAVIGATOR, sal_True ); + mbShowNavigatorAfterSpecialMode = sal_False; } } // ----------------------------------------------------------------------------- -void ShowWindow::DrawPauseScene( BOOL bTimeoutOnly ) +void ShowWindow::DrawPauseScene( sal_Bool bTimeoutOnly ) { const MapMode& rMap = GetMapMode(); const Point aOutOrg( PixelToLogic( Point() ) ); @@ -580,7 +580,7 @@ void ShowWindow::DrawPauseScene( BOOL bTimeoutOnly ) const Size aTextSize( LogicToLogic( Size( 0, 14 ), MAP_POINT, rMap ) ); const Size aOffset( LogicToLogic( Size( 1000, 1000 ), MAP_100TH_MM, rMap ) ); String aText( SdResId( STR_PRES_PAUSE ) ); - BOOL bDrawn = FALSE; + sal_Bool bDrawn = sal_False; Font aFont( GetSettings().GetStyleSettings().GetMenuFont() ); const Font aOldFont( GetFont() ); @@ -633,7 +633,7 @@ void ShowWindow::DrawPauseScene( BOOL bTimeoutOnly ) aText.AppendAscii( RTL_CONSTASCII_STRINGPARAM( " )" )); aVDev.DrawText( Point( aOffset.Width(), 0 ), aText ); DrawOutDev( Point( aOutOrg.X(), aOffset.Height() ), aVDevSize, Point(), aVDevSize, aVDev ); - bDrawn = TRUE; + bDrawn = sal_True; } } @@ -680,7 +680,7 @@ IMPL_LINK( ShowWindow, PauseTimeoutHdl, Timer*, pTimer ) RestartShow(); else { - DrawPauseScene( TRUE ); + DrawPauseScene( sal_True ); pTimer->Start(); } @@ -698,7 +698,7 @@ IMPL_LINK( ShowWindow, MouseTimeoutHdl, Timer*, EMPTYARG ) else { // mouse has been idle to long, hide pointer - ShowPointer( FALSE ); + ShowPointer( sal_False ); mbMouseCursorHidden = true; } return 0L; @@ -727,9 +727,9 @@ void ShowWindow::DeleteWindowFromPaintView() if( mpViewShell->GetView() ) mpViewShell->GetView()->DeleteWindowFromPaintView( this ); - USHORT nChild = GetChildCount(); + sal_uInt16 nChild = GetChildCount(); while( nChild-- ) - GetChild( nChild )->Show( FALSE ); + GetChild( nChild )->Show( sal_False ); } void ShowWindow::AddWindowToPaintView() @@ -737,9 +737,9 @@ void ShowWindow::AddWindowToPaintView() if( mpViewShell->GetView() ) mpViewShell->GetView()->AddWindowToPaintView( this ); - USHORT nChild = GetChildCount(); + sal_uInt16 nChild = GetChildCount(); while( nChild-- ) - GetChild( nChild )->Show( TRUE ); + GetChild( nChild )->Show( sal_True ); } } // end of namespace sd diff --git a/sd/source/ui/slideshow/showwindow.hxx b/sd/source/ui/slideshow/showwindow.hxx index 9521b6946138..a34957c1b2d5 100644..100755 --- a/sd/source/ui/slideshow/showwindow.hxx +++ b/sd/source/ui/slideshow/showwindow.hxx @@ -79,9 +79,9 @@ public: ShowWindow ( const ::rtl::Reference< ::sd::SlideshowImpl >& xController, ::Window* pParent ); virtual ~ShowWindow (void); - BOOL SetEndMode(); - BOOL SetPauseMode( sal_Int32 nPageIndexToRestart, sal_Int32 nTimeoutSec = SLIDE_NO_TIMEOUT, Graphic* pLogo = NULL ); - BOOL SetBlankMode( sal_Int32 nPageIndexToRestart, const Color& rBlankColor ); + sal_Bool SetEndMode(); + sal_Bool SetPauseMode( sal_Int32 nPageIndexToRestart, sal_Int32 nTimeoutSec = SLIDE_NO_TIMEOUT, Graphic* pLogo = NULL ); + sal_Bool SetBlankMode( sal_Int32 nPageIndexToRestart, const Color& rBlankColor ); const Color& GetBlankColor() const { return maShowBackground.GetColor(); } @@ -111,7 +111,7 @@ public: void RestartShow(); private: - void DrawPauseScene( BOOL bTimeoutOnly ); + void DrawPauseScene( sal_Bool bTimeoutOnly ); void DrawEndScene(); void DrawBlankScene(); @@ -123,14 +123,14 @@ private: Timer maMouseTimer; Wallpaper maShowBackground; Graphic maLogo; - ULONG mnPauseTimeout; + sal_uLong mnPauseTimeout; sal_Int32 mnRestartPageIndex; ShowWindowMode meShowWindowMode; - BOOL mbShowNavigatorAfterSpecialMode; + sal_Bool mbShowNavigatorAfterSpecialMode; Rectangle maPresArea; bool mbMouseAutoHide; bool mbMouseCursorHidden; - ULONG mnFirstMouseMove; + sal_uLong mnFirstMouseMove; DECL_LINK( PauseTimeoutHdl, Timer* pTimer ); DECL_LINK( MouseTimeoutHdl, Timer* pTimer ); diff --git a/sd/source/ui/slideshow/slideshow.cxx b/sd/source/ui/slideshow/slideshow.cxx index 70777d8a06db..84962348d693 100755 --- a/sd/source/ui/slideshow/slideshow.cxx +++ b/sd/source/ui/slideshow/slideshow.cxx @@ -709,7 +709,7 @@ void SAL_CALL SlideShow::end() throw(RuntimeException) WorkWindow* pWorkWindow = dynamic_cast<WorkWindow*>(pShell->GetViewFrame()->GetTopFrame().GetWindow().GetParent()); if( pWorkWindow ) { - pWorkWindow->StartPresentationMode( FALSE, isAlwaysOnTop() ); + pWorkWindow->StartPresentationMode( sal_False, isAlwaysOnTop() ); } } } @@ -750,7 +750,7 @@ void SAL_CALL SlideShow::end() throw(RuntimeException) framework::FrameworkHelper::GetViewURL(ePreviousType), framework::FrameworkHelper::msCenterPaneURL); - pViewShell->GetViewFrame()->GetBindings().InvalidateAll( TRUE ); + pViewShell->GetViewFrame()->GetBindings().InvalidateAll( sal_True ); } } } @@ -769,7 +769,7 @@ void SAL_CALL SlideShow::end() throw(RuntimeException) // switch to the previously visible Slide DrawViewShell* pDrawViewShell = dynamic_cast<DrawViewShell*>( pViewShell ); if( pDrawViewShell ) - pDrawViewShell->SwitchPage( (USHORT)xController->getRestoreSlide() ); + pDrawViewShell->SwitchPage( (sal_uInt16)xController->getRestoreSlide() ); else { Reference<XDrawView> xDrawView ( @@ -1183,8 +1183,8 @@ void SlideShow::StartFullscreenPresentation( ) const sal_Int32 nDisplay (GetDisplay()); WorkWindow* pWorkWindow = new FullScreenWorkWindow(this, mpCurrentViewShellBase); pWorkWindow->SetBackground(Wallpaper(COL_BLACK)); - pWorkWindow->StartPresentationMode( TRUE, mpDoc->getPresentationSettings().mbAlwaysOnTop ? PRESENTATION_HIDEALLAPPS : 0, nDisplay); - // pWorkWindow->ShowFullScreenMode(FALSE, nDisplay); + pWorkWindow->StartPresentationMode( sal_True, mpDoc->getPresentationSettings().mbAlwaysOnTop ? PRESENTATION_HIDEALLAPPS : 0, nDisplay); + // pWorkWindow->ShowFullScreenMode(sal_False, nDisplay); if (pWorkWindow->IsVisible()) { @@ -1204,7 +1204,7 @@ void SlideShow::StartFullscreenPresentation( ) // new view shell--a prerequisite to process slot calls and initialize // its panes--a GrabFocus() has to be called later on. SfxFrame* pNewFrame = SfxFrame::Create( *mpDoc->GetDocSh(), *pWorkWindow, PRESENTATION_FACTORY_ID, true ); - pNewFrame->SetPresentationMode(TRUE); + pNewFrame->SetPresentationMode(sal_True); mpFullScreenViewShellBase = static_cast<ViewShellBase*>(pNewFrame->GetCurrentViewFrame()->GetViewShell()); if(mpFullScreenViewShellBase != NULL) diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx index 67ac7e94cadb..1aef702d63f3 100755 --- a/sd/source/ui/slideshow/slideshowimpl.cxx +++ b/sd/source/ui/slideshow/slideshowimpl.cxx @@ -116,7 +116,7 @@ namespace sd // Slots, welche im Sfx verwaltet werden und in der SlideShow disabled // werden sollen (muss in Reihenfolge der SIDs geordnet sein) -static USHORT __READONLY_DATA pAllowed[] = +static sal_uInt16 __READONLY_DATA pAllowed[] = { SID_OPENDOC , // 5501 // damit interne Spruenge klappen SID_JUMPTOMARK , // 5598 @@ -690,7 +690,7 @@ void SAL_CALL SlideshowImpl::disposing() mpView->DeleteWindowFromPaintView( mpShowWindow ); if( mpView ) - mpView->SetAnimationPause( FALSE ); + mpView->SetAnimationPause( sal_False ); if( mpViewShell ) { @@ -768,7 +768,7 @@ void SAL_CALL SlideshowImpl::disposing() // restart the custom show dialog if he started us if( mpViewShell->IsStartShowWithDialog() && getDispatcher() ) { - mpViewShell->SetStartShowWithDialog( FALSE ); + mpViewShell->SetStartShowWithDialog( sal_False ); getDispatcher()->Execute( SID_CUSTOMSHOW_DLG, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD ); } @@ -852,7 +852,7 @@ bool SlideshowImpl::startPreview( if( mpView ) { mpView->AddWindowToPaintView( mpShowWindow ); - mpView->SetAnimationPause( TRUE ); + mpView->SetAnimationPause( sal_True ); } // call resize handler @@ -959,7 +959,7 @@ bool SlideshowImpl::startShow( PresentationSettingsEx* pPresSettings ) { // we are in notes page mode, so get // the corresponding draw page - const USHORT nPgNum = ( pStartPage->GetPageNum() - 2 ) >> 1; + const sal_uInt16 nPgNum = ( pStartPage->GetPageNum() - 2 ) >> 1; pStartPage = mpDoc->GetSdPage( nPgNum, PK_STANDARD ); } } @@ -1001,7 +1001,7 @@ bool SlideshowImpl::startShow( PresentationSettingsEx* pPresSettings ) sal_Int32 nSlide; for( nSlide = 0; (nSlide < nSlideCount); nSlide++ ) { - if( mpDoc->GetSdPage( (USHORT) nSlide, PK_STANDARD )->GetName() == aPresSlide ) + if( mpDoc->GetSdPage( (sal_uInt16) nSlide, PK_STANDARD )->GetName() == aPresSlide ) break; } @@ -1040,7 +1040,7 @@ bool SlideshowImpl::startShow( PresentationSettingsEx* pPresSettings ) // these Slots are forbiden in other views for this document if( mpDocSh ) { - mpDocSh->SetSlotFilter( TRUE, sizeof( pAllowed ) / sizeof( USHORT ), pAllowed ); + mpDocSh->SetSlotFilter( sal_True, sizeof( pAllowed ) / sizeof( sal_uInt16 ), pAllowed ); mpDocSh->ApplySlotFilter(); } @@ -1090,7 +1090,7 @@ bool SlideshowImpl::startShow( PresentationSettingsEx* pPresSettings ) if( mpView ) { mpView->AddWindowToPaintView( mpShowWindow ); - mpView->SetAnimationPause( TRUE ); + mpView->SetAnimationPause( sal_True ); } SfxBindings* pBindings = getBindings(); @@ -1259,7 +1259,7 @@ void SlideshowImpl::onFirstPaint() } ::vos::OGuard aSolarGuard( Application::GetSolarMutex() ); - maUpdateTimer.SetTimeout( (ULONG)100 ); + maUpdateTimer.SetTimeout( (sal_uLong)100 ); maUpdateTimer.Start(); } @@ -1662,7 +1662,7 @@ void SlideshowImpl::click( const Reference< XShape >& xShape, const ::com::sun:: if( INET_PROT_FILE == aURL.GetProtocol() ) { SfxStringItem aUrl( SID_FILE_NAME, aURL.GetMainURL( INetURLObject::NO_DECODE ) ); - SfxBoolItem aBrowsing( SID_BROWSE, TRUE ); + SfxBoolItem aBrowsing( SID_BROWSE, sal_True ); SfxViewFrame* pViewFrm = SfxViewFrame::Current(); if (pViewFrm) @@ -1725,9 +1725,9 @@ void SlideshowImpl::click( const Reference< XShape >& xShape, const ::com::sun:: sal_Int32 SlideshowImpl::getSlideNumberForBookmark( const OUString& rStrBookmark ) { - BOOL bIsMasterPage; + sal_Bool bIsMasterPage; OUString aBookmark = getUiNameFromPageApiNameImpl( rStrBookmark ); - USHORT nPgNum = mpDoc->GetPageByName( aBookmark, bIsMasterPage ); + sal_uInt16 nPgNum = mpDoc->GetPageByName( aBookmark, bIsMasterPage ); if( nPgNum == SDRPAGE_NOTFOUND ) { @@ -1737,7 +1737,7 @@ sal_Int32 SlideshowImpl::getSlideNumberForBookmark( const OUString& rStrBookmark if( pObj ) { nPgNum = pObj->GetPage()->GetPageNum(); - bIsMasterPage = (BOOL)pObj->GetPage()->IsMasterPage(); + bIsMasterPage = (sal_Bool)pObj->GetPage()->IsMasterPage(); } } @@ -1967,13 +1967,13 @@ sal_Int32 SlideshowImpl::updateSlideShow (void) // Make sure that the maximum frame count has not been set // too high (only then conversion to milliseconds and long // integer may lead to zero value.) - OSL_ASSERT(static_cast<ULONG>(fUpdate * 1000.0) > 0); + OSL_ASSERT(static_cast<sal_uLong>(fUpdate * 1000.0) > 0); Application::EnableNoYieldMode(false); Application::RemovePostYieldListener(LINK(this, SlideshowImpl, PostYieldListener)); // Use a timer for the asynchronous callback. - maUpdateTimer.SetTimeout(static_cast<ULONG>(fUpdate * 1000.0)); + maUpdateTimer.SetTimeout(static_cast<sal_uLong>(fUpdate * 1000.0)); maUpdateTimer.Start(); } } @@ -2239,13 +2239,13 @@ IMPL_LINK( SlideshowImpl, ContextMenuHdl, void*, EMPTYARG ) Reference< ::com::sun::star::frame::XFrame > xFrame( pViewFrame->GetFrame().GetFrameInterface() ); if( xFrame.is() ) { - pMenu->SetItemImage( CM_NEXT_SLIDE, GetImage( xFrame, OUString( RTL_CONSTASCII_USTRINGPARAM( "slot:10617") ), FALSE, FALSE ) ); - pMenu->SetItemImage( CM_PREV_SLIDE, GetImage( xFrame, OUString( RTL_CONSTASCII_USTRINGPARAM( "slot:10618") ), FALSE, FALSE ) ); + pMenu->SetItemImage( CM_NEXT_SLIDE, GetImage( xFrame, OUString( RTL_CONSTASCII_USTRINGPARAM( "slot:10617") ), sal_False, sal_False ) ); + pMenu->SetItemImage( CM_PREV_SLIDE, GetImage( xFrame, OUString( RTL_CONSTASCII_USTRINGPARAM( "slot:10618") ), sal_False, sal_False ) ); if( pPageMenu ) { - pPageMenu->SetItemImage( CM_FIRST_SLIDE, GetImage( xFrame, OUString( RTL_CONSTASCII_USTRINGPARAM( "slot:10616") ), FALSE, FALSE ) ); - pPageMenu->SetItemImage( CM_LAST_SLIDE, GetImage( xFrame, OUString( RTL_CONSTASCII_USTRINGPARAM( "slot:10619") ), FALSE, FALSE ) ); + pPageMenu->SetItemImage( CM_FIRST_SLIDE, GetImage( xFrame, OUString( RTL_CONSTASCII_USTRINGPARAM( "slot:10616") ), sal_False, sal_False ) ); + pPageMenu->SetItemImage( CM_LAST_SLIDE, GetImage( xFrame, OUString( RTL_CONSTASCII_USTRINGPARAM( "slot:10619") ), sal_False, sal_False ) ); } } } @@ -2256,7 +2256,7 @@ IMPL_LINK( SlideshowImpl, ContextMenuHdl, void*, EMPTYARG ) const sal_Int32 nPageNumberCount = mpSlideController->getSlideNumberCount(); if( nPageNumberCount <= 1 ) { - pMenu->EnableItem( CM_GOTO, FALSE ); + pMenu->EnableItem( CM_GOTO, sal_False ); } else { @@ -2273,12 +2273,12 @@ IMPL_LINK( SlideshowImpl, ContextMenuHdl, void*, EMPTYARG ) { if( mpSlideController->isVisibleSlideNumber( nPageNumber ) ) { - SdPage* pPage = mpDoc->GetSdPage((USHORT)nPageNumber, PK_STANDARD); + SdPage* pPage = mpDoc->GetSdPage((sal_uInt16)nPageNumber, PK_STANDARD); if (pPage) { - pPageMenu->InsertItem( (USHORT)(CM_SLIDES + nPageNumber), pPage->GetName() ); + pPageMenu->InsertItem( (sal_uInt16)(CM_SLIDES + nPageNumber), pPage->GetName() ); if( nPageNumber == nCurrentSlideNumber ) - pPageMenu->CheckItem( (USHORT)(CM_SLIDES + nPageNumber) ); + pPageMenu->CheckItem( (sal_uInt16)(CM_SLIDES + nPageNumber) ); } } } @@ -2326,9 +2326,9 @@ IMPL_LINK( SlideshowImpl, ContextMenuHdl, void*, EMPTYARG ) break; } - pWidthMenu->EnableItem( (USHORT)(CM_WIDTH_PEN + nIterator), TRUE); + pWidthMenu->EnableItem( (sal_uInt16)(CM_WIDTH_PEN + nIterator), sal_True); if( nWidth == mdUserPaintStrokeWidth) - pWidthMenu->CheckItem( (USHORT)(CM_WIDTH_PEN + nIterator) ); + pWidthMenu->CheckItem( (sal_uInt16)(CM_WIDTH_PEN + nIterator) ); } } @@ -2552,16 +2552,16 @@ void SlideshowImpl::createSlideList( bool bAll, bool bStartWithActualSlide, cons if( rPresSlide.Len() ) { sal_Int32 nSlide; - BOOL bTakeNextAvailable = FALSE; + sal_Bool bTakeNextAvailable = sal_False; for( nSlide = 0, nFirstSlide = -1; ( nSlide < nSlideCount ) && ( -1 == nFirstSlide ); nSlide++ ) { - SdPage* pTestSlide = mpDoc->GetSdPage( (USHORT)nSlide, PK_STANDARD ); + SdPage* pTestSlide = mpDoc->GetSdPage( (sal_uInt16)nSlide, PK_STANDARD ); if( pTestSlide->GetName() == rPresSlide ) { if( pTestSlide->IsExcluded() ) - bTakeNextAvailable = TRUE; + bTakeNextAvailable = sal_True; else nFirstSlide = nSlide; } @@ -2576,7 +2576,7 @@ void SlideshowImpl::createSlideList( bool bAll, bool bStartWithActualSlide, cons for( sal_Int32 i = 0; i < nSlideCount; i++ ) { - bool bVisible = ( mpDoc->GetSdPage( (USHORT)i, PK_STANDARD ) )->IsExcluded() ? false : true; + bool bVisible = ( mpDoc->GetSdPage( (sal_uInt16)i, PK_STANDARD ) )->IsExcluded() ? false : true; if( bVisible || (eMode == AnimationSlideController::ALL) ) mpSlideController->insertSlideNumber( i, bVisible ); } @@ -2589,18 +2589,18 @@ void SlideshowImpl::createSlideList( bool bAll, bool bStartWithActualSlide, cons { sal_Int32 nSlide; for( nSlide = 0; nSlide < nSlideCount; nSlide++ ) - if( rPresSlide == mpDoc->GetSdPage( (USHORT) nSlide, PK_STANDARD )->GetName() ) + if( rPresSlide == mpDoc->GetSdPage( (sal_uInt16) nSlide, PK_STANDARD )->GetName() ) break; if( nSlide < nSlideCount ) - mpSlideController->insertSlideNumber( (USHORT) nSlide ); + mpSlideController->insertSlideNumber( (sal_uInt16) nSlide ); } void* pCustomSlide; sal_Int32 nSlideIndex; for( pCustomSlide = pCustomShow->First(),nSlideIndex=0; pCustomSlide; pCustomSlide = pCustomShow->Next(), nSlideIndex++ ) { - const USHORT nSdSlide = ( ( (SdPage*) pCustomSlide )->GetPageNum() - 1 ) / 2; + const sal_uInt16 nSdSlide = ( ( (SdPage*) pCustomSlide )->GetPageNum() - 1 ) / 2; if( !( mpDoc->GetSdPage( nSdSlide, PK_STANDARD ) )->IsExcluded()) mpSlideController->insertSlideNumber( nSdSlide ); @@ -2611,7 +2611,7 @@ void SlideshowImpl::createSlideList( bool bAll, bool bStartWithActualSlide, cons // --------------------------------------------------------- -typedef USHORT (*FncGetChildWindowId)(); +typedef sal_uInt16 (*FncGetChildWindowId)(); FncGetChildWindowId aShowChilds[] = { @@ -2643,13 +2643,13 @@ void SlideshowImpl::hideChildWindows() if( pViewFrame->GetChildWindow( SID_NAVIGATOR ) != NULL ) mnChildMask |= NAVIGATOR_CHILD_MASK; - for( ULONG i = 0, nCount = sizeof( aShowChilds ) / sizeof( FncGetChildWindowId ); i < nCount; i++ ) + for( sal_uLong i = 0, nCount = sizeof( aShowChilds ) / sizeof( FncGetChildWindowId ); i < nCount; i++ ) { - const USHORT nId = ( *aShowChilds[ i ] )(); + const sal_uInt16 nId = ( *aShowChilds[ i ] )(); if( pViewFrame->GetChildWindow( nId ) ) { - pViewFrame->SetChildWindow( nId, FALSE ); + pViewFrame->SetChildWindow( nId, sal_False ); mnChildMask |= 1 << i; } } @@ -2668,10 +2668,10 @@ void SlideshowImpl::showChildWindows() { pViewFrame->SetChildWindow( SID_NAVIGATOR, ( mnChildMask & NAVIGATOR_CHILD_MASK ) != 0 ); - for( ULONG i = 0, nCount = sizeof( aShowChilds ) / sizeof( FncGetChildWindowId ); i < nCount; i++ ) + for( sal_uLong i = 0, nCount = sizeof( aShowChilds ) / sizeof( FncGetChildWindowId ); i < nCount; i++ ) { if( mnChildMask & ( 1 << i ) ) - pViewFrame->SetChildWindow( ( *aShowChilds[ i ] )(), TRUE ); + pViewFrame->SetChildWindow( ( *aShowChilds[ i ] )(), sal_True ); } } } @@ -2799,11 +2799,11 @@ void SAL_CALL SlideshowImpl::activate() throw (RuntimeException) if( pDispatcher ) { // filter all forbiden slots - pDispatcher->SetSlotFilter( TRUE, sizeof(pAllowed) / sizeof(USHORT), pAllowed ); + pDispatcher->SetSlotFilter( sal_True, sizeof(pAllowed) / sizeof(sal_uInt16), pAllowed ); } if( getBindings() ) - getBindings()->InvalidateAll(TRUE); + getBindings()->InvalidateAll(sal_True); mpShowWindow->GrabFocus(); } @@ -2888,8 +2888,8 @@ void SlideshowImpl::receiveRequest(SfxRequest& rReq) const String aTarget( ((SfxStringItem&) pArgs->Get(SID_NAVIGATOR_OBJECT)).GetValue() ); // is the bookmark a Slide? - BOOL bIsMasterPage; - USHORT nPgNum = mpDoc->GetPageByName( aTarget, bIsMasterPage ); + sal_Bool bIsMasterPage; + sal_uInt16 nPgNum = mpDoc->GetPageByName( aTarget, bIsMasterPage ); SdrObject* pObj = NULL; if( nPgNum == SDRPAGE_NOTFOUND ) diff --git a/sd/source/ui/slideshow/slideshowimpl.hxx b/sd/source/ui/slideshow/slideshowimpl.hxx index 98a34959e0b9..c85c479d8cf5 100755 --- a/sd/source/ui/slideshow/slideshowimpl.hxx +++ b/sd/source/ui/slideshow/slideshowimpl.hxx @@ -414,8 +414,8 @@ private: ::std::auto_ptr<PaneHider> mpPaneHider; - ULONG mnEndShowEvent; - ULONG mnContextMenuEvent; + sal_uLong mnEndShowEvent; + sal_uLong mnContextMenuEvent; sal_Int32 mnUpdateEvent; css::uno::Reference< css::presentation::XPresentation2 > mxPresentation; diff --git a/sd/source/ui/slidesorter/cache/SlsRequestQueue.hxx b/sd/source/ui/slidesorter/cache/SlsRequestQueue.hxx index f59ec702ac01..f59ec702ac01 100644..100755 --- a/sd/source/ui/slidesorter/cache/SlsRequestQueue.hxx +++ b/sd/source/ui/slidesorter/cache/SlsRequestQueue.hxx diff --git a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx index 8018c71e2b88..43d5928df349 100644 --- a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx +++ b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx @@ -379,7 +379,7 @@ bool SlideSorterController::Command ( case COMMAND_CONTEXTMENU: { SdPage* pPage = NULL; - USHORT nPopupId; + sal_uInt16 nPopupId; model::PageEnumeration aSelectedPages ( PageEnumerationProvider::CreateSelectedPagesEnumeration(mrModel)); @@ -660,7 +660,7 @@ IMPL_LINK(SlideSorterController, WindowEventHandler, VclWindowEvent*, pEvent) cache::PageCacheManager::Instance()->InvalidateAllCaches(); // Update the draw mode. - ULONG nDrawMode (Application::GetSettings().GetStyleSettings().GetHighContrastMode() + sal_uLong nDrawMode (Application::GetSettings().GetStyleSettings().GetHighContrastMode() ? ViewShell::OUTPUT_DRAWMODE_CONTRAST : ViewShell::OUTPUT_DRAWMODE_COLOR); if (mrSlideSorter.GetViewShell() != NULL) @@ -685,7 +685,7 @@ IMPL_LINK(SlideSorterController, WindowEventHandler, VclWindowEvent*, pEvent) } } - return TRUE; + return sal_True; } @@ -717,8 +717,8 @@ void SlideSorterController::GetCtrlState (SfxItemSet& rSet) { if (mrSlideSorter.GetContentWindow()) { - ULONG nMode = mrSlideSorter.GetContentWindow()->GetDrawMode(); - UINT16 nQuality = 0; + sal_uLong nMode = mrSlideSorter.GetContentWindow()->GetDrawMode(); + sal_uInt16 nQuality = 0; switch (nMode) { @@ -737,19 +737,19 @@ void SlideSorterController::GetCtrlState (SfxItemSet& rSet) } rSet.Put (SfxBoolItem (SID_OUTPUT_QUALITY_COLOR, - (BOOL)(nQuality==0))); + (sal_Bool)(nQuality==0))); rSet.Put (SfxBoolItem (SID_OUTPUT_QUALITY_GRAYSCALE, - (BOOL)(nQuality==1))); + (sal_Bool)(nQuality==1))); rSet.Put (SfxBoolItem (SID_OUTPUT_QUALITY_BLACKWHITE, - (BOOL)(nQuality==2))); + (sal_Bool)(nQuality==2))); rSet.Put (SfxBoolItem (SID_OUTPUT_QUALITY_CONTRAST, - (BOOL)(nQuality==3))); + (sal_Bool)(nQuality==3))); } } if (rSet.GetItemState(SID_MAIL_SCROLLBODY_PAGEDOWN) == SFX_ITEM_AVAILABLE) { - rSet.Put (SfxBoolItem( SID_MAIL_SCROLLBODY_PAGEDOWN, TRUE)); + rSet.Put (SfxBoolItem( SID_MAIL_SCROLLBODY_PAGEDOWN, sal_True)); } } @@ -996,7 +996,7 @@ void SlideSorterController::PageNameHasChanged (int nPageIndex, const String& rs break; ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > - xAccessible (pWindow->GetAccessible(FALSE)); + xAccessible (pWindow->GetAccessible(sal_False)); if ( ! xAccessible.is()) break; diff --git a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx index 68ae50e091e7..823112166bf4 100755 --- a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx +++ b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx @@ -233,7 +233,7 @@ void Clipboard::DoDelete (::Window* ) void Clipboard::DoCopy (::Window* pWindow ) { - CreateSlideTransferable( pWindow, FALSE ); + CreateSlideTransferable( pWindow, sal_False ); } @@ -310,25 +310,25 @@ sal_Int32 Clipboard::PasteTransferable (sal_Int32 nInsertPosition) SdTransferable* pClipTransferable = SD_MOD()->pTransferClip; model::SlideSorterModel& rModel (mrSlideSorter.GetModel()); bool bMergeMasterPages = !pClipTransferable->HasSourceDoc (rModel.GetDocument()); - USHORT nInsertIndex (rModel.GetCoreIndex(nInsertPosition)); + sal_uInt16 nInsertIndex (rModel.GetCoreIndex(nInsertPosition)); sal_Int32 nInsertPageCount (0); if (pClipTransferable->HasPageBookmarks()) { const List& rBookmarkList = pClipTransferable->GetPageBookmarks(); const ::vos::OGuard aGuard (Application::GetSolarMutex()); - nInsertPageCount = (USHORT) rBookmarkList.Count(); + nInsertPageCount = (sal_uInt16) rBookmarkList.Count(); rModel.GetDocument()->InsertBookmarkAsPage( const_cast<List*>(&rBookmarkList), NULL, - FALSE, - FALSE, + sal_False, + sal_False, nInsertIndex, - FALSE, + sal_False, pClipTransferable->GetPageDocShell(), - TRUE, + sal_True, bMergeMasterPages, - FALSE); + sal_False); } else { @@ -346,14 +346,14 @@ sal_Int32 Clipboard::PasteTransferable (sal_Int32 nInsertPosition) rModel.GetDocument()->InsertBookmarkAsPage( NULL, NULL, - FALSE, - FALSE, + sal_False, + sal_False, nInsertIndex, - FALSE, + sal_False, pDataDocSh, - TRUE, + sal_True, bMergeMasterPages, - FALSE); + sal_False); } } mrController.HandleModelChange(); @@ -369,7 +369,7 @@ void Clipboard::SelectPageRange (sal_Int32 nFirstIndex, sal_Int32 nPageCount) // after the nInsertIndex position. PageSelector& rSelector (mrController.GetPageSelector()); rSelector.DeselectAllPages(); - for (USHORT i=0; i<nPageCount; i++) + for (sal_uInt16 i=0; i<nPageCount; i++) { model::SharedPageDescriptor pDescriptor ( mrSlideSorter.GetModel().GetPageDescriptor(nFirstIndex + i)); @@ -436,7 +436,7 @@ void Clipboard::CreateSlideTransferable ( SdTransferable* pTransferable = new Transferable ( pDocument, NULL, - FALSE, + sal_False, dynamic_cast<SlideSorterViewShell*>(mrSlideSorter.GetViewShell()), aRepresentatives); @@ -498,7 +498,7 @@ void Clipboard::StartDrag ( maPagesToRemove.clear(); maPagesToSelect.clear(); mbUpdateSelectionPending = false; - CreateSlideTransferable(pWindow, TRUE); + CreateSlideTransferable(pWindow, sal_True); mrController.GetInsertionIndicatorHandler()->UpdatePosition( rPosition, @@ -585,8 +585,8 @@ sal_Int8 Clipboard::AcceptDrop ( const AcceptDropEvent& rEvent, DropTargetHelper& rTargetHelper, ::sd::Window* pTargetWindow, - USHORT nPage, - USHORT nLayer) + sal_uInt16 nPage, + sal_uInt16 nLayer) { sal_Int8 nAction (DND_ACTION_NONE); @@ -655,8 +655,8 @@ sal_Int8 Clipboard::ExecuteDrop ( const ExecuteDropEvent& rEvent, DropTargetHelper& rTargetHelper, ::sd::Window* pTargetWindow, - USHORT nPage, - USHORT nLayer) + sal_uInt16 nPage, + sal_uInt16 nLayer) { sal_Int8 nResult = DND_ACTION_NONE; mpUndoContext.reset(); @@ -680,7 +680,7 @@ sal_Int8 Clipboard::ExecuteDrop ( mrController.GetInsertionIndicatorHandler()); // Get insertion position and then turn off the insertion indicator. pInsertionIndicatorHandler->UpdatePosition(aEventModelPosition, rEvent.mnAction); - // USHORT nIndex = DetermineInsertPosition(*pDragTransferable); + // sal_uInt16 nIndex = DetermineInsertPosition(*pDragTransferable); // Do not process the insertion when it is trivial, // i.e. would insert pages at their original place. @@ -754,7 +754,7 @@ void Clipboard::Abort (void) -USHORT Clipboard::DetermineInsertPosition (const SdTransferable& ) +sal_uInt16 Clipboard::DetermineInsertPosition (const SdTransferable& ) { // Tell the model to move the dragged pages behind the one with the // index nInsertionIndex which first has to be transformed into an index @@ -772,11 +772,11 @@ USHORT Clipboard::DetermineInsertPosition (const SdTransferable& ) -USHORT Clipboard::InsertSlides ( +sal_uInt16 Clipboard::InsertSlides ( const SdTransferable& rTransferable, - USHORT nInsertPosition) + sal_uInt16 nInsertPosition) { - USHORT nInsertedPageCount = ViewClipboard::InsertSlides ( + sal_uInt16 nInsertedPageCount = ViewClipboard::InsertSlides ( rTransferable, nInsertPosition); @@ -827,8 +827,8 @@ sal_Int8 Clipboard::ExecuteOrAcceptShapeDrop ( const void* pDropEvent, DropTargetHelper& rTargetHelper, ::sd::Window* pTargetWindow, - USHORT nPage, - USHORT nLayer) + sal_uInt16 nPage, + sal_uInt16 nLayer) { sal_Int8 nResult = 0; diff --git a/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx b/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx index 7b2ca60cb4f0..74a97802cf71 100644 --- a/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx @@ -169,7 +169,7 @@ void CurrentSlideManager::SwitchCurrentSlide ( // The slide sorter is the main view. FrameView* pFrameView = pViewShell->GetFrameView(); if (pFrameView != NULL) - pFrameView->SetSelectedPage(sal::static_int_cast<USHORT>(mnCurrentSlideIndex)); + pFrameView->SetSelectedPage(sal::static_int_cast<sal_uInt16>(mnCurrentSlideIndex)); mrSlideSorter.GetController().GetPageSelector().SetCoreSelection(); } @@ -212,7 +212,7 @@ void CurrentSlideManager::SetCurrentSlideAtViewShellBase (const SharedPageDescri pBase->GetMainViewShell().get()); if (pDrawViewShell != NULL) { - USHORT nPageNumber = (rpDescriptor->GetPage()->GetPageNum()-1)/2; + sal_uInt16 nPageNumber = (rpDescriptor->GetPage()->GetPageNum()-1)/2; pDrawViewShell->SwitchPage(nPageNumber); pDrawViewShell->GetPageTabControl()->SetCurPageId(nPageNumber+1); } @@ -233,7 +233,7 @@ void CurrentSlideManager::SetCurrentSlideAtTabControl (const SharedPageDescripto ::boost::dynamic_pointer_cast<DrawViewShell>(pBase->GetMainViewShell())); if (pDrawViewShell) { - USHORT nPageNumber = (rpDescriptor->GetPage()->GetPageNum()-1)/2; + sal_uInt16 nPageNumber = (rpDescriptor->GetPage()->GetPageNum()-1)/2; pDrawViewShell->GetPageTabControl()->SetCurPageId(nPageNumber+1); } } diff --git a/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx b/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx index 88b294f3202f..76a5f583f4a5 100644 --- a/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx +++ b/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx @@ -86,11 +86,11 @@ void DragAndDropContext::GetPagesFromBookmarks ( if (pDocument == NULL) return; - for (ULONG nIndex=0,nCount=rBookmarks.Count(); nIndex<nCount; ++nIndex) + for (sal_uLong nIndex=0,nCount=rBookmarks.Count(); nIndex<nCount; ++nIndex) { const String sPageName (*static_cast<String*>(rBookmarks.GetObject(nIndex))); - BOOL bIsMasterPage (FALSE); - const USHORT nPageIndex (pDocument->GetPageByName(sPageName, bIsMasterPage)); + sal_Bool bIsMasterPage (sal_False); + const sal_uInt16 nPageIndex (pDocument->GetPageByName(sPageName, bIsMasterPage)); if (nPageIndex == SDRPAGE_NOTFOUND) continue; diff --git a/sd/source/ui/slidesorter/controller/SlsHideSlideFunction.cxx b/sd/source/ui/slidesorter/controller/SlsHideSlideFunction.cxx index dbb65b0f657a..d2ce3f927eec 100755 --- a/sd/source/ui/slidesorter/controller/SlsHideSlideFunction.cxx +++ b/sd/source/ui/slidesorter/controller/SlsHideSlideFunction.cxx @@ -131,7 +131,7 @@ HideSlideFunction::ExclusionState HideSlideFunction::GetExclusionState ( model::PageEnumeration& rPageSet) { ExclusionState eState (UNDEFINED); - BOOL bState; + sal_Bool bState; // Get toggle state of the selected pages. while (rPageSet.HasMoreElements() && eState!=MIXED) diff --git a/sd/source/ui/slidesorter/controller/SlsListener.cxx b/sd/source/ui/slidesorter/controller/SlsListener.cxx index 9f1218013e16..009b4fc732b9 100755 --- a/sd/source/ui/slidesorter/controller/SlsListener.cxx +++ b/sd/source/ui/slidesorter/controller/SlsListener.cxx @@ -659,7 +659,7 @@ void Listener::HandleShapeModification (const SdrPage* pPage) // pages that are linked to this master page. if (pPage->IsMasterPage()) { - for (USHORT nIndex=0,nCount=pDocument->GetSdPageCount(PK_STANDARD); + for (sal_uInt16 nIndex=0,nCount=pDocument->GetSdPageCount(PK_STANDARD); nIndex<nCount; ++nIndex) { diff --git a/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx b/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx index c94dd6d550b0..e411dc76d6ba 100644 --- a/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx @@ -310,7 +310,7 @@ IMPL_LINK(ScrollBarManager, VerticalScrollBarHandler, ScrollBar*, pScrollBar) mrSlideSorter.GetContentWindow()->SetVisibleXY(-1, nRelativePosition); mrSlideSorter.GetController().GetVisibleAreaManager().DeactivateCurrentSlideTracking(); } - return TRUE; + return sal_True; } @@ -329,7 +329,7 @@ IMPL_LINK(ScrollBarManager, HorizontalScrollBarHandler, ScrollBar*, pScrollBar) mrSlideSorter.GetContentWindow()->SetVisibleXY(nRelativePosition, -1); mrSlideSorter.GetController().GetVisibleAreaManager().DeactivateCurrentSlideTracking(); } - return TRUE; + return sal_True; } diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionCommand.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionCommand.cxx index 687019954feb..20287d5fe537 100755 --- a/sd/source/ui/slidesorter/controller/SlsSelectionCommand.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSelectionCommand.cxx @@ -54,7 +54,7 @@ SelectionCommand::SelectionCommand ( -void SelectionCommand::AddSlide (USHORT nPageIndex) +void SelectionCommand::AddSlide (sal_uInt16 nPageIndex) { maPagesToSelect.push_back(nPageIndex); } diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionCommand.hxx b/sd/source/ui/slidesorter/controller/SlsSelectionCommand.hxx index 7a9d0f27369e..a6589bdffd23 100755 --- a/sd/source/ui/slidesorter/controller/SlsSelectionCommand.hxx +++ b/sd/source/ui/slidesorter/controller/SlsSelectionCommand.hxx @@ -67,7 +67,7 @@ public: /** Remember the specified page to be selected when this command is executed. */ - void AddSlide (USHORT nPageIndex); + void AddSlide (sal_uInt16 nPageIndex); /** Execute the command and select the pages added by previous calls to AddPages() and AddPage(). diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx index 1d4d075fc3ce..fc5687e0afc0 100644 --- a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx @@ -398,7 +398,7 @@ FunctionReference SelectionFunction::Create( -BOOL SelectionFunction::MouseButtonDown (const MouseEvent& rEvent) +sal_Bool SelectionFunction::MouseButtonDown (const MouseEvent& rEvent) { // #95491# remember button state for creation of own MouseEvents SetMouseButtonCode (rEvent.GetButtons()); @@ -409,22 +409,22 @@ BOOL SelectionFunction::MouseButtonDown (const MouseEvent& rEvent) ProcessMouseEvent(BUTTON_DOWN, rEvent); - return TRUE; + return sal_True; } -BOOL SelectionFunction::MouseMove (const MouseEvent& rEvent) +sal_Bool SelectionFunction::MouseMove (const MouseEvent& rEvent) { ProcessMouseEvent(MOUSE_MOTION, rEvent); - return TRUE; + return sal_True; } -BOOL SelectionFunction::MouseButtonUp (const MouseEvent& rEvent) +sal_Bool SelectionFunction::MouseButtonUp (const MouseEvent& rEvent) { mrController.GetScrollBarManager().StopAutoScroll (); @@ -433,7 +433,7 @@ BOOL SelectionFunction::MouseButtonUp (const MouseEvent& rEvent) mbProcessingMouseButtonDown = false; // mpWindow->ReleaseMouse(); - return TRUE; + return sal_True; } @@ -447,12 +447,12 @@ void SelectionFunction::NotifyDragFinished (void) -BOOL SelectionFunction::KeyInput (const KeyEvent& rEvent) +sal_Bool SelectionFunction::KeyInput (const KeyEvent& rEvent) { view::SlideSorterView::DrawLock aDrawLock (mrSlideSorter); PageSelector::UpdateLock aLock (mrSlideSorter); FocusManager& rFocusManager (mrController.GetFocusManager()); - BOOL bResult = FALSE; + sal_Bool bResult = sal_False; const KeyCode& rCode (rEvent.GetKeyCode()); switch (rCode.GetCode()) @@ -477,7 +477,7 @@ BOOL SelectionFunction::KeyInput (const KeyEvent& rEvent) SID_INSERTPAGE, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD); } - bResult = TRUE; + bResult = sal_True; } break; } @@ -486,7 +486,7 @@ BOOL SelectionFunction::KeyInput (const KeyEvent& rEvent) if ( ! rFocusManager.IsFocusShowing()) { rFocusManager.ShowFocus(); - bResult = TRUE; + bResult = sal_True; } break; @@ -495,7 +495,7 @@ BOOL SelectionFunction::KeyInput (const KeyEvent& rEvent) // operation then stop that. mpModeHandler->Abort(); SwitchToNormalMode(); - bResult = TRUE; + bResult = sal_True; break; case KEY_SPACE: @@ -509,7 +509,7 @@ BOOL SelectionFunction::KeyInput (const KeyEvent& rEvent) else mrController.GetPageSelector().SelectPage(pDescriptor); } - bResult = TRUE; + bResult = sal_True; } break; @@ -517,47 +517,47 @@ BOOL SelectionFunction::KeyInput (const KeyEvent& rEvent) // Move the focus indicator left. case KEY_LEFT: MoveFocus(FocusManager::FMD_LEFT, rCode.IsShift(), rCode.IsMod1()); - bResult = TRUE; + bResult = sal_True; break; // Move the focus indicator right. case KEY_RIGHT: MoveFocus(FocusManager::FMD_RIGHT, rCode.IsShift(), rCode.IsMod1()); - bResult = TRUE; + bResult = sal_True; break; // Move the focus indicator up. case KEY_UP: MoveFocus(FocusManager::FMD_UP, rCode.IsShift(), rCode.IsMod1()); - bResult = TRUE; + bResult = sal_True; break; // Move the focus indicator down. case KEY_DOWN: MoveFocus(FocusManager::FMD_DOWN, rCode.IsShift(), rCode.IsMod1()); - bResult = TRUE; + bResult = sal_True; break; // Go to previous page. No wrap around. case KEY_PAGEUP: GotoNextPage(-1); - bResult = TRUE; + bResult = sal_True; break; // Go to next page. No wrap around.. case KEY_PAGEDOWN: GotoNextPage(+1); - bResult = TRUE; + bResult = sal_True; break; case KEY_HOME: GotoPage(0); - bResult = TRUE; + bResult = sal_True; break; case KEY_END: GotoPage(mrSlideSorter.GetModel().GetPageCount()-1); - bResult = TRUE; + bResult = sal_True; break; case KEY_DELETE: @@ -569,7 +569,7 @@ BOOL SelectionFunction::KeyInput (const KeyEvent& rEvent) mrController.GetSelectionManager()->DeleteSelectedPages(rCode.GetCode()==KEY_DELETE); mnShiftKeySelectionAnchor = -1; - bResult = TRUE; + bResult = sal_True; } break; @@ -748,7 +748,7 @@ void SelectionFunction::GotoNextPage (int nOffset) void SelectionFunction::GotoPage (int nIndex) { - USHORT nPageCount = (USHORT)mrSlideSorter.GetModel().GetPageCount(); + sal_uInt16 nPageCount = (sal_uInt16)mrSlideSorter.GetModel().GetPageCount(); if (nIndex >= nPageCount) nIndex = nPageCount - 1; @@ -1260,7 +1260,7 @@ void SelectionFunction::ModeHandler::SwitchView (const model::SharedPageDescript { if (rpDescriptor.get()!=NULL && rpDescriptor->GetPage()!=NULL) { - mrSlideSorter.GetModel().GetDocument()->SetSelected(rpDescriptor->GetPage(), TRUE); + mrSlideSorter.GetModel().GetDocument()->SetSelected(rpDescriptor->GetPage(), sal_True); pViewShell->GetFrameView()->SetSelectedPage( (rpDescriptor->GetPage()->GetPageNum()-1)/2); } @@ -1542,15 +1542,15 @@ void NormalModeHandler::RangeSelect (const model::SharedPageDescriptor& rpDescri { // Select all pages between the anchor and the given one, including // the two. - const USHORT nAnchorIndex ((pAnchor->GetPage()->GetPageNum()-1) / 2); - const USHORT nOtherIndex ((rpDescriptor->GetPage()->GetPageNum()-1) / 2); + const sal_uInt16 nAnchorIndex ((pAnchor->GetPage()->GetPageNum()-1) / 2); + const sal_uInt16 nOtherIndex ((rpDescriptor->GetPage()->GetPageNum()-1) / 2); // Iterate over all pages in the range. Start with the anchor // page. This way the PageSelector will recognize it again as // anchor (the first selected page after a DeselectAllPages() // becomes the anchor.) - const USHORT nStep ((nAnchorIndex < nOtherIndex) ? +1 : -1); - USHORT nIndex (nAnchorIndex); + const sal_uInt16 nStep ((nAnchorIndex < nOtherIndex) ? +1 : -1); + sal_uInt16 nIndex (nAnchorIndex); while (true) { rSelector.SelectPage(nIndex); diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx index d9062a4ef2b1..07c2c267d1d8 100755 --- a/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx @@ -189,7 +189,7 @@ void SelectionManager::DeleteSelectedNormalPages (const ::std::vector<SdPage*>& if (xPages->getCount() <= 1) break; - const USHORT nPage (model::FromCoreIndex((*aI)->GetPageNum())); + const sal_uInt16 nPage (model::FromCoreIndex((*aI)->GetPageNum())); Reference< XDrawPage > xPage( xPages->getByIndex( nPage ), UNO_QUERY_THROW ); xPages->remove(xPage); @@ -225,7 +225,7 @@ void SelectionManager::DeleteSelectedMasterPages (const ::std::vector<SdPage*>& if (xPages->getCount() <= 1) break; - const USHORT nPage (model::FromCoreIndex((*aI)->GetPageNum())); + const sal_uInt16 nPage (model::FromCoreIndex((*aI)->GetPageNum())); Reference< XDrawPage > xPage( xPages->getByIndex( nPage ), UNO_QUERY_THROW ); xPages->remove(xPage); diff --git a/sd/source/ui/slidesorter/controller/SlsSlideFunction.cxx b/sd/source/ui/slidesorter/controller/SlsSlideFunction.cxx index 1af831c2ad8a..da7971983dcd 100755 --- a/sd/source/ui/slidesorter/controller/SlsSlideFunction.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSlideFunction.cxx @@ -61,20 +61,20 @@ void SlideFunction::ScrollEnd (void) { } -BOOL SlideFunction::MouseMove(const MouseEvent& ) +sal_Bool SlideFunction::MouseMove(const MouseEvent& ) { - return FALSE; + return sal_False; } -BOOL SlideFunction::MouseButtonUp(const MouseEvent& ) +sal_Bool SlideFunction::MouseButtonUp(const MouseEvent& ) { - return FALSE; + return sal_False; } -BOOL SlideFunction::MouseButtonDown(const MouseEvent& ) +sal_Bool SlideFunction::MouseButtonDown(const MouseEvent& ) { - return FALSE; + return sal_False; } } } } // end of namespace ::sd::slidesorter::controller diff --git a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx index 9fb7fbed87e6..048880f2a8aa 100644 --- a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx @@ -164,7 +164,7 @@ void SlotManager::FuTemporary (SfxRequest& rRequest) if (rRequest.GetArgs() != NULL) { SFX_REQUEST_ARG(rRequest, pPagesPerRow, SfxUInt16Item, - SID_PAGES_PER_ROW, FALSE); + SID_PAGES_PER_ROW, sal_False); if (pPagesPerRow != NULL) { sal_Int32 nColumnCount = pPagesPerRow->GetValue(); @@ -400,7 +400,7 @@ void SlotManager::FuSupport (SfxRequest& rRequest) SlideSorterController::ModelChangeLock aModelLock (mrSlideSorter.GetController()); PageSelector::UpdateLock aUpdateLock (mrSlideSorter); SelectionObserver::Context aContext (mrSlideSorter); - pViewShell->ImpSidUndo (FALSE, rRequest); + pViewShell->ImpSidUndo (sal_False, rRequest); } break; } @@ -415,7 +415,7 @@ void SlotManager::FuSupport (SfxRequest& rRequest) SlideSorterController::ModelChangeLock aModelLock (mrSlideSorter.GetController()); PageSelector::UpdateLock aUpdateLock (mrSlideSorter); SelectionObserver::Context aContext (mrSlideSorter); - pViewShell->ImpSidRedo (FALSE, rRequest); + pViewShell->ImpSidRedo (sal_False, rRequest); } break; } @@ -431,7 +431,7 @@ void SlotManager::FuSupport (SfxRequest& rRequest) void SlotManager::ExecCtrl (SfxRequest& rRequest) { ViewShell* pViewShell = mrSlideSorter.GetViewShell(); - USHORT nSlot = rRequest.GetSlot(); + sal_uInt16 nSlot = rRequest.GetSlot(); switch (nSlot) { case SID_RELOAD: @@ -497,10 +497,10 @@ void SlotManager::GetAttrState (SfxItemSet& rSet) { // Iteratate over all items. SfxWhichIter aIter (rSet); - USHORT nWhich = aIter.FirstWhich(); + sal_uInt16 nWhich = aIter.FirstWhich(); while (nWhich) { - USHORT nSlotId (nWhich); + sal_uInt16 nSlotId (nWhich); if (SfxItemPool::IsWhich(nWhich) && mrSlideSorter.GetViewShell()!=NULL) nSlotId = mrSlideSorter.GetViewShell()->GetPool().GetSlotId(nWhich); switch (nSlotId) @@ -509,7 +509,7 @@ void SlotManager::GetAttrState (SfxItemSet& rSet) rSet.Put ( SfxUInt16Item ( nSlotId, - (USHORT)mrSlideSorter.GetView().GetLayouter().GetColumnCount() + (sal_uInt16)mrSlideSorter.GetView().GetLayouter().GetColumnCount() ) ); break; @@ -526,15 +526,15 @@ void SlotManager::GetMenuState (SfxItemSet& rSet) if (pShell!=NULL && pShell->GetCurrentFunction().is()) { - USHORT nSId = pShell->GetCurrentFunction()->GetSlotID(); + sal_uInt16 nSId = pShell->GetCurrentFunction()->GetSlotID(); - rSet.Put( SfxBoolItem( nSId, TRUE ) ); + rSet.Put( SfxBoolItem( nSId, sal_True ) ); } - rSet.Put( SfxBoolItem( SID_DRAWINGMODE, FALSE ) ); - rSet.Put( SfxBoolItem( SID_DIAMODE, TRUE ) ); - rSet.Put( SfxBoolItem( SID_OUTLINEMODE, FALSE ) ); - rSet.Put( SfxBoolItem( SID_NOTESMODE, FALSE ) ); - rSet.Put( SfxBoolItem( SID_HANDOUTMODE, FALSE ) ); + rSet.Put( SfxBoolItem( SID_DRAWINGMODE, sal_False ) ); + rSet.Put( SfxBoolItem( SID_DIAMODE, sal_True ) ); + rSet.Put( SfxBoolItem( SID_OUTLINEMODE, sal_False ) ); + rSet.Put( SfxBoolItem( SID_NOTESMODE, sal_False ) ); + rSet.Put( SfxBoolItem( SID_HANDOUTMODE, sal_False ) ); // Vorlagenkatalog darf nicht aufgerufen werden rSet.DisableItem(SID_STYLE_CATALOG); @@ -616,7 +616,7 @@ void SlotManager::GetMenuState (SfxItemSet& rSet) if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_PRESENTATION ) || SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_REHEARSE_TIMINGS ) ) { - BOOL bDisable = TRUE; + sal_Bool bDisable = sal_True; model::PageEnumeration aAllPages ( model::PageEnumerationProvider::CreateAllPagesEnumeration(mrSlideSorter.GetModel())); while (aAllPages.HasMoreElements()) @@ -624,7 +624,7 @@ void SlotManager::GetMenuState (SfxItemSet& rSet) SdPage* pPage = aAllPages.GetNextElement()->GetPage(); if( !pPage->IsExcluded() ) - bDisable = FALSE; + bDisable = sal_False; } if( bDisable || pDocShell->IsPreview()) { @@ -830,8 +830,8 @@ void SlotManager::GetStatusBarState (SfxItemSet& rSet) */ SdPage* pPage = NULL; SdPage* pFirstPage = NULL; - USHORT nFirstPage; - USHORT nSelectedPages = (USHORT)mrSlideSorter.GetController().GetPageSelector().GetSelectedPageCount(); + sal_uInt16 nFirstPage; + sal_uInt16 nSelectedPages = (sal_uInt16)mrSlideSorter.GetController().GetPageSelector().GetSelectedPageCount(); String aPageStr; String aLayoutStr; @@ -959,9 +959,9 @@ IMPL_LINK(SlotManager, RenameSlideHdl, AbstractSvxNameDialog*, pDialog) && mrSlideSorter.GetViewShell()->GetDocSh()->IsNewPageNameValid( aNewName ) )); } -bool SlotManager::RenameSlideFromDrawViewShell( USHORT nPageId, const String & rName ) +bool SlotManager::RenameSlideFromDrawViewShell( sal_uInt16 nPageId, const String & rName ) { - BOOL bOutDummy; + sal_Bool bOutDummy; SdDrawDocument* pDocument = mrSlideSorter.GetModel().GetDocument(); if( pDocument->GetPageByName( rName, bOutDummy ) != SDRPAGE_NOTFOUND ) return false; @@ -983,8 +983,8 @@ bool SlotManager::RenameSlideFromDrawViewShell( USHORT nPageId, const String & r // Undo SdPage* pUndoPage = pPageToRename; SdrLayerAdmin & rLayerAdmin = pDocument->GetLayerAdmin(); - BYTE nBackground = rLayerAdmin.GetLayerID( String( SdResId( STR_LAYER_BCKGRND )), FALSE ); - BYTE nBgObj = rLayerAdmin.GetLayerID( String( SdResId( STR_LAYER_BCKGRNDOBJ )), FALSE ); + sal_uInt8 nBackground = rLayerAdmin.GetLayerID( String( SdResId( STR_LAYER_BCKGRND )), sal_False ); + sal_uInt8 nBgObj = rLayerAdmin.GetLayerID( String( SdResId( STR_LAYER_BCKGRNDOBJ )), sal_False ); SetOfByte aVisibleLayers = pPageToRename->TRG_GetMasterPageVisibleLayers(); // (#67720#) @@ -1018,7 +1018,7 @@ bool SlotManager::RenameSlideFromDrawViewShell( USHORT nPageId, const String & r } } - bool bSuccess = pPageToRename!=NULL && ( FALSE != rName.Equals( pPageToRename->GetName())); + bool bSuccess = pPageToRename!=NULL && ( sal_False != rName.Equals( pPageToRename->GetName())); if( bSuccess ) { @@ -1026,10 +1026,10 @@ bool SlotManager::RenameSlideFromDrawViewShell( USHORT nPageId, const String & r // aTabControl.SetPageText( nPageId, rName ); // set document to modified state - pDocument->SetChanged( TRUE ); + pDocument->SetChanged( sal_True ); // inform navigator about change - SfxBoolItem aItem( SID_NAVIGATOR_INIT, TRUE ); + SfxBoolItem aItem( SID_NAVIGATOR_INIT, sal_True ); if (mrSlideSorter.GetViewShell() != NULL) mrSlideSorter.GetViewShell()->GetDispatcher()->Execute( SID_NAVIGATOR_INIT, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, &aItem, 0L ); @@ -1092,8 +1092,8 @@ void SlotManager::InsertSlide (SfxRequest& rRequest) // Create shapes for the default layout. pNewPage = pDocument->GetMasterSdPage( - (USHORT)(nInsertionIndex+1), PK_STANDARD); - pNewPage->CreateTitleAndLayout (TRUE,TRUE); + (sal_uInt16)(nInsertionIndex+1), PK_STANDARD); + pNewPage->CreateTitleAndLayout (sal_True,sal_True); } } } @@ -1300,7 +1300,7 @@ namespace { SlideExclusionState GetSlideExclusionState (model::PageEnumeration& rPageSet) { SlideExclusionState eState (UNDEFINED); - BOOL bState; + sal_Bool bState; // Get toggle state of the selected pages. while (rPageSet.HasMoreElements() && eState!=MIXED) diff --git a/sd/source/ui/slidesorter/controller/SlsTransferable.cxx b/sd/source/ui/slidesorter/controller/SlsTransferable.cxx index efda2eb1e4eb..1f03c70759b6 100755 --- a/sd/source/ui/slidesorter/controller/SlsTransferable.cxx +++ b/sd/source/ui/slidesorter/controller/SlsTransferable.cxx @@ -38,7 +38,7 @@ namespace sd { namespace slidesorter { namespace controller { Transferable::Transferable ( SdDrawDocument* pSrcDoc, ::sd::View* pWorkView, - BOOL bInitOnGetData, + sal_Bool bInitOnGetData, SlideSorterViewShell* pViewShell, const ::std::vector<Representative>& rRepresentatives) : SdTransferable (pSrcDoc, pWorkView, bInitOnGetData), diff --git a/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx b/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx index 9b7b1f5ec2d3..1bf5b8eae177 100755 --- a/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx @@ -87,25 +87,25 @@ public: const AcceptDropEvent& rEvt, DropTargetHelper& rTargetHelper, ::sd::Window* pTargetWindow = NULL, - USHORT nPage = SDRPAGE_NOTFOUND, - USHORT nLayer = SDRPAGE_NOTFOUND ); + sal_uInt16 nPage = SDRPAGE_NOTFOUND, + sal_uInt16 nLayer = SDRPAGE_NOTFOUND ); sal_Int8 ExecuteDrop ( const ExecuteDropEvent& rEvt, DropTargetHelper& rTargetHelper, ::sd::Window* pTargetWindow = NULL, - USHORT nPage = SDRPAGE_NOTFOUND, - USHORT nLayer = SDRPAGE_NOTFOUND); + sal_uInt16 nPage = SDRPAGE_NOTFOUND, + sal_uInt16 nLayer = SDRPAGE_NOTFOUND); void Abort (void); protected: - virtual USHORT DetermineInsertPosition ( + virtual sal_uInt16 DetermineInsertPosition ( const SdTransferable& rTransferable); - virtual USHORT InsertSlides ( + virtual sal_uInt16 InsertSlides ( const SdTransferable& rTransferable, - USHORT nInsertPosition); + sal_uInt16 nInsertPosition); private: SlideSorter& mrSlideSorter; @@ -126,7 +126,7 @@ private: /** When pages are moved or copied then the selection of the slide sorter has to be updated. This flag is used to remember whether the - selection has to be updated or can stay as it is (FALSE). + selection has to be updated or can stay as it is (sal_False). */ bool mbUpdateSelectionPending; @@ -137,7 +137,7 @@ private: ::boost::scoped_ptr<UndoContext> mpUndoContext; ::boost::scoped_ptr<SelectionObserver::Context> mpSelectionObserverContext; - ULONG mnDragFinishedUserEventId; + sal_uLong mnDragFinishedUserEventId; void CreateSlideTransferable ( ::Window* pWindow, @@ -218,8 +218,8 @@ private: const void* pDropEvent , DropTargetHelper& rTargetHelper, ::sd::Window* pTargetWindow, - USHORT nPage, - USHORT nLayer); + sal_uInt16 nPage, + sal_uInt16 nLayer); /** Asynchronous part of DragFinished. The argument is the sal_Int8 nDropAction, disguised as void*. diff --git a/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx b/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx index 9dcd0abb646c..f3963ae04255 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx @@ -62,10 +62,10 @@ public: static FunctionReference Create( SlideSorter& rSlideSorter, SfxRequest& rRequest ); // Mouse- & Key-Events - virtual BOOL KeyInput(const KeyEvent& rKEvt); - virtual BOOL MouseMove(const MouseEvent& rMEvt); - virtual BOOL MouseButtonUp(const MouseEvent& rMEvt); - virtual BOOL MouseButtonDown(const MouseEvent& rMEvt); + virtual sal_Bool KeyInput(const KeyEvent& rKEvt); + virtual sal_Bool MouseMove(const MouseEvent& rMEvt); + virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt); + virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt); virtual void Activate(); virtual void Deactivate(); diff --git a/sd/source/ui/slidesorter/inc/controller/SlsSlideFunction.hxx b/sd/source/ui/slidesorter/inc/controller/SlsSlideFunction.hxx index 5b8c7d9a08b6..f149365f710a 100755 --- a/sd/source/ui/slidesorter/inc/controller/SlsSlideFunction.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsSlideFunction.hxx @@ -50,9 +50,9 @@ class SlideFunction public: TYPEINFO(); - virtual BOOL MouseMove (const MouseEvent& rMEvt); - virtual BOOL MouseButtonUp (const MouseEvent& rMEvt); - virtual BOOL MouseButtonDown (const MouseEvent& rMEvt); + virtual sal_Bool MouseMove (const MouseEvent& rMEvt); + virtual sal_Bool MouseButtonUp (const MouseEvent& rMEvt); + virtual sal_Bool MouseButtonDown (const MouseEvent& rMEvt); /** Called from ForceScroll() before the actual scrolling. */ diff --git a/sd/source/ui/slidesorter/inc/controller/SlsSlotManager.hxx b/sd/source/ui/slidesorter/inc/controller/SlsSlotManager.hxx index d2c9f7481624..4a678dcbfd06 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsSlotManager.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsSlotManager.hxx @@ -103,7 +103,7 @@ private: */ void RenameSlide (void); DECL_LINK(RenameSlideHdl, AbstractSvxNameDialog*); - bool RenameSlideFromDrawViewShell( USHORT nPageId, const String& rName); + bool RenameSlideFromDrawViewShell( sal_uInt16 nPageId, const String& rName); /** Handle SID_INSERTPAGE slot calls. */ diff --git a/sd/source/ui/slidesorter/inc/controller/SlsTransferable.hxx b/sd/source/ui/slidesorter/inc/controller/SlsTransferable.hxx index 289fb1f5f072..c0a09e73bfe9 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsTransferable.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsTransferable.hxx @@ -65,7 +65,7 @@ public: Transferable ( SdDrawDocument* pSrcDoc, ::sd::View* pWorkView, - BOOL bInitOnGetData, + sal_Bool bInitOnGetData, SlideSorterViewShell* pViewShell, const ::std::vector<Representative>& rRepresentatives); diff --git a/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx b/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx index 9dfd861fd5cf..a8b3ca12e6a6 100644 --- a/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx +++ b/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx @@ -59,8 +59,8 @@ namespace sd { namespace slidesorter { namespace model { class DocumentPageContainer; -inline sal_Int32 FromCoreIndex (const USHORT nCoreIndex) { return (nCoreIndex-1)/2; } -inline USHORT ToCoreIndex (const sal_Int32 nIndex) { return nIndex*2+1; } +inline sal_Int32 FromCoreIndex (const sal_uInt16 nCoreIndex) { return (nCoreIndex-1)/2; } +inline sal_uInt16 ToCoreIndex (const sal_Int32 nIndex) { return nIndex*2+1; } /** The model of the slide sorter gives access to the slides that are to be displayed in the slide sorter view. Via the SetDocumentSlides() method @@ -155,7 +155,7 @@ public: the n*2+1 magic. Only when a special model is set, like a custom slide show, then the returned value is different. */ - USHORT GetCoreIndex (const sal_Int32 nIndex) const; + sal_uInt16 GetCoreIndex (const sal_Int32 nIndex) const; /** Call this method after the document has changed its structure. This will get the model in sync with the SdDrawDocument. This method diff --git a/sd/source/ui/slidesorter/inc/model/SlsPageEnumeration.hxx b/sd/source/ui/slidesorter/inc/model/SlsPageEnumeration.hxx index 3586eead3532..3586eead3532 100644..100755 --- a/sd/source/ui/slidesorter/inc/model/SlsPageEnumeration.hxx +++ b/sd/source/ui/slidesorter/inc/model/SlsPageEnumeration.hxx diff --git a/sd/source/ui/slidesorter/inc/view/SlsPageObjectViewObjectContact.hxx b/sd/source/ui/slidesorter/inc/view/SlsPageObjectViewObjectContact.hxx index 7e884fc54797..7e884fc54797 100644..100755 --- a/sd/source/ui/slidesorter/inc/view/SlsPageObjectViewObjectContact.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlsPageObjectViewObjectContact.hxx diff --git a/sd/source/ui/slidesorter/inc/view/SlsTheme.hxx b/sd/source/ui/slidesorter/inc/view/SlsTheme.hxx index 2b39e6d2a3ee..0781d8ea3519 100644 --- a/sd/source/ui/slidesorter/inc/view/SlsTheme.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlsTheme.hxx @@ -227,7 +227,7 @@ private: /** Guarded initialization of the specified icon in the maIcons container. Call only while a LocalResource object is active. */ - void InitializeIcon (const IconType eType, USHORT nResourceId); + void InitializeIcon (const IconType eType, sal_uInt16 nResourceId); }; diff --git a/sd/source/ui/slidesorter/inc/view/SlsToolTip.hxx b/sd/source/ui/slidesorter/inc/view/SlsToolTip.hxx index b633b1f3f5ca..48a4c7c3d272 100644 --- a/sd/source/ui/slidesorter/inc/view/SlsToolTip.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlsToolTip.hxx @@ -77,7 +77,7 @@ private: model::SharedPageDescriptor mpDescriptor; ::rtl::OUString msDefaultHelpText; ::rtl::OUString msCurrentHelpText; - ULONG mnHelpWindowHandle; + sal_uLong mnHelpWindowHandle; Timer maTimer; /** Request to show the tool tip. diff --git a/sd/source/ui/slidesorter/model/SlideSorterModel.cxx b/sd/source/ui/slidesorter/model/SlideSorterModel.cxx index be964715f1a6..d439ac4da0a6 100644 --- a/sd/source/ui/slidesorter/model/SlideSorterModel.cxx +++ b/sd/source/ui/slidesorter/model/SlideSorterModel.cxx @@ -331,7 +331,7 @@ sal_Int32 SlideSorterModel::GetIndex (const SdrPage* pPage) const -USHORT SlideSorterModel::GetCoreIndex (const sal_Int32 nIndex) const +sal_uInt16 SlideSorterModel::GetCoreIndex (const sal_Int32 nIndex) const { SharedPageDescriptor pDescriptor (GetPageDescriptor(nIndex)); if (pDescriptor) @@ -646,7 +646,7 @@ bool SlideSorterModel::NotifyPageEvent (const SdrPage* pSdrPage) void SlideSorterModel::InsertSlide (SdPage* pPage) { // Find the index at which to insert the given page. - USHORT nCoreIndex (pPage->GetPageNum()); + sal_uInt16 nCoreIndex (pPage->GetPageNum()); sal_Int32 nIndex (FromCoreIndex(nCoreIndex)); if (pPage != GetPage(nIndex)) return; @@ -725,9 +725,9 @@ SdPage* SlideSorterModel::GetPage (const sal_Int32 nSdIndex) const if (pModel != NULL) { if (meEditMode == EM_PAGE) - return pModel->GetSdPage ((USHORT)nSdIndex, mePageKind); + return pModel->GetSdPage ((sal_uInt16)nSdIndex, mePageKind); else - return pModel->GetMasterSdPage ((USHORT)nSdIndex, mePageKind); + return pModel->GetMasterSdPage ((sal_uInt16)nSdIndex, mePageKind); } else return NULL; diff --git a/sd/source/ui/slidesorter/model/SlsPageDescriptor.cxx b/sd/source/ui/slidesorter/model/SlsPageDescriptor.cxx index 24d744e459d6..f498f1b01e5b 100644 --- a/sd/source/ui/slidesorter/model/SlsPageDescriptor.cxx +++ b/sd/source/ui/slidesorter/model/SlsPageDescriptor.cxx @@ -206,7 +206,7 @@ bool PageDescriptor::SetState (const State eState, const bool bNewStateValue) // This is a state of the page and has to be handled differently // from the view-only states. if (mpPage != NULL) - if (bNewStateValue != (mpPage->IsExcluded()==TRUE)) + if (bNewStateValue != (mpPage->IsExcluded()==sal_True)) { mpPage->SetExcluded(bNewStateValue); bModified = true; @@ -232,7 +232,7 @@ VisualState& PageDescriptor::GetVisualState (void) bool PageDescriptor::GetCoreSelection (void) { - if (mpPage!=NULL && (mpPage->IsSelected()==TRUE) != mbIsSelected) + if (mpPage!=NULL && (mpPage->IsSelected()==sal_True) != mbIsSelected) return SetState(ST_Selected, !mbIsSelected); else return false; @@ -245,9 +245,9 @@ void PageDescriptor::SetCoreSelection (void) { if (mpPage != NULL) if (HasState(ST_Selected)) - mpPage->SetSelected(TRUE); + mpPage->SetSelected(sal_True); else - mpPage->SetSelected(FALSE); + mpPage->SetSelected(sal_False); else { OSL_ASSERT(mpPage!=NULL); diff --git a/sd/source/ui/slidesorter/shell/SlideSorter.cxx b/sd/source/ui/slidesorter/shell/SlideSorter.cxx index c19c6c331d28..cbf417348bb1 100755 --- a/sd/source/ui/slidesorter/shell/SlideSorter.cxx +++ b/sd/source/ui/slidesorter/shell/SlideSorter.cxx @@ -500,11 +500,11 @@ void SlideSorter::ArrangeGUIElements ( // Prevent untimely redraws while the view is not yet correctly // resized. view::SlideSorterView::DrawLock aLock (*this); - GetContentWindow()->EnablePaint (FALSE); + GetContentWindow()->EnablePaint (sal_False); mpSlideSorterController->Resize (Rectangle(aOrigin, rSize)); - GetContentWindow()->EnablePaint (TRUE); + GetContentWindow()->EnablePaint (sal_True); mbLayoutPending = false; } diff --git a/sd/source/ui/slidesorter/shell/SlideSorterChildWindow.cxx b/sd/source/ui/slidesorter/shell/SlideSorterChildWindow.cxx index 985fb72b38a5..3144ac795eb0 100644..100755 --- a/sd/source/ui/slidesorter/shell/SlideSorterChildWindow.cxx +++ b/sd/source/ui/slidesorter/shell/SlideSorterChildWindow.cxx @@ -40,7 +40,7 @@ namespace sd { namespace slidesorter { SlideSorterChildWindow::SlideSorterChildWindow ( ::Window* pParentWindow, - USHORT nId, + sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo) : SfxChildWindow (pParentWindow, nId) @@ -51,7 +51,7 @@ SlideSorterChildWindow::SlideSorterChildWindow ( pParentWindow); eChildAlignment = SFX_ALIGN_LEFT; static_cast<SfxDockingWindow*>(pWindow)->Initialize (pInfo); - // SetHideNotDelete (TRUE); + // SetHideNotDelete (sal_True); } diff --git a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx index b1bcc7050a77..3d3f560574b4 100755 --- a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx +++ b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx @@ -544,7 +544,7 @@ void SlideSorterViewShell::ArrangeGUIElements (void) -void SlideSorterViewShell::Activate (BOOL bIsMDIActivate) +void SlideSorterViewShell::Activate (sal_Bool bIsMDIActivate) { ViewShell::Activate(bIsMDIActivate); if (mbIsArrangeGUIElementsPending) @@ -582,7 +582,7 @@ void SlideSorterViewShell::ReadFrameViewData (FrameView* pFrameView) { view::SlideSorterView& rView (mpSlideSorter->GetView()); - USHORT nSlidesPerRow (pFrameView->GetSlidesPerRow()); + sal_uInt16 nSlidesPerRow (pFrameView->GetSlidesPerRow()); if (nSlidesPerRow > 0 && rView.GetOrientation() == view::Layouter::GRID && IsMainViewShell()) @@ -620,7 +620,7 @@ void SlideSorterViewShell::WriteFrameViewData (void) if (mpFrameView != NULL) { view::SlideSorterView& rView (mpSlideSorter->GetView()); - mpFrameView->SetSlidesPerRow((USHORT)rView.GetLayouter().GetColumnCount()); + mpFrameView->SetSlidesPerRow((sal_uInt16)rView.GetLayouter().GetColumnCount()); // DrawMode for 'main' window if( mpFrameView->GetDrawMode() != GetActiveWindow()->GetDrawMode() ) @@ -640,7 +640,7 @@ void SlideSorterViewShell::WriteFrameViewData (void) // We have no current page to set but at least we can make sure // that the index of the frame view has a legal value. if (mpFrameView->GetSelectedPage() >= mpSlideSorter->GetModel().GetPageCount()) - mpFrameView->SetSelectedPage((USHORT)mpSlideSorter->GetModel().GetPageCount()-1); + mpFrameView->SetSelectedPage((sal_uInt16)mpSlideSorter->GetModel().GetPageCount()-1); } } } @@ -738,8 +738,8 @@ sal_Int8 SlideSorterViewShell::AcceptDrop ( const AcceptDropEvent& rEvt, DropTargetHelper& rTargetHelper, ::sd::Window* pTargetWindow, - USHORT nPage, - USHORT nLayer) + sal_uInt16 nPage, + sal_uInt16 nLayer) { OSL_ASSERT(mpSlideSorter.get()!=NULL); return mpSlideSorter->GetController().GetClipboard().AcceptDrop ( @@ -757,8 +757,8 @@ sal_Int8 SlideSorterViewShell::ExecuteDrop ( const ExecuteDropEvent& rEvt, DropTargetHelper& rTargetHelper, ::sd::Window* pTargetWindow, - USHORT nPage, - USHORT nLayer) + sal_uInt16 nPage, + sal_uInt16 nLayer) { OSL_ASSERT(mpSlideSorter.get()!=NULL); return mpSlideSorter->GetController().GetClipboard().ExecuteDrop ( diff --git a/sd/source/ui/slidesorter/view/SlideSorterView.cxx b/sd/source/ui/slidesorter/view/SlideSorterView.cxx index f3637e55e63c..728eff5ee384 100644 --- a/sd/source/ui/slidesorter/view/SlideSorterView.cxx +++ b/sd/source/ui/slidesorter/view/SlideSorterView.cxx @@ -175,7 +175,7 @@ SlideSorterView::SlideSorterView (SlideSorter& rSlideSorter) maVisibilityChangeListeners() { // Hide the page that contains the page objects. - SetPageVisible (FALSE); + SetPageVisible (sal_False); // Register the background painter on level 1 to avoid the creation of a diff --git a/sd/source/ui/slidesorter/view/SlsButtonBar.cxx b/sd/source/ui/slidesorter/view/SlsButtonBar.cxx index 70655caeda2a..f338a998c56f 100644 --- a/sd/source/ui/slidesorter/view/SlsButtonBar.cxx +++ b/sd/source/ui/slidesorter/view/SlsButtonBar.cxx @@ -154,8 +154,8 @@ namespace { for (sal_Int32 nY = 0; nY<nHeight; ++nY) for (sal_Int32 nX = 0; nX<nWidth; ++nX) { - const BYTE nValue (255 - pSourceBitmap->GetPixel(nY, nX).GetBlueOrIndex()); - const BYTE nNewValue (nValue * (1-nAlpha)); + const sal_uInt8 nValue (255 - pSourceBitmap->GetPixel(nY, nX).GetBlueOrIndex()); + const sal_uInt8 nNewValue (nValue * (1-nAlpha)); pBitmap->SetPixel(nY, nX, 255-nNewValue); } } @@ -1291,7 +1291,7 @@ void ImageButton::Paint ( if ( ! mbIsActive) return; - const USHORT nSavedAntialiasingMode (rDevice.GetAntialiasing()); + const sal_uInt16 nSavedAntialiasingMode (rDevice.GetAntialiasing()); rDevice.SetAntialiasing(nSavedAntialiasingMode | ANTIALIASING_ENABLE_B2DDRAW); rDevice.SetLineColor(); diff --git a/sd/source/ui/slidesorter/view/SlsFontProvider.cxx b/sd/source/ui/slidesorter/view/SlsFontProvider.cxx index 9d2e224aefdf..c3410f88d984 100644..100755 --- a/sd/source/ui/slidesorter/view/SlsFontProvider.cxx +++ b/sd/source/ui/slidesorter/view/SlsFontProvider.cxx @@ -111,7 +111,7 @@ FontProvider::SharedFontPointer FontProvider::GetFont (const OutputDevice& rDevi { // Initialize the font from the application style settings. maFont.reset(new Font (Application::GetSettings().GetStyleSettings().GetAppFont())); - maFont->SetTransparent(TRUE); + maFont->SetTransparent(sal_True); maFont->SetWeight(WEIGHT_NORMAL); // Transform the point size to pixel size. diff --git a/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx b/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx index a0bc19edb470..cb78c1a12f71 100644 --- a/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx +++ b/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx @@ -52,9 +52,9 @@ namespace sd { namespace slidesorter { namespace view { namespace { -UINT8 Blend ( - const UINT8 nValue1, - const UINT8 nValue2, +sal_uInt8 Blend ( + const sal_uInt8 nValue1, + const sal_uInt8 nValue2, const double nWeight) { const double nValue (nValue1*(1-nWeight) + nValue2 * nWeight); @@ -63,7 +63,7 @@ UINT8 Blend ( else if (nValue > 255) return 255; else - return (UINT8)nValue; + return (sal_uInt8)nValue; } sal_uInt8 ClampColorChannel (const double nValue) @@ -118,7 +118,7 @@ PageObjectPainter::PageObjectPainter ( // Replace the color (not the alpha values) in the focus border with a // color derived from the current selection color. Color aColor (mpTheme->GetColor(Theme::Color_Selection)); - USHORT nHue, nSat, nBri; + sal_uInt16 nHue, nSat, nBri; aColor.RGBtoHSB(nHue, nSat, nBri); aColor = Color::HSBtoRGB(nHue, 28, 65); mpFocusBorderPainter->AdaptColor(aColor, true); @@ -149,7 +149,7 @@ void PageObjectPainter::PaintPageObject ( // Turn off antialiasing to avoid the bitmaps from being shifted by // fractions of a pixel and thus show blurry edges. - const USHORT nSavedAntialiasingMode (rDevice.GetAntialiasing()); + const sal_uInt16 nSavedAntialiasingMode (rDevice.GetAntialiasing()); rDevice.SetAntialiasing(nSavedAntialiasingMode & ~ANTIALIASING_ENABLE_B2DDRAW); PaintBackground(rDevice, rpDescriptor); diff --git a/sd/source/ui/slidesorter/view/SlsTheme.cxx b/sd/source/ui/slidesorter/view/SlsTheme.cxx index 2aaa7f23af95..5cc06eadae04 100644 --- a/sd/source/ui/slidesorter/view/SlsTheme.cxx +++ b/sd/source/ui/slidesorter/view/SlsTheme.cxx @@ -59,9 +59,9 @@ ColorData HGBAdapt ( const sal_Int32 nNewSaturation, const sal_Int32 nNewBrightness) { - USHORT nHue (0); - USHORT nSaturation (0); - USHORT nBrightness (0); + sal_uInt16 nHue (0); + sal_uInt16 nSaturation (0); + sal_uInt16 nBrightness (0); Color(aColorData).RGBtoHSB(nHue, nSaturation, nBrightness); return Color::HSBtoRGB( nHue, @@ -260,13 +260,13 @@ void Theme::Update (const ::boost::shared_ptr<controller::Properties>& rpPropert { case Font_PageNumber: pFont.reset(new Font(Application::GetSettings().GetStyleSettings().GetAppFont())); - pFont->SetTransparent(TRUE); + pFont->SetTransparent(sal_True); pFont->SetWeight(WEIGHT_BOLD); break; case Font_PageCount: pFont.reset(new Font(Application::GetSettings().GetStyleSettings().GetAppFont())); - pFont->SetTransparent(TRUE); + pFont->SetTransparent(sal_True); pFont->SetWeight(WEIGHT_NORMAL); { const Size aSize (pFont->GetSize()); @@ -276,7 +276,7 @@ void Theme::Update (const ::boost::shared_ptr<controller::Properties>& rpPropert case Font_Button: pFont.reset(new Font(Application::GetSettings().GetStyleSettings().GetAppFont())); - pFont->SetTransparent(TRUE); + pFont->SetTransparent(sal_True); pFont->SetWeight(WEIGHT_BOLD); { const Size aSize (pFont->GetSize()); @@ -517,7 +517,7 @@ Theme::GradientDescriptor& Theme::GetGradient (const GradientColorType eType) -void Theme::InitializeIcon (const IconType eType, USHORT nResourceId) +void Theme::InitializeIcon (const IconType eType, sal_uInt16 nResourceId) { if (eType>=0 && size_t(eType)<maIcons.size()) { diff --git a/sd/source/ui/table/TableDesignPane.cxx b/sd/source/ui/table/TableDesignPane.cxx index cdba12e9887e..61e164fd5d06 100755 --- a/sd/source/ui/table/TableDesignPane.cxx +++ b/sd/source/ui/table/TableDesignPane.cxx @@ -127,7 +127,7 @@ TableDesignPane::TableDesignPane( ::Window* pParent, ViewShellBase& rBase, bool pValueSet->SetSelectHdl (LINK(this, TableDesignPane, implValueSetHdl)); mxControls[FL_STYLE_OPTIONS].reset( new FixedLine( pControlParent, SdResId( FL_STYLE_OPTIONS + 1 ) ) ); - USHORT i; + sal_uInt16 i; for( i = CB_HEADER_ROW; i <= CB_BANDED_COLUMNS; ++i ) { CheckBox *pCheckBox = new CheckBox( pControlParent, SdResId( i+1 ) ); @@ -388,7 +388,7 @@ void TableDesignPane::updateLayout() Size aSize( mxControls[nId]->GetSizePixel() ); aSize.Width() = aPaneSize.Width() - aOffset.X() - mxControls[nId]->GetPosPixel().X(); mxControls[nId]->SetSizePixel( aSize ); - mxControls[nId]->SetPaintTransparent(TRUE); + mxControls[nId]->SetPaintTransparent(sal_True); mxControls[nId]->SetBackground(); } aValueSetSize = Size( pValueSet->GetSizePixel().Width(), nStylesHeight - mxControls[FL_TABLE_STYLES]->GetSizePixel().Height() - mnOrgOffsetY[FL_TABLE_STYLES] ); @@ -419,10 +419,10 @@ void TableDesignPane::updateLayout() int nVisibleRowCount = (aValueSetSize.Height()+2) / aItemSize.Height(); - pValueSet->SetLineCount ( (nRowCount < nVisibleRowCount) ? (USHORT)nRowCount : 0 ); + pValueSet->SetLineCount ( (nRowCount < nVisibleRowCount) ? (sal_uInt16)nRowCount : 0 ); - pValueSet->SetColCount ((USHORT)nColumnCount); - pValueSet->SetLineCount ((USHORT)nRowCount); + pValueSet->SetColCount ((sal_uInt16)nColumnCount); + pValueSet->SetLineCount ((sal_uInt16)nRowCount); if( !mbModal ) { @@ -476,7 +476,7 @@ void TableDesignPane::updateControls() const bool bHasTable = mxSelectedTable.is(); const OUString* pPropNames = getPropertyNames(); - for( USHORT i = CB_HEADER_ROW; i <= CB_BANDED_COLUMNS; ++i ) + for( sal_uInt16 i = CB_HEADER_ROW; i <= CB_BANDED_COLUMNS; ++i ) { sal_Bool bUse = gDefaults[i-CB_HEADER_ROW]; if( bHasTable ) try @@ -487,15 +487,15 @@ void TableDesignPane::updateControls() { DBG_ERROR("sd::TableDesignPane::updateControls(), exception caught!"); } - static_cast< CheckBox* >( mxControls[i].get() )->Check( bUse ? TRUE : FALSE ); - mxControls[i]->Enable(bHasTable ? TRUE : FALSE ); + static_cast< CheckBox* >( mxControls[i].get() )->Check( bUse ? sal_True : sal_False ); + mxControls[i]->Enable(bHasTable ? sal_True : sal_False ); } FillDesignPreviewControl(); updateLayout(); - USHORT nSelection = 0; + sal_uInt16 nSelection = 0; if( mxSelectedTable.is() ) { Reference< XNamed > xNamed( mxSelectedTable->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "TableTemplate" ) ) ), UNO_QUERY ); @@ -511,7 +511,7 @@ void TableDesignPane::updateControls() { if( aNames[nIndex] == sStyleName ) { - nSelection = (USHORT)nIndex+1; + nSelection = (sal_uInt16)nIndex+1; break; } } @@ -809,7 +809,7 @@ const Bitmap CreateDesignPreview( const Reference< XIndexAccess >& xTableStyle, sal_Int32* pDiff = &border_diffs[0]; // draw top border - for( USHORT nLine = 0; nLine < 4; ++nLine ) + for( sal_uInt16 nLine = 0; nLine < 4; ++nLine ) { const SvxBorderLine* pBorderLine = xCellInfo->maBorder.GetLine(nLine); if( !pBorderLine || ((pBorderLine->GetOutWidth() == 0) && (pBorderLine->GetInWidth()==0)) ) @@ -823,7 +823,7 @@ const Bitmap CreateDesignPreview( const Reference< XIndexAccess >& xTableStyle, boost::shared_ptr< CellInfo > xBorderInfo( aMatrix[nBorderCol][nBorderRow] ); if( xBorderInfo.get() ) { - const USHORT nOtherLine = nLine ^ 1; + const sal_uInt16 nOtherLine = nLine ^ 1; const SvxBorderLine* pBorderLine2 = xBorderInfo->maBorder.GetLine(nOtherLine^1); if( pBorderLine2 && pBorderLine2->HasPriority(*pBorderLine) ) continue; // other border line wins @@ -853,7 +853,7 @@ void TableDesignPane::FillDesignPreviewControl() { ValueSet* pValueSet = static_cast< ValueSet* >( mxControls[CT_TABLE_STYLES].get() ); - USHORT nSelectedItem = pValueSet->GetSelectItemId(); + sal_uInt16 nSelectedItem = pValueSet->GetSelectItemId(); pValueSet->Clear(); try { @@ -883,7 +883,7 @@ void TableDesignPane::FillDesignPreviewControl() { Reference< XIndexAccess > xTableStyle( mxTableFamily->getByIndex( nIndex ), UNO_QUERY ); if( xTableStyle.is() ) - pValueSet->InsertItem( sal::static_int_cast<USHORT>( nIndex + 1 ), Image( CreateDesignPreview( xTableStyle, aSettings, bIsPageDark ) ) ); + pValueSet->InsertItem( sal::static_int_cast<sal_uInt16>( nIndex + 1 ), Image( CreateDesignPreview( xTableStyle, aSettings, bIsPageDark ) ) ); } catch( Exception& ) { @@ -925,9 +925,9 @@ short TableDesignDialog::Execute() if( mpDesignPane->isOptionsChanged() ) mpDesignPane->ApplyOptions(); - return TRUE; + return sal_True; } - return FALSE; + return sal_False; } // ==================================================================== diff --git a/sd/source/ui/table/tablefunction.cxx b/sd/source/ui/table/tablefunction.cxx index b30e259e049a..957c9da398c6 100755 --- a/sd/source/ui/table/tablefunction.cxx +++ b/sd/source/ui/table/tablefunction.cxx @@ -186,7 +186,7 @@ void DrawViewShell::FuTable(SfxRequest& rReq) } if( pPickObj ) - mpView->ReplaceObjectAtView(pPickObj, *pPV, pObj, TRUE ); + mpView->ReplaceObjectAtView(pPickObj, *pPV, pObj, sal_True ); else mpView->InsertObjectAtView(pObj, *pPV, SDRINSERT_SETDEFLAYER); diff --git a/sd/source/ui/table/tableobjectbar.cxx b/sd/source/ui/table/tableobjectbar.cxx index 854009b00c7e..7f3ac63d0192 100644..100755 --- a/sd/source/ui/table/tableobjectbar.cxx +++ b/sd/source/ui/table/tableobjectbar.cxx @@ -157,7 +157,7 @@ void TableObjectBar::Execute( SfxRequest& rReq ) SfxBindings* pBindings = &mpViewSh->GetViewFrame()->GetBindings(); rtl::Reference< sdr::SelectionController > xController( mpView->getSelectionController() ); - ULONG nSlotId = rReq.GetSlot(); + sal_uLong nSlotId = rReq.GetSlot(); if( xController.is() ) { switch( nSlotId ) @@ -175,10 +175,10 @@ void TableObjectBar::Execute( SfxRequest& rReq ) else nSlotId = SID_TABLE_INSERT_COL; - rReq.AppendItem( SfxInt16Item( (USHORT)nSlotId, (sal_uInt16)pDlg->getInsertCount() ) ); + rReq.AppendItem( SfxInt16Item( (sal_uInt16)nSlotId, (sal_uInt16)pDlg->getInsertCount() ) ); rReq.AppendItem( SfxBoolItem( SID_TABLE_PARAM_INSERT_AFTER, !pDlg->isInsertBefore() ) ); - rReq.SetSlot( (USHORT)nSlotId ); + rReq.SetSlot( (sal_uInt16)nSlotId ); } } } diff --git a/sd/source/ui/toolpanel/ControlContainer.cxx b/sd/source/ui/toolpanel/ControlContainer.cxx index 78e4125b024d..5a0001f62653 100755 --- a/sd/source/ui/toolpanel/ControlContainer.cxx +++ b/sd/source/ui/toolpanel/ControlContainer.cxx @@ -98,7 +98,7 @@ sal_uInt32 ControlContainer::AddControl (::std::auto_ptr<TreeNode> pControl) void ControlContainer::SetExpansionState ( - UINT32 nIndex, + sal_uInt32 nIndex, ExpansionState aState) { ::osl::MutexGuard aGuard (maMutex); @@ -177,7 +177,7 @@ void ControlContainer::SetExpansionState ( } // Update the expansion state of all controls. - for (UINT32 i=0; i<GetControlCount(); i=GetNextIndex(i)) + for (sal_uInt32 i=0; i<GetControlCount(); i=GetNextIndex(i)) { TreeNode* pControl = GetControl(i); bResizeNecessary |= pControl->Expand(i == mnActiveControlIndex); @@ -237,7 +237,7 @@ sal_uInt32 ControlContainer::GetVisibleControlCount (void) const { sal_uInt32 nCount (0); - UINT32 nIndex; + sal_uInt32 nIndex; sal_uInt32 nAllCount (maControlList.size()); for (nIndex=0; nIndex<nAllCount; nIndex=GetNextIndex(nIndex,true)) { diff --git a/sd/source/ui/toolpanel/LayoutMenu.cxx b/sd/source/ui/toolpanel/LayoutMenu.cxx index ef621db2a22d..0cdde4154670 100755 --- a/sd/source/ui/toolpanel/LayoutMenu.cxx +++ b/sd/source/ui/toolpanel/LayoutMenu.cxx @@ -121,9 +121,9 @@ TYPEINIT1(LayoutMenu, SfxShell); struct snewfoil_value_info { - USHORT mnBmpResId; - USHORT mnHCBmpResId; - USHORT mnStrResId; + sal_uInt16 mnBmpResId; + sal_uInt16 mnHCBmpResId; + sal_uInt16 mnStrResId; WritingMode meWritingMode; AutoLayout maAutoLayout; }; @@ -288,8 +288,8 @@ Size LayoutMenu::GetPreferredSize (void) Size aItemSize = CalcItemSizePixel (Size()); Size aPreferredWindowSize = CalcWindowSizePixel ( aItemSize, - (USHORT)mnPreferredColumnCount, - (USHORT)CalculateRowCount (aItemSize,mnPreferredColumnCount)); + (sal_uInt16)mnPreferredColumnCount, + (sal_uInt16)CalculateRowCount (aItemSize,mnPreferredColumnCount)); return aPreferredWindowSize; } @@ -482,8 +482,8 @@ void LayoutMenu::Resize (void) int nRowCount = CalculateRowCount (aItemSize, nColumnCount); - SetColCount ((USHORT)nColumnCount); - SetLineCount ((USHORT)nRowCount); + SetColCount ((sal_uInt16)nColumnCount); + SetLineCount ((sal_uInt16)nRowCount); } } @@ -500,7 +500,7 @@ void LayoutMenu::MouseButtonDown (const MouseEvent& rEvent) if (rEvent.IsRight()) { ReleaseMouse(); - USHORT nIndex = GetItemId (rEvent.GetPosPixel()); + sal_uInt16 nIndex = GetItemId (rEvent.GetPosPixel()); if (nIndex > 0) SelectItem(nIndex); } @@ -712,7 +712,7 @@ void LayoutMenu::AssignLayoutToSelectedSlides (AutoLayout aLayout) SfxRequest aRequest (mrBase.GetViewFrame(), SID_ASSIGN_LAYOUT); aRequest.AppendItem(SfxUInt32Item (ID_VAL_WHATPAGE, ((*iPage)->GetPageNum()-1)/2)); aRequest.AppendItem(SfxUInt32Item (ID_VAL_WHATLAYOUT, aLayout)); - pMainViewShell->ExecuteSlot (aRequest, BOOL(FALSE)); + pMainViewShell->ExecuteSlot (aRequest, sal_Bool(sal_False)); } } while(false); @@ -722,7 +722,7 @@ void LayoutMenu::AssignLayoutToSelectedSlides (AutoLayout aLayout) SfxRequest LayoutMenu::CreateRequest ( - USHORT nSlotId, + sal_uInt16 nSlotId, AutoLayout aLayout) { SfxRequest aRequest (mrBase.GetViewFrame(), nSlotId); @@ -730,10 +730,10 @@ SfxRequest LayoutMenu::CreateRequest ( do { SdrLayerAdmin& rLayerAdmin (mrBase.GetDocument()->GetLayerAdmin()); - BYTE aBackground (rLayerAdmin.GetLayerID( - String(SdResId(STR_LAYER_BCKGRND)), FALSE)); - BYTE aBackgroundObject (rLayerAdmin.GetLayerID( - String(SdResId(STR_LAYER_BCKGRNDOBJ)), FALSE)); + sal_uInt8 aBackground (rLayerAdmin.GetLayerID( + String(SdResId(STR_LAYER_BCKGRND)), sal_False)); + sal_uInt8 aBackgroundObject (rLayerAdmin.GetLayerID( + String(SdResId(STR_LAYER_BCKGRNDOBJ)), sal_False)); ViewShell* pViewShell = mrBase.GetMainViewShell().get(); if (pViewShell == NULL) break; @@ -832,7 +832,7 @@ void LayoutMenu::Fill (void) void LayoutMenu::Clear (void) { - for (USHORT nId=1; nId<=GetItemCount(); nId++) + for (sal_uInt16 nId=1; nId<=GetItemCount(); nId++) delete static_cast<AutoLayout*>(GetItemData(nId)); ValueSet::Clear(); } @@ -884,7 +884,7 @@ void LayoutMenu::Command (const CommandEvent& rEvent) // When the command event was not caused by a mouse // event (for example a key press instead) then show the // popup menu at the center of the current item. - if (GetSelectItemId() != (USHORT)-1) + if (GetSelectItemId() != (sal_uInt16)-1) { Rectangle aBBox (GetItemRect(GetSelectItemId())); Point aPosition (aBBox.Center()); @@ -936,8 +936,8 @@ void LayoutMenu::UpdateSelection (void) break; // Find the entry of the menu for to the layout. - USHORT nItemCount (GetItemCount()); - for (USHORT nId=1; nId<=nItemCount; nId++) + sal_uInt16 nItemCount (GetItemCount()); + for (sal_uInt16 nId=1; nId<=nItemCount; nId++) { if (*static_cast<AutoLayout*>(GetItemData(nId)) == aLayout) { diff --git a/sd/source/ui/toolpanel/LayoutMenu.hxx b/sd/source/ui/toolpanel/LayoutMenu.hxx index 627a363fb576..5f782666ac93 100755 --- a/sd/source/ui/toolpanel/LayoutMenu.hxx +++ b/sd/source/ui/toolpanel/LayoutMenu.hxx @@ -216,7 +216,7 @@ private: Layout of the page to insert or to assign. */ SfxRequest CreateRequest ( - USHORT nSlotId, + sal_uInt16 nSlotId, AutoLayout aLayout); /** Select the layout that is used by the current page. diff --git a/sd/source/ui/toolpanel/ScrollPanel.cxx b/sd/source/ui/toolpanel/ScrollPanel.cxx index 9c1c087c8ab1..276703999808 100755 --- a/sd/source/ui/toolpanel/ScrollPanel.cxx +++ b/sd/source/ui/toolpanel/ScrollPanel.cxx @@ -80,10 +80,10 @@ void ScrollPanel::Construct() // Initialize the scroll bars. maVerticalScrollBar.SetScrollHdl ( LINK(this, ScrollPanel, ScrollBarHandler)); - maVerticalScrollBar.EnableDrag (TRUE); + maVerticalScrollBar.EnableDrag (sal_True); maHorizontalScrollBar.SetScrollHdl ( LINK(this, ScrollPanel, ScrollBarHandler)); - maHorizontalScrollBar.EnableDrag (TRUE); + maHorizontalScrollBar.EnableDrag (sal_True); } @@ -656,14 +656,14 @@ IMPL_LINK(ScrollPanel, ScrollBarHandler, ScrollBar*, EMPTYARG) long ScrollPanel::Notify( NotifyEvent& rNEvt ) { - long nRet = FALSE; + long nRet = sal_False; if( rNEvt.GetType() == EVENT_COMMAND ) { // note: dynamic_cast is not possible as GetData() returns a void* CommandEvent* pCmdEvent = reinterpret_cast< CommandEvent* >(rNEvt.GetData()); DBG_ASSERT( pCmdEvent!=0 && - ( pCmdEvent->IsMouseEvent() == TRUE || - pCmdEvent->IsMouseEvent() == FALSE ), + ( pCmdEvent->IsMouseEvent() == sal_True || + pCmdEvent->IsMouseEvent() == sal_False ), "Invalid CommandEvent" ); if (pCmdEvent) switch (pCmdEvent->GetCommand()) diff --git a/sd/source/ui/toolpanel/TaskPaneTreeNode.cxx b/sd/source/ui/toolpanel/TaskPaneTreeNode.cxx index 8c69e12c504d..0e4a1655cf8f 100755 --- a/sd/source/ui/toolpanel/TaskPaneTreeNode.cxx +++ b/sd/source/ui/toolpanel/TaskPaneTreeNode.cxx @@ -216,7 +216,7 @@ TaskPaneShellManager* TreeNode::GetShellManager (void) ::Window* pWindow = GetWindow(); if (pWindow != NULL) { - xAccessible = pWindow->GetAccessible(FALSE); + xAccessible = pWindow->GetAccessible(sal_False); if ( ! xAccessible.is()) { ::com::sun::star::uno::Reference< diff --git a/sd/source/ui/toolpanel/TestMenu.cxx b/sd/source/ui/toolpanel/TestMenu.cxx index a8f0b6df7893..c3eba1790093 100755 --- a/sd/source/ui/toolpanel/TestMenu.cxx +++ b/sd/source/ui/toolpanel/TestMenu.cxx @@ -97,8 +97,8 @@ Size ColorMenu::GetPreferredSize (void) Size aItemSize = maSet.CalcItemSizePixel (Size()); Size aPreferredWindowSize = maSet.CalcWindowSizePixel ( aItemSize, - (USHORT)mnPreferredColumnCount, - (USHORT)CalculateRowCount (aItemSize, (USHORT)mnPreferredColumnCount)); + (sal_uInt16)mnPreferredColumnCount, + (sal_uInt16)CalculateRowCount (aItemSize, (sal_uInt16)mnPreferredColumnCount)); return aPreferredWindowSize; } @@ -193,9 +193,9 @@ void ColorMenu::Resize (void) else if (nColumnCount > 4) nColumnCount = 4; - USHORT nRowCount = (USHORT)CalculateRowCount (aItemSize, nColumnCount); + sal_uInt16 nRowCount = (sal_uInt16)CalculateRowCount (aItemSize, nColumnCount); - maSet.SetColCount ((USHORT)nColumnCount); + maSet.SetColCount ((sal_uInt16)nColumnCount); maSet.SetLineCount (nRowCount); } } @@ -229,7 +229,7 @@ void ColorMenu::Fill (void) maSet.Clear(); maSet.SetItemWidth (30); maSet.SetItemHeight (30); - USHORT i = 0; + sal_uInt16 i = 0; maSet.InsertItem (++i, rSettings.GetFaceColor()); maSet.SetItemText (i, String::CreateFromAscii("FaceColor")); maSet.InsertItem (++i, rSettings.GetCheckedColor()); diff --git a/sd/source/ui/toolpanel/TitleBar.cxx b/sd/source/ui/toolpanel/TitleBar.cxx index de49b7a6abb5..583285b6f54a 100755 --- a/sd/source/ui/toolpanel/TitleBar.cxx +++ b/sd/source/ui/toolpanel/TitleBar.cxx @@ -69,7 +69,7 @@ TitleBar::TitleBar ( ::Window* pParent, const String& rsTitle, TitleBarType eTyp , mpDevice(new VirtualDevice (*this)) , mbIsExpandable (bIsExpandable) { - EnableMapMode (FALSE); + EnableMapMode (sal_False); SetBackground (Wallpaper()); @@ -254,7 +254,7 @@ Image TitleBar::GetExpansionIndicator (void) const bool bHighContrastMode (GetSettings().GetStyleSettings().GetHighContrastMode() != 0); if (mbIsExpandable) { - USHORT nResourceId = 0; + sal_uInt16 nResourceId = 0; switch (meType) { case TBT_SUB_CONTROL_HEADLINE: @@ -310,7 +310,7 @@ void TitleBar::PaintFocusIndicator (const Rectangle& rTextBox) if (mbFocused) { Rectangle aTextPixelBox (mpDevice->LogicToPixel (rTextBox)); - mpDevice->EnableMapMode (FALSE); + mpDevice->EnableMapMode (sal_False); Rectangle aBox (rTextBox); aBox.Top() -= 1; aBox.Bottom() += 1; @@ -327,7 +327,7 @@ void TitleBar::PaintFocusIndicator (const Rectangle& rTextBox) mpDevice->SetLineColor (COL_BLACK); mpDevice->DrawPolyLine (Polygon(aTextPixelBox), aDottedStyle); - mpDevice->EnableMapMode (FALSE); + mpDevice->EnableMapMode (sal_False); } else HideFocus (); @@ -372,7 +372,7 @@ void TitleBar::PaintText (const Rectangle& rTextBox) -USHORT TitleBar::GetTextStyle (void) +sal_uInt16 TitleBar::GetTextStyle (void) { if(IsEnabled()) { @@ -403,9 +403,9 @@ void TitleBar::PaintBackground (const Rectangle& rTitleBarBox) if (mbExpanded) { // Make the color a little bit darker. - aColor.SetRed(UINT8(((UINT16)aColor.GetRed()) * 8 / 10)); - aColor.SetGreen(UINT8(((UINT16)aColor.GetGreen()) * 8 / 10)); - aColor.SetBlue(UINT8(((UINT16)aColor.GetBlue()) * 8 / 10)); + aColor.SetRed(sal_uInt8(((sal_uInt16)aColor.GetRed()) * 8 / 10)); + aColor.SetGreen(sal_uInt8(((sal_uInt16)aColor.GetGreen()) * 8 / 10)); + aColor.SetBlue(sal_uInt8(((sal_uInt16)aColor.GetBlue()) * 8 / 10)); } mpDevice->SetFillColor (aColor); diff --git a/sd/source/ui/toolpanel/ToolPanel.cxx b/sd/source/ui/toolpanel/ToolPanel.cxx index 6dbcae52547a..b7307cc86ace 100755 --- a/sd/source/ui/toolpanel/ToolPanel.cxx +++ b/sd/source/ui/toolpanel/ToolPanel.cxx @@ -93,7 +93,7 @@ namespace sd { namespace toolpanel Reference< XAccessible > SAL_CALL ToolPanel::createAccessible( const Reference< XAccessible >& i_rParentAccessible ) throw (RuntimeException) { ToolPanelGuard aGuard( *this ); - Reference< XAccessible > xAccessible( m_pControl->GetWindow()->GetAccessible( FALSE ) ); + Reference< XAccessible > xAccessible( m_pControl->GetWindow()->GetAccessible( sal_False ) ); if ( !xAccessible.is() ) { xAccessible.set( m_pControl->CreateAccessibleObject( i_rParentAccessible ) ); diff --git a/sd/source/ui/toolpanel/ToolPanelViewShell.cxx b/sd/source/ui/toolpanel/ToolPanelViewShell.cxx index fbbcebe7ab7f..df28807c7aa1 100755 --- a/sd/source/ui/toolpanel/ToolPanelViewShell.cxx +++ b/sd/source/ui/toolpanel/ToolPanelViewShell.cxx @@ -523,7 +523,7 @@ ToolPanelViewShell::ToolPanelViewShell( SfxViewFrame* pFrame, ViewShellBase& rVi // create the former here, the latter is still created on demand, when somebody requests it. // #i113671# / 2010-09-17 / frank.schoenheit@oracle.com if (mpContentWindow.get()) - mpContentWindow->GetAccessible( TRUE ); + mpContentWindow->GetAccessible( sal_True ); // For accessibility we have to shortly hide the content window. This // triggers the construction of a new accessibility object for the new @@ -881,7 +881,7 @@ void ToolPanelViewShell_Impl::ConnectToDockingWindow() // --------------------------------------------------------------------------------------------------------------------- Reference< XAccessible > ToolPanelViewShell_Impl::CreateAccessible( ::sd::Window& i_rWindow ) { - Reference< XAccessible > xAccessible( GetToolPanelDeck().GetAccessible( FALSE ) ); + Reference< XAccessible > xAccessible( GetToolPanelDeck().GetAccessible( sal_False ) ); if ( !xAccessible.is() ) { // determine the XAccessible which is the parent of the to-be-created object @@ -889,7 +889,7 @@ Reference< XAccessible > ToolPanelViewShell_Impl::CreateAccessible( ::sd::Window OSL_ENSURE( pAccessibleParent, "ToolPanelViewShell_Impl::CreateAccessible: illegal accessible parent provided by the sd::Window!" ); GetToolPanelDeck().SetAccessibleParentWindow( pAccessibleParent ); - xAccessible = GetToolPanelDeck().GetAccessible( TRUE ); + xAccessible = GetToolPanelDeck().GetAccessible( sal_True ); ENSURE_OR_RETURN( xAccessible.is(), "ToolPanelViewShell_Impl::CreateAccessible: illegal ToolPanelDeck accessible!", NULL ); OSL_ENSURE( xAccessible->getAccessibleContext().is() && xAccessible->getAccessibleContext()->getAccessibleParent() == pAccessibleParent->GetAccessible(), diff --git a/sd/source/ui/toolpanel/controls/AllMasterPagesSelector.hxx b/sd/source/ui/toolpanel/controls/AllMasterPagesSelector.hxx index e937958dbbf0..e937958dbbf0 100644..100755 --- a/sd/source/ui/toolpanel/controls/AllMasterPagesSelector.hxx +++ b/sd/source/ui/toolpanel/controls/AllMasterPagesSelector.hxx diff --git a/sd/source/ui/toolpanel/controls/CurrentMasterPagesSelector.cxx b/sd/source/ui/toolpanel/controls/CurrentMasterPagesSelector.cxx index 7f4149d7e6fd..29018cb3a3ca 100644..100755 --- a/sd/source/ui/toolpanel/controls/CurrentMasterPagesSelector.cxx +++ b/sd/source/ui/toolpanel/controls/CurrentMasterPagesSelector.cxx @@ -119,12 +119,12 @@ void CurrentMasterPagesSelector::LateInit (void) void CurrentMasterPagesSelector::Fill (ItemList& rItemList) { - USHORT nPageCount = mrDocument.GetMasterSdPageCount(PK_STANDARD); + sal_uInt16 nPageCount = mrDocument.GetMasterSdPageCount(PK_STANDARD); SdPage* pMasterPage; // Remember the names of the master pages that have been inserted to // avoid double insertion. ::std::set<String> aMasterPageNames; - for (USHORT nIndex=0; nIndex<nPageCount; nIndex++) + for (sal_uInt16 nIndex=0; nIndex<nPageCount; nIndex++) { pMasterPage = mrDocument.GetMasterSdPage (nIndex, PK_STANDARD); if (pMasterPage == NULL) @@ -172,10 +172,10 @@ void CurrentMasterPagesSelector::UpdateSelection (void) { // Iterate over all pages and for the selected ones put the name of // their master page into a set. - USHORT nPageCount = mrDocument.GetSdPageCount(PK_STANDARD); + sal_uInt16 nPageCount = mrDocument.GetSdPageCount(PK_STANDARD); SdPage* pPage; ::std::set<String> aNames; - USHORT nIndex; + sal_uInt16 nIndex; bool bLoop (true); for (nIndex=0; nIndex<nPageCount && bLoop; nIndex++) { @@ -203,7 +203,7 @@ void CurrentMasterPagesSelector::UpdateSelection (void) } // Find the items for the master pages in the set. - USHORT nItemCount (mpPageSet->GetItemCount()); + sal_uInt16 nItemCount (mpPageSet->GetItemCount()); for (nIndex=1; nIndex<=nItemCount && bLoop; nIndex++) { String sName (mpPageSet->GetItemText (nIndex)); @@ -232,7 +232,7 @@ void CurrentMasterPagesSelector::Execute (SfxRequest& rRequest) // Removing the precious flag so that the following call to // RemoveUnnessesaryMasterPages() will remove this master page. pMasterPage->SetPrecious(false); - mrDocument.RemoveUnnecessaryMasterPages(pMasterPage, FALSE, TRUE); + mrDocument.RemoveUnnecessaryMasterPages(pMasterPage, sal_False, sal_True); } } break; diff --git a/sd/source/ui/toolpanel/controls/DocumentHelper.cxx b/sd/source/ui/toolpanel/controls/DocumentHelper.cxx index f7d470e56333..8ed46a90dbba 100755 --- a/sd/source/ui/toolpanel/controls/DocumentHelper.cxx +++ b/sd/source/ui/toolpanel/controls/DocumentHelper.cxx @@ -79,13 +79,13 @@ SdPage* DocumentHelper::CopyMasterPageToLocalDocument ( // present. This is not the case when we are called during the // creation of the slide master page because then the notes master // page is not there. - USHORT nSourceMasterPageCount = pSourceDocument->GetMasterPageCount(); + sal_uInt16 nSourceMasterPageCount = pSourceDocument->GetMasterPageCount(); if (nSourceMasterPageCount%2 == 0) // There should be 1 handout page + n slide masters + n notes // masters = 2*n+1. An even value indicates that a new slide // master but not yet the notes master has been inserted. break; - USHORT nIndex = pMasterPage->GetPageNum(); + sal_uInt16 nIndex = pMasterPage->GetPageNum(); if (nSourceMasterPageCount <= nIndex+1) break; // Get the slide master page. @@ -102,8 +102,8 @@ SdPage* DocumentHelper::CopyMasterPageToLocalDocument ( // Check if a master page with the same name as that of the given // master page already exists. bool bPageExists (false); - USHORT nMasterPageCount(rTargetDocument.GetMasterSdPageCount(PK_STANDARD)); - for (USHORT nMaster=0; nMaster<nMasterPageCount; nMaster++) + sal_uInt16 nMasterPageCount(rTargetDocument.GetMasterSdPageCount(PK_STANDARD)); + for (sal_uInt16 nMaster=0; nMaster<nMasterPageCount; nMaster++) { SdPage* pCandidate = static_cast<SdPage*>( rTargetDocument.GetMasterSdPage (nMaster, PK_STANDARD)); @@ -135,7 +135,7 @@ SdPage* DocumentHelper::CopyMasterPageToLocalDocument ( PK_STANDARD); if (pSlide == NULL) break; - pSlide->SetAutoLayout(AUTOLAYOUT_TITLE, TRUE); + pSlide->SetAutoLayout(AUTOLAYOUT_TITLE, sal_True); // Create a copy of the master page and the associated notes // master page and insert them into our document. @@ -153,9 +153,9 @@ SdPage* DocumentHelper::CopyMasterPageToLocalDocument ( rTargetDocument.GetSdPageCount(PK_STANDARD)-1, pNewMasterPage->GetName(), &rTargetDocument, - FALSE, // Connect the new master page with the new slide but + sal_False, // Connect the new master page with the new slide but // do not modify other (master) pages. - TRUE); + sal_True); } while (false); @@ -183,7 +183,7 @@ SdPage* DocumentHelper::GetSlideForMasterPage (SdPage* pMasterPage) { // In most cases a new slide has just been inserted so start with // the last page. - USHORT nPageIndex (pDocument->GetSdPageCount(PK_STANDARD)-1); + sal_uInt16 nPageIndex (pDocument->GetSdPageCount(PK_STANDARD)-1); bool bFound (false); while ( ! bFound) { @@ -297,7 +297,7 @@ void DocumentHelper::ProvideStyles ( new SdMoveStyleSheetsUndoAction ( &rTargetDocument, aCreatedStyles, - TRUE); + sal_True); pUndoManager->AddUndoAction (pMovStyles); } } @@ -372,7 +372,7 @@ void DocumentHelper::AssignMasterPageToPageList ( SdPage* DocumentHelper::AddMasterPage ( SdDrawDocument& rTargetDocument, SdPage* pMasterPage, - USHORT nInsertionIndex) + sal_uInt16 nInsertionIndex) { SdPage* pClonedMasterPage = NULL; @@ -403,9 +403,9 @@ SdPage* DocumentHelper::AddMasterPage ( pClonedMasterPage->GetUppBorder(), pClonedMasterPage->GetRgtBorder(), pClonedMasterPage->GetLwrBorder()); - pClonedMasterPage->ScaleObjects(aNewSize, aBorders, TRUE); + pClonedMasterPage->ScaleObjects(aNewSize, aBorders, sal_True); pClonedMasterPage->SetSize(aNewSize); - pClonedMasterPage->CreateTitleAndLayout(TRUE); + pClonedMasterPage->CreateTitleAndLayout(sal_True); } } @@ -448,22 +448,22 @@ void DocumentHelper::AssignMasterPageToPage ( pDocument->GetDocSh()->GetUndoManager()->AddUndoAction( new SdBackgroundObjUndoAction( *pDocument, *pPage, pPage->getSdrPageProperties().GetItemSet()), - TRUE); + sal_True); pPage->getSdrPageProperties().PutItem(XFillStyleItem(XFILL_NONE)); pDocument->SetMasterPage ( (pPage->GetPageNum()-1)/2, rsBaseLayoutName, pDocument, - FALSE, - FALSE); + sal_False, + sal_False); } else { // Find first slide that uses the master page. SdPage* pSlide = NULL; - USHORT nPageCount = pDocument->GetSdPageCount(PK_STANDARD); - for (USHORT nPage=0; nPage<nPageCount&&pSlide==NULL; nPage++) + sal_uInt16 nPageCount = pDocument->GetSdPageCount(PK_STANDARD); + for (sal_uInt16 nPage=0; nPage<nPageCount&&pSlide==NULL; nPage++) { SdrPage* pCandidate = pDocument->GetSdPage(nPage,PK_STANDARD); if (pCandidate != NULL @@ -482,15 +482,15 @@ void DocumentHelper::AssignMasterPageToPage ( (pSlide->GetPageNum()-1)/2, rsBaseLayoutName, pDocument, - FALSE, - FALSE); + sal_False, + sal_False); } else { // 3. Replace the master page A by a copy of the given master // page B. pDocument->RemoveUnnecessaryMasterPages ( - pPage, FALSE); + pPage, sal_False); } } } @@ -529,7 +529,7 @@ SdPage* DocumentHelper::ProvideMasterPage ( // Search for a master page with the same name as the given one in // the target document. const XubString sMasterPageLayoutName (pMasterPage->GetLayoutName()); - for (USHORT nIndex=0,nCount=rTargetDocument.GetMasterPageCount(); nIndex<nCount; ++nIndex) + for (sal_uInt16 nIndex=0,nCount=rTargetDocument.GetMasterPageCount(); nIndex<nCount; ++nIndex) { SdPage* pCandidate = static_cast<SdPage*>(rTargetDocument.GetMasterPage(nIndex)); if (pCandidate!=NULL @@ -548,7 +548,7 @@ SdPage* DocumentHelper::ProvideMasterPage ( // Determine the position where the new master pages are inserted. // By default they are inserted at the end. When we assign to a // master page then insert after the last of the (selected) pages. - USHORT nInsertionIndex = rTargetDocument.GetMasterPageCount(); + sal_uInt16 nInsertionIndex = rTargetDocument.GetMasterPageCount(); if (rpPageList->front()->IsMasterPage()) { nInsertionIndex = rpPageList->back()->GetPageNum(); diff --git a/sd/source/ui/toolpanel/controls/DocumentHelper.hxx b/sd/source/ui/toolpanel/controls/DocumentHelper.hxx index 2ff1c8aa575a..997420f44cd5 100644..100755 --- a/sd/source/ui/toolpanel/controls/DocumentHelper.hxx +++ b/sd/source/ui/toolpanel/controls/DocumentHelper.hxx @@ -84,7 +84,7 @@ private: static SdPage* AddMasterPage ( SdDrawDocument& rTargetDocument, SdPage* pMasterPage, - USHORT nInsertionIndex); + sal_uInt16 nInsertionIndex); static SdPage* ProvideMasterPage ( SdDrawDocument& rTargetDocument, SdPage* pMasterPage, diff --git a/sd/source/ui/toolpanel/controls/MasterPageContainer.cxx b/sd/source/ui/toolpanel/controls/MasterPageContainer.cxx index 80a094ec1a66..7e1079b91006 100755 --- a/sd/source/ui/toolpanel/controls/MasterPageContainer.cxx +++ b/sd/source/ui/toolpanel/controls/MasterPageContainer.cxx @@ -188,7 +188,7 @@ private: const String& sFileName, SfxObjectShellLock& rxDocumentShell); - Image GetPreviewSubstitution (USHORT nId, PreviewSize ePreviewSize); + Image GetPreviewSubstitution (sal_uInt16 nId, PreviewSize ePreviewSize); void CleanContainer (void); }; @@ -1062,7 +1062,7 @@ SdDrawDocument* MasterPageContainer::Implementation::GetDocument (void) Image MasterPageContainer::Implementation::GetPreviewSubstitution ( - USHORT nId, + sal_uInt16 nId, PreviewSize ePreviewSize) { const ::osl::MutexGuard aGuard (maMutex); diff --git a/sd/source/ui/toolpanel/controls/MasterPageContainerFiller.hxx b/sd/source/ui/toolpanel/controls/MasterPageContainerFiller.hxx index c8ba61fef378..c8ba61fef378 100644..100755 --- a/sd/source/ui/toolpanel/controls/MasterPageContainerFiller.hxx +++ b/sd/source/ui/toolpanel/controls/MasterPageContainerFiller.hxx diff --git a/sd/source/ui/toolpanel/controls/MasterPageContainerProviders.cxx b/sd/source/ui/toolpanel/controls/MasterPageContainerProviders.cxx index 61483f278a4f..b9fa0d87b663 100755 --- a/sd/source/ui/toolpanel/controls/MasterPageContainerProviders.cxx +++ b/sd/source/ui/toolpanel/controls/MasterPageContainerProviders.cxx @@ -306,9 +306,9 @@ SdPage* TemplatePageObjectProvider::operator() (SdDrawDocument* pContainerDocume { SfxApplication* pSfxApp = SFX_APP(); SfxItemSet* pSet = new SfxAllItemSet (pSfxApp->GetPool()); - pSet->Put (SfxBoolItem (SID_TEMPLATE, TRUE)); - pSet->Put (SfxBoolItem (SID_PREVIEW, TRUE)); - if (pSfxApp->LoadTemplate (mxDocumentShell, sFileName, TRUE, pSet)) + pSet->Put (SfxBoolItem (SID_TEMPLATE, sal_True)); + pSet->Put (SfxBoolItem (SID_PREVIEW, sal_True)); + if (pSfxApp->LoadTemplate (mxDocumentShell, sFileName, sal_True, pSet)) { mxDocumentShell = NULL; } @@ -355,7 +355,7 @@ SdPage* DefaultPageObjectProvider::operator () (SdDrawDocument* pContainerDocume if (pContainerDocument != NULL) { sal_Int32 nIndex (0); - SdPage* pLocalSlide = pContainerDocument->GetSdPage((USHORT)nIndex, PK_STANDARD); + SdPage* pLocalSlide = pContainerDocument->GetSdPage((sal_uInt16)nIndex, PK_STANDARD); if (pLocalSlide!=NULL && pLocalSlide->TRG_HasMasterPage()) pLocalMasterPage = dynamic_cast<SdPage*>(&pLocalSlide->TRG_GetMasterPage()); } diff --git a/sd/source/ui/toolpanel/controls/MasterPageContainerQueue.hxx b/sd/source/ui/toolpanel/controls/MasterPageContainerQueue.hxx index 3e8d31e67c1b..3e8d31e67c1b 100644..100755 --- a/sd/source/ui/toolpanel/controls/MasterPageContainerQueue.hxx +++ b/sd/source/ui/toolpanel/controls/MasterPageContainerQueue.hxx diff --git a/sd/source/ui/toolpanel/controls/MasterPageObserver.cxx b/sd/source/ui/toolpanel/controls/MasterPageObserver.cxx index 2ba0cc678403..6524dc429c56 100755 --- a/sd/source/ui/toolpanel/controls/MasterPageObserver.cxx +++ b/sd/source/ui/toolpanel/controls/MasterPageObserver.cxx @@ -194,8 +194,8 @@ void MasterPageObserver::Implementation::RegisterDocument ( { // Gather the names of all the master pages in the given document. MasterPageContainer::data_type aMasterPageSet; - USHORT nMasterPageCount = rDocument.GetMasterSdPageCount(PK_STANDARD); - for (USHORT nIndex=0; nIndex<nMasterPageCount; nIndex++) + sal_uInt16 nMasterPageCount = rDocument.GetMasterSdPageCount(PK_STANDARD); + for (sal_uInt16 nIndex=0; nIndex<nMasterPageCount; nIndex++) { SdPage* pMasterPage = rDocument.GetMasterSdPage (nIndex, PK_STANDARD); if (pMasterPage != NULL) @@ -330,9 +330,9 @@ void MasterPageObserver::Implementation::AnalyzeUsedMasterPages ( SdDrawDocument& rDocument) { // Create a set of names of the master pages used by the given document. - USHORT nMasterPageCount = rDocument.GetMasterSdPageCount(PK_STANDARD); + sal_uInt16 nMasterPageCount = rDocument.GetMasterSdPageCount(PK_STANDARD); ::std::set<String> aCurrentMasterPages; - for (USHORT nIndex=0; nIndex<nMasterPageCount; nIndex++) + for (sal_uInt16 nIndex=0; nIndex<nMasterPageCount; nIndex++) { SdPage* pMasterPage = rDocument.GetMasterSdPage (nIndex, PK_STANDARD); if (pMasterPage != NULL) diff --git a/sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx b/sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx index 6c59f5fa2b51..76595b111c12 100755 --- a/sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx +++ b/sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx @@ -270,7 +270,7 @@ IMPL_LINK(MasterPagesSelector, RightClickHandler, MouseEvent*, pEvent) mpPageSet->ReleaseMouse(); if (GetDispatcher() != NULL && pEvent != NULL) { - USHORT nIndex = mpPageSet->GetItemId (pEvent->GetPosPixel()); + sal_uInt16 nIndex = mpPageSet->GetItemId (pEvent->GetPosPixel()); if (nIndex > 0) mpPageSet->SelectItem (nIndex); } @@ -286,7 +286,7 @@ IMPL_LINK(MasterPagesSelector, ContextMenuCallback, CommandEvent*, pEvent) // center. if (GetShellManager() != NULL) GetShellManager()->MoveToTop (this); - const USHORT nIndex = mpPageSet->GetSelectItemId(); + const sal_uInt16 nIndex = mpPageSet->GetSelectItemId(); if (nIndex > 0 && pEvent!=NULL) { // The position of the upper left corner of the context menu is @@ -328,7 +328,7 @@ SdPage* MasterPagesSelector::GetSelectedMasterPage (void) const ::osl::MutexGuard aGuard (maMutex); SdPage* pMasterPage = NULL; - USHORT nIndex = mpPageSet->GetSelectItemId(); + sal_uInt16 nIndex = mpPageSet->GetSelectItemId(); UserData* pData = GetUserData(nIndex); if (pData != NULL) { @@ -350,7 +350,7 @@ void MasterPagesSelector::AssignMasterPageToAllSlides (SdPage* pMasterPage) if (pMasterPage == NULL) break; - USHORT nPageCount = mrDocument.GetSdPageCount(PK_STANDARD); + sal_uInt16 nPageCount = mrDocument.GetSdPageCount(PK_STANDARD); if (nPageCount == 0) break; @@ -360,7 +360,7 @@ void MasterPagesSelector::AssignMasterPageToAllSlides (SdPage* pMasterPage) String sFullLayoutName (pMasterPage->GetLayoutName()); ::sd::slidesorter::SharedPageSelection pPageList ( new ::sd::slidesorter::SlideSorterViewShell::PageSelection()); - for (USHORT nPageIndex=0; nPageIndex<nPageCount; nPageIndex++) + for (sal_uInt16 nPageIndex=0; nPageIndex<nPageCount; nPageIndex++) { SdPage* pPage = mrDocument.GetSdPage (nPageIndex, PK_STANDARD); if (pPage != NULL @@ -441,9 +441,9 @@ void MasterPagesSelector::NotifyContainerChangeEvent (const MasterPageContainerC if (nIndex >= 0) { mpPageSet->SetItemImage ( - (USHORT)nIndex, + (sal_uInt16)nIndex, mpContainer->GetPreviewForToken(rEvent.maChildToken)); - mpPageSet->Invalidate(mpPageSet->GetItemRect((USHORT)nIndex)); + mpPageSet->Invalidate(mpPageSet->GetItemRect((sal_uInt16)nIndex)); } } break; @@ -478,7 +478,7 @@ MasterPagesSelector::UserData* MasterPagesSelector::GetUserData (int nIndex) con const ::osl::MutexGuard aGuard (maMutex); if (nIndex>0 && nIndex<=mpPageSet->GetItemCount()) - return reinterpret_cast<UserData*>(mpPageSet->GetItemData((USHORT)nIndex)); + return reinterpret_cast<UserData*>(mpPageSet->GetItemData((sal_uInt16)nIndex)); else return NULL; } @@ -495,7 +495,7 @@ void MasterPagesSelector::SetUserData (int nIndex, UserData* pData) UserData* pOldData = GetUserData(nIndex); if (pOldData!=NULL && pOldData!=pData) delete pOldData; - mpPageSet->SetItemData((USHORT)nIndex, pData); + mpPageSet->SetItemData((sal_uInt16)nIndex, pData); } } @@ -578,7 +578,7 @@ void MasterPagesSelector::Execute (SfxRequest& rRequest) SfxDispatcher* pDispatcher = pViewFrame->GetDispatcher(); if (pDispatcher != NULL) { - USHORT nIndex = mpPageSet->GetSelectItemId(); + sal_uInt16 nIndex = mpPageSet->GetSelectItemId(); pDispatcher->Execute(SID_MASTERPAGE, SFX_CALLMODE_SYNCHRON); mpPageSet->SelectItem (nIndex); mrBase.GetDrawController().setCurrentPage(xSelectedMaster); @@ -615,7 +615,7 @@ void MasterPagesSelector::GetState (SfxItemSet& rItemSet) void MasterPagesSelector::SetItem ( - USHORT nIndex, + sal_uInt16 nIndex, MasterPageContainer::Token aToken) { const ::osl::MutexGuard aGuard (maMutex); @@ -664,7 +664,7 @@ void MasterPagesSelector::SetItem ( void MasterPagesSelector::AddTokenToIndexEntry ( - USHORT nIndex, + sal_uInt16 nIndex, MasterPageContainer::Token aToken) { const ::osl::MutexGuard aGuard (maMutex); @@ -676,7 +676,7 @@ void MasterPagesSelector::AddTokenToIndexEntry ( void MasterPagesSelector::RemoveTokenToIndexEntry ( - USHORT nIndex, + sal_uInt16 nIndex, MasterPageContainer::Token aNewToken) { const ::osl::MutexGuard aGuard (maMutex); @@ -702,7 +702,7 @@ void MasterPagesSelector::InvalidatePreview (const SdPage* pPage) { const ::osl::MutexGuard aGuard (maMutex); - for (USHORT nIndex=1; nIndex<=mpPageSet->GetItemCount(); nIndex++) + for (sal_uInt16 nIndex=1; nIndex<=mpPageSet->GetItemCount(); nIndex++) { UserData* pData = GetUserData(nIndex); if (pData != NULL) @@ -722,7 +722,7 @@ void MasterPagesSelector::UpdateAllPreviews (void) { const ::osl::MutexGuard aGuard (maMutex); - for (USHORT nIndex=1; nIndex<=mpPageSet->GetItemCount(); nIndex++) + for (sal_uInt16 nIndex=1; nIndex<=mpPageSet->GetItemCount(); nIndex++) { UserData* pData = GetUserData(nIndex); if (pData != NULL) @@ -745,7 +745,7 @@ void MasterPagesSelector::ClearPageSet (void) { const ::osl::MutexGuard aGuard (maMutex); - for (USHORT nIndex=1; nIndex<=mpPageSet->GetItemCount(); nIndex++) + for (sal_uInt16 nIndex=1; nIndex<=mpPageSet->GetItemCount(); nIndex++) { UserData* pData = GetUserData(nIndex); if (pData != NULL) @@ -817,7 +817,7 @@ void MasterPagesSelector::UpdateItemList (::std::auto_ptr<ItemList> pNewItemList ItemList::const_iterator iCurrentItem (maCurrentItemList.begin()); ItemList::const_iterator iNewEnd (pNewItemList->end()); ItemList::const_iterator iCurrentEnd (maCurrentItemList.end()); - USHORT nIndex (1); + sal_uInt16 nIndex (1); // Update existing items. for ( ; iNewItem!=iNewEnd && iCurrentItem!=iCurrentEnd; ++iNewItem, ++iCurrentItem,++nIndex) diff --git a/sd/source/ui/toolpanel/controls/MasterPagesSelector.hxx b/sd/source/ui/toolpanel/controls/MasterPagesSelector.hxx index bc3c87f7a6c9..996c44c96219 100755 --- a/sd/source/ui/toolpanel/controls/MasterPagesSelector.hxx +++ b/sd/source/ui/toolpanel/controls/MasterPagesSelector.hxx @@ -87,7 +87,7 @@ public: static SdPage* AddMasterPage ( SdDrawDocument* pTargetDocument, SdPage* pMasterPage, - USHORT nInsertionIndex); + sal_uInt16 nInsertionIndex); virtual Size GetPreferredSize (void); virtual sal_Int32 GetPreferredWidth (sal_Int32 nHeight); @@ -152,7 +152,7 @@ protected: eventually. Filled by InvalidatePreview() and operated upon by UpdatePreviews(). */ - ::std::queue<USHORT> maPreviewUpdateQueue; + ::std::queue<sal_uInt16> maPreviewUpdateQueue; virtual SdPage* GetSelectedMasterPage (void); @@ -221,13 +221,13 @@ private: DECL_LINK(ContainerChangeListener, MasterPageContainerChangeEvent*); void SetItem ( - USHORT nIndex, + sal_uInt16 nIndex, MasterPageContainer::Token aToken); void AddTokenToIndexEntry ( - USHORT nIndex, + sal_uInt16 nIndex, MasterPageContainer::Token aToken); void RemoveTokenToIndexEntry ( - USHORT nIndex, + sal_uInt16 nIndex, MasterPageContainer::Token aToken); }; diff --git a/sd/source/ui/toolpanel/controls/PreviewValueSet.cxx b/sd/source/ui/toolpanel/controls/PreviewValueSet.cxx index a1f29dfee044..3474065247d9 100644..100755 --- a/sd/source/ui/toolpanel/controls/PreviewValueSet.cxx +++ b/sd/source/ui/toolpanel/controls/PreviewValueSet.cxx @@ -141,12 +141,12 @@ void PreviewValueSet::Command (const CommandEvent& rEvent) void PreviewValueSet::Rearrange (bool bForceRequestResize) { - USHORT nOldColumnCount (GetColCount()); - USHORT nOldRowCount (GetLineCount()); + sal_uInt16 nOldColumnCount (GetColCount()); + sal_uInt16 nOldRowCount (GetLineCount()); - USHORT nNewColumnCount (CalculateColumnCount ( + sal_uInt16 nNewColumnCount (CalculateColumnCount ( GetOutputSizePixel().Width())); - USHORT nNewRowCount (CalculateRowCount (nNewColumnCount)); + sal_uInt16 nNewRowCount (CalculateRowCount (nNewColumnCount)); SetColCount(nNewColumnCount); SetLineCount(nNewRowCount); @@ -168,7 +168,7 @@ void PreviewValueSet::SetContextMenuCallback (const Link& rLink) -USHORT PreviewValueSet::CalculateColumnCount (int nWidth) const +sal_uInt16 PreviewValueSet::CalculateColumnCount (int nWidth) const { int nColumnCount = 0; if (nWidth > 0) @@ -179,13 +179,13 @@ USHORT PreviewValueSet::CalculateColumnCount (int nWidth) const else if (mnMaxColumnCount>0 && nColumnCount>mnMaxColumnCount) nColumnCount = mnMaxColumnCount; } - return (USHORT)nColumnCount; + return (sal_uInt16)nColumnCount; } -USHORT PreviewValueSet::CalculateRowCount (USHORT nColumnCount) const +sal_uInt16 PreviewValueSet::CalculateRowCount (sal_uInt16 nColumnCount) const { int nRowCount = 0; int nItemCount = GetItemCount(); @@ -196,7 +196,7 @@ USHORT PreviewValueSet::CalculateRowCount (USHORT nColumnCount) const nRowCount = 1; } - return (USHORT)nRowCount; + return (sal_uInt16)nRowCount; } diff --git a/sd/source/ui/toolpanel/controls/PreviewValueSet.hxx b/sd/source/ui/toolpanel/controls/PreviewValueSet.hxx index 69fa7e272330..0b8af21d5167 100644..100755 --- a/sd/source/ui/toolpanel/controls/PreviewValueSet.hxx +++ b/sd/source/ui/toolpanel/controls/PreviewValueSet.hxx @@ -87,8 +87,8 @@ private: const int mnBorderHeight; const int mnMaxColumnCount; - USHORT CalculateColumnCount (int nWidth) const; - USHORT CalculateRowCount (USHORT nColumnCount) const; + sal_uInt16 CalculateColumnCount (int nWidth) const; + sal_uInt16 CalculateRowCount (sal_uInt16 nColumnCount) const; }; } } } // end of namespace ::sd::toolpanel::controls diff --git a/sd/source/ui/toolpanel/controls/RecentMasterPagesSelector.cxx b/sd/source/ui/toolpanel/controls/RecentMasterPagesSelector.cxx index 2f2789216b8d..45161ffee68e 100644..100755 --- a/sd/source/ui/toolpanel/controls/RecentMasterPagesSelector.cxx +++ b/sd/source/ui/toolpanel/controls/RecentMasterPagesSelector.cxx @@ -90,8 +90,8 @@ void RecentMasterPagesSelector::Fill (ItemList& rItemList) { // Create a set of names of the master pages used by the document. MasterPageObserver::MasterPageNameSet aCurrentNames; - USHORT nMasterPageCount = mrDocument.GetMasterSdPageCount(PK_STANDARD); - USHORT nIndex; + sal_uInt16 nMasterPageCount = mrDocument.GetMasterSdPageCount(PK_STANDARD); + sal_uInt16 nIndex; for (nIndex=0; nIndex<nMasterPageCount; nIndex++) { SdPage* pMasterPage = mrDocument.GetMasterSdPage (nIndex, PK_STANDARD); @@ -129,7 +129,7 @@ void RecentMasterPagesSelector::AssignMasterPageToPageList ( SdPage* pMasterPage, const ::boost::shared_ptr<std::vector<SdPage*> >& rpPageList) { - USHORT nSelectedItemId = mpPageSet->GetSelectItemId(); + sal_uInt16 nSelectedItemId = mpPageSet->GetSelectItemId(); MasterPagesSelector::AssignMasterPageToPageList(pMasterPage, rpPageList); diff --git a/sd/source/ui/toolpanel/controls/RecentlyUsedMasterPages.hxx b/sd/source/ui/toolpanel/controls/RecentlyUsedMasterPages.hxx index 1f16d31b95d5..1f16d31b95d5 100644..100755 --- a/sd/source/ui/toolpanel/controls/RecentlyUsedMasterPages.hxx +++ b/sd/source/ui/toolpanel/controls/RecentlyUsedMasterPages.hxx diff --git a/sd/source/ui/tools/IconCache.cxx b/sd/source/ui/tools/IconCache.cxx index 12e7b6b52e95..de4d53b73495 100644..100755 --- a/sd/source/ui/tools/IconCache.cxx +++ b/sd/source/ui/tools/IconCache.cxx @@ -50,17 +50,17 @@ private: */ static IconCache* mpInstance; - typedef ::std::hash_map<USHORT,Image> ImageContainer; + typedef ::std::hash_map<sal_uInt16,Image> ImageContainer; ImageContainer maContainer; - Image GetIcon (USHORT nResourceId); + Image GetIcon (sal_uInt16 nResourceId); }; IconCache* IconCache::Implementation::mpInstance = NULL; -Image IconCache::Implementation::GetIcon (USHORT nResourceId) +Image IconCache::Implementation::GetIcon (sal_uInt16 nResourceId) { Image aResult; ImageContainer::iterator iImage; @@ -109,7 +109,7 @@ IconCache& IconCache::Instance (void) -Image IconCache::GetIcon (USHORT nResourceId) +Image IconCache::GetIcon (sal_uInt16 nResourceId) { return mpImpl->GetIcon (nResourceId); } diff --git a/sd/source/ui/tools/PreviewRenderer.cxx b/sd/source/ui/tools/PreviewRenderer.cxx index 3b6e8339c22d..d4f6d056fc90 100644 --- a/sd/source/ui/tools/PreviewRenderer.cxx +++ b/sd/source/ui/tools/PreviewRenderer.cxx @@ -211,12 +211,12 @@ Image PreviewRenderer::RenderSubstitution ( const Rectangle aPaintRectangle ( Point(0,0), mpPreviewDevice->GetOutputSizePixel()); - mpPreviewDevice->EnableMapMode(FALSE); + mpPreviewDevice->EnableMapMode(sal_False); mpPreviewDevice->SetLineColor(); svtools::ColorConfig aColorConfig; mpPreviewDevice->SetFillColor(aColorConfig.GetColorValue(svtools::DOCCOLOR).nColor); mpPreviewDevice->DrawRect (aPaintRectangle); - mpPreviewDevice->EnableMapMode(TRUE); + mpPreviewDevice->EnableMapMode(sal_True); // Paint substitution text and a frame around it. PaintSubstitutionText (rSubstitutionText); @@ -327,7 +327,7 @@ void PreviewRenderer::PaintPage ( // Turn off online spelling and redlining. SdrOutliner* pOutliner = NULL; - ULONG nSavedControlWord (0); + sal_uLong nSavedControlWord (0); if (mpDocShellOfView!=NULL && mpDocShellOfView->GetDoc()!=NULL) { pOutliner = &mpDocShellOfView->GetDoc()->GetDrawOutliner(); @@ -373,7 +373,7 @@ void PreviewRenderer::PaintSubstitutionText (const String& rSubstitutionText) Point(0,0), mpPreviewDevice->PixelToLogic( mpPreviewDevice->GetOutputSizePixel())); - USHORT nTextStyle = + sal_uInt16 nTextStyle = TEXT_DRAW_CENTER | TEXT_DRAW_VCENTER | TEXT_DRAW_MULTILINE @@ -396,11 +396,11 @@ void PreviewRenderer::PaintFrame (void) Rectangle aPaintRectangle ( Point(0,0), mpPreviewDevice->GetOutputSizePixel()); - mpPreviewDevice->EnableMapMode(FALSE); + mpPreviewDevice->EnableMapMode(sal_False); mpPreviewDevice->SetLineColor(maFrameColor); mpPreviewDevice->SetFillColor(); mpPreviewDevice->DrawRect(aPaintRectangle); - mpPreviewDevice->EnableMapMode(TRUE); + mpPreviewDevice->EnableMapMode(sal_True); } } diff --git a/sd/source/ui/unoidl/SdUnoDrawView.cxx b/sd/source/ui/unoidl/SdUnoDrawView.cxx index 8594d4e0ebf9..b090adcb74c0 100755 --- a/sd/source/ui/unoidl/SdUnoDrawView.cxx +++ b/sd/source/ui/unoidl/SdUnoDrawView.cxx @@ -143,7 +143,7 @@ Reference<drawing::XLayer> SdUnoDrawView::getActiveLayer (void) throw () // From the model get the current SdrLayer object via the layer admin. SdrLayerAdmin& rLayerAdmin = pSdModel->GetLayerAdmin (); - SdrLayer* pLayer = rLayerAdmin.GetLayer (mrView.GetActiveLayer(), TRUE); + SdrLayer* pLayer = rLayerAdmin.GetLayer (mrView.GetActiveLayer(), sal_True); if (pLayer == NULL) break; diff --git a/sd/source/ui/unoidl/UnoDocumentSettings.cxx b/sd/source/ui/unoidl/UnoDocumentSettings.cxx index ed47e57b2130..948293828833 100755 --- a/sd/source/ui/unoidl/UnoDocumentSettings.cxx +++ b/sd/source/ui/unoidl/UnoDocumentSettings.cxx @@ -252,11 +252,11 @@ void DocumentSettings::_setPropertyValues( const PropertyMapEntry** ppEntries, c SdOptionsPrintItem aOptionsPrintItem( ATTR_OPTIONS_PRINT ); - SfxPrinter* pPrinter = pDocSh->GetPrinter( FALSE ); + SfxPrinter* pPrinter = pDocSh->GetPrinter( sal_False ); if( pPrinter ) { SdOptionsPrintItem* pPrinterOptions = NULL; - if(pPrinter->GetOptions().GetItemState( ATTR_OPTIONS_PRINT, FALSE, (const SfxPoolItem**) &pPrinterOptions) == SFX_ITEM_SET) + if(pPrinter->GetOptions().GetItemState( ATTR_OPTIONS_PRINT, sal_False, (const SfxPoolItem**) &pPrinterOptions) == SFX_ITEM_SET) aOptionsPrintItem.GetOptionsPrint() = pPrinterOptions->GetOptionsPrint(); } else @@ -473,7 +473,7 @@ void DocumentSettings::_setPropertyValues( const PropertyMapEntry** ppEntries, c { if( static_cast<sal_Int16>( aPrintOpts.GetHandoutPages() ) != nValue ) { - aPrintOpts.SetHandoutPages( static_cast< UINT16 >( nValue ) ); + aPrintOpts.SetHandoutPages( static_cast< sal_uInt16 >( nValue ) ); bOptionsChanged = true; } bOk = sal_True; @@ -738,16 +738,16 @@ void DocumentSettings::_setPropertyValues( const PropertyMapEntry** ppEntries, c pDoc->SetSummationOfParagraphs( bIsSummationOfParagraphs ); SdDrawDocument* pDocument = pDocSh->GetDoc(); - SdrOutliner& rOutl = pDocument->GetDrawOutliner( FALSE ); + SdrOutliner& rOutl = pDocument->GetDrawOutliner( sal_False ); nCntrl = rOutl.GetControlWord() &~ EE_CNTRL_ULSPACESUMMATION; rOutl.SetControlWord( nCntrl | nSum ); - ::sd::Outliner* pOutl = pDocument->GetOutliner( FALSE ); + ::sd::Outliner* pOutl = pDocument->GetOutliner( sal_False ); if( pOutl ) { nCntrl = pOutl->GetControlWord() &~ EE_CNTRL_ULSPACESUMMATION; pOutl->SetControlWord( nCntrl | nSum ); } - pOutl = pDocument->GetInternalOutliner( FALSE ); + pOutl = pDocument->GetInternalOutliner( sal_False ); if( pOutl ) { nCntrl = pOutl->GetControlWord() &~ EE_CNTRL_ULSPACESUMMATION; @@ -765,19 +765,19 @@ void DocumentSettings::_setPropertyValues( const PropertyMapEntry** ppEntries, c { bOk = sal_True; - pDoc->SetCharCompressType( (UINT16)nCharCompressType ); + pDoc->SetCharCompressType( (sal_uInt16)nCharCompressType ); SdDrawDocument* pDocument = pDocSh->GetDoc(); - SdrOutliner& rOutl = pDocument->GetDrawOutliner( FALSE ); - rOutl.SetAsianCompressionMode( (UINT16)nCharCompressType ); - ::sd::Outliner* pOutl = pDocument->GetOutliner( FALSE ); + SdrOutliner& rOutl = pDocument->GetDrawOutliner( sal_False ); + rOutl.SetAsianCompressionMode( (sal_uInt16)nCharCompressType ); + ::sd::Outliner* pOutl = pDocument->GetOutliner( sal_False ); if( pOutl ) { - pOutl->SetAsianCompressionMode( (UINT16)nCharCompressType ); + pOutl->SetAsianCompressionMode( (sal_uInt16)nCharCompressType ); } - pOutl = pDocument->GetInternalOutliner( FALSE ); + pOutl = pDocument->GetInternalOutliner( sal_False ); if( pOutl ) { - pOutl->SetAsianCompressionMode( (UINT16)nCharCompressType ); + pOutl->SetAsianCompressionMode( (sal_uInt16)nCharCompressType ); } } break; @@ -792,14 +792,14 @@ void DocumentSettings::_setPropertyValues( const PropertyMapEntry** ppEntries, c pDoc->SetKernAsianPunctuation( bAsianPunct ); SdDrawDocument* pDocument = pDocSh->GetDoc(); - SdrOutliner& rOutl = pDocument->GetDrawOutliner( FALSE ); + SdrOutliner& rOutl = pDocument->GetDrawOutliner( sal_False ); rOutl.SetKernAsianPunctuation( bAsianPunct ); - ::sd::Outliner* pOutl = pDocument->GetOutliner( FALSE ); + ::sd::Outliner* pOutl = pDocument->GetOutliner( sal_False ); if( pOutl ) { pOutl->SetKernAsianPunctuation( bAsianPunct ); } - pOutl = pDocument->GetInternalOutliner( FALSE ); + pOutl = pDocument->GetInternalOutliner( sal_False ); if( pOutl ) { pOutl->SetKernAsianPunctuation( bAsianPunct ); @@ -874,7 +874,7 @@ void DocumentSettings::_setPropertyValues( const PropertyMapEntry** ppEntries, c if( bOptionsChanged ) { if( !pPrinter ) - pPrinter = pDocSh->GetPrinter( TRUE ); + pPrinter = pDocSh->GetPrinter( sal_True ); SfxItemSet aNewOptions( pPrinter->GetOptions() ); aNewOptions.Put( aOptionsPrintItem ); pPrinter->SetOptions( aNewOptions ); @@ -895,11 +895,11 @@ void DocumentSettings::_getPropertyValues( const PropertyMapEntry** ppEntries, A SdOptionsPrintItem aOptionsPrintItem( ATTR_OPTIONS_PRINT ); - SfxPrinter* pPrinter = pDocSh->GetPrinter( FALSE ); + SfxPrinter* pPrinter = pDocSh->GetPrinter( sal_False ); if( pPrinter ) { SdOptionsPrintItem* pPrinterOptions = NULL; - if(pPrinter->GetOptions().GetItemState( ATTR_OPTIONS_PRINT, FALSE, (const SfxPoolItem**) &pPrinterOptions) == SFX_ITEM_SET) + if(pPrinter->GetOptions().GetItemState( ATTR_OPTIONS_PRINT, sal_False, (const SfxPoolItem**) &pPrinterOptions) == SFX_ITEM_SET) aOptionsPrintItem.GetOptionsPrint() = pPrinterOptions->GetOptionsPrint(); } else diff --git a/sd/source/ui/unoidl/sddetect.cxx b/sd/source/ui/unoidl/sddetect.cxx index f462d22a780e..6b30a6d5bd5b 100755 --- a/sd/source/ui/unoidl/sddetect.cxx +++ b/sd/source/ui/unoidl/sddetect.cxx @@ -180,7 +180,7 @@ SdFilterDetect::~SdFilterDetect() SfxApplication* pApp = SFX_APP(); SfxAllItemSet *pSet = new SfxAllItemSet( pApp->GetPool() ); TransformParameters( SID_OPENDOC, lDescriptor, *pSet ); - SFX_ITEMSET_ARG( pSet, pItem, SfxBoolItem, SID_DOC_READONLY, FALSE ); + SFX_ITEMSET_ARG( pSet, pItem, SfxBoolItem, SID_DOC_READONLY, sal_False ); bWasReadOnly = pItem && pItem->GetValue(); @@ -208,8 +208,8 @@ SdFilterDetect::~SdFilterDetect() else { // ctor of SfxMedium uses owner transition of ItemSet - SfxMedium aMedium( aURL, bWasReadOnly ? STREAM_STD_READ : STREAM_STD_READWRITE, FALSE, NULL, pSet ); - aMedium.UseInteractionHandler( TRUE ); + SfxMedium aMedium( aURL, bWasReadOnly ? STREAM_STD_READ : STREAM_STD_READWRITE, sal_False, NULL, pSet ); + aMedium.UseInteractionHandler( sal_True ); if ( aPreselectedFilterName.Len() ) pFilter = SfxFilter::GetFilterByName( aPreselectedFilterName ); else if( aTypeName.Len() ) @@ -225,7 +225,7 @@ SdFilterDetect::~SdFilterDetect() xStream = aMedium.GetInputStream(); xContent = aMedium.GetContent(); bReadOnly = aMedium.IsReadOnly(); - BOOL bIsStorage = aMedium.IsStorage(); + sal_Bool bIsStorage = aMedium.IsStorage(); if (aMedium.GetError() == SVSTREAM_OK) { @@ -273,7 +273,7 @@ SdFilterDetect::~SdFilterDetect() String sFilterName; if ( pFilter ) sFilterName = pFilter->GetName(); - aTypeName = SfxFilter::GetTypeFromStorage( xStorage, pFilter ? pFilter->IsOwnTemplateFormat() : FALSE, &sFilterName ); + aTypeName = SfxFilter::GetTypeFromStorage( xStorage, pFilter ? pFilter->IsOwnTemplateFormat() : sal_False, &sFilterName ); } catch( lang::WrappedTargetException& aWrap ) { @@ -341,7 +341,7 @@ SdFilterDetect::~SdFilterDetect() } else { - SotStorageRef aStorage = new SotStorage ( pStm, FALSE ); + SotStorageRef aStorage = new SotStorage ( pStm, sal_False ); if ( !aStorage->GetError() ) { String aStreamName = UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "PowerPoint Document" ) ); @@ -364,7 +364,7 @@ SdFilterDetect::~SdFilterDetect() const String aFileName( aMedium.GetURLObject().GetMainURL( INetURLObject::NO_DECODE ) ); GraphicDescriptor aDesc( *pStm, &aFileName ); GraphicFilter* pGrfFilter = GraphicFilter::GetGraphicFilter(); - if( !aDesc.Detect( FALSE ) ) + if( !aDesc.Detect( sal_False ) ) { pFilter = 0; if( SvtModuleOptions().IsImpress() ) diff --git a/sd/source/ui/unoidl/unocpres.hxx b/sd/source/ui/unoidl/unocpres.hxx index 615d5ba7007c..b138acc74b84 100755 --- a/sd/source/ui/unoidl/unocpres.hxx +++ b/sd/source/ui/unoidl/unocpres.hxx @@ -58,7 +58,7 @@ private: // for xComponent ::osl::Mutex aDisposeContainerMutex; ::cppu::OInterfaceContainerHelper aDisposeListeners; - BOOL bDisposing; + sal_Bool bDisposing; public: SdXCustomPresentation() throw(); diff --git a/sd/source/ui/unoidl/unodoc.cxx b/sd/source/ui/unoidl/unodoc.cxx index a423692caa4f..63149b8f92df 100644..100755 --- a/sd/source/ui/unoidl/unodoc.cxx +++ b/sd/source/ui/unoidl/unodoc.cxx @@ -68,7 +68,7 @@ uno::Reference< uno::XInterface > SAL_CALL SdDrawingDocument_createInstance( SfxObjectShell* pShell = new ::sd::GraphicDocShell( - _nCreationFlags, FALSE, DOCUMENT_TYPE_DRAW ); + _nCreationFlags, sal_False, DOCUMENT_TYPE_DRAW ); return uno::Reference< uno::XInterface >( pShell->GetModel() ); } @@ -97,7 +97,7 @@ uno::Reference< uno::XInterface > SAL_CALL SdPresentationDocument_createInstance SfxObjectShell* pShell = new ::sd::DrawDocShell( - _nCreationFlags, FALSE, DOCUMENT_TYPE_IMPRESS ); + _nCreationFlags, sal_False, DOCUMENT_TYPE_IMPRESS ); return uno::Reference< uno::XInterface >( pShell->GetModel() ); } diff --git a/sd/source/ui/unoidl/unolayer.cxx b/sd/source/ui/unoidl/unolayer.cxx index 5ad9fe3fd555..9ba794d629ab 100644..100755 --- a/sd/source/ui/unoidl/unolayer.cxx +++ b/sd/source/ui/unoidl/unolayer.cxx @@ -561,7 +561,7 @@ uno::Reference< drawing::XLayer > SAL_CALL SdLayerManager::insertNewByIndex( sal SdrLayerAdmin& rLA=mpModel->mpDoc->GetLayerAdmin(); const sal_Int32 nMax=rLA.GetLayerCount(); if (nIndex>nMax) nIndex=nMax; - xLayer = GetLayer (rLA.NewLayer(aLayerName,(USHORT)nIndex)); + xLayer = GetLayer (rLA.NewLayer(aLayerName,(sal_uInt16)nIndex)); mpModel->SetModified(); } return xLayer; @@ -684,7 +684,7 @@ uno::Any SAL_CALL SdLayerManager::getByName( const OUString& aName ) throw lang::DisposedException(); SdrLayerAdmin& rLayerAdmin = mpModel->mpDoc->GetLayerAdmin(); - SdrLayer* pLayer = rLayerAdmin.GetLayer( SdLayer::convertToInternalName( aName ), FALSE ); + SdrLayer* pLayer = rLayerAdmin.GetLayer( SdLayer::convertToInternalName( aName ), sal_False ); if( pLayer == NULL ) throw container::NoSuchElementException(); @@ -726,7 +726,7 @@ sal_Bool SAL_CALL SdLayerManager::hasByName( const OUString& aName ) throw(uno:: SdrLayerAdmin& rLayerAdmin = mpModel->mpDoc->GetLayerAdmin(); - return NULL != rLayerAdmin.GetLayer( SdLayer::convertToInternalName( aName ), FALSE ); + return NULL != rLayerAdmin.GetLayer( SdLayer::convertToInternalName( aName ), sal_False ); } // XElementAccess diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx index e11f76a64baa..c10c64a02145 100755 --- a/sd/source/ui/unoidl/unomodel.cxx +++ b/sd/source/ui/unoidl/unomodel.cxx @@ -501,8 +501,8 @@ SdPage* SdXImpressDocument::InsertSdPage( sal_uInt16 nPage, sal_Bool bDuplicate { sal_uInt16 nPageCount = mpDoc->GetSdPageCount( PK_STANDARD ); SdrLayerAdmin& rLayerAdmin = mpDoc->GetLayerAdmin(); - BYTE aBckgrnd = rLayerAdmin.GetLayerID(String(SdResId(STR_LAYER_BCKGRND)), sal_False); - BYTE aBckgrndObj = rLayerAdmin.GetLayerID(String(SdResId(STR_LAYER_BCKGRNDOBJ)), sal_False); + sal_uInt8 aBckgrnd = rLayerAdmin.GetLayerID(String(SdResId(STR_LAYER_BCKGRND)), sal_False); + sal_uInt8 aBckgrndObj = rLayerAdmin.GetLayerID(String(SdResId(STR_LAYER_BCKGRNDOBJ)), sal_False); SdPage* pStandardPage = NULL; @@ -1580,8 +1580,8 @@ sal_Int32 ImplPDFGetBookmarkPage( const String& rBookmark, SdDrawDocument& rDoc aBookmark = rBookmark.Copy( 1 ); // is the bookmark a page ? - BOOL bIsMasterPage; - USHORT nPgNum = rDoc.GetPageByName( aBookmark, bIsMasterPage ); + sal_Bool bIsMasterPage; + sal_uInt16 nPgNum = rDoc.GetPageByName( aBookmark, bIsMasterPage ); SdrObject* pObj = NULL; if ( nPgNum == SDRPAGE_NOTFOUND ) @@ -1893,7 +1893,7 @@ void SAL_CALL SdXImpressDocument::render( sal_Int32 nRenderer, const uno::Any& r vcl::PDFExtOutDevData* pPDFExtOutDevData = PTR_CAST( vcl::PDFExtOutDevData, pOut->GetExtOutDevData() ); ::sd::ClientView* pView = new ::sd::ClientView( mpDocShell, pOut, NULL ); - Rectangle aVisArea = Rectangle( Point(), mpDoc->GetSdPage( (USHORT)nPageNumber - 1, ePageKind )->GetSize() ); + Rectangle aVisArea = Rectangle( Point(), mpDoc->GetSdPage( (sal_uInt16)nPageNumber - 1, ePageKind )->GetSize() ); Region aRegion( aVisArea ); Point aOrigin; @@ -1919,7 +1919,7 @@ void SAL_CALL SdXImpressDocument::render( sal_Int32 nRenderer, const uno::Any& r if( xModel == mpDocShell->GetModel() ) { - pView->ShowSdrPage( mpDoc->GetSdPage( (USHORT)nPageNumber - 1, ePageKind )); + pView->ShowSdrPage( mpDoc->GetSdPage( (sal_uInt16)nPageNumber - 1, ePageKind )); SdrPageView* pPV = pView->GetSdrPageView(); if( pOldSdView ) @@ -2119,7 +2119,7 @@ void SAL_CALL SdXImpressDocument::render( sal_Int32 nRenderer, const uno::Any& r rBookmarks.clear(); //---> i56629, i40318 //get the page name, will be used as outline element in PDF bookmark pane - String aPageName = mpDoc->GetSdPage( (USHORT)nPageNumber - 1 , PK_STANDARD )->GetName(); + String aPageName = mpDoc->GetSdPage( (sal_uInt16)nPageNumber - 1 , PK_STANDARD )->GetName(); if( aPageName.Len() > 0 ) { // insert the bookmark to this page into the NamedDestinations @@ -2696,7 +2696,7 @@ uno::Reference< drawing::XDrawPage > SAL_CALL SdMasterPagesAccess::insertNewByIn bUnique = sal_True; for( sal_Int32 nMaster = 1; nMaster < nMPageCount; nMaster++ ) { - SdPage* pPage = (SdPage*)mpDoc->GetMasterPage((USHORT)nMaster); + SdPage* pPage = (SdPage*)mpDoc->GetMasterPage((sal_uInt16)nMaster); if( pPage && pPage->GetName() == aPrefix ) { bUnique = sal_False; @@ -2733,7 +2733,7 @@ uno::Reference< drawing::XDrawPage > SAL_CALL SdMasterPagesAccess::insertNewByIn pPage->GetRgtBorder(), pPage->GetLwrBorder() ); pMPage->SetLayoutName( aLayoutName ); - mpDoc->InsertMasterPage(pMPage, (USHORT)nInsertPos); + mpDoc->InsertMasterPage(pMPage, (sal_uInt16)nInsertPos); { // ensure default MasterPage fill @@ -2751,7 +2751,7 @@ uno::Reference< drawing::XDrawPage > SAL_CALL SdMasterPagesAccess::insertNewByIn pRefNotesPage->GetRgtBorder(), pRefNotesPage->GetLwrBorder() ); pMNotesPage->SetLayoutName( aLayoutName ); - mpDoc->InsertMasterPage(pMNotesPage, (USHORT)nInsertPos + 1); + mpDoc->InsertMasterPage(pMNotesPage, (sal_uInt16)nInsertPos + 1); // pMNotesPage->InsertMasterPage( pMPage->GetPageNum() ); pMNotesPage->SetAutoLayout(AUTOLAYOUT_NOTES, sal_True, sal_True); mpModel->SetModified(); diff --git a/sd/source/ui/unoidl/unoobj.cxx b/sd/source/ui/unoidl/unoobj.cxx index f31c960d432d..681aad8f44ed 100755 --- a/sd/source/ui/unoidl/unoobj.cxx +++ b/sd/source/ui/unoidl/unoobj.cxx @@ -609,7 +609,7 @@ void SAL_CALL SdXShape::setPropertyValue( const ::rtl::OUString& aPropertyName, if(!(aValue >>= nVerb)) throw lang::IllegalArgumentException(); - pInfo->mnVerb = (USHORT)nVerb; + pInfo->mnVerb = (sal_uInt16)nVerb; break; } case WID_DIMCOLOR: @@ -786,7 +786,7 @@ void SAL_CALL SdXShape::setPropertyValue( const ::rtl::OUString& aPropertyName, { SdDrawDocument* pDoc = mpModel?mpModel->GetDoc():NULL; // is the bookmark a page? - BOOL bIsMasterPage; + sal_Bool bIsMasterPage; if(pDoc->GetPageByName( pInfo->GetBookmark(), bIsMasterPage ) != SDRPAGE_NOTFOUND) { aString = SdDrawPage::getPageApiNameFromUiName( pInfo->GetBookmark() ); @@ -1400,7 +1400,7 @@ void SAL_CALL SdUnoEventsAccess::replaceByName( const OUString& aName, const uno case presentation::ClickAction_VERB: if( nFound & FOUND_VERB ) { - pInfo->mnVerb = (USHORT)nVerb; + pInfo->mnVerb = (sal_uInt16)nVerb; bOk = sal_True; } break; diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx index fb356087245a..5902ab86ae4d 100755 --- a/sd/source/ui/unoidl/unopage.cxx +++ b/sd/source/ui/unoidl/unopage.cxx @@ -545,7 +545,7 @@ SdrObject * SdGenericDrawPage::_CreateSdrObject( const Reference< drawing::XShap } else { - pPresObj = GetPage()->CreatePresObj( eObjKind, FALSE, aRect, sal_True ); + pPresObj = GetPage()->CreatePresObj( eObjKind, sal_False, aRect, sal_True ); } if( pPresObj ) @@ -680,7 +680,7 @@ void SAL_CALL SdGenericDrawPage::setPropertyValue( const OUString& aPropertyName SdDrawDocument* pDoc = (SdDrawDocument*)GetPage()->GetModel(); const PageKind ePageKind = GetPage()->GetPageKind(); - USHORT i, nPageCnt = pDoc->GetMasterSdPageCount(ePageKind); + sal_uInt16 i, nPageCnt = pDoc->GetMasterSdPageCount(ePageKind); for (i = 0; i < nPageCnt; i++) { SdPage* pPage = pDoc->GetMasterSdPage(i, ePageKind); @@ -723,7 +723,7 @@ void SAL_CALL SdGenericDrawPage::setPropertyValue( const OUString& aPropertyName sal_Bool bVisible = sal_False; if( ! ( aValue >>= bVisible ) ) throw lang::IllegalArgumentException(); - GetPage()->SetExcluded( bVisible == FALSE ); + GetPage()->SetExcluded( bVisible == sal_False ); break; } case WID_PAGE_SOUNDFILE : @@ -779,7 +779,7 @@ void SAL_CALL SdGenericDrawPage::setPropertyValue( const OUString& aPropertyName { SdrLayerAdmin& rLayerAdmin = pDoc->GetLayerAdmin(); SetOfByte aVisibleLayers = pPage->TRG_GetMasterPageVisibleLayers(); - aVisibleLayers.Set(rLayerAdmin.GetLayerID(String(SdResId(STR_LAYER_BCKGRND)), FALSE), bVisible); + aVisibleLayers.Set(rLayerAdmin.GetLayerID(String(SdResId(STR_LAYER_BCKGRND)), sal_False), bVisible); pPage->TRG_SetMasterPageVisibleLayers(aVisibleLayers); } } @@ -799,7 +799,7 @@ void SAL_CALL SdGenericDrawPage::setPropertyValue( const OUString& aPropertyName { SdrLayerAdmin& rLayerAdmin = pDoc->GetLayerAdmin(); SetOfByte aVisibleLayers = pPage->TRG_GetMasterPageVisibleLayers(); - aVisibleLayers.Set(rLayerAdmin.GetLayerID(String(SdResId(STR_LAYER_BCKGRNDOBJ)), FALSE), bVisible); + aVisibleLayers.Set(rLayerAdmin.GetLayerID(String(SdResId(STR_LAYER_BCKGRNDOBJ)), sal_False), bVisible); pPage->TRG_SetMasterPageVisibleLayers(aVisibleLayers); } } @@ -1078,7 +1078,7 @@ Any SAL_CALL SdGenericDrawPage::getPropertyValue( const OUString& PropertyName ) } case WID_PAGE_LDBITMAP: { - BOOL bHC = Application::GetSettings().GetStyleSettings().GetHighContrastMode(); + sal_Bool bHC = Application::GetSettings().GetStyleSettings().GetHighContrastMode(); Reference< awt::XBitmap > xBitmap( VCLUnoHelper::CreateBitmap( BitmapEx( SdResId( bHC ? BMP_PAGE_H : BMP_PAGE ) ) ) ); aAny <<= xBitmap; @@ -1109,7 +1109,7 @@ Any SAL_CALL SdGenericDrawPage::getPropertyValue( const OUString& PropertyName ) { Point aPoint; Size aSize( GetPage()->GetSize() ); - pMetaFile->AddAction( (MetaAction*) new MetaFillColorAction( COL_WHITE, TRUE ), 0 ); + pMetaFile->AddAction( (MetaAction*) new MetaFillColorAction( COL_WHITE, sal_True ), 0 ); pMetaFile->AddAction( (MetaAction*) new MetaRectAction( Rectangle( aPoint, aSize ) ), 1 ); pMetaFile->SetPrefMapMode( MAP_100TH_MM ); pMetaFile->SetPrefSize( aSize ); @@ -1147,7 +1147,7 @@ Any SAL_CALL SdGenericDrawPage::getPropertyValue( const OUString& PropertyName ) aBitmap ) ) { SvMemoryStream aMemStream; - aBitmap.GetBitmap().Write( aMemStream, FALSE, FALSE ); + aBitmap.GetBitmap().Write( aMemStream, sal_False, sal_False ); uno::Sequence<sal_Int8> aSeq( (sal_Int8*)aMemStream.GetData(), aMemStream.Tell() ); aAny <<= aSeq; } @@ -1158,7 +1158,7 @@ Any SAL_CALL SdGenericDrawPage::getPropertyValue( const OUString& PropertyName ) case WID_PAGE_VISIBLE : { - sal_Bool bVisible = GetPage()->IsExcluded() == FALSE; + sal_Bool bVisible = GetPage()->IsExcluded() == sal_False; aAny <<= Any( &bVisible, ::getBooleanCppuType() ); break; } @@ -1199,7 +1199,7 @@ Any SAL_CALL SdGenericDrawPage::getPropertyValue( const OUString& PropertyName ) { SdrLayerAdmin& rLayerAdmin = pDoc->GetLayerAdmin(); SetOfByte aVisibleLayers = pPage->TRG_GetMasterPageVisibleLayers(); - aAny <<= (sal_Bool)aVisibleLayers.IsSet(rLayerAdmin.GetLayerID(String(SdResId(STR_LAYER_BCKGRND)), FALSE)); + aAny <<= (sal_Bool)aVisibleLayers.IsSet(rLayerAdmin.GetLayerID(String(SdResId(STR_LAYER_BCKGRND)), sal_False)); } else { @@ -1218,7 +1218,7 @@ Any SAL_CALL SdGenericDrawPage::getPropertyValue( const OUString& PropertyName ) { SdrLayerAdmin& rLayerAdmin = pDoc->GetLayerAdmin(); SetOfByte aVisibleLayers = pPage->TRG_GetMasterPageVisibleLayers(); - aAny <<= (sal_Bool)aVisibleLayers.IsSet(rLayerAdmin.GetLayerID(String(SdResId(STR_LAYER_BCKGRNDOBJ)), FALSE)); + aAny <<= (sal_Bool)aVisibleLayers.IsSet(rLayerAdmin.GetLayerID(String(SdResId(STR_LAYER_BCKGRNDOBJ)), sal_False)); } else { @@ -1686,7 +1686,7 @@ void SdGenericDrawPage::SetLftBorder( sal_Int32 nValue ) SdDrawDocument* pDoc = (SdDrawDocument*)GetPage()->GetModel(); const PageKind ePageKind = GetPage()->GetPageKind(); - USHORT i, nPageCnt = pDoc->GetMasterSdPageCount(ePageKind); + sal_uInt16 i, nPageCnt = pDoc->GetMasterSdPageCount(ePageKind); for (i = 0; i < nPageCnt; i++) { SdPage* pPage = pDoc->GetMasterSdPage(i, ePageKind); @@ -1710,7 +1710,7 @@ void SdGenericDrawPage::SetRgtBorder( sal_Int32 nValue ) SdDrawDocument* pDoc = (SdDrawDocument*)GetPage()->GetModel(); const PageKind ePageKind = GetPage()->GetPageKind(); - USHORT i, nPageCnt = pDoc->GetMasterSdPageCount(ePageKind); + sal_uInt16 i, nPageCnt = pDoc->GetMasterSdPageCount(ePageKind); for (i = 0; i < nPageCnt; i++) { SdPage* pPage = pDoc->GetMasterSdPage(i, ePageKind); @@ -1734,7 +1734,7 @@ void SdGenericDrawPage::SetUppBorder( sal_Int32 nValue ) SdDrawDocument* pDoc = (SdDrawDocument*)GetPage()->GetModel(); const PageKind ePageKind = GetPage()->GetPageKind(); - USHORT i, nPageCnt = pDoc->GetMasterSdPageCount(ePageKind); + sal_uInt16 i, nPageCnt = pDoc->GetMasterSdPageCount(ePageKind); for (i = 0; i < nPageCnt; i++) { SdPage* pPage = pDoc->GetMasterSdPage(i, ePageKind); @@ -1758,7 +1758,7 @@ void SdGenericDrawPage::SetLwrBorder( sal_Int32 nValue ) SdDrawDocument* pDoc = (SdDrawDocument*)GetPage()->GetModel(); const PageKind ePageKind = GetPage()->GetPageKind(); - USHORT i, nPageCnt = pDoc->GetMasterSdPageCount(ePageKind); + sal_uInt16 i, nPageCnt = pDoc->GetMasterSdPageCount(ePageKind); for (i = 0; i < nPageCnt; i++) { SdPage* pPage = pDoc->GetMasterSdPage(i, ePageKind); @@ -1796,7 +1796,7 @@ static void refreshpage( SdDrawDocument* pDoc, const PageKind ePageKind ) pDoc->SetMaxObjSize(aViewSize); - pViewSh->InitWindows(aPageOrg, aViewSize, Point(-1, -1), TRUE); + pViewSh->InitWindows(aPageOrg, aViewSize, Point(-1, -1), sal_True); pViewSh->UpdateScrollBars(); } @@ -1813,7 +1813,7 @@ void SdGenericDrawPage::SetWidth( sal_Int32 nWidth ) SdDrawDocument* pDoc = (SdDrawDocument*)GetPage()->GetModel(); const PageKind ePageKind = GetPage()->GetPageKind(); - USHORT i, nPageCnt = pDoc->GetMasterSdPageCount(ePageKind); + sal_uInt16 i, nPageCnt = pDoc->GetMasterSdPageCount(ePageKind); for (i = 0; i < nPageCnt; i++) { SdPage* pPage = pDoc->GetMasterSdPage(i, ePageKind); @@ -1842,7 +1842,7 @@ void SdGenericDrawPage::SetHeight( sal_Int32 nHeight ) SdDrawDocument* pDoc = (SdDrawDocument*)GetPage()->GetModel(); const PageKind ePageKind = GetPage()->GetPageKind(); - USHORT i, nPageCnt = pDoc->GetMasterSdPageCount(ePageKind); + sal_uInt16 i, nPageCnt = pDoc->GetMasterSdPageCount(ePageKind); for (i = 0; i < nPageCnt; i++) { SdPage* pPage = pDoc->GetMasterSdPage(i, ePageKind); @@ -2336,7 +2336,7 @@ void SAL_CALL SdDrawPage::setName( const OUString& rName ) GetPage()->SetName( aName ); - USHORT nNotesPageNum = (GetPage()->GetPageNum()-1)>>1; + sal_uInt16 nNotesPageNum = (GetPage()->GetPageNum()-1)>>1; if( GetModel()->GetDoc()->GetSdPageCount( PK_NOTES ) > nNotesPageNum ) { SdPage* pNotesPage = GetModel()->GetDoc()->GetSdPage( nNotesPageNum, PK_NOTES ); @@ -2355,7 +2355,7 @@ void SAL_CALL SdDrawPage::setName( const OUString& rName ) EditMode eMode = pDrawViewSh->GetEditMode(); if( eMode == EM_PAGE ) { - BOOL bLayer = pDrawViewSh->IsLayerModeActive(); + sal_Bool bLayer = pDrawViewSh->IsLayerModeActive(); pDrawViewSh->ChangeEditMode( eMode, !bLayer ); pDrawViewSh->ChangeEditMode( eMode, bLayer ); @@ -3081,7 +3081,7 @@ void SAL_CALL SdMasterPage::setName( const OUString& aName ) EditMode eMode = pDrawViewSh->GetEditMode(); if( eMode == EM_MASTERPAGE ) { - BOOL bLayer = pDrawViewSh->IsLayerModeActive(); + sal_Bool bLayer = pDrawViewSh->IsLayerModeActive(); pDrawViewSh->ChangeEditMode( eMode, !bLayer ); pDrawViewSh->ChangeEditMode( eMode, bLayer ); diff --git a/sd/source/ui/unoidl/unopool.cxx b/sd/source/ui/unoidl/unopool.cxx index 21ac567edc70..0030cc0666bf 100644..100755 --- a/sd/source/ui/unoidl/unopool.cxx +++ b/sd/source/ui/unoidl/unopool.cxx @@ -87,7 +87,7 @@ void SdUnoDrawPool::putAny( SfxItemPool* pPool, const comphelper::PropertyMapEnt if( rValue >>= aLocale ) mpDrawModel->SetLanguage( SdUnoGetLanguage( aLocale ), - (const USHORT)pEntry->mnHandle ); + (const sal_uInt16)pEntry->mnHandle ); } } SvxUnoDrawPool::putAny( pPool, pEntry, rValue ); diff --git a/sd/source/ui/unoidl/unosrch.cxx b/sd/source/ui/unoidl/unosrch.cxx index 56133e03a375..fdee1afc1f65 100755 --- a/sd/source/ui/unoidl/unosrch.cxx +++ b/sd/source/ui/unoidl/unosrch.cxx @@ -615,8 +615,8 @@ uno::Reference< text::XTextRange > SdUnoSearchReplaceShape::Search( uno::Refere { if( nStartPos <= nTextLen && nEndPos <= nTextLen ) { - ESelection aSelection( (USHORT)pConvertPara[nStartPos], (USHORT)pConvertPos[nStartPos], - (USHORT)pConvertPara[nEndPos], (USHORT)pConvertPos[nEndPos] ); + ESelection aSelection( (sal_uInt16)pConvertPara[nStartPos], (sal_uInt16)pConvertPos[nStartPos], + (sal_uInt16)pConvertPara[nEndPos], (sal_uInt16)pConvertPos[nEndPos] ); SvxUnoTextRange *pRange; SvxUnoTextBase* pParent = SvxUnoTextBase::getImplementation( xParent ); diff --git a/sd/source/ui/view/DocumentRenderer.cxx b/sd/source/ui/view/DocumentRenderer.cxx index b0248647b3dc..7f67a549fc10 100755 --- a/sd/source/ui/view/DocumentRenderer.cxx +++ b/sd/source/ui/view/DocumentRenderer.cxx @@ -153,7 +153,7 @@ namespace { return GetBoolValue("PageContentType", sal_Int32(3)); } - ULONG GetOutputQuality (void) const + sal_uLong GetOutputQuality (void) const { sal_Int32 nQuality = static_cast<sal_Int32>(mrProperties.getIntValue( "Quality", sal_Int32(0) )); return nQuality; @@ -327,7 +327,7 @@ namespace { {} const Printer* mpPrinter; - ULONG mnDrawMode; + sal_uLong mnDrawMode; ::rtl::OUString msTimeDate; ::rtl::OUString msPageString; Size maPrintSize; @@ -681,7 +681,7 @@ namespace { maProperties.push_back( aVal ); } - Sequence<rtl::OUString> CreateChoice (const USHORT nResourceId) const + Sequence<rtl::OUString> CreateChoice (const sal_uInt16 nResourceId) const { SdResId aResourceId (nResourceId); ResStringArray aChoiceStrings (aResourceId); @@ -729,9 +729,9 @@ namespace { const bool bPrintMarkedOnly, const ::rtl::OUString& rsPageString, const Point& rPageStringOffset, - const ULONG nDrawMode, + const sal_uLong nDrawMode, const Orientation eOrientation, - const USHORT nPaperTray) + const sal_uInt16 nPaperTray) : mePageKind(ePageKind), maMap(rMapMode), mbPrintMarkedOnly(bPrintMarkedOnly), @@ -754,9 +754,9 @@ namespace { const SetOfByte& rVisibleLayers, const SetOfByte& rPrintableLayers) const = 0; - ULONG GetDrawMode (void) const { return mnDrawMode; } + sal_uLong GetDrawMode (void) const { return mnDrawMode; } Orientation GetOrientation (void) const { return meOrientation; } - USHORT GetPaperTray (void) const { return mnPaperTray; } + sal_uInt16 GetPaperTray (void) const { return mnPaperTray; } protected: const PageKind mePageKind; @@ -764,9 +764,9 @@ namespace { const bool mbPrintMarkedOnly; const ::rtl::OUString msPageString; const Point maPageStringOffset; - const ULONG mnDrawMode; + const sal_uLong mnDrawMode; const Orientation meOrientation; - const USHORT mnPaperTray; + const sal_uInt16 mnPaperTray; }; @@ -779,15 +779,15 @@ namespace { { public: RegularPrinterPage ( - const USHORT nPageIndex, + const sal_uInt16 nPageIndex, const PageKind ePageKind, const MapMode& rMapMode, const bool bPrintMarkedOnly, const ::rtl::OUString& rsPageString, const Point& rPageStringOffset, - const ULONG nDrawMode, + const sal_uLong nDrawMode, const Orientation eOrientation, - const USHORT nPaperTray) + const sal_uInt16 nPaperTray) : PrinterPage(ePageKind, rMapMode, bPrintMarkedOnly, rsPageString, rPageStringOffset, nDrawMode, eOrientation, nPaperTray), mnPageIndex(nPageIndex) @@ -823,7 +823,7 @@ namespace { } private: - const USHORT mnPageIndex; + const sal_uInt16 mnPageIndex; }; @@ -836,15 +836,15 @@ namespace { { public: TiledPrinterPage ( - const USHORT nPageIndex, + const sal_uInt16 nPageIndex, const PageKind ePageKind, const sal_Int32 nGap, const bool bPrintMarkedOnly, const ::rtl::OUString& rsPageString, const Point& rPageStringOffset, - const ULONG nDrawMode, + const sal_uLong nDrawMode, const Orientation eOrientation, - const USHORT nPaperTray) + const sal_uInt16 nPaperTray) : PrinterPage(ePageKind, MapMode(), bPrintMarkedOnly, rsPageString, rPageStringOffset, nDrawMode, eOrientation, nPaperTray), mnPageIndex(nPageIndex), @@ -908,7 +908,7 @@ namespace { } private: - const USHORT mnPageIndex; + const sal_uInt16 mnPageIndex; const sal_Int32 mnGap; }; @@ -919,16 +919,16 @@ namespace { { public: BookletPrinterPage ( - const USHORT nFirstPageIndex, - const USHORT nSecondPageIndex, + const sal_uInt16 nFirstPageIndex, + const sal_uInt16 nSecondPageIndex, const Point& rFirstOffset, const Point& rSecondOffset, const PageKind ePageKind, const MapMode& rMapMode, const bool bPrintMarkedOnly, - const ULONG nDrawMode, + const sal_uLong nDrawMode, const Orientation eOrientation, - const USHORT nPaperTray) + const sal_uInt16 nPaperTray) : PrinterPage(ePageKind, rMapMode, bPrintMarkedOnly, ::rtl::OUString(), Point(), nDrawMode, eOrientation, nPaperTray), mnFirstPageIndex(nFirstPageIndex), @@ -983,8 +983,8 @@ namespace { } private: - const USHORT mnFirstPageIndex; - const USHORT mnSecondPageIndex; + const sal_uInt16 mnFirstPageIndex; + const sal_uInt16 mnSecondPageIndex; const Point maFirstOffset; const Point maSecondOffset; }; @@ -998,14 +998,14 @@ namespace { { public: HandoutPrinterPage ( - const USHORT nHandoutPageIndex, - const ::std::vector<USHORT>& rPageIndices, + const sal_uInt16 nHandoutPageIndex, + const ::std::vector<sal_uInt16>& rPageIndices, const MapMode& rMapMode, const ::rtl::OUString& rsPageString, const Point& rPageStringOffset, - const ULONG nDrawMode, + const sal_uLong nDrawMode, const Orientation eOrientation, - const USHORT nPaperTray) + const sal_uInt16 nPaperTray) : PrinterPage(PK_HANDOUT, rMapMode, false, rsPageString, rPageStringOffset, nDrawMode, eOrientation, nPaperTray), mnHandoutPageIndex(nHandoutPageIndex), @@ -1041,7 +1041,7 @@ namespace { // Connect page objects with pages. std::vector<SdrPageObj*>::iterator aPageObjIter (aHandoutPageObjects.begin()); - for (std::vector<USHORT>::const_iterator + for (std::vector<sal_uInt16>::const_iterator iPageIndex(maPageIndices.begin()), iEnd(maPageIndices.end()); iPageIndex!=iEnd && aPageObjIter!=aHandoutPageObjects.end(); @@ -1130,8 +1130,8 @@ namespace { } private: - const USHORT mnHandoutPageIndex; - const ::std::vector<USHORT> maPageIndices; + const sal_uInt16 mnHandoutPageIndex; + const ::std::vector<sal_uInt16> maPageIndices; }; @@ -1148,9 +1148,9 @@ namespace { const MapMode& rMapMode, const ::rtl::OUString& rsPageString, const Point& rPageStringOffset, - const ULONG nDrawMode, + const sal_uLong nDrawMode, const Orientation eOrientation, - const USHORT nPaperTray) + const sal_uInt16 nPaperTray) : PrinterPage(PK_HANDOUT, rMapMode, false, rsPageString, rPageStringOffset, nDrawMode, eOrientation, nPaperTray), mpParaObject(pParaObject) @@ -1183,13 +1183,13 @@ namespace { // Get and set up the outliner. const Rectangle aOutRect (rPrinter.GetPageOffset(), rPrinter.GetOutputSize()); Outliner* pOutliner = rDocument.GetInternalOutliner(); - const USHORT nSavedOutlMode (pOutliner->GetMode()); - const BOOL bSavedUpdateMode (pOutliner->GetUpdateMode()); + const sal_uInt16 nSavedOutlMode (pOutliner->GetMode()); + const sal_Bool bSavedUpdateMode (pOutliner->GetUpdateMode()); const Size aSavedPaperSize (pOutliner->GetPaperSize()); pOutliner->Init(OUTLINERMODE_OUTLINEVIEW); pOutliner->SetPaperSize(aOutRect.GetSize()); - pOutliner->SetUpdateMode(TRUE); + pOutliner->SetUpdateMode(sal_True); pOutliner->Clear(); pOutliner->SetText(*mpParaObject); @@ -1372,9 +1372,9 @@ public: return; const Orientation eSavedOrientation (rPrinter.GetOrientation()); - const ULONG nSavedDrawMode (rPrinter.GetDrawMode()); + const sal_uLong nSavedDrawMode (rPrinter.GetDrawMode()); const MapMode aSavedMapMode (rPrinter.GetMapMode()); - const USHORT nSavedPaperBin (rPrinter.GetPaperBin()); + const sal_uInt16 nSavedPaperBin (rPrinter.GetPaperBin()); // Set page orientation. @@ -1504,15 +1504,15 @@ private: mpPrinter->SetMapMode(aMap); ::Outliner& rOutliner = mrBase.GetDocument()->GetDrawOutliner(); - const ULONG nSavedControlWord (rOutliner.GetControlWord()); - ULONG nCntrl = nSavedControlWord; + const sal_uLong nSavedControlWord (rOutliner.GetControlWord()); + sal_uLong nCntrl = nSavedControlWord; nCntrl &= ~EE_CNTRL_MARKFIELDS; nCntrl &= ~EE_CNTRL_ONLINESPELLING; rOutliner.SetControlWord( nCntrl ); // When in outline view then apply all pending changes to the model. if (pShell->ISA(OutlineViewShell)) - static_cast<OutlineViewShell*>(pShell)->PrepareClose (FALSE, FALSE); + static_cast<OutlineViewShell*>(pShell)->PrepareClose (sal_False, sal_False); // Collect some frequently used data. if (mpOptions->IsDate()) @@ -1522,7 +1522,7 @@ private: } if (mpOptions->IsTime()) - aInfo.msTimeDate += GetSdrGlobalData().GetLocaleData()->getTime( Time(), FALSE, FALSE ); + aInfo.msTimeDate += GetSdrGlobalData().GetLocaleData()->getTime( Time(), sal_False, sal_False ); aInfo.maPrintSize = aInfo.mpPrinter->GetOutputSize(); maPrintSize = awt::Size( aInfo.mpPrinter->GetPaperSize().Width(), @@ -1661,7 +1661,7 @@ private: // const bool bPrintExcluded (mpOptions->IsPrintExcluded()); bool bContainsTransparency = false; - for (USHORT + for (sal_uInt16 nIndex=0, nCount=mrBase.GetDocument()->GetSdPageCount(PK_STANDARD); nIndex < nCount && !bContainsTransparency; @@ -1697,7 +1697,7 @@ private: if ( ! rInfo.maSelection.IsSelected(nPageIndex)) return NULL; SdPage* pPage = mrBase.GetDocument()->GetSdPage( - sal::static_int_cast<USHORT>(nPageIndex), + sal::static_int_cast<sal_uInt16>(nPageIndex), ePageKind); if (pPage == NULL) return NULL; @@ -1738,16 +1738,16 @@ private: Link aOldLink; Outliner* pOutliner = mrBase.GetDocument()->GetInternalOutliner(); pOutliner->Init(OUTLINERMODE_OUTLINEVIEW); - const USHORT nSavedOutlMode (pOutliner->GetMode()); - const BOOL bSavedUpdateMode (pOutliner->GetUpdateMode()); + const sal_uInt16 nSavedOutlMode (pOutliner->GetMode()); + const sal_Bool bSavedUpdateMode (pOutliner->GetUpdateMode()); const Size aSavedPaperSize (pOutliner->GetPaperSize()); const MapMode aSavedMapMode (pOutliner->GetRefMapMode()); pOutliner->SetPaperSize(aOutRect.GetSize()); - pOutliner->SetUpdateMode(TRUE); + pOutliner->SetUpdateMode(sal_True); long nPageH = aOutRect.GetHeight(); - for (USHORT + for (sal_uInt16 nIndex=0, nCount=mrBase.GetDocument()->GetSdPageCount(PK_STANDARD); nIndex < nCount; @@ -1809,7 +1809,7 @@ private: pTextObj = dynamic_cast<SdrTextObj*>(pPage->GetPresObj(PRESOBJ_TEXT)); // Untertitel vorhanden? } - ULONG nParaCount1 = pOutliner->GetParagraphCount(); + sal_uLong nParaCount1 = pOutliner->GetParagraphCount(); if (pTextObj!=NULL && !pTextObj->IsEmptyPresObj() @@ -1824,7 +1824,7 @@ private: for (sal_Int32 nPara=nParaCount1; nPara<nParaCount2; ++nPara) { Paragraph* pP = pOutliner->GetParagraph(nPara); - if (pP!=NULL && pOutliner->GetDepth((USHORT)nPara) > 0) + if (pP!=NULL && pOutliner->GetDepth((sal_uInt16)nPara) > 0) pOutliner->SetDepth(pP, 0); } } @@ -1836,9 +1836,9 @@ private: // the current page. if (nH > nPageH && pPara!=NULL) { - ULONG nCnt = pOutliner->GetAbsPos( + sal_uLong nCnt = pOutliner->GetAbsPos( pOutliner->GetParagraph( pOutliner->GetParagraphCount() - 1 ) ); - ULONG nParaPos = pOutliner->GetAbsPos( pPara ); + sal_uLong nParaPos = pOutliner->GetAbsPos( pPara ); nCnt -= nParaPos; pPara = pOutliner->GetParagraph( ++nParaPos ); if ( nCnt && pPara ) @@ -1879,7 +1879,7 @@ private: const bool bScalePage (mpOptions->IsPageSize()); - USHORT nPaperBin; + sal_uInt16 nPaperBin; if ( ! mpOptions->IsPaperBin()) nPaperBin = rHandoutPage.GetPaperBin(); else @@ -1942,15 +1942,15 @@ private: ++nShapeCount; } - const USHORT nPageCount = mrBase.GetDocument()->GetSdPageCount(PK_STANDARD); - const USHORT nHandoutPageCount = nShapeCount ? (nPageCount + nShapeCount - 1) / nShapeCount : 0; + const sal_uInt16 nPageCount = mrBase.GetDocument()->GetSdPageCount(PK_STANDARD); + const sal_uInt16 nHandoutPageCount = nShapeCount ? (nPageCount + nShapeCount - 1) / nShapeCount : 0; pViewShell->SetPrintedHandoutPageCount( nHandoutPageCount ); mrBase.GetDocument()->setHandoutPageCount( nHandoutPageCount ); // Distribute pages to handout pages. - ::std::vector<USHORT> aPageIndices; + ::std::vector<sal_uInt16> aPageIndices; std::vector<SdPage*> aPagesVector; - for (USHORT + for (sal_uInt16 nIndex=0, nCount= nPageCount, nHandoutPageIndex=0; @@ -2030,7 +2030,7 @@ private: pViewShell->WriteFrameViewData(); Point aPtZero; - for (USHORT + for (sal_uInt16 nIndex=0, nCount=mrBase.GetDocument()->GetSdPageCount(PK_STANDARD); nIndex < nCount; @@ -2074,13 +2074,13 @@ private: // Bugfix zu 44530: // Falls implizit umgestellt wurde (Landscape/Portrait) // wird dies beim Kacheln, bzw. aufteilen (Poster) beruecksichtigt - BOOL bSwitchPageSize = FALSE; + sal_Bool bSwitchPageSize = sal_False; if( ( rInfo.maPrintSize.Width() > rInfo.maPrintSize.Height() && aPageWidth < aPageHeight ) || ( rInfo.maPrintSize.Width() < rInfo.maPrintSize.Height() && aPageWidth > aPageHeight ) ) { - bSwitchPageSize = TRUE; + bSwitchPageSize = sal_True; const sal_Int32 nTmp (rInfo.maPrintSize.Width()); rInfo.maPrintSize.Width() = rInfo.maPrintSize.Height(); rInfo.maPrintSize.Height() = nTmp; @@ -2156,8 +2156,8 @@ private: } // create vector of pages to print - ::std::vector< USHORT > aPageVector; - for (USHORT + ::std::vector< sal_uInt16 > aPageVector; + for (sal_uInt16 nIndex=0, nCount=mrBase.GetDocument()->GetSdPageCount(ePageKind); nIndex < nCount; @@ -2169,14 +2169,14 @@ private: } // create pairs of pages to print on each page - typedef ::std::vector< ::std::pair< USHORT, USHORT > > PairVector; + typedef ::std::vector< ::std::pair< sal_uInt16, sal_uInt16 > > PairVector; PairVector aPairVector; if ( ! aPageVector.empty()) { sal_uInt32 nFirstIndex = 0, nLastIndex = aPageVector.size() - 1; if( aPageVector.size() & 1 ) - aPairVector.push_back( ::std::make_pair( (USHORT) 65535, aPageVector[ nFirstIndex++ ] ) ); + aPairVector.push_back( ::std::make_pair( (sal_uInt16) 65535, aPageVector[ nFirstIndex++ ] ) ); else aPairVector.push_back( ::std::make_pair( aPageVector[ nLastIndex-- ], aPageVector[ nFirstIndex++ ] ) ); @@ -2199,7 +2199,7 @@ private: if ((!bIsIndexOdd && mpOptions->IsPrintFrontPage()) || (bIsIndexOdd && mpOptions->IsPrintBackPage())) { - const ::std::pair<USHORT, USHORT> aPair (aPairVector[nIndex]); + const ::std::pair<sal_uInt16, sal_uInt16> aPair (aPairVector[nIndex]); Point aSecondOffset (aOffset); if (rInfo.meOrientation == ORIENTATION_LANDSCAPE) aSecondOffset.X() += aAdjustedPrintSize.Width() / 2; @@ -2235,7 +2235,7 @@ private: const PageKind ePageKind, const PrintInfo& rInfo) { - USHORT nPaperBin; + sal_uInt16 nPaperBin; if ( ! mpOptions->IsPaperBin()) nPaperBin = rPage.GetPaperBin(); else @@ -2244,7 +2244,7 @@ private: maPrinterPages.push_back( ::boost::shared_ptr<PrinterPage>( new TiledPrinterPage( - sal::static_int_cast<USHORT>(nPageIndex), + sal::static_int_cast<sal_uInt16>(nPageIndex), ePageKind, 500, rInfo.mbPrintMarkedOnly, @@ -2269,7 +2269,7 @@ private: { const Point aPageOffset (rInfo.mpPrinter->GetPageOffset()); - USHORT nPaperBin; + sal_uInt16 nPaperBin; if ( ! mpOptions->IsPaperBin()) nPaperBin = rPage.GetPaperBin(); else @@ -2300,7 +2300,7 @@ private: maPrinterPages.push_back( ::boost::shared_ptr<PrinterPage>( new RegularPrinterPage( - sal::static_int_cast<USHORT>(nPageIndex), + sal::static_int_cast<sal_uInt16>(nPageIndex), ePageKind, aMap, rInfo.mbPrintMarkedOnly, @@ -2340,7 +2340,7 @@ private: maPrinterPages.push_back( ::boost::shared_ptr<PrinterPage>( new RegularPrinterPage( - sal::static_int_cast<USHORT>(nPageIndex), + sal::static_int_cast<sal_uInt16>(nPageIndex), ePageKind, aMap, rInfo.mbPrintMarkedOnly, diff --git a/sd/source/ui/view/GraphicObjectBar.cxx b/sd/source/ui/view/GraphicObjectBar.cxx index cea33fda98bf..1150659a59ce 100644..100755 --- a/sd/source/ui/view/GraphicObjectBar.cxx +++ b/sd/source/ui/view/GraphicObjectBar.cxx @@ -128,14 +128,14 @@ void GraphicObjectBar::Execute( SfxRequest& rReq ) void GraphicObjectBar::GetFilterState( SfxItemSet& rSet ) { const SdrMarkList& rMarkList = mpView->GetMarkedObjectList(); - BOOL bEnable = FALSE; + sal_Bool bEnable = sal_False; if( rMarkList.GetMarkCount() == 1 ) { SdrObject* pObj = rMarkList.GetMark( 0 )->GetMarkedSdrObj(); if( pObj && pObj->ISA( SdrGrafObj ) && ( ( (SdrGrafObj*) pObj )->GetGraphicType() == GRAPHIC_BITMAP ) ) - bEnable = TRUE; + bEnable = sal_True; } if( !bEnable ) diff --git a/sd/source/ui/view/GraphicViewShellBase.cxx b/sd/source/ui/view/GraphicViewShellBase.cxx index e63ce8d62fa1..890620b40341 100755 --- a/sd/source/ui/view/GraphicViewShellBase.cxx +++ b/sd/source/ui/view/GraphicViewShellBase.cxx @@ -53,7 +53,7 @@ SfxViewShell* __EXPORT GraphicViewShellBase::CreateInstance ( pBase->LateInit(framework::FrameworkHelper::msDrawViewURL); return pBase; } -void GraphicViewShellBase::RegisterFactory( USHORT nPrio ) +void GraphicViewShellBase::RegisterFactory( sal_uInt16 nPrio ) { pFactory = new SfxViewFactory( &CreateInstance,&InitFactory,nPrio,"Default"); @@ -90,7 +90,7 @@ GraphicViewShellBase::~GraphicViewShellBase (void) void GraphicViewShellBase::Execute (SfxRequest& rRequest) { - USHORT nSlotId = rRequest.GetSlot(); + sal_uInt16 nSlotId = rRequest.GetSlot(); switch (nSlotId) { diff --git a/sd/source/ui/view/ImpressViewShellBase.cxx b/sd/source/ui/view/ImpressViewShellBase.cxx index 17815dcc9554..d4fb1316c948 100755 --- a/sd/source/ui/view/ImpressViewShellBase.cxx +++ b/sd/source/ui/view/ImpressViewShellBase.cxx @@ -53,7 +53,7 @@ SfxViewShell* __EXPORT ImpressViewShellBase::CreateInstance ( pBase->LateInit(::rtl::OUString()); return pBase; } -void ImpressViewShellBase::RegisterFactory( USHORT nPrio ) +void ImpressViewShellBase::RegisterFactory( sal_uInt16 nPrio ) { pFactory = new SfxViewFactory( &CreateInstance,&InitFactory,nPrio,"Default"); @@ -92,7 +92,7 @@ ImpressViewShellBase::~ImpressViewShellBase (void) void ImpressViewShellBase::Execute (SfxRequest& rRequest) { - USHORT nSlotId = rRequest.GetSlot(); + sal_uInt16 nSlotId = rRequest.GetSlot(); switch (nSlotId) { diff --git a/sd/source/ui/view/MediaObjectBar.cxx b/sd/source/ui/view/MediaObjectBar.cxx index ad5135939bc3..762a27acbc39 100644..100755 --- a/sd/source/ui/view/MediaObjectBar.cxx +++ b/sd/source/ui/view/MediaObjectBar.cxx @@ -98,7 +98,7 @@ MediaObjectBar::~MediaObjectBar() void MediaObjectBar::GetState( SfxItemSet& rSet ) { SfxWhichIter aIter( rSet ); - USHORT nWhich = aIter.FirstWhich(); + sal_uInt16 nWhich = aIter.FirstWhich(); while( nWhich ) { @@ -140,7 +140,7 @@ void MediaObjectBar::Execute( SfxRequest& rReq ) const SfxItemSet* pArgs = rReq.GetArgs(); const SfxPoolItem* pItem; - if( !pArgs || ( SFX_ITEM_SET != pArgs->GetItemState( SID_AVMEDIA_TOOLBOX, FALSE, &pItem ) ) ) + if( !pArgs || ( SFX_ITEM_SET != pArgs->GetItemState( SID_AVMEDIA_TOOLBOX, sal_False, &pItem ) ) ) pItem = NULL; if( pItem ) diff --git a/sd/source/ui/view/OutlineViewShellBase.cxx b/sd/source/ui/view/OutlineViewShellBase.cxx index 4e0827727e79..0f3b60afa998 100755 --- a/sd/source/ui/view/OutlineViewShellBase.cxx +++ b/sd/source/ui/view/OutlineViewShellBase.cxx @@ -51,7 +51,7 @@ SfxViewShell* __EXPORT OutlineViewShellBase::CreateInstance ( pBase->LateInit(framework::FrameworkHelper::msOutlineViewURL); return pBase; } -void OutlineViewShellBase::RegisterFactory( USHORT nPrio ) +void OutlineViewShellBase::RegisterFactory( sal_uInt16 nPrio ) { pFactory = new SfxViewFactory( &CreateInstance,&InitFactory,nPrio,"Outline"); diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx index 7c94e7b27b07..29440af545bc 100755 --- a/sd/source/ui/view/Outliner.cxx +++ b/sd/source/ui/view/Outliner.cxx @@ -144,7 +144,7 @@ private: |* \************************************************************************/ -Outliner::Outliner( SdDrawDocument* pDoc, USHORT nMode ) +Outliner::Outliner( SdDrawDocument* pDoc, sal_uInt16 nMode ) : SdrOutliner( &pDoc->GetItemPool(), nMode ), mpImpl(new Implementation()), meMode(SEARCH), @@ -154,13 +154,13 @@ Outliner::Outliner( SdDrawDocument* pDoc, USHORT nMode ) mpDrawDocument(pDoc), mnConversionLanguage(LANGUAGE_NONE), mnIgnoreCurrentPageChangesLevel(0), - mbStringFound(FALSE), + mbStringFound(sal_False), mbMatchMayExist(false), mnPageCount(0), mnObjectCount(0), - mbEndOfSearch(FALSE), - mbFoundObject(FALSE), - mbError(FALSE), + mbEndOfSearch(sal_False), + mbFoundObject(sal_False), + mbError(sal_False), mbDirectionIsForward(true), mbRestrictSearchToSelection(false), maMarkListCopy(), @@ -172,7 +172,7 @@ Outliner::Outliner( SdDrawDocument* pDoc, USHORT nMode ) mpParaObj(NULL), meStartViewMode(PK_STANDARD), meStartEditMode(EM_PAGE), - mnStartPageIndex((USHORT)-1), + mnStartPageIndex((sal_uInt16)-1), mpStartEditedObject(NULL), maStartSelection(), mpSearchItem(NULL), @@ -191,13 +191,13 @@ Outliner::Outliner( SdDrawDocument* pDoc, USHORT nMode ) SetCalcFieldValueHdl(LINK(SD_MOD(), SdModule, CalcFieldValueHdl)); SetForbiddenCharsTable( pDoc->GetForbiddenCharsTable() ); - ULONG nCntrl = GetControlWord(); + sal_uLong nCntrl = GetControlWord(); nCntrl |= EE_CNTRL_ALLOWBIGOBJS; nCntrl |= EE_CNTRL_URLSFXEXECUTE; nCntrl |= EE_CNTRL_MARKFIELDS; nCntrl |= EE_CNTRL_AUTOCORRECT; - BOOL bOnlineSpell = false; + sal_Bool bOnlineSpell = false; DrawDocShell* pDocSh = mpDrawDocument->GetDocSh(); @@ -289,13 +289,13 @@ void Outliner::PrepareSpelling (void) if (mpViewShell.get() != NULL) { - mbStringFound = FALSE; + mbStringFound = sal_False; mbWholeDocumentProcessed = false; // Supposed that we are not located at the very beginning/end of // the document then there may be a match in the document // prior/after the current position. - mbMatchMayExist = TRUE; + mbMatchMayExist = sal_True; maObjectIterator = ::sd::outliner::Iterator(); maSearchStartPosition = ::sd::outliner::Iterator(); @@ -366,7 +366,7 @@ void Outliner::EndSpelling (void) mpImpl->ReleaseOutlinerView(); } - SetUpdateMode(TRUE); + SetUpdateMode(sal_True); } // #95811# Before clearing the modify flag use it as a hint that @@ -374,9 +374,9 @@ void Outliner::EndSpelling (void) if(IsModified()) { if(mpView && mpView->ISA(OutlineView)) - static_cast<OutlineView*>(mpView)->PrepareClose(FALSE); + static_cast<OutlineView*>(mpView)->PrepareClose(sal_False); if(mpDrawDocument && !mpDrawDocument->IsChanged()) - mpDrawDocument->SetChanged(TRUE); + mpDrawDocument->SetChanged(sal_True); } // #95811# now clear the modify flag to have a specified state of @@ -396,7 +396,7 @@ void Outliner::EndSpelling (void) -BOOL Outliner::SpellNextDocument (void) +sal_Bool Outliner::SpellNextDocument (void) { if (mpViewShell->ISA(OutlineViewShell)) { @@ -408,8 +408,8 @@ BOOL Outliner::SpellNextDocument (void) else { if (mpView->ISA(OutlineView)) - ((OutlineView*)mpView)->PrepareClose(FALSE); - mpDrawDocument->GetDocSh()->SetWaitCursor( TRUE ); + ((OutlineView*)mpView)->PrepareClose(sal_False); + mpDrawDocument->GetDocSh()->SetWaitCursor( sal_True ); Initialize (true); @@ -419,11 +419,11 @@ BOOL Outliner::SpellNextDocument (void) pOutlinerView->SetWindow(mpWindow); ProvideNextTextObject (); - mpDrawDocument->GetDocSh()->SetWaitCursor( FALSE ); + mpDrawDocument->GetDocSh()->SetWaitCursor( sal_False ); ClearModifyFlag(); } - return mbEndOfSearch ? FALSE : TRUE; + return mbEndOfSearch ? sal_False : sal_True; } @@ -483,11 +483,11 @@ BOOL Outliner::SpellNextDocument (void) */ bool Outliner::StartSearchAndReplace (const SvxSearchItem* pSearchItem) { - BOOL bEndOfSearch = TRUE; + sal_Bool bEndOfSearch = sal_True; if (mbViewShellValid) { - mpDrawDocument->GetDocSh()->SetWaitCursor( TRUE ); + mpDrawDocument->GetDocSh()->SetWaitCursor( sal_True ); if (mbPrepareSpellingPending) PrepareSpelling(); ViewShellBase* pBase = PTR_CAST(ViewShellBase,SfxViewShell::Current()); @@ -521,11 +521,11 @@ bool Outliner::StartSearchAndReplace (const SvxSearchItem* pSearchItem) meMode = SEARCH; mpSearchItem = pSearchItem; - mbFoundObject = FALSE; + mbFoundObject = sal_False; Initialize ( ! mpSearchItem->GetBackward()); - USHORT nCommand = mpSearchItem->GetCommand(); + sal_uInt16 nCommand = mpSearchItem->GetCommand(); if (nCommand == SVX_SEARCHCMD_REPLACE_ALL) bEndOfSearch = SearchAndReplaceAll (); else @@ -536,11 +536,11 @@ bool Outliner::StartSearchAndReplace (const SvxSearchItem* pSearchItem) if(!mbStringFound) RestoreStartPosition (); else - mnStartPageIndex = (USHORT)-1; + mnStartPageIndex = (sal_uInt16)-1; } } else - mpDrawDocument->GetDocSh()->SetWaitCursor( FALSE ); + mpDrawDocument->GetDocSh()->SetWaitCursor( sal_False ); } return bEndOfSearch; @@ -684,7 +684,7 @@ bool Outliner::SearchAndReplaceOnce (void) pOutlinerView->StartSearchAndReplace(*mpSearchItem); // Search for the next match. - ULONG nMatchCount = 0; + sal_uLong nMatchCount = 0; if (mpSearchItem->GetCommand() != SVX_SEARCHCMD_REPLACE_ALL) nMatchCount = pOutlinerView->StartSearchAndReplace(*mpSearchItem); @@ -708,7 +708,7 @@ bool Outliner::SearchAndReplaceOnce (void) "SearchAndReplace without valid view!" ); if ( ! GetEditEngine().HasView( &pOutlinerView->GetEditView() ) ) { - mpDrawDocument->GetDocSh()->SetWaitCursor( FALSE ); + mpDrawDocument->GetDocSh()->SetWaitCursor( sal_False ); return true; } @@ -719,7 +719,7 @@ bool Outliner::SearchAndReplaceOnce (void) } else if (mpViewShell->ISA(OutlineViewShell)) { - mpDrawDocument->GetDocSh()->SetWaitCursor (FALSE); + mpDrawDocument->GetDocSh()->SetWaitCursor (sal_False); // The following loop is executed more then once only when a // wrap arround search is done. while (true) @@ -740,7 +740,7 @@ bool Outliner::SearchAndReplaceOnce (void) } } - mpDrawDocument->GetDocSh()->SetWaitCursor( FALSE ); + mpDrawDocument->GetDocSh()->SetWaitCursor( sal_False ); return mbEndOfSearch; } @@ -770,7 +770,7 @@ void Outliner::DetectChange (void) if (pPageView != NULL) mpView->UnmarkAllObj (pPageView); mpView->SdrEndTextEdit(); - SetUpdateMode(FALSE); + SetUpdateMode(sal_False); OutlinerView* pOutlinerView = mpImpl->GetOutlinerView(); if (pOutlinerView != NULL) pOutlinerView->SetOutputArea( Rectangle( Point(), Size(1, 1) ) ); @@ -816,7 +816,7 @@ void Outliner::DetectChange (void) bool Outliner::DetectSelectionChange (void) { bool bSelectionHasChanged = false; - ULONG nMarkCount = mpView->GetMarkedObjectList().GetMarkCount(); + sal_uLong nMarkCount = mpView->GetMarkedObjectList().GetMarkCount(); // If mpObj is NULL then we have not yet found our first match. // Detecting a change makes no sense. @@ -889,7 +889,7 @@ void Outliner::RememberStartPosition (void) } else { - mnStartPageIndex = (USHORT)-1; + mnStartPageIndex = (sal_uInt16)-1; } } @@ -901,7 +901,7 @@ void Outliner::RestoreStartPosition (void) bool bRestore = true; // Take a negative start page index as inidicator that restoring the // start position is not requested. - if (mnStartPageIndex == (USHORT)-1 ) + if (mnStartPageIndex == (sal_uInt16)-1 ) bRestore = false; // Dont't resore when the view shell is not valid. if (mpViewShell == NULL) @@ -973,7 +973,7 @@ void Outliner::ProvideNextTextObject (void) { DBG_UNHANDLED_EXCEPTION(); } - SetUpdateMode(FALSE); + SetUpdateMode(sal_False); OutlinerView* pOutlinerView = mpImpl->GetOutlinerView(); if (pOutlinerView != NULL) pOutlinerView->SetOutputArea( Rectangle( Point(), Size(1, 1) ) ); @@ -1046,7 +1046,7 @@ void Outliner::EndOfSearch (void) if ( ! mbMatchMayExist) { ShowEndOfSearchDialog (); - mbEndOfSearch = TRUE; + mbEndOfSearch = sal_True; } // Ask the user whether to wrap arround and continue the search or // to terminate. @@ -1111,7 +1111,7 @@ bool Outliner::ShowWrapArroundDialog (void) if (mpSearchItem != NULL) { // When searching display the dialog only for single find&replace. - USHORT nCommand = mpSearchItem->GetCommand(); + sal_uInt16 nCommand = mpSearchItem->GetCommand(); bShowDialog = (nCommand==SVX_SEARCHCMD_REPLACE) || (nCommand==SVX_SEARCHCMD_FIND); } @@ -1122,9 +1122,9 @@ bool Outliner::ShowWrapArroundDialog (void) if (bShowDialog) { // The question text depends on the search direction. - BOOL bImpress = mpDrawDocument!=NULL + sal_Bool bImpress = mpDrawDocument!=NULL && mpDrawDocument->GetDocumentType() == DOCUMENT_TYPE_IMPRESS; - USHORT nStringId; + sal_uInt16 nStringId; if (mbDirectionIsForward) nStringId = bImpress ? STR_SAR_WRAP_FORWARD @@ -1141,7 +1141,7 @@ bool Outliner::ShowWrapArroundDialog (void) WB_YES_NO | WB_DEF_YES, String(SdResId(nStringId))); aQuestionBox.SetImage (QueryBox::GetStandardImage()); - USHORT nBoxResult = ShowModalMessageBox(aQuestionBox); + sal_uInt16 nBoxResult = ShowModalMessageBox(aQuestionBox); bDoWrapArround = (nBoxResult == BUTTONID_YES); } @@ -1191,8 +1191,8 @@ void Outliner::PrepareSpellCheck (void) if (eState == EE_SPELL_NOLANGUAGE) { - mbError = TRUE; - mbEndOfSearch = TRUE; + mbError = sal_True; + mbEndOfSearch = sal_True; ErrorBox aErrorBox (NULL, WB_OK, String(SdResId(STR_NOLANGUAGE))); @@ -1214,7 +1214,7 @@ void Outliner::PrepareSpellCheck (void) } } - EnterEditMode( FALSE ); + EnterEditMode( sal_False ); } } @@ -1230,7 +1230,7 @@ void Outliner::PrepareSearchAndReplace (void) EnterEditMode (); - mpDrawDocument->GetDocSh()->SetWaitCursor( FALSE ); + mpDrawDocument->GetDocSh()->SetWaitCursor( sal_False ); // Start seach at the right end of the current object's text // depending on the search direction. OutlinerView* pOutlinerView = mpImpl->GetOutlinerView(); @@ -1249,7 +1249,7 @@ void Outliner::SetViewMode (PageKind ePageKind) if (pDrawViewShell.get()!=NULL && ePageKind != pDrawViewShell->GetPageKind()) { // Restore old edit mode. - pDrawViewShell->ChangeEditMode(mpImpl->meOriginalEditMode, FALSE); + pDrawViewShell->ChangeEditMode(mpImpl->meOriginalEditMode, sal_False); SetStatusEventHdl(Link()); ::rtl::OUString sViewURL; @@ -1308,7 +1308,7 @@ void Outliner::SetViewMode (PageKind ePageKind) -void Outliner::SetPage (EditMode eEditMode, USHORT nPageIndex) +void Outliner::SetPage (EditMode eEditMode, sal_uInt16 nPageIndex) { if ( ! mbRestrictSearchToSelection) { @@ -1317,7 +1317,7 @@ void Outliner::SetPage (EditMode eEditMode, USHORT nPageIndex) OSL_ASSERT(pDrawViewShell.get()!=NULL); if (pDrawViewShell.get() != NULL) { - pDrawViewShell->ChangeEditMode(eEditMode, FALSE); + pDrawViewShell->ChangeEditMode(eEditMode, sal_False); pDrawViewShell->SwitchPage(nPageIndex); } } @@ -1326,7 +1326,7 @@ void Outliner::SetPage (EditMode eEditMode, USHORT nPageIndex) -void Outliner::EnterEditMode (BOOL bGrabFocus) +void Outliner::EnterEditMode (sal_Bool bGrabFocus) { OutlinerView* pOutlinerView = mpImpl->GetOutlinerView(); if (mbViewShellValid && pOutlinerView != NULL) @@ -1355,8 +1355,8 @@ void Outliner::EnterEditMode (BOOL bGrabFocus) // Turn on the edit mode for the text object. mpView->SdrBeginTextEdit(mpTextObj, pPV, mpWindow, sal_True, this, pOutlinerView, sal_True, sal_True, bGrabFocus); - SetUpdateMode(TRUE); - mbFoundObject = TRUE; + SetUpdateMode(sal_True); + mbFoundObject = sal_True; } } @@ -1372,7 +1372,7 @@ void Outliner::EnterEditMode (BOOL bGrabFocus) IMPL_LINK_INLINE_START( Outliner, SpellError, void *, nLang ) { mbError = true; - String aError( SvtLanguageTable::GetLanguageString( (LanguageType)(ULONG)nLang ) ); + String aError( SvtLanguageTable::GetLanguageString( (LanguageType)(sal_uLong)nLang ) ); ErrorHandler::HandleError(* new StringErrorInfo( ERRCODE_SVX_LINGU_LANGUAGENOTEXISTS, aError) ); return 0; @@ -1394,7 +1394,7 @@ ESelection Outliner::GetSearchStartPosition (void) { // Retrieve the position after the last character in the last // paragraph. - USHORT nParagraphCount = static_cast<USHORT>(GetParagraphCount()); + sal_uInt16 nParagraphCount = static_cast<sal_uInt16>(GetParagraphCount()); if (nParagraphCount == 0) aPosition = ESelection(); else @@ -1419,7 +1419,7 @@ bool Outliner::HasNoPreviousMatch (void) // Detect whether the cursor stands at the beginning // resp. at the end of the text. - return pOutlinerView->GetSelection().IsEqual(GetSearchStartPosition ()) == TRUE; + return pOutlinerView->GetSelection().IsEqual(GetSearchStartPosition ()) == sal_True; } @@ -1459,7 +1459,7 @@ SdrObject* Outliner::SetObject ( const ::sd::outliner::IteratorPosition& rPosition) { SetViewMode (rPosition.mePageKind); - SetPage (rPosition.meEditMode, (USHORT)rPosition.mnPageIndex); + SetPage (rPosition.meEditMode, (sal_uInt16)rPosition.mnPageIndex); mnText = rPosition.mnText; return rPosition.mxObject.get(); } @@ -1503,17 +1503,17 @@ void Outliner::SetViewShell (const ::boost::shared_ptr<ViewShell>& rpViewShell) void Outliner::HandleChangedSelection (void) { maMarkListCopy.clear(); - mbRestrictSearchToSelection = (mpView->AreObjectsMarked()==TRUE); + mbRestrictSearchToSelection = (mpView->AreObjectsMarked()==sal_True); if (mbRestrictSearchToSelection) { // Make a copy of the current mark list. const SdrMarkList& rMarkList = mpView->GetMarkedObjectList(); - ULONG nCount = rMarkList.GetMarkCount(); + sal_uLong nCount = rMarkList.GetMarkCount(); if (nCount > 0) { maMarkListCopy.clear(); maMarkListCopy.reserve (nCount); - for (ULONG i=0; i<nCount; i++) + for (sal_uLong i=0; i<nCount; i++) maMarkListCopy.push_back (rMarkList.GetMark(i)->GetMarkedSdrObj ()); } else @@ -1526,10 +1526,10 @@ void Outliner::HandleChangedSelection (void) -void Outliner::StartConversion( INT16 nSourceLanguage, INT16 nTargetLanguage, - const Font *pTargetFont, INT32 nOptions, BOOL bIsInteractive ) +void Outliner::StartConversion( sal_Int16 nSourceLanguage, sal_Int16 nTargetLanguage, + const Font *pTargetFont, sal_Int32 nOptions, sal_Bool bIsInteractive ) { - BOOL bMultiDoc = mpViewShell->ISA(DrawViewShell); + sal_Bool bMultiDoc = mpViewShell->ISA(DrawViewShell); meMode = TEXT_CONVERSION; mbDirectionIsForward = true; @@ -1565,12 +1565,12 @@ void Outliner::PrepareConversion (void) if( HasConvertibleTextPortion( mnConversionLanguage ) ) { SetUpdateMode(sal_False); - mbStringFound = TRUE; - mbMatchMayExist = TRUE; + mbStringFound = sal_True; + mbMatchMayExist = sal_True; EnterEditMode (); - mpDrawDocument->GetDocSh()->SetWaitCursor( FALSE ); + mpDrawDocument->GetDocSh()->SetWaitCursor( sal_False ); // Start seach at the right end of the current object's text // depending on the search direction. // mpOutlineView->SetSelection (GetSearchStartPosition ()); @@ -1594,12 +1594,12 @@ void Outliner::BeginConversion (void) if (mpViewShell != NULL) { - mbStringFound = FALSE; + mbStringFound = sal_False; // Supposed that we are not located at the very beginning/end of the // document then there may be a match in the document prior/after // the current position. - mbMatchMayExist = TRUE; + mbMatchMayExist = sal_True; maObjectIterator = ::sd::outliner::Iterator(); maSearchStartPosition = ::sd::outliner::Iterator(); @@ -1628,7 +1628,7 @@ sal_Bool Outliner::ConvertNextDocument() if( mpViewShell && mpViewShell->ISA(OutlineViewShell) ) return false; - mpDrawDocument->GetDocSh()->SetWaitCursor( TRUE ); + mpDrawDocument->GetDocSh()->SetWaitCursor( sal_True ); Initialize ( true ); @@ -1640,7 +1640,7 @@ sal_Bool Outliner::ConvertNextDocument() } ProvideNextTextObject (); - mpDrawDocument->GetDocSh()->SetWaitCursor( FALSE ); + mpDrawDocument->GetDocSh()->SetWaitCursor( sal_False ); ClearModifyFlag(); // for text conversion we automaticly wrap around one @@ -1661,7 +1661,7 @@ sal_Bool Outliner::ConvertNextDocument() -USHORT Outliner::ShowModalMessageBox (Dialog& rMessageBox) +sal_uInt16 Outliner::ShowModalMessageBox (Dialog& rMessageBox) { // We assume that the parent of the given messge box is NULL, i.e. it is // modal with respect to the top application window. However, this @@ -1692,13 +1692,13 @@ USHORT Outliner::ShowModalMessageBox (Dialog& rMessageBox) if (pChildWindow != NULL) pSearchDialog = pChildWindow->GetWindow(); if (pSearchDialog != NULL) - pSearchDialog->EnableInput(FALSE,TRUE); + pSearchDialog->EnableInput(sal_False,sal_True); - USHORT nResult = rMessageBox.Execute(); + sal_uInt16 nResult = rMessageBox.Execute(); // Unlock the search dialog. if (pSearchDialog != NULL) - pSearchDialog->EnableInput(TRUE,TRUE); + pSearchDialog->EnableInput(sal_True,sal_True); return nResult; } @@ -1770,12 +1770,12 @@ void Outliner::Implementation::ProvideOutlinerView ( } else mpOutlineView->SetWindow(pWindow); - ULONG nStat = mpOutlineView->GetControlWord(); + sal_uLong nStat = mpOutlineView->GetControlWord(); nStat &= ~EV_CNTRL_AUTOSCROLL; mpOutlineView->SetControlWord(nStat); if (bInsert) rOutliner.InsertView( mpOutlineView ); - rOutliner.SetUpdateMode(FALSE); + rOutliner.SetUpdateMode(sal_False); mpOutlineView->SetOutputArea (Rectangle (Point(), Size(1, 1))); rOutliner.SetPaperSize( Size(1, 1) ); rOutliner.SetText( String(), rOutliner.GetParagraph( 0 ) ); diff --git a/sd/source/ui/view/OutlinerIterator.cxx b/sd/source/ui/view/OutlinerIterator.cxx index 226d767c6c91..d2f1a97ad698 100755 --- a/sd/source/ui/view/OutlinerIterator.cxx +++ b/sd/source/ui/view/OutlinerIterator.cxx @@ -716,11 +716,11 @@ void ViewIteratorImpl::SetPage (sal_Int32 nPageIndex) { if (maPosition.meEditMode == EM_PAGE) mpPage = mpDocument->GetSdPage ( - (USHORT)nPageIndex, + (sal_uInt16)nPageIndex, maPosition.mePageKind); else mpPage = mpDocument->GetMasterSdPage ( - (USHORT)nPageIndex, + (sal_uInt16)nPageIndex, maPosition.mePageKind); } else diff --git a/sd/source/ui/view/PresentationViewShellBase.cxx b/sd/source/ui/view/PresentationViewShellBase.cxx index ac7fb4ac32d6..77a9e125d551 100755 --- a/sd/source/ui/view/PresentationViewShellBase.cxx +++ b/sd/source/ui/view/PresentationViewShellBase.cxx @@ -61,7 +61,7 @@ SfxViewShell* __EXPORT PresentationViewShellBase::CreateInstance ( pBase->LateInit(framework::FrameworkHelper::msPresentationViewURL); return pBase; } -void PresentationViewShellBase::RegisterFactory( USHORT nPrio ) +void PresentationViewShellBase::RegisterFactory( sal_uInt16 nPrio ) { pFactory = new SfxViewFactory( &CreateInstance,&InitFactory,nPrio,"FullScreenPresentation"); diff --git a/sd/source/ui/view/SlideSorterViewShellBase.cxx b/sd/source/ui/view/SlideSorterViewShellBase.cxx index 792555904f60..be8e5907ed4e 100755 --- a/sd/source/ui/view/SlideSorterViewShellBase.cxx +++ b/sd/source/ui/view/SlideSorterViewShellBase.cxx @@ -55,7 +55,7 @@ SfxViewShell* __EXPORT SlideSorterViewShellBase::CreateInstance ( -void SlideSorterViewShellBase::RegisterFactory( USHORT nPrio ) +void SlideSorterViewShellBase::RegisterFactory( sal_uInt16 nPrio ) { pFactory = new SfxViewFactory( &CreateInstance,&InitFactory,nPrio,"SlideSorter"); diff --git a/sd/source/ui/view/ToolBarManager.cxx b/sd/source/ui/view/ToolBarManager.cxx index ce3064392d40..ed13049feb4f 100755 --- a/sd/source/ui/view/ToolBarManager.cxx +++ b/sd/source/ui/view/ToolBarManager.cxx @@ -344,8 +344,8 @@ private: ::std::auto_ptr<LayouterLock> mpSynchronousLayouterLock; ::std::auto_ptr<LayouterLock> mpAsynchronousLayouterLock; ::std::auto_ptr<ViewShellManager::UpdateLock> mpViewShellManagerLock; - ULONG mnPendingUpdateCall; - ULONG mnPendingSetValidCall; + sal_uLong mnPendingUpdateCall; + sal_uLong mnPendingSetValidCall; ToolBarRules maToolBarRules; ::rtl::OUString GetToolBarResourceName (const ::rtl::OUString& rsBaseName) const; diff --git a/sd/source/ui/view/ViewClipboard.cxx b/sd/source/ui/view/ViewClipboard.cxx index ab108fd1991a..50c5e99ad4f9 100755 --- a/sd/source/ui/view/ViewClipboard.cxx +++ b/sd/source/ui/view/ViewClipboard.cxx @@ -103,12 +103,12 @@ SdPage* ViewClipboard::GetFirstMasterPage (const SdTransferable& rTransferable) for (int nIndex=0; nIndex<nBookmarkCount; nIndex++) { String sName (*(String*) pBookmarks->GetObject(nIndex)); - BOOL bIsMasterPage; + sal_Bool bIsMasterPage; - // SdPage* GetMasterSdPage(USHORT nPgNum, PageKind ePgKind); - // USHORT GetMasterSdPageCount(PageKind ePgKind) const; + // SdPage* GetMasterSdPage(sal_uInt16 nPgNum, PageKind ePgKind); + // sal_uInt16 GetMasterSdPageCount(PageKind ePgKind) const; - USHORT nBMPage = pDocument->GetPageByName ( + sal_uInt16 nBMPage = pDocument->GetPageByName ( sName, bIsMasterPage); if ( ! bIsMasterPage) { @@ -172,7 +172,7 @@ void ViewClipboard::AssignMasterPage ( // appended again by SetMasterPage() to the given name. Don't ask. String sLayoutSuffix (RTL_CONSTASCII_STRINGPARAM(SD_LT_SEPARATOR)); sLayoutSuffix.Append (SdResId(STR_LAYOUT_OUTLINE)); - USHORT nLength = sLayoutSuffix.Len(); + sal_uInt16 nLength = sLayoutSuffix.Len(); String sLayoutName (pMasterPage->GetLayoutName()); if (String(sLayoutName, sLayoutName.Len()-nLength, nLength).Equals ( sLayoutSuffix)) @@ -182,8 +182,8 @@ void ViewClipboard::AssignMasterPage ( pPage->GetPageNum() / 2, sLayoutName, pSourceDocument, - FALSE, // Exchange the master page of only the target page. - FALSE // Keep unused master pages. + sal_False, // Exchange the master page of only the target page. + sal_False // Keep unused master pages. ); } while (false); @@ -192,16 +192,16 @@ void ViewClipboard::AssignMasterPage ( -USHORT ViewClipboard::DetermineInsertPosition ( +sal_uInt16 ViewClipboard::DetermineInsertPosition ( const SdTransferable& ) { SdDrawDocument* pDoc = mrView.GetDoc(); - USHORT nPgCnt = pDoc->GetSdPageCount( PK_STANDARD ); + sal_uInt16 nPgCnt = pDoc->GetSdPageCount( PK_STANDARD ); // Insert position is the behind the last selected page or behind the // last page when the selection is empty. - USHORT nInsertPos = pDoc->GetSdPageCount( PK_STANDARD ) * 2 + 1; - for( USHORT nPage = 0; nPage < nPgCnt; nPage++ ) + sal_uInt16 nInsertPos = pDoc->GetSdPageCount( PK_STANDARD ) * 2 + 1; + for( sal_uInt16 nPage = 0; nPage < nPgCnt; nPage++ ) { SdPage* pPage = pDoc->GetSdPage( nPage, PK_STANDARD ); @@ -215,14 +215,14 @@ USHORT ViewClipboard::DetermineInsertPosition ( -USHORT ViewClipboard::InsertSlides ( +sal_uInt16 ViewClipboard::InsertSlides ( const SdTransferable& rTransferable, - USHORT nInsertPosition) + sal_uInt16 nInsertPosition) { SdDrawDocument* pDoc = mrView.GetDoc(); - USHORT nInsertPgCnt = 0; - BOOL bMergeMasterPages = !rTransferable.HasSourceDoc( pDoc ); + sal_uInt16 nInsertPgCnt = 0; + sal_Bool bMergeMasterPages = !rTransferable.HasSourceDoc( pDoc ); // Prepare the insertion. const List* pBookmarkList; @@ -233,7 +233,7 @@ USHORT ViewClipboard::InsertSlides ( // pages are inserted. pBookmarkList = &rTransferable.GetPageBookmarks(); pDataDocSh = rTransferable.GetPageDocShell(); - nInsertPgCnt = (USHORT)pBookmarkList->Count(); + nInsertPgCnt = (sal_uInt16)pBookmarkList->Count(); } else { @@ -250,7 +250,7 @@ USHORT ViewClipboard::InsertSlides ( { const ::vos::OGuard aGuard( Application::GetSolarMutex() ); ::sd::Window* pWin = mrView.GetViewShell()->GetActiveWindow(); - const BOOL bWait = pWin && pWin->IsWait(); + const sal_Bool bWait = pWin && pWin->IsWait(); if( bWait ) pWin->LeaveWait(); @@ -258,14 +258,14 @@ USHORT ViewClipboard::InsertSlides ( pDoc->InsertBookmarkAsPage( const_cast<List*>(pBookmarkList), NULL, - FALSE, - FALSE, + sal_False, + sal_False, nInsertPosition, (&rTransferable == SD_MOD()->pTransferDrag), pDataDocSh, - TRUE, + sal_True, bMergeMasterPages, - FALSE); + sal_False); if( bWait ) pWin->EnterWait(); diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx index c0f371c867e8..0ad6f09223dd 100644 --- a/sd/source/ui/view/ViewShellBase.cxx +++ b/sd/source/ui/view/ViewShellBase.cxx @@ -249,7 +249,7 @@ SfxViewShell* __EXPORT ViewShellBase::CreateInstance ( pBase->LateInit(OUString()); return pBase; } -void ViewShellBase::RegisterFactory( USHORT nPrio ) +void ViewShellBase::RegisterFactory( sal_uInt16 nPrio ) { pFactory = new SfxViewFactory( &CreateInstance,&InitFactory,nPrio,"Default"); @@ -339,8 +339,8 @@ ViewShellBase::~ViewShellBase (void) void ViewShellBase::LateInit (const ::rtl::OUString& rsDefaultView) { - StartListening(*GetViewFrame(),TRUE); - StartListening(*GetDocShell(),TRUE); + StartListening(*GetViewFrame(),sal_True); + StartListening(*GetDocShell(),sal_True); mpImpl->LateInit(); InitializeFramework(); @@ -555,7 +555,7 @@ void ViewShellBase::Rearrange (void) OSL_TRACE("Rearrange: window missing"); } - GetViewFrame()->Resize(TRUE); + GetViewFrame()->Resize(sal_True); } @@ -585,7 +585,7 @@ Reference<view::XRenderable> ViewShellBase::GetRenderable (void) -SfxPrinter* ViewShellBase::GetPrinter (BOOL bCreate) +SfxPrinter* ViewShellBase::GetPrinter (sal_Bool bCreate) { OSL_ASSERT(mpImpl.get()!=NULL); @@ -595,9 +595,9 @@ SfxPrinter* ViewShellBase::GetPrinter (BOOL bCreate) -USHORT ViewShellBase::SetPrinter ( +sal_uInt16 ViewShellBase::SetPrinter ( SfxPrinter* pNewPrinter, - USHORT nDiffFlags, + sal_uInt16 nDiffFlags, bool bIsAPI) { OSL_ASSERT(mpImpl.get()!=NULL); @@ -613,7 +613,7 @@ USHORT ViewShellBase::SetPrinter ( pNewPrinter->SetMapMode(aMap); Size aNewSize = pNewPrinter->GetOutputSize(); - BOOL bScaleAll = FALSE; + sal_Bool bScaleAll = sal_False; if ( bIsAPI ) { WarningBox aWarnBox ( @@ -702,7 +702,7 @@ SvBorder ViewShellBase::GetBorder (bool ) void ViewShellBase::Execute (SfxRequest& rRequest) { - USHORT nSlotId = rRequest.GetSlot(); + sal_uInt16 nSlotId = rRequest.GetSlot(); switch (nSlotId) { @@ -852,7 +852,7 @@ void ViewShellBase::ReadUserDataSequence ( -void ViewShellBase::Activate (BOOL bIsMDIActivate) +void ViewShellBase::Activate (sal_Bool bIsMDIActivate) { SfxViewShell::Activate(bIsMDIActivate); @@ -870,7 +870,7 @@ void ViewShellBase::Activate (BOOL bIsMDIActivate) -void ViewShellBase::Deactivate (BOOL bIsMDIActivate) +void ViewShellBase::Deactivate (sal_Bool bIsMDIActivate) { SfxViewShell::Deactivate(bIsMDIActivate); } @@ -892,11 +892,11 @@ void ViewShellBase::SetZoomFactor ( -USHORT ViewShellBase::PrepareClose (BOOL bUI, BOOL bForBrowsing) +sal_uInt16 ViewShellBase::PrepareClose (sal_Bool bUI, sal_Bool bForBrowsing) { - USHORT nResult = SfxViewShell::PrepareClose (bUI, bForBrowsing); + sal_uInt16 nResult = SfxViewShell::PrepareClose (bUI, bForBrowsing); - if (nResult == TRUE) + if (nResult == sal_True) { mpImpl->mbIsClosing = true; @@ -912,7 +912,7 @@ USHORT ViewShellBase::PrepareClose (BOOL bUI, BOOL bForBrowsing) -void ViewShellBase::WriteUserData (String& rString, BOOL bBrowse) +void ViewShellBase::WriteUserData (String& rString, sal_Bool bBrowse) { SfxViewShell::WriteUserData (rString, bBrowse); @@ -925,7 +925,7 @@ void ViewShellBase::WriteUserData (String& rString, BOOL bBrowse) -void ViewShellBase::ReadUserData (const String& rString, BOOL bBrowse) +void ViewShellBase::ReadUserData (const String& rString, sal_Bool bBrowse) { SfxViewShell::ReadUserData (rString, bBrowse); @@ -1290,9 +1290,9 @@ void ViewShellBase::Implementation::ProcessRestoreEditingViewSlot (void) void ViewShellBase::Implementation::ShowViewTabBar (bool bShow) { if (mpViewTabBar.is() - && (mpViewTabBar->GetTabControl()->IsVisible()==TRUE) != bShow) + && (mpViewTabBar->GetTabControl()->IsVisible()==sal_True) != bShow) { - mpViewTabBar->GetTabControl()->Show(bShow ? TRUE : FALSE); + mpViewTabBar->GetTabControl()->Show(bShow ? sal_True : sal_False); mrBase.Rearrange(); } } @@ -1368,8 +1368,8 @@ void ViewShellBase::Implementation::SetPaneVisibility ( // Determine the new visibility state. const SfxItemSet* pArguments = rRequest.GetArgs(); - BOOL bShowChildWindow; - USHORT nSlotId = rRequest.GetSlot(); + sal_Bool bShowChildWindow; + sal_uInt16 nSlotId = rRequest.GetSlot(); if (pArguments != NULL) bShowChildWindow = static_cast<const SfxBoolItem&>( pArguments->Get(nSlotId)).GetValue(); @@ -1556,7 +1556,7 @@ void ViewShellBase::Implementation::ProcessTaskPaneSlot (SfxRequest& rRequest) { // Set the visibility state of the toolpanel and one of its top // level panels. - BOOL bShowToolPanel = TRUE; + sal_Bool bShowToolPanel = sal_True; toolpanel::PanelId nPanelId ( toolpanel::PID_UNKNOWN); bool bPanelIdGiven = false; @@ -1568,14 +1568,14 @@ void ViewShellBase::Implementation::ProcessTaskPaneSlot (SfxRequest& rRequest) if ((pArgs->Count() == 1) || (pArgs->Count() == 2)) { SFX_REQUEST_ARG (rRequest, pIsPanelVisible, - SfxBoolItem, ID_VAL_ISVISIBLE, FALSE); + SfxBoolItem, ID_VAL_ISVISIBLE, sal_False); if (pIsPanelVisible != NULL) bShowToolPanel = pIsPanelVisible->GetValue(); } if (pArgs->Count() == 2) { SFX_REQUEST_ARG (rRequest, pPanelId, SfxUInt32Item, - ID_VAL_PANEL_INDEX, FALSE); + ID_VAL_PANEL_INDEX, sal_False); if (pPanelId != NULL) { nPanelId = static_cast< diff --git a/sd/source/ui/view/ViewShellImplementation.cxx b/sd/source/ui/view/ViewShellImplementation.cxx index 2a574fa087ef..613aff9fd36c 100755 --- a/sd/source/ui/view/ViewShellImplementation.cxx +++ b/sd/source/ui/view/ViewShellImplementation.cxx @@ -109,10 +109,10 @@ void ViewShell::Implementation::ProcessModifyPageSlot ( { SdDrawDocument* pDocument = mrViewShell.GetDoc(); SdrLayerAdmin& rLayerAdmin = pDocument->GetLayerAdmin(); - BYTE aBckgrnd = rLayerAdmin.GetLayerID(String(SdResId(STR_LAYER_BCKGRND)), FALSE); - BYTE aBckgrndObj = rLayerAdmin.GetLayerID(String(SdResId(STR_LAYER_BCKGRNDOBJ)), FALSE); + sal_uInt8 aBckgrnd = rLayerAdmin.GetLayerID(String(SdResId(STR_LAYER_BCKGRND)), sal_False); + sal_uInt8 aBckgrndObj = rLayerAdmin.GetLayerID(String(SdResId(STR_LAYER_BCKGRNDOBJ)), sal_False); SetOfByte aVisibleLayers; - BOOL bHandoutMode = FALSE; + sal_Bool bHandoutMode = sal_False; SdPage* pHandoutMPage = NULL; String aNewName; @@ -121,8 +121,8 @@ void ViewShell::Implementation::ProcessModifyPageSlot ( AutoLayout aNewAutoLayout; - BOOL bBVisible; - BOOL bBObjsVisible; + sal_Bool bBVisible; + sal_Bool bBObjsVisible; const SfxItemSet* pArgs = rRequest.GetArgs(); if (pCurrentPage != NULL && pCurrentPage->TRG_HasMasterPage()) @@ -144,14 +144,14 @@ void ViewShell::Implementation::ProcessModifyPageSlot ( // dialog. We could select that layout in the // layout panel instead. /* - SFX_REQUEST_ARG (rRequest, pNewAutoLayout, SfxUInt32Item, ID_VAL_WHATLAYOUT, FALSE); + SFX_REQUEST_ARG (rRequest, pNewAutoLayout, SfxUInt32Item, ID_VAL_WHATLAYOUT, sal_False); eNewAutoLayout = (AutoLayout) pNewAutoLayout->GetValue (); */ } // Make the layout menu visible in the tool pane. - SfxBoolItem aMakeToolPaneVisible (ID_VAL_ISVISIBLE, TRUE); + SfxBoolItem aMakeToolPaneVisible (ID_VAL_ISVISIBLE, sal_True); SfxUInt32Item aPanelId (ID_VAL_PANEL_INDEX, ::sd::toolpanel::PID_LAYOUT); SfxViewFrame* pFrame = mrViewShell.GetViewFrame(); @@ -177,10 +177,10 @@ void ViewShell::Implementation::ProcessModifyPageSlot ( } else if (pArgs->Count() == 4) { - SFX_REQUEST_ARG (rRequest, pNewName, SfxStringItem, ID_VAL_PAGENAME, FALSE); - SFX_REQUEST_ARG (rRequest, pNewAutoLayout, SfxUInt32Item, ID_VAL_WHATLAYOUT, FALSE); - SFX_REQUEST_ARG (rRequest, pBVisible, SfxBoolItem, ID_VAL_ISPAGEBACK, FALSE); - SFX_REQUEST_ARG (rRequest, pBObjsVisible, SfxBoolItem, ID_VAL_ISPAGEOBJ, FALSE); + SFX_REQUEST_ARG (rRequest, pNewName, SfxStringItem, ID_VAL_PAGENAME, sal_False); + SFX_REQUEST_ARG (rRequest, pNewAutoLayout, SfxUInt32Item, ID_VAL_WHATLAYOUT, sal_False); + SFX_REQUEST_ARG (rRequest, pBVisible, SfxBoolItem, ID_VAL_ISPAGEBACK, sal_False); + SFX_REQUEST_ARG (rRequest, pBObjsVisible, SfxBoolItem, ID_VAL_ISPAGEOBJ, sal_False); AutoLayout aLayout ((AutoLayout)pNewAutoLayout->GetValue ()); if (aLayout >= AUTOLAYOUT__START && aLayout < AUTOLAYOUT__END) @@ -198,7 +198,7 @@ void ViewShell::Implementation::ProcessModifyPageSlot ( } if (ePageKind == PK_HANDOUT) { - bHandoutMode = TRUE; + bHandoutMode = sal_True; pHandoutMPage = pDocument->GetMasterSdPage(0, PK_HANDOUT); } } @@ -235,34 +235,34 @@ void ViewShell::Implementation::ProcessModifyPageSlot ( if (ePageKind == PK_STANDARD) { - USHORT nPage = (pCurrentPage->GetPageNum()-1) / 2; + sal_uInt16 nPage = (pCurrentPage->GetPageNum()-1) / 2; SdPage* pNotesPage = pDocument->GetSdPage(nPage, PK_NOTES); if (pNotesPage != NULL) pNotesPage->SetName(aNewName); } } - pCurrentPage->SetAutoLayout(aNewAutoLayout, TRUE); + pCurrentPage->SetAutoLayout(aNewAutoLayout, sal_True); - aBckgrnd = rLayerAdmin.GetLayerID(String(SdResId(STR_LAYER_BCKGRND)), FALSE); - aBckgrndObj = rLayerAdmin.GetLayerID(String(SdResId(STR_LAYER_BCKGRNDOBJ)), FALSE); + aBckgrnd = rLayerAdmin.GetLayerID(String(SdResId(STR_LAYER_BCKGRND)), sal_False); + aBckgrndObj = rLayerAdmin.GetLayerID(String(SdResId(STR_LAYER_BCKGRNDOBJ)), sal_False); aVisibleLayers.Set(aBckgrnd, bBVisible); aVisibleLayers.Set(aBckgrndObj, bBObjsVisible); pCurrentPage->TRG_SetMasterPageVisibleLayers(aVisibleLayers); } else { - pHandoutMPage->SetAutoLayout(aNewAutoLayout, TRUE); + pHandoutMPage->SetAutoLayout(aNewAutoLayout, sal_True); } mrViewShell.GetViewFrame()->GetDispatcher()->Execute(SID_SWITCHPAGE, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD); - BOOL bSetModified = TRUE; + sal_Bool bSetModified = sal_True; if (pArgs && pArgs->Count() == 1) { - bSetModified = (BOOL) ((SfxBoolItem&) pArgs->Get(SID_MODIFYPAGE)).GetValue(); + bSetModified = (sal_Bool) ((SfxBoolItem&) pArgs->Get(SID_MODIFYPAGE)).GetValue(); } pUndoManager->AddUndoAction( new UndoAutoLayoutPosAndSize( *pUndoPage ) ); @@ -279,8 +279,8 @@ void ViewShell::Implementation::ProcessModifyPageSlot ( void ViewShell::Implementation::AssignLayout ( SfxRequest& rRequest, PageKind ePageKind ) { - const SfxUInt32Item* pWhatPage = static_cast< const SfxUInt32Item* > ( rRequest.GetArg( ID_VAL_WHATPAGE, FALSE, TYPE(SfxUInt32Item) ) ); - const SfxUInt32Item* pWhatLayout = static_cast< const SfxUInt32Item* > ( rRequest.GetArg( ID_VAL_WHATLAYOUT, FALSE, TYPE(SfxUInt32Item) ) ); + const SfxUInt32Item* pWhatPage = static_cast< const SfxUInt32Item* > ( rRequest.GetArg( ID_VAL_WHATPAGE, sal_False, TYPE(SfxUInt32Item) ) ); + const SfxUInt32Item* pWhatLayout = static_cast< const SfxUInt32Item* > ( rRequest.GetArg( ID_VAL_WHATLAYOUT, sal_False, TYPE(SfxUInt32Item) ) ); SdDrawDocument* pDocument = mrViewShell.GetDoc(); if( !pDocument ) @@ -289,7 +289,7 @@ void ViewShell::Implementation::AssignLayout ( SfxRequest& rRequest, PageKind eP SdPage* pPage = 0; if( pWhatPage ) { - pPage = pDocument->GetSdPage(static_cast<USHORT>(pWhatPage->GetValue()), ePageKind); + pPage = pDocument->GetSdPage(static_cast<sal_uInt16>(pWhatPage->GetValue()), ePageKind); } if( pPage == 0 ) @@ -305,8 +305,8 @@ void ViewShell::Implementation::AssignLayout ( SfxRequest& rRequest, PageKind eP // Transform the given request into the four argument form that is // understood by ProcessModifyPageSlot(). SdrLayerAdmin& rLayerAdmin (mrViewShell.GetViewShellBase().GetDocument()->GetLayerAdmin()); - BYTE aBackground (rLayerAdmin.GetLayerID(String(SdResId(STR_LAYER_BCKGRND)), FALSE)); - BYTE aBackgroundObject (rLayerAdmin.GetLayerID(String(SdResId(STR_LAYER_BCKGRNDOBJ)), FALSE)); + sal_uInt8 aBackground (rLayerAdmin.GetLayerID(String(SdResId(STR_LAYER_BCKGRND)), sal_False)); + sal_uInt8 aBackgroundObject (rLayerAdmin.GetLayerID(String(SdResId(STR_LAYER_BCKGRNDOBJ)), sal_False)); SetOfByte aVisibleLayers; diff --git a/sd/source/ui/view/ViewShellManager.cxx b/sd/source/ui/view/ViewShellManager.cxx index 2335a6ec838f..2df075662eb1 100755 --- a/sd/source/ui/view/ViewShellManager.cxx +++ b/sd/source/ui/view/ViewShellManager.cxx @@ -930,7 +930,7 @@ void ViewShellManager::Implementation::UpdateShellStack (void) // 3. Get SFX shell stack. ShellStack aSfxShellStack; - USHORT nIndex (0); + sal_uInt16 nIndex (0); while (mrBase.GetSubShell(nIndex)!=NULL) ++nIndex; aSfxShellStack.reserve(nIndex); @@ -1026,7 +1026,7 @@ void ViewShellManager::Implementation::TakeShellsFromStack (const SfxShell* pShe // 0.Make sure that the given shell is on the stack. This is a // preparation for the following assertion. - for (USHORT nIndex=0; true; nIndex++) + for (sal_uInt16 nIndex=0; true; nIndex++) { SfxShell* pShellOnStack = mrBase.GetSubShell(nIndex); if (pShellOnStack == NULL) @@ -1044,7 +1044,7 @@ void ViewShellManager::Implementation::TakeShellsFromStack (const SfxShell* pShe { // 1. Deactivate our shells on the stack before they are removed so // that during the Deactivation() calls the stack is still intact. - for (USHORT nIndex=0; true; nIndex++) + for (sal_uInt16 nIndex=0; true; nIndex++) { SfxShell* pShellOnStack = mrBase.GetSubShell(nIndex); Deactivate(pShellOnStack); @@ -1187,7 +1187,7 @@ IMPL_LINK(ViewShellManager::Implementation, WindowEventHandler, VclWindowEvent*, break; } } - return TRUE; + return sal_True; } @@ -1340,7 +1340,7 @@ void ViewShellManager::Implementation::DumpShellStack (const ShellStack& rStack) void ViewShellManager::Implementation::DumpSfxShellStack (void) { ShellStack aSfxShellStack; - USHORT nIndex (0); + sal_uInt16 nIndex (0); while (mrBase.GetSubShell(nIndex)!=NULL) ++nIndex; aSfxShellStack.reserve(nIndex); @@ -1373,7 +1373,7 @@ void ViewShellManager::Implementation::Deactivate (SfxShell* pShell) } // Now we can deactivate the shell. - pShell->Deactivate(TRUE); + pShell->Deactivate(sal_True); } diff --git a/sd/source/ui/view/ViewTabBar.cxx b/sd/source/ui/view/ViewTabBar.cxx index a12412bf7f7d..0c0cd2b9836e 100755 --- a/sd/source/ui/view/ViewTabBar.cxx +++ b/sd/source/ui/view/ViewTabBar.cxx @@ -198,7 +198,7 @@ void ViewTabBar::disposing (void) { const ::vos::OGuard aSolarGuard (Application::GetSolarMutex()); // Set all references to the one tab page to NULL and delete the page. - for (USHORT nIndex=0; nIndex<mpTabControl->GetPageCount(); ++nIndex) + for (sal_uInt16 nIndex=0; nIndex<mpTabControl->GetPageCount(); ++nIndex) mpTabControl->SetTabPage(nIndex, NULL); mpTabPage.reset(); mpTabControl.reset(); @@ -453,7 +453,7 @@ bool ViewTabBar::ActivatePage (void) pIPClient = dynamic_cast<Client*>(mpViewShellBase->GetIPClient()); if (pIPClient==NULL || ! pIPClient->IsObjectInPlaceActive()) { - USHORT nIndex (mpTabControl->GetCurPageId() - 1); + sal_uInt16 nIndex (mpTabControl->GetCurPageId() - 1); if (nIndex < maTabBarButtons.size()) { xConfigurationController->requestResourceActivation( @@ -552,7 +552,7 @@ void ViewTabBar::AddTabBarButton ( if (nPosition>=0 && nPosition<=mpTabControl->GetPageCount()) { - USHORT nIndex ((USHORT)nPosition); + sal_uInt16 nIndex ((sal_uInt16)nPosition); // Insert the button into our local array. maTabBarButtons.insert(maTabBarButtons.begin()+nIndex, rButton); @@ -567,7 +567,7 @@ void ViewTabBar::AddTabBarButton ( void ViewTabBar::RemoveTabBarButton ( const ::com::sun::star::drawing::framework::TabBarButton& rButton) { - USHORT nIndex; + sal_uInt16 nIndex; for (nIndex=0; nIndex<maTabBarButtons.size(); ++nIndex) { if (IsEqual(maTabBarButtons[nIndex], rButton)) @@ -628,7 +628,7 @@ void ViewTabBar::UpdateActiveButton (void) if (xView.is()) { Reference<XResourceId> xViewId (xView->getResourceId()); - for (USHORT nIndex=0; nIndex<maTabBarButtons.size(); ++nIndex) + for (sal_uInt16 nIndex=0; nIndex<maTabBarButtons.size(); ++nIndex) { if (maTabBarButtons[nIndex].ResourceId->compareTo(xViewId) == 0) { @@ -646,8 +646,8 @@ void ViewTabBar::UpdateActiveButton (void) void ViewTabBar::UpdateTabBarButtons (void) { TabBarButtonList::const_iterator iTab; - USHORT nPageCount (mpTabControl->GetPageCount()); - USHORT nIndex; + sal_uInt16 nPageCount (mpTabControl->GetPageCount()); + sal_uInt16 nIndex; for (iTab=maTabBarButtons.begin(),nIndex=1; iTab!=maTabBarButtons.end(); ++iTab,++nIndex) { // Create a new tab when there are not enough. diff --git a/sd/source/ui/view/bmcache.cxx b/sd/source/ui/view/bmcache.cxx index c7f313037ff8..35739b46ff72 100755 --- a/sd/source/ui/view/bmcache.cxx +++ b/sd/source/ui/view/bmcache.cxx @@ -60,13 +60,13 @@ BitmapCache::~BitmapCache() void BitmapCache::Remove( const SdPage* pPage ) { - for( ULONG nPos = 0; nPos < aEntries.Count(); ) + for( sal_uLong nPos = 0; nPos < aEntries.Count(); ) { BitmapCacheEntry* pCand = (BitmapCacheEntry*) aEntries.GetObject( nPos ); if( pCand->pPage == pPage ) { - pCand = (BitmapCacheEntry*) aEntries.Remove((ULONG)nPos); + pCand = (BitmapCacheEntry*) aEntries.Remove((sal_uLong)nPos); delete pCand->pGraphicObject; delete pCand; } diff --git a/sd/source/ui/view/drawview.cxx b/sd/source/ui/view/drawview.cxx index b32cd1fe023a..f42eba5af17b 100755 --- a/sd/source/ui/view/drawview.cxx +++ b/sd/source/ui/view/drawview.cxx @@ -162,10 +162,10 @@ void DrawView::ModelHasChanged() |* \************************************************************************/ -BOOL DrawView::SetAttributes(const SfxItemSet& rSet, - BOOL bReplaceAll) +sal_Bool DrawView::SetAttributes(const SfxItemSet& rSet, + sal_Bool bReplaceAll) { - BOOL bOk = FALSE; + sal_Bool bOk = sal_False; // wird eine Masterpage bearbeitet? if ( mpDrawViewShell && mpDrawViewShell->GetEditMode() == EM_MASTERPAGE ) @@ -180,11 +180,11 @@ BOOL DrawView::SetAttributes(const SfxItemSet& rSet, // Textedit String aTemplateName(aLayoutName); - UINT32 nInv = pEditObject->GetObjInventor(); + sal_uInt32 nInv = pEditObject->GetObjInventor(); if (nInv == SdrInventor) { - UINT16 eObjKind = pEditObject->GetObjIdentifier(); + sal_uInt16 eObjKind = pEditObject->GetObjIdentifier(); PresObjKind ePresObjKind = rPage.GetPresObjKind(pEditObject); if ( ePresObjKind == PRESOBJ_TITLE || @@ -204,7 +204,7 @@ BOOL DrawView::SetAttributes(const SfxItemSet& rSet, pSheet->GetItemSet().Put(aTempSet); pSheet->Broadcast(SfxSimpleHint(SFX_HINT_DATACHANGED)); - bOk = TRUE; + bOk = sal_True; } else if (eObjKind == OBJ_OUTLINETEXT) { @@ -214,8 +214,8 @@ BOOL DrawView::SetAttributes(const SfxItemSet& rSet, List* pList = (List*)pOV->CreateSelectionList(); aTemplateName += String(SdResId(STR_LAYOUT_OUTLINE)); - pOutliner->SetUpdateMode(FALSE); - mpDocSh->SetWaitCursor( TRUE ); + pOutliner->SetUpdateMode(sal_False); + mpDocSh->SetWaitCursor( sal_True ); // Platzhalter durch Vorlagennamen ersetzen String aComment(SdResId(STR_UNDO_CHANGE_PRES_OBJECT)); @@ -227,8 +227,8 @@ BOOL DrawView::SetAttributes(const SfxItemSet& rSet, Paragraph* pPara = (Paragraph*)pList->Last(); while (pPara) { - ULONG nParaPos = pOutliner->GetAbsPos( pPara ); - sal_Int16 nDepth = pOutliner->GetDepth( (USHORT) nParaPos ); + sal_uLong nParaPos = pOutliner->GetAbsPos( pPara ); + sal_Int16 nDepth = pOutliner->GetDepth( (sal_uInt16) nParaPos ); String aName(rPage.GetLayoutName()); aName += (sal_Unicode)(' '); aName += String::CreateFromInt32( (nDepth <= 0) ? 1 : nDepth + 1 ); @@ -268,17 +268,17 @@ BOOL DrawView::SetAttributes(const SfxItemSet& rSet, pPara = (Paragraph*)pList->Prev(); if( !pPara && nDepth > 0 && rSet.GetItemState( EE_PARA_NUMBULLET ) == SFX_ITEM_ON && - pOutliner->GetDepth( (USHORT) pOutliner->GetAbsPos( (Paragraph*) pList->First() ) ) > 0 ) + pOutliner->GetDepth( (sal_uInt16) pOutliner->GetAbsPos( (Paragraph*) pList->First() ) ) > 0 ) pPara = pOutliner->GetParagraph( 0 ); // Put NumBulletItem in outline level 1 } - mpDocSh->SetWaitCursor( FALSE ); - pOV->GetOutliner()->SetUpdateMode(TRUE); + mpDocSh->SetWaitCursor( sal_False ); + pOV->GetOutliner()->SetUpdateMode(sal_True); mpDocSh->GetUndoManager()->LeaveListAction(); delete pList; - bOk = TRUE; + bOk = sal_True; } else { @@ -290,15 +290,15 @@ BOOL DrawView::SetAttributes(const SfxItemSet& rSet, { // Selection const SdrMarkList& rList = GetMarkedObjectList(); - ULONG nMarkCount = rList.GetMarkCount(); - for (ULONG nMark = 0; nMark < nMarkCount; nMark++) + sal_uLong nMarkCount = rList.GetMarkCount(); + for (sal_uLong nMark = 0; nMark < nMarkCount; nMark++) { SdrObject* pObject = rList.GetMark(nMark)->GetMarkedSdrObj(); - UINT32 nInv = pObject->GetObjInventor(); + sal_uInt32 nInv = pObject->GetObjInventor(); if (nInv == SdrInventor) { - UINT16 eObjKind = pObject->GetObjIdentifier(); + sal_uInt16 eObjKind = pObject->GetObjIdentifier(); PresObjKind ePresObjKind = rPage.GetPresObjKind(pObject); String aTemplateName(aLayoutName); @@ -319,13 +319,13 @@ BOOL DrawView::SetAttributes(const SfxItemSet& rSet, pSheet->GetItemSet().Put(aTempSet,false); pSheet->Broadcast(SfxSimpleHint(SFX_HINT_DATACHANGED)); - bOk = TRUE; + bOk = sal_True; } else if (eObjKind == OBJ_OUTLINETEXT) { // Presentation object outline aTemplateName += String(SdResId(STR_LAYOUT_OUTLINE)); - for (USHORT nLevel = 9; nLevel > 0; nLevel--) + for (sal_uInt16 nLevel = 9; nLevel > 0; nLevel--) { String aName(rPage.GetLayoutName()); aName += (sal_Unicode)(' '); @@ -376,7 +376,7 @@ BOOL DrawView::SetAttributes(const SfxItemSet& rSet, nWhich = aWhichIter.NextWhich(); } - bOk = TRUE; + bOk = sal_True; } } } @@ -439,7 +439,7 @@ void DrawView::Notify(SfxBroadcaster& rBC, const SfxHint& rHint) |* \************************************************************************/ -void DrawView::BlockPageOrderChangedHint(BOOL bBlock) +void DrawView::BlockPageOrderChangedHint(sal_Bool bBlock) { if (bBlock) mnPOCHSmph++; @@ -457,19 +457,19 @@ void DrawView::BlockPageOrderChangedHint(BOOL bBlock) |* \************************************************************************/ -BOOL DrawView::SetStyleSheet(SfxStyleSheet* pStyleSheet, BOOL bDontRemoveHardAttr) +sal_Bool DrawView::SetStyleSheet(SfxStyleSheet* pStyleSheet, sal_Bool bDontRemoveHardAttr) { - BOOL bResult = TRUE; + sal_Bool bResult = sal_True; // wird eine Masterpage bearbeitet? if (mpDrawViewShell && mpDrawViewShell->GetEditMode() == EM_MASTERPAGE) { - if (IsPresObjSelected(FALSE, TRUE)) + if (IsPresObjSelected(sal_False, sal_True)) { InfoBox(mpDrawViewShell->GetActiveWindow(), String(SdResId(STR_ACTION_NOTPOSSIBLE))).Execute(); - bResult = FALSE; + bResult = sal_False; } else { @@ -497,7 +497,7 @@ void DrawView::CompleteRedraw(OutputDevice* pOutDev, const Region& rReg, sdr::co mpVDev = NULL; } - BOOL bStandardPaint = TRUE; + sal_Bool bStandardPaint = sal_True; SdDrawDocument* pDoc = mpDocShell->GetDoc(); if( pDoc && pDoc->GetDocumentType() == DOCUMENT_TYPE_IMPRESS) @@ -510,7 +510,7 @@ void DrawView::CompleteRedraw(OutputDevice* pOutDev, const Region& rReg, sdr::co { if( pShowWindow == pOutDev ) PresPaint(rReg); - bStandardPaint = FALSE; + bStandardPaint = sal_False; } } } @@ -542,7 +542,7 @@ void DrawView::PresPaint(const Region& rRegion) |* erschienene Animationsobjekte in der Diashow) \************************************************************************/ -BOOL DrawView::IsObjMarkable(SdrObject* pObj, SdrPageView* pPV) const +sal_Bool DrawView::IsObjMarkable(SdrObject* pObj, SdrPageView* pPV) const { return FmFormView::IsObjMarkable(pObj, pPV);; } @@ -594,11 +594,11 @@ void DrawView::DeleteMarked() SdPage* pPage = 0; bool bResetLayout = false; - const ULONG nMarkCount = GetMarkedObjectList().GetMarkCount(); + const sal_uLong nMarkCount = GetMarkedObjectList().GetMarkCount(); if( nMarkCount ) { SdrMarkList aList( GetMarkedObjectList() ); - for (ULONG nMark = 0; nMark < nMarkCount; nMark++) + for (sal_uLong nMark = 0; nMark < nMarkCount; nMark++) { SdrObject* pObj = aList.GetMark(nMark)->GetMarkedSdrObj(); if( pObj && !pObj->IsEmptyPresObj() && pObj->GetUserCall() ) diff --git a/sd/source/ui/view/drbezob.cxx b/sd/source/ui/view/drbezob.cxx index ae512b0441d9..0d7bcfb47ad3 100644..100755 --- a/sd/source/ui/view/drbezob.cxx +++ b/sd/source/ui/view/drbezob.cxx @@ -125,7 +125,7 @@ void BezierObjectBar::GetAttrState(SfxItemSet& rSet) { SfxItemSet aAttrSet( mpView->GetDoc()->GetPool() ); mpView->GetAttributes( aAttrSet ); - rSet.Put(aAttrSet, FALSE); // <- FALSE, damit DontCare-Status uebernommen wird + rSet.Put(aAttrSet, sal_False); // <- sal_False, damit DontCare-Status uebernommen wird FunctionReference xFunc( mpViewSh->GetCurrentFunction() ); @@ -133,13 +133,13 @@ void BezierObjectBar::GetAttrState(SfxItemSet& rSet) { if(xFunc->ISA(FuSelection)) { - USHORT nEditMode = static_cast<FuSelection*>(xFunc.get())->GetEditMode(); - rSet.Put(SfxBoolItem(nEditMode, TRUE)); + sal_uInt16 nEditMode = static_cast<FuSelection*>(xFunc.get())->GetEditMode(); + rSet.Put(SfxBoolItem(nEditMode, sal_True)); } else if (xFunc->ISA(FuConstructBezierPolygon)) { - USHORT nEditMode = static_cast<FuConstructBezierPolygon*>(xFunc.get())->GetEditMode(); - rSet.Put(SfxBoolItem(nEditMode, TRUE)); + sal_uInt16 nEditMode = static_cast<FuConstructBezierPolygon*>(xFunc.get())->GetEditMode(); + rSet.Put(SfxBoolItem(nEditMode, sal_True)); } } @@ -187,8 +187,8 @@ void BezierObjectBar::GetAttrState(SfxItemSet& rSet) switch (eSegm) { case SDRPATHSEGMENT_DONTCARE: rSet.InvalidateItem(SID_BEZIER_CONVERT); break; - case SDRPATHSEGMENT_LINE : rSet.Put(SfxBoolItem(SID_BEZIER_CONVERT,FALSE)); break; // Button reingedrueckt = Kurve - case SDRPATHSEGMENT_CURVE : rSet.Put(SfxBoolItem(SID_BEZIER_CONVERT,TRUE)); break; + case SDRPATHSEGMENT_LINE : rSet.Put(SfxBoolItem(SID_BEZIER_CONVERT,sal_False)); break; // Button reingedrueckt = Kurve + case SDRPATHSEGMENT_CURVE : rSet.Put(SfxBoolItem(SID_BEZIER_CONVERT,sal_True)); break; default: break; } } @@ -204,9 +204,9 @@ void BezierObjectBar::GetAttrState(SfxItemSet& rSet) switch (eSmooth) { case SDRPATHSMOOTH_DONTCARE : break; - case SDRPATHSMOOTH_ANGULAR : rSet.Put(SfxBoolItem(SID_BEZIER_EDGE, TRUE)); break; - case SDRPATHSMOOTH_ASYMMETRIC: rSet.Put(SfxBoolItem(SID_BEZIER_SMOOTH,TRUE)); break; - case SDRPATHSMOOTH_SYMMETRIC : rSet.Put(SfxBoolItem(SID_BEZIER_SYMMTR,TRUE)); break; + case SDRPATHSMOOTH_ANGULAR : rSet.Put(SfxBoolItem(SID_BEZIER_EDGE, sal_True)); break; + case SDRPATHSMOOTH_ASYMMETRIC: rSet.Put(SfxBoolItem(SID_BEZIER_SMOOTH,sal_True)); break; + case SDRPATHSMOOTH_SYMMETRIC : rSet.Put(SfxBoolItem(SID_BEZIER_SYMMTR,sal_True)); break; } } if (!pIPPEC || !pIPPEC->IsOpenCloseMarkedObjectsPossible()) @@ -219,8 +219,8 @@ void BezierObjectBar::GetAttrState(SfxItemSet& rSet) switch (eClose) { case SDROBJCLOSED_DONTCARE: rSet.InvalidateItem(SID_BEZIER_CLOSE); break; - case SDROBJCLOSED_OPEN : rSet.Put(SfxBoolItem(SID_BEZIER_CLOSE,FALSE)); break; - case SDROBJCLOSED_CLOSED : rSet.Put(SfxBoolItem(SID_BEZIER_CLOSE,TRUE)); break; + case SDROBJCLOSED_OPEN : rSet.Put(SfxBoolItem(SID_BEZIER_CLOSE,sal_False)); break; + case SDROBJCLOSED_CLOSED : rSet.Put(SfxBoolItem(SID_BEZIER_CLOSE,sal_True)); break; default: break; } } @@ -241,7 +241,7 @@ void BezierObjectBar::GetAttrState(SfxItemSet& rSet) void BezierObjectBar::Execute(SfxRequest& rReq) { - USHORT nSId = rReq.GetSlot(); + sal_uInt16 nSId = rReq.GetSlot(); switch (nSId) { diff --git a/sd/source/ui/view/drtxtob.cxx b/sd/source/ui/view/drtxtob.cxx index 9eb0a3b2ff8c..4f1ddccdb5c8 100755 --- a/sd/source/ui/view/drtxtob.cxx +++ b/sd/source/ui/view/drtxtob.cxx @@ -166,8 +166,8 @@ TextObjectBar::~TextObjectBar() void TextObjectBar::GetAttrState( SfxItemSet& rSet ) { SfxWhichIter aIter( rSet ); - USHORT nWhich = aIter.FirstWhich(); - BOOL bTemplate = FALSE; + sal_uInt16 nWhich = aIter.FirstWhich(); + sal_Bool bTemplate = sal_False; SfxItemSet aAttrSet( mpView->GetDoc()->GetPool() ); SvtLanguageOptions aLangOpt; sal_Bool bDisableParagraphTextDirection = !aLangOpt.IsCTLFontEnabled(); @@ -177,7 +177,7 @@ void TextObjectBar::GetAttrState( SfxItemSet& rSet ) while ( nWhich ) { - USHORT nSlotId = SfxItemPool::IsWhich(nWhich) + sal_uInt16 nSlotId = SfxItemPool::IsWhich(nWhich) ? GetPool().GetSlotId(nWhich) : nWhich; @@ -189,9 +189,9 @@ void TextObjectBar::GetAttrState( SfxItemSet& rSet ) case SID_ATTR_CHAR_POSTURE: { SvxScriptSetItem aSetItem( nSlotId, GetPool() ); - aSetItem.GetItemSet().Put( aAttrSet, FALSE ); + aSetItem.GetItemSet().Put( aAttrSet, sal_False ); - USHORT nScriptType = mpView->GetScriptType(); + sal_uInt16 nScriptType = mpView->GetScriptType(); if( (nSlotId == SID_ATTR_CHAR_FONT) || (nSlotId == SID_ATTR_CHAR_FONTHEIGHT) ) { @@ -235,7 +235,7 @@ void TextObjectBar::GetAttrState( SfxItemSet& rSet ) { rSet.Put( SfxTemplateItem( nWhich, String() ) ); } - bTemplate = TRUE; + bTemplate = sal_True; } break; @@ -244,10 +244,10 @@ void TextObjectBar::GetAttrState( SfxItemSet& rSet ) case SID_OUTLINE_UP: case SID_OUTLINE_DOWN: { - BOOL bDisableLeft = TRUE; - BOOL bDisableRight = TRUE; - BOOL bDisableUp = TRUE; - BOOL bDisableDown = TRUE; + sal_Bool bDisableLeft = sal_True; + sal_Bool bDisableRight = sal_True; + sal_Bool bDisableUp = sal_True; + sal_Bool bDisableDown = sal_True; OutlinerView* pOLV = mpView->GetTextEditOutlinerView(); if (mpView->ISA(OutlineView)) @@ -256,7 +256,7 @@ void TextObjectBar::GetAttrState( SfxItemSet& rSet ) mpViewShell->GetActiveWindow()); } - BOOL bOutlineViewSh = mpViewShell->ISA(OutlineViewShell); + sal_Bool bOutlineViewSh = mpViewShell->ISA(OutlineViewShell); if (pOLV && ( pOLV->GetOutliner()->GetMode() == OUTLINERMODE_OUTLINEOBJECT || bOutlineViewSh ) ) @@ -267,7 +267,7 @@ void TextObjectBar::GetAttrState( SfxItemSet& rSet ) Paragraph* pPara = (Paragraph*) pList->First(); // #96539# find out if we are a OutlineView - BOOL bIsOutlineView(OUTLINERMODE_OUTLINEVIEW == pOLV->GetOutliner()->GetMode()); + sal_Bool bIsOutlineView(OUTLINERMODE_OUTLINEVIEW == pOLV->GetOutliner()->GetMode()); // #96539# This is ONLY for OutlineViews if(bIsOutlineView) @@ -278,7 +278,7 @@ void TextObjectBar::GetAttrState( SfxItemSet& rSet ) if(pOutl->GetAbsPos(pPara) > 1 || ( pOutl->HasParaFlag(pPara,PARAFLAG_ISPAGE) && pOutl->GetAbsPos(pPara) > 0 ) ) { // Nicht ganz oben - bDisableUp = FALSE; + bDisableUp = sal_False; } } else @@ -287,25 +287,25 @@ void TextObjectBar::GetAttrState( SfxItemSet& rSet ) if(pOutl->GetAbsPos(pPara) > 0) { // Nicht ganz oben - bDisableUp = FALSE; + bDisableUp = sal_False; } } while (pPara) { - sal_Int16 nDepth = pOutl->GetDepth( (USHORT) pOutl->GetAbsPos( pPara ) ); + sal_Int16 nDepth = pOutl->GetDepth( (sal_uInt16) pOutl->GetAbsPos( pPara ) ); if (nDepth > 0 || (bOutlineViewSh && (nDepth <= 0) && !pOutl->HasParaFlag( pPara, PARAFLAG_ISPAGE )) ) { // Nicht minimale Tiefe - bDisableLeft = FALSE; + bDisableLeft = sal_False; } if( (nDepth < pOLV->GetOutliner()->GetMaxDepth() && ( !bOutlineViewSh || pOutl->GetAbsPos(pPara) != 0 )) || (bOutlineViewSh && (nDepth <= 0) && pOutl->HasParaFlag( pPara, PARAFLAG_ISPAGE ) && pOutl->GetAbsPos(pPara) != 0) ) { // Nicht maximale Tiefe und nicht ganz oben - bDisableRight = FALSE; + bDisableRight = sal_False; } pPara = static_cast<Paragraph*>( pList->Next() ); @@ -315,7 +315,7 @@ void TextObjectBar::GetAttrState( SfxItemSet& rSet ) ( pOutl->GetParagraphCount() > 1 || !bOutlineViewSh) ) { // Nicht letzter Absatz - bDisableDown = FALSE; + bDisableDown = sal_False; } // #96250# and #78665# @@ -328,7 +328,7 @@ void TextObjectBar::GetAttrState( SfxItemSet& rSet ) && !pOutl->HasParaFlag( pOutl->GetParagraph(1), PARAFLAG_ISPAGE ) ) { // Needs to be disabled - bDisableDown = TRUE; + bDisableDown = sal_True; } delete pList; @@ -355,13 +355,13 @@ void TextObjectBar::GetAttrState( SfxItemSet& rSet ) } else { - BOOL bLeftToRight = TRUE; + sal_Bool bLeftToRight = sal_True; SdrOutliner* pOutl = mpView->GetTextEditOutliner(); if( pOutl ) { if( pOutl->IsVertical() ) - bLeftToRight = FALSE; + bLeftToRight = sal_False; } else bLeftToRight = ( (const SvxWritingModeItem&) aAttrSet.Get( SDRATTR_TEXTDIRECTION ) ).GetValue() == com::sun::star::text::WritingMode_LR_TB; @@ -415,7 +415,7 @@ void TextObjectBar::GetAttrState( SfxItemSet& rSet ) nWhich = aIter.NextWhich(); } - rSet.Put( aAttrSet, FALSE ); // <- FALSE, damit DontCare-Status uebernommen wird + rSet.Put( aAttrSet, sal_False ); // <- sal_False, damit DontCare-Status uebernommen wird // die sind im Gliederungsmodus disabled @@ -443,17 +443,17 @@ void TextObjectBar::GetAttrState( SfxItemSet& rSet ) { ESelection aSel = pOLV->GetSelection(); aSel.Adjust(); - ULONG nStartPara = aSel.nStartPara; - ULONG nEndPara = aSel.nEndPara; + sal_uLong nStartPara = aSel.nStartPara; + sal_uLong nEndPara = aSel.nEndPara; if( !aSel.HasRange() ) { nStartPara = 0; nEndPara = pOLV->GetOutliner()->GetParagraphCount() - 1; } long nUpper = 0L; - for( ULONG nPara = nStartPara; nPara <= nEndPara; nPara++ ) + for( sal_uLong nPara = nStartPara; nPara <= nEndPara; nPara++ ) { - const SfxItemSet& rItems = pOLV->GetOutliner()->GetParaAttribs( (USHORT)nPara ); + const SfxItemSet& rItems = pOLV->GetOutliner()->GetParaAttribs( (sal_uInt16)nPara ); const SvxULSpaceItem& rItem = (const SvxULSpaceItem&) rItems.Get( EE_PARA_ULSPACE ); nUpper = Max( nUpper, (long)rItem.GetUpper() ); } @@ -472,16 +472,16 @@ void TextObjectBar::GetAttrState( SfxItemSet& rSet ) switch( eAdj ) { case SVX_ADJUST_LEFT: - rSet.Put( SfxBoolItem( SID_ATTR_PARA_ADJUST_LEFT, TRUE ) ); + rSet.Put( SfxBoolItem( SID_ATTR_PARA_ADJUST_LEFT, sal_True ) ); break; case SVX_ADJUST_CENTER: - rSet.Put( SfxBoolItem( SID_ATTR_PARA_ADJUST_CENTER, TRUE ) ); + rSet.Put( SfxBoolItem( SID_ATTR_PARA_ADJUST_CENTER, sal_True ) ); break; case SVX_ADJUST_RIGHT: - rSet.Put( SfxBoolItem( SID_ATTR_PARA_ADJUST_RIGHT, TRUE ) ); + rSet.Put( SfxBoolItem( SID_ATTR_PARA_ADJUST_RIGHT, sal_True ) ); break; case SVX_ADJUST_BLOCK: - rSet.Put( SfxBoolItem( SID_ATTR_PARA_ADJUST_BLOCK, TRUE ) ); + rSet.Put( SfxBoolItem( SID_ATTR_PARA_ADJUST_BLOCK, sal_True ) ); break; default: break; @@ -506,13 +506,13 @@ void TextObjectBar::GetAttrState( SfxItemSet& rSet ) break; case FRMDIR_HORI_LEFT_TOP: - rSet.Put( SfxBoolItem( SID_ATTR_PARA_LEFT_TO_RIGHT, TRUE ) ); - rSet.Put( SfxBoolItem( SID_ATTR_PARA_RIGHT_TO_LEFT, FALSE ) ); + rSet.Put( SfxBoolItem( SID_ATTR_PARA_LEFT_TO_RIGHT, sal_True ) ); + rSet.Put( SfxBoolItem( SID_ATTR_PARA_RIGHT_TO_LEFT, sal_False ) ); break; case FRMDIR_HORI_RIGHT_TOP: - rSet.Put( SfxBoolItem( SID_ATTR_PARA_LEFT_TO_RIGHT, FALSE ) ); - rSet.Put( SfxBoolItem( SID_ATTR_PARA_RIGHT_TO_LEFT, TRUE ) ); + rSet.Put( SfxBoolItem( SID_ATTR_PARA_LEFT_TO_RIGHT, sal_False ) ); + rSet.Put( SfxBoolItem( SID_ATTR_PARA_RIGHT_TO_LEFT, sal_True ) ); break; // #107865# @@ -543,26 +543,26 @@ void TextObjectBar::GetAttrState( SfxItemSet& rSet ) if (aBulletState.GetValue() != 0) { - rSet.Put(SfxBoolItem(FN_NUM_BULLET_ON, TRUE)); + rSet.Put(SfxBoolItem(FN_NUM_BULLET_ON, sal_True)); } else { - rSet.Put(SfxBoolItem(FN_NUM_BULLET_ON, FALSE)); + rSet.Put(SfxBoolItem(FN_NUM_BULLET_ON, sal_False)); } } */ - USHORT nLineSpace = (USHORT) ( (const SvxLineSpacingItem&) aAttrSet. + sal_uInt16 nLineSpace = (sal_uInt16) ( (const SvxLineSpacingItem&) aAttrSet. Get( EE_PARA_SBL ) ).GetPropLineSpace(); switch( nLineSpace ) { case 100: - rSet.Put( SfxBoolItem( SID_ATTR_PARA_LINESPACE_10, TRUE ) ); + rSet.Put( SfxBoolItem( SID_ATTR_PARA_LINESPACE_10, sal_True ) ); break; case 150: - rSet.Put( SfxBoolItem( SID_ATTR_PARA_LINESPACE_15, TRUE ) ); + rSet.Put( SfxBoolItem( SID_ATTR_PARA_LINESPACE_15, sal_True ) ); break; case 200: - rSet.Put( SfxBoolItem( SID_ATTR_PARA_LINESPACE_20, TRUE ) ); + rSet.Put( SfxBoolItem( SID_ATTR_PARA_LINESPACE_20, sal_True ) ); break; } } @@ -572,9 +572,9 @@ void TextObjectBar::GetAttrState( SfxItemSet& rSet ) aAttrSet.Get( EE_CHAR_ESCAPEMENT ) ).GetEnumValue(); if( eEsc == SVX_ESCAPEMENT_SUPERSCRIPT ) - rSet.Put( SfxBoolItem( SID_SET_SUPER_SCRIPT, TRUE ) ); + rSet.Put( SfxBoolItem( SID_SET_SUPER_SCRIPT, sal_True ) ); else if( eEsc == SVX_ESCAPEMENT_SUBSCRIPT ) - rSet.Put( SfxBoolItem( SID_SET_SUB_SCRIPT, TRUE ) ); + rSet.Put( SfxBoolItem( SID_SET_SUB_SCRIPT, sal_True ) ); } /************************************************************************* diff --git a/sd/source/ui/view/drtxtob1.cxx b/sd/source/ui/view/drtxtob1.cxx index 4a6d83e376e7..9c2fc112cf3c 100755 --- a/sd/source/ui/view/drtxtob1.cxx +++ b/sd/source/ui/view/drtxtob1.cxx @@ -94,15 +94,15 @@ void TextObjectBar::Execute( SfxRequest &rReq ) { const SfxItemSet* pArgs = rReq.GetArgs(); const SfxPoolItem* pPoolItem = NULL; - USHORT nSlot = rReq.GetSlot(); - BOOL bOutlineMode = FALSE; + sal_uInt16 nSlot = rReq.GetSlot(); + sal_Bool bOutlineMode = sal_False; OutlinerView* pOLV = mpView->GetTextEditOutlinerView(); std::auto_ptr< OutlineViewModelChangeGuard > aGuard; if (mpView->ISA(OutlineView)) { - bOutlineMode = TRUE; + bOutlineMode = sal_True; pOLV = static_cast<OutlineView*>(mpView) ->GetViewByWindow(mpViewShell->GetActiveWindow()); @@ -148,14 +148,14 @@ void TextObjectBar::Execute( SfxRequest &rReq ) { ESelection aSel = pOLV->GetSelection(); aSel.Adjust(); - ULONG nStartPara = aSel.nStartPara; - ULONG nEndPara = aSel.nEndPara; + sal_uLong nStartPara = aSel.nStartPara; + sal_uLong nEndPara = aSel.nEndPara; if( !aSel.HasRange() ) { nStartPara = 0; nEndPara = pOLV->GetOutliner()->GetParagraphCount() - 1; } - for( ULONG nPara = nStartPara; nPara <= nEndPara; nPara++ ) + for( sal_uLong nPara = nStartPara; nPara <= nEndPara; nPara++ ) { SfxStyleSheet* pStyleSheet = NULL; if (pOLV->GetOutliner() != NULL) @@ -163,8 +163,8 @@ void TextObjectBar::Execute( SfxRequest &rReq ) if (pStyleSheet != NULL) { SfxItemSet aAttr( pStyleSheet->GetItemSet() ); - SfxItemSet aTmpSet( pOLV->GetOutliner()->GetParaAttribs( (USHORT) nPara ) ); - aAttr.Put( aTmpSet, FALSE ); // FALSE= InvalidItems nicht als Default, sondern als "Loecher" betrachten + SfxItemSet aTmpSet( pOLV->GetOutliner()->GetParaAttribs( (sal_uInt16) nPara ) ); + aAttr.Put( aTmpSet, sal_False ); // sal_False= InvalidItems nicht als Default, sondern als "Loecher" betrachten const SvxULSpaceItem& rItem = (const SvxULSpaceItem&) aAttr.Get( EE_PARA_ULSPACE ); SvxULSpaceItem* pNewItem = (SvxULSpaceItem*) rItem.Clone(); @@ -176,7 +176,7 @@ void TextObjectBar::Execute( SfxRequest &rReq ) nUpper -= 100; nUpper = Max( (long) nUpper, 0L ); } - pNewItem->SetUpper( (USHORT) nUpper ); + pNewItem->SetUpper( (sal_uInt16) nUpper ); long nLower = pNewItem->GetLower(); if( nSlot == SID_PARASPACE_INCREASE ) @@ -186,12 +186,12 @@ void TextObjectBar::Execute( SfxRequest &rReq ) nLower -= 100; nLower = Max( (long) nLower, 0L ); } - pNewItem->SetLower( (USHORT) nLower ); + pNewItem->SetLower( (sal_uInt16) nLower ); SfxItemSet aNewAttrs( aAttr ); aNewAttrs.Put( *pNewItem ); delete pNewItem; - pOLV->GetOutliner()->SetParaAttribs( (USHORT)nPara, aNewAttrs ); + pOLV->GetOutliner()->SetParaAttribs( (sal_uInt16)nPara, aNewAttrs ); } } } @@ -217,7 +217,7 @@ void TextObjectBar::Execute( SfxRequest &rReq ) nUpper -= 100; nUpper = Max( (long) nUpper, 0L ); } - pNewItem->SetUpper( (USHORT) nUpper ); + pNewItem->SetUpper( (sal_uInt16) nUpper ); long nLower = pNewItem->GetLower(); if( nSlot == SID_PARASPACE_INCREASE ) @@ -227,7 +227,7 @@ void TextObjectBar::Execute( SfxRequest &rReq ) nLower -= 100; nLower = Max( (long) nLower, 0L ); } - pNewItem->SetLower( (USHORT) nLower ); + pNewItem->SetLower( (sal_uInt16) nLower ); aNewAttrs.Put( *pNewItem ); delete pNewItem; @@ -240,7 +240,7 @@ void TextObjectBar::Execute( SfxRequest &rReq ) Invalidate(); // Um die Preview (im Gliederungsmodus) zu aktualisieren muss // der Slot invalidiert werden: - mpViewShell->GetViewFrame()->GetBindings().Invalidate( SID_PREVIEW_STATE, TRUE, FALSE ); + mpViewShell->GetViewFrame()->GetBindings().Invalidate( SID_PREVIEW_STATE, sal_True, sal_False ); } break; @@ -253,7 +253,7 @@ void TextObjectBar::Execute( SfxRequest &rReq ) // Ensure bold/italic etc. icon state updates Invalidate(); // #96551# trigger preview refresh - mpViewShell->GetViewFrame()->GetBindings().Invalidate( SID_PREVIEW_STATE, TRUE, FALSE ); + mpViewShell->GetViewFrame()->GetBindings().Invalidate( SID_PREVIEW_STATE, sal_True, sal_False ); } rReq.Done(); } @@ -268,7 +268,7 @@ void TextObjectBar::Execute( SfxRequest &rReq ) // Ensure bold/italic etc. icon state updates Invalidate(); // #96551# trigger preview refresh - mpViewShell->GetViewFrame()->GetBindings().Invalidate( SID_PREVIEW_STATE, TRUE, FALSE ); + mpViewShell->GetViewFrame()->GetBindings().Invalidate( SID_PREVIEW_STATE, sal_True, sal_False ); } rReq.Done(); } @@ -281,7 +281,7 @@ void TextObjectBar::Execute( SfxRequest &rReq ) pOLV->AdjustHeight( -1 ); // #96551# trigger preview refresh - mpViewShell->GetViewFrame()->GetBindings().Invalidate( SID_PREVIEW_STATE, TRUE, FALSE ); + mpViewShell->GetViewFrame()->GetBindings().Invalidate( SID_PREVIEW_STATE, sal_True, sal_False ); } rReq.Done(); } @@ -294,7 +294,7 @@ void TextObjectBar::Execute( SfxRequest &rReq ) pOLV->AdjustHeight( 1 ); // #96551# trigger preview refresh - mpViewShell->GetViewFrame()->GetBindings().Invalidate( SID_PREVIEW_STATE, TRUE, FALSE ); + mpViewShell->GetViewFrame()->GetBindings().Invalidate( SID_PREVIEW_STATE, sal_True, sal_False ); } rReq.Done(); } @@ -312,7 +312,7 @@ void TextObjectBar::Execute( SfxRequest &rReq ) rReq.Done( aAttr ); mpView->SetAttributes( aAttr ); Invalidate(); - mpViewShell->GetViewFrame()->GetBindings().Invalidate( SID_PREVIEW_STATE, TRUE, FALSE ); + mpViewShell->GetViewFrame()->GetBindings().Invalidate( SID_PREVIEW_STATE, sal_True, sal_False ); } break; @@ -488,7 +488,7 @@ void TextObjectBar::Execute( SfxRequest &rReq ) { if( pArgs ) { - if( SFX_ITEM_SET == pArgs->GetItemState( EE_CHAR_FONTINFO, TRUE, &pPoolItem ) ) + if( SFX_ITEM_SET == pArgs->GetItemState( EE_CHAR_FONTINFO, sal_True, &pPoolItem ) ) aNewAttr.Put( *pPoolItem ); } else @@ -500,7 +500,7 @@ void TextObjectBar::Execute( SfxRequest &rReq ) { if( pArgs ) { - if( SFX_ITEM_SET == pArgs->GetItemState( EE_CHAR_FONTHEIGHT, TRUE, &pPoolItem ) ) + if( SFX_ITEM_SET == pArgs->GetItemState( EE_CHAR_FONTHEIGHT, sal_True, &pPoolItem ) ) aNewAttr.Put( *pPoolItem ); } else @@ -510,7 +510,7 @@ void TextObjectBar::Execute( SfxRequest &rReq ) break; case SID_ATTR_CHAR_COLOR: { - if( pArgs && SFX_ITEM_SET == pArgs->GetItemState( EE_CHAR_COLOR, TRUE, &pPoolItem ) ) + if( pArgs && SFX_ITEM_SET == pArgs->GetItemState( EE_CHAR_COLOR, sal_True, &pPoolItem ) ) aNewAttr.Put( *pPoolItem ); } break; @@ -550,8 +550,8 @@ void TextObjectBar::Execute( SfxRequest &rReq ) { sal_Bool bLeftToRight = nSlot == SID_ATTR_PARA_LEFT_TO_RIGHT; - USHORT nAdjust = SVX_ADJUST_LEFT; - if( SFX_ITEM_ON == aEditAttr.GetItemState(EE_PARA_JUST, TRUE, &pPoolItem ) ) + sal_uInt16 nAdjust = SVX_ADJUST_LEFT; + if( SFX_ITEM_ON == aEditAttr.GetItemState(EE_PARA_JUST, sal_True, &pPoolItem ) ) nAdjust = ( (SvxAdjustItem*)pPoolItem)->GetEnumValue(); if( bLeftToRight ) @@ -578,7 +578,7 @@ void TextObjectBar::Execute( SfxRequest &rReq ) nSlot == SID_ATTR_CHAR_WEIGHT ) { // #i78017 establish the same behaviour as in Writer - USHORT nScriptType = SCRIPTTYPE_LATIN | SCRIPTTYPE_ASIAN | SCRIPTTYPE_COMPLEX; + sal_uInt16 nScriptType = SCRIPTTYPE_LATIN | SCRIPTTYPE_ASIAN | SCRIPTTYPE_COMPLEX; if (nSlot == SID_ATTR_CHAR_FONT) nScriptType = mpView->GetScriptType(); @@ -598,7 +598,7 @@ void TextObjectBar::Execute( SfxRequest &rReq ) // Um die Preview (im Gliederungsmodus) zu aktualisieren muss // der Slot invalidiert werden: - mpViewShell->GetViewFrame()->GetBindings().Invalidate( SID_PREVIEW_STATE, TRUE, FALSE ); + mpViewShell->GetViewFrame()->GetBindings().Invalidate( SID_PREVIEW_STATE, sal_True, sal_False ); } break; } diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx index f2075a50bd3e..9a289a6d4927 100755 --- a/sd/source/ui/view/drviews1.cxx +++ b/sd/source/ui/view/drviews1.cxx @@ -118,7 +118,7 @@ using namespace com::sun::star; namespace sd { -void DrawViewShell::Activate(BOOL bIsMDIActivate) +void DrawViewShell::Activate(sal_Bool bIsMDIActivate) { ViewShell::Activate(bIsMDIActivate); } @@ -150,7 +150,7 @@ void DrawViewShell::UIDeactivated( SfxInPlaceClient* pCli ) |* \************************************************************************/ -void DrawViewShell::Deactivate(BOOL bIsMDIActivate) +void DrawViewShell::Deactivate(sal_Bool bIsMDIActivate) { ViewShell::Deactivate(bIsMDIActivate); } @@ -186,7 +186,7 @@ void DrawViewShell::SelectionHasChanged (void) Invalidate(); //Update3DWindow(); // 3D-Controller - SfxBoolItem aItem( SID_3D_STATE, TRUE ); + SfxBoolItem aItem( SID_3D_STATE, sal_True ); GetViewFrame()->GetDispatcher()->Execute( SID_3D_STATE, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, &aItem, 0L ); @@ -202,8 +202,8 @@ void DrawViewShell::SelectionHasChanged (void) SdrMark* pMark = rMarkList.GetMark(0); SdrObject* pObj = pMark->GetMarkedSdrObj(); - UINT32 nInv = pObj->GetObjInventor(); - UINT16 nSdrObjKind = pObj->GetObjIdentifier(); + sal_uInt32 nInv = pObj->GetObjInventor(); + sal_uInt16 nSdrObjKind = pObj->GetObjIdentifier(); if (nInv == SdrInventor && nSdrObjKind == OBJ_OLE2) { @@ -295,7 +295,7 @@ void DrawViewShell::SelectionHasChanged (void) // #96124# Invalidate for every subshell GetViewShellBase().GetViewShellManager()->InvalidateAllSubShells(this); - mpDrawView->UpdateSelectionClipboard( FALSE ); + mpDrawView->UpdateSelectionClipboard( sal_False ); GetViewShellBase().GetDrawController().FireSelectionChangeListener(); } @@ -311,7 +311,7 @@ void DrawViewShell::SetZoom( long nZoom ) { // Make sure that the zoom factor will not be recalculated on // following window resizings. - mbZoomOnPage = FALSE; + mbZoomOnPage = sal_False; ViewShell::SetZoom( nZoom ); GetViewFrame()->GetBindings().Invalidate( SID_ATTR_ZOOM ); GetViewFrame()->GetBindings().Invalidate( SID_ATTR_ZOOMSLIDER ); @@ -339,16 +339,16 @@ void DrawViewShell::SetZoomRect( const Rectangle& rZoomRect ) |* \************************************************************************/ -USHORT DrawViewShell::PrepareClose( BOOL bUI, BOOL bForBrowsing ) +sal_uInt16 DrawViewShell::PrepareClose( sal_Bool bUI, sal_Bool bForBrowsing ) { - if ( ViewShell::PrepareClose(bUI, bForBrowsing) != TRUE ) - return FALSE; + if ( ViewShell::PrepareClose(bUI, bForBrowsing) != sal_True ) + return sal_False; - BOOL bRet = TRUE; + sal_Bool bRet = sal_True; if( bRet && HasCurrentFunction() ) { - USHORT nID = GetCurrentFunction()->GetSlotID(); + sal_uInt16 nID = GetCurrentFunction()->GetSlotID(); if (nID == SID_TEXTEDIT || nID == SID_ATTR_CHAR) { mpDrawView->SdrEndTextEdit(); @@ -376,7 +376,7 @@ void DrawViewShell::ChangeEditMode(EditMode eEMode, bool bIsLayerModeActive) { ViewShellManager::UpdateLock aLock (GetViewShellBase().GetViewShellManager()); - USHORT nActualPageNum = 0; + sal_uInt16 nActualPageNum = 0; GetViewShellBase().GetDrawController().FireChangeEditMode (eEMode == EM_MASTERPAGE); GetViewShellBase().GetDrawController().FireChangeLayerMode (bIsLayerModeActive); @@ -425,9 +425,9 @@ void DrawViewShell::ChangeEditMode(EditMode eEMode, bool bIsLayerModeActive) SdPage* pPage; String aPageName; - USHORT nPageCnt = GetDoc()->GetSdPageCount(mePageKind); + sal_uInt16 nPageCnt = GetDoc()->GetSdPageCount(mePageKind); - for (USHORT i = 0; i < nPageCnt; i++) + for (sal_uInt16 i = 0; i < nPageCnt; i++) { pPage = GetDoc()->GetSdPage(i, mePageKind); aPageName = pPage->GetName(); @@ -449,7 +449,7 @@ void DrawViewShell::ChangeEditMode(EditMode eEMode, bool bIsLayerModeActive) * MASTERPAGE ******************************************************************/ GetViewFrame()->SetChildWindow( - AnimationChildWindow::GetChildWindowId(), FALSE ); + AnimationChildWindow::GetChildWindowId(), sal_False ); if (!mpActualPage) { @@ -458,10 +458,10 @@ void DrawViewShell::ChangeEditMode(EditMode eEMode, bool bIsLayerModeActive) } maTabControl.Clear(); - USHORT nActualMasterPageNum = 0; - USHORT nMasterPageCnt = GetDoc()->GetMasterSdPageCount(mePageKind); + sal_uInt16 nActualMasterPageNum = 0; + sal_uInt16 nMasterPageCnt = GetDoc()->GetMasterSdPageCount(mePageKind); - for (USHORT i = 0; i < nMasterPageCnt; i++) + for (sal_uInt16 i = 0; i < nMasterPageCnt; i++) { SdPage* pMaster = GetDoc()->GetMasterSdPage(i, mePageKind); String aLayoutName(pMaster->GetLayoutName()); @@ -551,11 +551,11 @@ long DrawViewShell::GetHCtrlWidth() |* \************************************************************************/ -SvxRuler* DrawViewShell::CreateHRuler (::sd::Window* pWin, BOOL bIsFirst) +SvxRuler* DrawViewShell::CreateHRuler (::sd::Window* pWin, sal_Bool bIsFirst) { Ruler* pRuler; WinBits aWBits; - USHORT nFlags = SVXRULER_SUPPORT_OBJECT; + sal_uInt16 nFlags = SVXRULER_SUPPORT_OBJECT; if ( bIsFirst ) { @@ -572,10 +572,10 @@ SvxRuler* DrawViewShell::CreateHRuler (::sd::Window* pWin, BOOL bIsFirst) pRuler->SetSourceUnit(pWin->GetMapMode().GetMapUnit()); // Metric ... - UINT16 nMetric = (UINT16)GetDoc()->GetUIUnit(); + sal_uInt16 nMetric = (sal_uInt16)GetDoc()->GetUIUnit(); if( nMetric == 0xffff ) - nMetric = (UINT16)GetViewShellBase().GetViewFrame()->GetDispatcher()->GetModule()->GetFieldUnit(); + nMetric = (sal_uInt16)GetViewShellBase().GetViewFrame()->GetDispatcher()->GetModule()->GetFieldUnit(); pRuler->SetUnit( FieldUnit( nMetric ) ); @@ -599,17 +599,17 @@ SvxRuler* DrawViewShell::CreateVRuler(::sd::Window* pWin) { Ruler* pRuler; WinBits aWBits = WB_VSCROLL | WB_3DLOOK | WB_BORDER; - USHORT nFlags = SVXRULER_SUPPORT_OBJECT; + sal_uInt16 nFlags = SVXRULER_SUPPORT_OBJECT; pRuler = new Ruler(*this, GetParentWindow(), pWin, nFlags, GetViewFrame()->GetBindings(), aWBits); pRuler->SetSourceUnit(pWin->GetMapMode().GetMapUnit()); // #96629# Metric same as HRuler, use document setting - UINT16 nMetric = (UINT16)GetDoc()->GetUIUnit(); + sal_uInt16 nMetric = (sal_uInt16)GetDoc()->GetUIUnit(); if( nMetric == 0xffff ) - nMetric = (UINT16)GetViewShellBase().GetViewFrame()->GetDispatcher()->GetModule()->GetFieldUnit(); + nMetric = (sal_uInt16)GetViewShellBase().GetViewFrame()->GetDispatcher()->GetModule()->GetFieldUnit(); pRuler->SetUnit( FieldUnit( nMetric ) ); @@ -704,11 +704,11 @@ SdPage* DrawViewShell::getCurrentPage() const if (meEditMode == EM_PAGE) { - return GetDoc()->GetSdPage((USHORT)nCurrentPage, mePageKind); + return GetDoc()->GetSdPage((sal_uInt16)nCurrentPage, mePageKind); } else // EM_MASTERPAGE { - return GetDoc()->GetMasterSdPage((USHORT)nCurrentPage, mePageKind); + return GetDoc()->GetMasterSdPage((sal_uInt16)nCurrentPage, mePageKind); } } @@ -721,10 +721,10 @@ SdPage* DrawViewShell::getCurrentPage() const void DrawViewShell::ResetActualPage() { - USHORT nCurrentPage = maTabControl.GetCurPageId() - 1; - USHORT nPageCount = (meEditMode == EM_PAGE)?GetDoc()->GetSdPageCount(mePageKind):GetDoc()->GetMasterSdPageCount(mePageKind); + sal_uInt16 nCurrentPage = maTabControl.GetCurPageId() - 1; + sal_uInt16 nPageCount = (meEditMode == EM_PAGE)?GetDoc()->GetSdPageCount(mePageKind):GetDoc()->GetMasterSdPageCount(mePageKind); if (nPageCount > 0) - nCurrentPage = Min((USHORT)(nPageCount - 1), nCurrentPage); + nCurrentPage = Min((sal_uInt16)(nPageCount - 1), nCurrentPage); else nCurrentPage = 0; @@ -737,7 +737,7 @@ void DrawViewShell::ResetActualPage() SdPage* pPage = NULL; String aPageName; - for (USHORT i = 0; i < nPageCount; i++) + for (sal_uInt16 i = 0; i < nPageCount; i++) { pPage = GetDoc()->GetSdPage(i, mePageKind); aPageName = pPage->GetName(); @@ -753,10 +753,10 @@ void DrawViewShell::ResetActualPage() { SdPage* pActualPage = GetDoc()->GetMasterSdPage(nCurrentPage, mePageKind); maTabControl.Clear(); - USHORT nActualMasterPageNum = 0; + sal_uInt16 nActualMasterPageNum = 0; - USHORT nMasterPageCnt = GetDoc()->GetMasterSdPageCount(mePageKind); - for (USHORT i = 0; i < nMasterPageCnt; i++) + sal_uInt16 nMasterPageCnt = GetDoc()->GetMasterSdPageCount(mePageKind); + for (sal_uInt16 i = 0; i < nMasterPageCnt; i++) { SdPage* pMaster = GetDoc()->GetMasterSdPage(i, mePageKind); String aLayoutName(pMaster->GetLayoutName()); @@ -793,8 +793,8 @@ ErrCode DrawViewShell::DoVerb(long nVerb) SdrMark* pMark = rMarkList.GetMark(0); SdrObject* pObj = pMark->GetMarkedSdrObj(); - UINT32 nInv = pObj->GetObjInventor(); - UINT16 nSdrObjKind = pObj->GetObjIdentifier(); + sal_uInt32 nInv = pObj->GetObjInventor(); + sal_uInt16 nSdrObjKind = pObj->GetObjIdentifier(); if (nInv == SdrInventor && nSdrObjKind == OBJ_OLE2) { @@ -883,9 +883,9 @@ ErrCode DrawViewShell::DoVerb(long nVerb) |* \************************************************************************/ -BOOL DrawViewShell::ActivateObject(SdrOle2Obj* pObj, long nVerb) +sal_Bool DrawViewShell::ActivateObject(SdrOle2Obj* pObj, long nVerb) { - BOOL bActivated = FALSE; + sal_Bool bActivated = sal_False; if ( !GetDocSh()->IsUIActive() ) { @@ -911,7 +911,7 @@ BOOL DrawViewShell::ActivateObject(SdrOle2Obj* pObj, long nVerb) void LclResetFlag (bool& rbFlag) {rbFlag = false;} -BOOL DrawViewShell::SwitchPage(USHORT nSelectedPage) +sal_Bool DrawViewShell::SwitchPage(sal_uInt16 nSelectedPage) { /** Under some circumstances there are nested calls to SwitchPage() and may crash the application (activation of form controls when the @@ -920,7 +920,7 @@ BOOL DrawViewShell::SwitchPage(USHORT nSelectedPage) would jump to the wrong page anyway.) */ if (mbIsInSwitchPage) - return FALSE; + return sal_False; mbIsInSwitchPage = true; comphelper::ScopeGuard aGuard (::boost::bind(LclResetFlag, ::boost::ref(mbIsInSwitchPage))); @@ -932,10 +932,10 @@ BOOL DrawViewShell::SwitchPage(USHORT nSelectedPage) ::std::mem_fun(&DrawViewShell::SwitchPage), this, nSelectedPage)); - return FALSE; + return sal_False; } - BOOL bOK = FALSE; + sal_Bool bOK = sal_False; // With the current implementation of FuSlideShow there is a problem // when it dsplays the show in a window: When the show is stopped it @@ -953,7 +953,7 @@ BOOL DrawViewShell::SwitchPage(USHORT nSelectedPage) { // Make sure that the given page index points to an existing page. Move // the index into the valid range if necessary. - USHORT nPageCount = (meEditMode == EM_PAGE) + sal_uInt16 nPageCount = (meEditMode == EM_PAGE) ? GetDoc()->GetSdPageCount(mePageKind) : GetDoc()->GetMasterSdPageCount(mePageKind); if (nSelectedPage >= nPageCount) @@ -964,7 +964,7 @@ BOOL DrawViewShell::SwitchPage(USHORT nSelectedPage) { ModifyGuard aGuard2( GetDoc() ); - bOK = TRUE; + bOK = sal_True; if (mpActualPage) { @@ -986,7 +986,7 @@ BOOL DrawViewShell::SwitchPage(USHORT nSelectedPage) && sPageText == maTabControl.GetPageText(nSelectedPage+1)) { // this slide is already visible - return TRUE; + return sal_True; } } } @@ -1008,7 +1008,7 @@ BOOL DrawViewShell::SwitchPage(USHORT nSelectedPage) && pNewPage->GetName() == maTabControl.GetPageText(nSelectedPage+1)) { // this slide is already visible - return TRUE; + return sal_True; } } } @@ -1028,8 +1028,8 @@ BOOL DrawViewShell::SwitchPage(USHORT nSelectedPage) SdPage* pMaster = GetDoc()->GetMasterSdPage(nSelectedPage, mePageKind); // Passt die selektierte Seite zur MasterPage? - USHORT nPageCount = GetDoc()->GetSdPageCount(mePageKind); - for (USHORT i = 0; i < nPageCount; i++) + sal_uInt16 nPageCount = GetDoc()->GetSdPageCount(mePageKind); + for (sal_uInt16 i = 0; i < nPageCount; i++) { SdPage* pPage = GetDoc()->GetSdPage(i, mePageKind); if(pPage && pPage->IsSelected() && pMaster == &(pPage->TRG_GetMasterPage())) @@ -1042,7 +1042,7 @@ BOOL DrawViewShell::SwitchPage(USHORT nSelectedPage) if (!mpActualPage) { // Die erste Seite nehmen, welche zur MasterPage passt - for (USHORT i = 0; i < nPageCount; i++) + for (sal_uInt16 i = 0; i < nPageCount; i++) { SdPage* pPage = GetDoc()->GetSdPage(i, mePageKind); if(pPage && pMaster == &(pPage->TRG_GetMasterPage())) @@ -1054,10 +1054,10 @@ BOOL DrawViewShell::SwitchPage(USHORT nSelectedPage) } } - for (USHORT i = 0; i < GetDoc()->GetSdPageCount(mePageKind); i++) + for (sal_uInt16 i = 0; i < GetDoc()->GetSdPageCount(mePageKind); i++) { // Alle Seiten deselektieren - GetDoc()->SetSelected( GetDoc()->GetSdPage(i, mePageKind), FALSE); + GetDoc()->SetSelected( GetDoc()->GetSdPage(i, mePageKind), sal_False); } if (!mpActualPage) @@ -1068,7 +1068,7 @@ BOOL DrawViewShell::SwitchPage(USHORT nSelectedPage) // diese Seite auch selektieren (mpActualPage zeigt immer auf Zeichenseite, // nie auf eine Masterpage) - GetDoc()->SetSelected(mpActualPage, TRUE); + GetDoc()->SetSelected(mpActualPage, sal_True); rtl::Reference< sd::SlideShow > xSlideshow( SlideShow::GetSlideShow( GetDoc() ) ); if( !xSlideshow.is() || !xSlideshow->isRunning() || ( xSlideshow->getAnimationMode() != ANIMATIONMODE_SHOW ) ) @@ -1085,7 +1085,7 @@ BOOL DrawViewShell::SwitchPage(USHORT nSelectedPage) /********************************************************************** * PAGEMODE **********************************************************************/ - GetDoc()->SetSelected(mpActualPage, TRUE); + GetDoc()->SetSelected(mpActualPage, sal_True); SdrPageView* pPageView = mpDrawView->GetSdrPageView(); @@ -1177,7 +1177,7 @@ BOOL DrawViewShell::SwitchPage(USHORT nSelectedPage) if( !pMaster ) // Falls es diese Page nicht geben sollte pMaster = GetDoc()->GetMasterSdPage(0, mePageKind); - USHORT nNum = pMaster->GetPageNum(); + sal_uInt16 nNum = pMaster->GetPageNum(); mpDrawView->ShowSdrPage(mpDrawView->GetModel()->GetMasterPage(nNum)); GetViewShellBase().GetDrawController().FireSwitchCurrentPage(pMaster); @@ -1239,12 +1239,12 @@ BOOL DrawViewShell::SwitchPage(USHORT nSelectedPage) // Damit der Navigator (und das Effekte-Window) das mitbekommt (/-men) SfxBindings& rBindings = GetViewFrame()->GetBindings(); - rBindings.Invalidate(SID_NAVIGATOR_PAGENAME, TRUE, FALSE); - rBindings.Invalidate(SID_STATUS_PAGE, TRUE, FALSE); - rBindings.Invalidate(SID_DELETE_MASTER_PAGE, TRUE, FALSE); - rBindings.Invalidate(SID_DELETE_PAGE, TRUE, FALSE); - rBindings.Invalidate(SID_ASSIGN_LAYOUT,TRUE,FALSE); - rBindings.Invalidate(SID_INSERTPAGE,TRUE,FALSE); + rBindings.Invalidate(SID_NAVIGATOR_PAGENAME, sal_True, sal_False); + rBindings.Invalidate(SID_STATUS_PAGE, sal_True, sal_False); + rBindings.Invalidate(SID_DELETE_MASTER_PAGE, sal_True, sal_False); + rBindings.Invalidate(SID_DELETE_PAGE, sal_True, sal_False); + rBindings.Invalidate(SID_ASSIGN_LAYOUT,sal_True,sal_False); + rBindings.Invalidate(SID_INSERTPAGE,sal_True,sal_False); UpdatePreview( mpActualPage ); mpDrawView->AdjustMarkHdl(); @@ -1260,12 +1260,12 @@ BOOL DrawViewShell::SwitchPage(USHORT nSelectedPage) |* \************************************************************************/ -BOOL DrawViewShell::IsSwitchPageAllowed() const +sal_Bool DrawViewShell::IsSwitchPageAllowed() const { bool bOK = true; FmFormShell* pFormShell = GetViewShellBase().GetFormShellManager()->GetFormShell(); - if (pFormShell!=NULL && !pFormShell->PrepareClose (FALSE)) + if (pFormShell!=NULL && !pFormShell->PrepareClose (sal_False)) bOK = false; return bOK; @@ -1286,8 +1286,8 @@ void DrawViewShell::ResetActualLayer() // remember old layer cound and current layer id // this is needed when one layer is renamed to // restore current layer - USHORT nOldLayerCnt = pLayerBar->GetPageCount(); - USHORT nOldLayerId = pLayerBar->GetCurPageId(); + sal_uInt16 nOldLayerCnt = pLayerBar->GetPageCount(); + sal_uInt16 nOldLayerId = pLayerBar->GetCurPageId(); /************************************************************* * Update fuer LayerTab @@ -1301,11 +1301,11 @@ void DrawViewShell::ResetActualLayer() String aLayoutLayer( SdResId(STR_LAYER_LAYOUT) ); String aControlsLayer( SdResId(STR_LAYER_CONTROLS) ); String aMeasureLinesLayer( SdResId(STR_LAYER_MEASURELINES) ); - USHORT nActiveLayer = SDRLAYER_NOTFOUND; + sal_uInt16 nActiveLayer = SDRLAYER_NOTFOUND; SdrLayerAdmin& rLayerAdmin = GetDoc()->GetLayerAdmin(); - USHORT nLayerCnt = rLayerAdmin.GetLayerCount(); + sal_uInt16 nLayerCnt = rLayerAdmin.GetLayerCount(); - for ( USHORT nLayer = 0; nLayer < nLayerCnt; nLayer++ ) + for ( sal_uInt16 nLayer = 0; nLayer < nLayerCnt; nLayer++ ) { aName = rLayerAdmin.GetLayer(nLayer)->GetName(); @@ -1401,8 +1401,8 @@ sal_Int8 DrawViewShell::AcceptDrop ( const AcceptDropEvent& rEvt, DropTargetHelper& rTargetHelper, ::sd::Window* pTargetWindow, - USHORT nPage, - USHORT nLayer ) + sal_uInt16 nPage, + sal_uInt16 nLayer ) { if( nPage != SDRPAGE_NOTFOUND ) nPage = GetDoc()->GetSdPage( nPage, mePageKind )->GetPageNum(); @@ -1423,8 +1423,8 @@ sal_Int8 DrawViewShell::ExecuteDrop ( const ExecuteDropEvent& rEvt, DropTargetHelper& rTargetHelper, ::sd::Window* pTargetWindow, - USHORT nPage, - USHORT nLayer) + sal_uInt16 nPage, + sal_uInt16 nLayer) { if( nPage != SDRPAGE_NOTFOUND ) nPage = GetDoc()->GetSdPage( nPage, mePageKind )->GetPageNum(); diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx index 092dce05a196..7c219331441b 100755 --- a/sd/source/ui/view/drviews2.cxx +++ b/sd/source/ui/view/drviews2.cxx @@ -123,7 +123,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) DeactivateCurrentFunction(); - USHORT nSId = rReq.GetSlot(); + sal_uInt16 nSId = rReq.GetSlot(); // Slot wird gemapped (ToolboxImages/-Slots) MapSlot( nSId ); @@ -150,7 +150,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) { if( rReq.GetArgs() ) { - BOOL bMergeUndo = FALSE; + sal_Bool bMergeUndo = sal_False; ::svl::IUndoManager* pUndoManager = GetDocSh()->GetUndoManager(); // Anpassungen Start/EndWidth #63083# @@ -158,41 +158,41 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) { SdrObject* pObj = NULL; const SdrMarkList& rMarkList = mpDrawView->GetMarkedObjectList(); - ULONG nCount = rMarkList.GetMarkCount(); + sal_uLong nCount = rMarkList.GetMarkCount(); - INT32 nNewLineWidth = ((const XLineWidthItem&)rReq.GetArgs()->Get(XATTR_LINEWIDTH)).GetValue(); + sal_Int32 nNewLineWidth = ((const XLineWidthItem&)rReq.GetArgs()->Get(XATTR_LINEWIDTH)).GetValue(); - for (ULONG i=0; i<nCount; i++) + for (sal_uLong i=0; i<nCount; i++) { SfxItemSet aAttr(GetDoc()->GetPool()); pObj = rMarkList.GetMark(i)->GetMarkedSdrObj(); aAttr.Put(pObj->GetMergedItemSet()); - INT32 nActLineWidth = ((const XLineWidthItem&)aAttr.Get(XATTR_LINEWIDTH)).GetValue(); + sal_Int32 nActLineWidth = ((const XLineWidthItem&)aAttr.Get(XATTR_LINEWIDTH)).GetValue(); if(nActLineWidth != nNewLineWidth) { - BOOL bSetItemSet(FALSE); + sal_Bool bSetItemSet(sal_False); // #86265# do this for SFX_ITEM_DEFAULT and for SFX_ITEM_SET if(SFX_ITEM_DONTCARE != aAttr.GetItemState(XATTR_LINESTARTWIDTH)) { - INT32 nValAct = ((const XLineStartWidthItem&)aAttr.Get(XATTR_LINESTARTWIDTH)).GetValue(); - INT32 nValNew = nValAct + (((nNewLineWidth - nActLineWidth) * 15) / 10); + sal_Int32 nValAct = ((const XLineStartWidthItem&)aAttr.Get(XATTR_LINESTARTWIDTH)).GetValue(); + sal_Int32 nValNew = nValAct + (((nNewLineWidth - nActLineWidth) * 15) / 10); if(nValNew < 0) nValNew = 0; - bSetItemSet = TRUE; + bSetItemSet = sal_True; aAttr.Put(XLineStartWidthItem(nValNew)); } // #86265# do this for SFX_ITEM_DEFAULT and for SFX_ITEM_SET if(SFX_ITEM_DONTCARE != aAttr.GetItemState(XATTR_LINEENDWIDTH)) { - INT32 nValAct = ((const XLineEndWidthItem&)aAttr.Get(XATTR_LINEENDWIDTH)).GetValue(); - INT32 nValNew = nValAct + (((nNewLineWidth - nActLineWidth) * 15) / 10); + sal_Int32 nValAct = ((const XLineEndWidthItem&)aAttr.Get(XATTR_LINEENDWIDTH)).GetValue(); + sal_Int32 nValNew = nValAct + (((nNewLineWidth - nActLineWidth) * 15) / 10); if(nValNew < 0) nValNew = 0; - bSetItemSet = TRUE; + bSetItemSet = sal_True; aAttr.Put(XLineEndWidthItem(nValNew)); } @@ -207,11 +207,11 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) // Ggf. werden transparente Objekte wei?gefuellt SdrObject* pObj = NULL; const SdrMarkList& rMarkList = mpDrawView->GetMarkedObjectList(); - ULONG nCount = rMarkList.GetMarkCount(); + sal_uLong nCount = rMarkList.GetMarkCount(); const bool bUndo = mpDrawView->IsUndoEnabled(); - for (ULONG i=0; i<nCount; i++) + for (sal_uLong i=0; i<nCount; i++) { SfxItemSet aAttr(GetDoc()->GetPool()); pObj = rMarkList.GetMark(i)->GetMarkedSdrObj(); @@ -232,7 +232,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) // daher hart attributieren: Fuellung setzen if (!bMergeUndo) { - bMergeUndo = TRUE; + bMergeUndo = sal_True; pUndoManager->EnterListAction( String(), String() ); mpDrawView->BegUndo(); } @@ -294,12 +294,12 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) { // const SfxPoolItem* pItem = rReq.GetArg( SID_HYPHENATION ); // ^-- Soll so nicht benutzt werden (Defaults sind falsch) ! - SFX_REQUEST_ARG( rReq, pItem, SfxBoolItem, SID_HYPHENATION, FALSE); + SFX_REQUEST_ARG( rReq, pItem, SfxBoolItem, SID_HYPHENATION, sal_False); if( pItem ) { SfxItemSet aSet( GetPool(), EE_PARA_HYPHENATE, EE_PARA_HYPHENATE ); - BOOL bValue = ( (const SfxBoolItem*) pItem)->GetValue(); + sal_Bool bValue = ( (const SfxBoolItem*) pItem)->GetValue(); aSet.Put( SfxBoolItem( EE_PARA_HYPHENATE, bValue ) ); mpDrawView->SetAttributes( aSet ); } @@ -307,7 +307,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) { DBG_ERROR(" Kein Wert fuer Silbentrennung!"); SfxItemSet aSet( GetPool(), EE_PARA_HYPHENATE, EE_PARA_HYPHENATE ); - BOOL bValue = TRUE; + sal_Bool bValue = sal_True; aSet.Put( SfxBoolItem( EE_PARA_HYPHENATE, bValue ) ); mpDrawView->SetAttributes( aSet ); } @@ -341,13 +341,13 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) xMasterPagesSupplier->getMasterPages()); if (xMasterPages.is()) { - USHORT nIndex = GetCurPageId(); + sal_uInt16 nIndex = GetCurPageId(); xMasterPages->insertNewByIndex (nIndex); // Create shapes for the default layout. SdPage* pMasterPage = GetDoc()->GetMasterSdPage( nIndex, PK_STANDARD); - pMasterPage->CreateTitleAndLayout (TRUE,TRUE); + pMasterPage->CreateTitleAndLayout (sal_True,sal_True); } } @@ -368,7 +368,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) { mpDrawView->SdrEndTextEdit(); } - USHORT nPage = maTabControl.GetCurPageId() - 1; + sal_uInt16 nPage = maTabControl.GetCurPageId() - 1; mpActualPage = GetDoc()->GetSdPage(nPage, mePageKind); ::sd::ViewShell::mpImpl->ProcessModifyPageSlot ( rReq, @@ -405,7 +405,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) mpDrawView->SdrEndTextEdit(); } - USHORT nPageId = maTabControl.GetCurPageId(); + sal_uInt16 nPageId = maTabControl.GetCurPageId(); SdPage* pCurrentPage = ( GetEditMode() == EM_PAGE ) ? GetDoc()->GetSdPage( nPageId - 1, GetPageKind() ) : GetDoc()->GetMasterSdPage( nPageId - 1, GetPageKind() ); @@ -467,13 +467,13 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) if (pArgs) if (pArgs->Count () == 3) { - SFX_REQUEST_ARG (rReq, pWidth, SfxUInt32Item, ID_VAL_PAGEWIDTH, FALSE); - SFX_REQUEST_ARG (rReq, pHeight, SfxUInt32Item, ID_VAL_PAGEHEIGHT, FALSE); - SFX_REQUEST_ARG (rReq, pScaleAll, SfxBoolItem, ID_VAL_SCALEOBJECTS, FALSE); + SFX_REQUEST_ARG (rReq, pWidth, SfxUInt32Item, ID_VAL_PAGEWIDTH, sal_False); + SFX_REQUEST_ARG (rReq, pHeight, SfxUInt32Item, ID_VAL_PAGEHEIGHT, sal_False); + SFX_REQUEST_ARG (rReq, pScaleAll, SfxBoolItem, ID_VAL_SCALEOBJECTS, sal_False); Size aSize (pWidth->GetValue (), pHeight->GetValue ()); - SetupPage (aSize, 0, 0, 0, 0, TRUE, FALSE, pScaleAll->GetValue ()); + SetupPage (aSize, 0, 0, 0, 0, sal_True, sal_False, pScaleAll->GetValue ()); rReq.Ignore (); break; } @@ -490,17 +490,17 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) if (pArgs) if (pArgs->Count () == 5) { - SFX_REQUEST_ARG (rReq, pLeft, SfxUInt32Item, ID_VAL_PAGELEFT, FALSE); - SFX_REQUEST_ARG (rReq, pRight, SfxUInt32Item, ID_VAL_PAGERIGHT, FALSE); - SFX_REQUEST_ARG (rReq, pUpper, SfxUInt32Item, ID_VAL_PAGETOP, FALSE); - SFX_REQUEST_ARG (rReq, pLower, SfxUInt32Item, ID_VAL_PAGEBOTTOM, FALSE); - SFX_REQUEST_ARG (rReq, pScaleAll, SfxBoolItem, ID_VAL_SCALEOBJECTS, FALSE); + SFX_REQUEST_ARG (rReq, pLeft, SfxUInt32Item, ID_VAL_PAGELEFT, sal_False); + SFX_REQUEST_ARG (rReq, pRight, SfxUInt32Item, ID_VAL_PAGERIGHT, sal_False); + SFX_REQUEST_ARG (rReq, pUpper, SfxUInt32Item, ID_VAL_PAGETOP, sal_False); + SFX_REQUEST_ARG (rReq, pLower, SfxUInt32Item, ID_VAL_PAGEBOTTOM, sal_False); + SFX_REQUEST_ARG (rReq, pScaleAll, SfxBoolItem, ID_VAL_SCALEOBJECTS, sal_False); Size aEmptySize (0, 0); SetupPage (aEmptySize, pLeft->GetValue (), pRight->GetValue (), pUpper->GetValue (), pLower->GetValue (), - FALSE, TRUE, pScaleAll->GetValue ()); + sal_False, sal_True, pScaleAll->GetValue ()); rReq.Ignore (); break; } @@ -516,7 +516,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) if (pArgs && pArgs->Count () == 1 ) { - SFX_REQUEST_ARG (rReq, pScale, SfxUInt16Item, SID_ATTR_ZOOMSLIDER, FALSE); + SFX_REQUEST_ARG (rReq, pScale, SfxUInt16Item, SID_ATTR_ZOOMSLIDER, sal_False); if (CHECK_RANGE (5, pScale->GetValue (), 3000)) { SetZoom (pScale->GetValue ()); @@ -541,7 +541,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) if (pArgs) if (pArgs->Count () == 1) { - SFX_REQUEST_ARG (rReq, pScale, SfxUInt32Item, ID_VAL_ZOOM, FALSE); + SFX_REQUEST_ARG (rReq, pScale, SfxUInt32Item, ID_VAL_ZOOM, sal_False); if (CHECK_RANGE (10, pScale->GetValue (), 1000)) { SetZoom (pScale->GetValue ()); @@ -566,7 +566,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) case SID_ATTR_ZOOM: { const SfxItemSet* pArgs = rReq.GetArgs(); - mbZoomOnPage = FALSE; + mbZoomOnPage = sal_False; if ( pArgs ) { @@ -626,7 +626,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) if( rReq.GetSlot() == SID_CHANGEBEZIER ) { WaitObject aWait( (Window*)GetActiveWindow() ); - mpDrawView->ConvertMarkedToPathObj(FALSE); + mpDrawView->ConvertMarkedToPathObj(sal_False); } else { @@ -635,7 +635,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) else { WaitObject aWait( (Window*)GetActiveWindow() ); - mpDrawView->ConvertMarkedToPolyObj(FALSE); + mpDrawView->ConvertMarkedToPolyObj(sal_False); } } @@ -667,7 +667,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) else { WaitObject aWait( (Window*)GetActiveWindow() ); - mpDrawView->ConvertMarkedToPathObj(TRUE); + mpDrawView->ConvertMarkedToPathObj(sal_True); Invalidate(SID_CONVERT_TO_CONTOUR); } @@ -771,24 +771,24 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) ::Outliner* pOutl = mpDrawView->GetTextEditOutliner(); if (pOutl) { - pOutl->RemoveFields(TRUE, (TypeId) SvxURLField::StaticType()); + pOutl->RemoveFields(sal_True, (TypeId) SvxURLField::StaticType()); } pSet = new SfxItemSet( GetPool(), EE_ITEMS_START, EE_ITEMS_END ); - mpDrawView->SetAttributes( *pSet, TRUE ); + mpDrawView->SetAttributes( *pSet, sal_True ); } else { const SdrMarkList& rMarkList = mpDrawView->GetMarkedObjectList(); - ULONG nCount = rMarkList.GetMarkCount(); + sal_uLong nCount = rMarkList.GetMarkCount(); // In diese Liste werden fuer jedes Praesentationsobjekt ein SfxItemSet // der harten Attribute sowie der UserCall eingetragen, da diese beim nachfolgenden - // mpDrawView->SetAttributes( *pSet, TRUE ) verloren gehen und spaeter restauriert + // mpDrawView->SetAttributes( *pSet, sal_True ) verloren gehen und spaeter restauriert // werden muessen List* pAttrList = new List(); SdPage* pPresPage = (SdPage*) mpDrawView->GetSdrPageView()->GetPage(); - ULONG i; + sal_uLong i; for ( i = 0; i < nCount; i++ ) { @@ -804,9 +804,9 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) } pSet = new SfxItemSet( GetPool() ); - mpDrawView->SetAttributes( *pSet, TRUE ); + mpDrawView->SetAttributes( *pSet, sal_True ); - ULONG j = 0; + sal_uLong j = 0; for ( i = 0; i < nCount; i++ ) { @@ -817,11 +817,11 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) { pSheet = mpActualPage->GetStyleSheetForPresObj(PRESOBJ_TITLE); if (pSheet) - pObj->SetStyleSheet(pSheet, FALSE); + pObj->SetStyleSheet(pSheet, sal_False); } else if(pObj->GetObjIdentifier() == OBJ_OUTLINETEXT) { - for (USHORT nLevel = 1; nLevel < 10; nLevel++) + for (sal_uInt16 nLevel = 1; nLevel < 10; nLevel++) { pSheet = mpActualPage->GetStyleSheetForPresObj( PRESOBJ_OUTLINE ); DBG_ASSERT(pSheet, "Vorlage fuer Gliederungsobjekt nicht gefunden"); @@ -831,7 +831,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) if( nLevel == 1 ) // Textrahmen hoert auf StyleSheet der Ebene1 - pObj->NbcSetStyleSheet(pSheet, FALSE); + pObj->NbcSetStyleSheet(pSheet, sal_False); } } @@ -871,11 +871,11 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) { SdrPageView* pPV; Point aMPos = GetActiveWindow()->PixelToLogic( maMousePos ); - USHORT nHitLog = (USHORT) GetActiveWindow()->PixelToLogic( Size( + sal_uInt16 nHitLog = (sal_uInt16) GetActiveWindow()->PixelToLogic( Size( FuPoor::HITPIX, 0 ) ).Width(); - USHORT nHelpLine; + sal_uInt16 nHelpLine; - mbMousePosFreezed = FALSE; + mbMousePosFreezed = sal_False; if( mpDrawView->PickHelpLine( aMPos, nHitLog, *GetActiveWindow(), nHelpLine, pPV) ) { diff --git a/sd/source/ui/view/drviews3.cxx b/sd/source/ui/view/drviews3.cxx index 28f8d909031b..d632929a3f65 100755 --- a/sd/source/ui/view/drviews3.cxx +++ b/sd/source/ui/view/drviews3.cxx @@ -133,7 +133,7 @@ void DrawViewShell::ExecCtrl(SfxRequest& rReq) CheckLineTo (rReq); // End text edit mode for some requests. - USHORT nSlot = rReq.GetSlot(); + sal_uInt16 nSlot = rReq.GetSlot(); switch (nSlot) { case SID_OUTPUT_QUALITY_COLOR: @@ -149,23 +149,23 @@ void DrawViewShell::ExecCtrl(SfxRequest& rReq) } } - // USHORT nSlot = rReq.GetSlot(); + // sal_uInt16 nSlot = rReq.GetSlot(); switch (nSlot) { case SID_SWITCHPAGE: // BASIC { - BOOL bWasBasic = FALSE; + sal_Bool bWasBasic = sal_False; // switch page in running slide show if(SlideShow::IsRunning(GetViewShellBase()) && rReq.GetArgs()) { - SFX_REQUEST_ARG(rReq, pWhatPage, SfxUInt32Item, ID_VAL_WHATPAGE, FALSE); + SFX_REQUEST_ARG(rReq, pWhatPage, SfxUInt32Item, ID_VAL_WHATPAGE, sal_False); SlideShow::GetSlideShow(GetViewShellBase())->jumpToPageNumber((sal_Int32)((pWhatPage->GetValue()-1)>>1)); } else { const SfxItemSet *pArgs = rReq.GetArgs (); - USHORT nSelectedPage = 0; + sal_uInt16 nSelectedPage = 0; if (! pArgs) { @@ -173,8 +173,8 @@ void DrawViewShell::ExecCtrl(SfxRequest& rReq) } else if (pArgs->Count () == 2) { - SFX_REQUEST_ARG (rReq, pWhatPage, SfxUInt32Item, ID_VAL_WHATPAGE, FALSE); - SFX_REQUEST_ARG (rReq, pWhatKind, SfxUInt32Item, ID_VAL_WHATKIND, FALSE); + SFX_REQUEST_ARG (rReq, pWhatPage, SfxUInt32Item, ID_VAL_WHATPAGE, sal_False); + SFX_REQUEST_ARG (rReq, pWhatKind, SfxUInt32Item, ID_VAL_WHATKIND, sal_False); sal_Int32 nWhatPage = (sal_Int32)pWhatPage->GetValue (); sal_Int32 nWhatKind = (sal_Int32)pWhatKind->GetValue (); @@ -195,7 +195,7 @@ void DrawViewShell::ExecCtrl(SfxRequest& rReq) nSelectedPage = (short) nWhatPage; mePageKind = (PageKind) nWhatKind; - bWasBasic = TRUE; + bWasBasic = sal_True; } } else @@ -224,11 +224,11 @@ void DrawViewShell::ExecCtrl(SfxRequest& rReq) case SID_SWITCHLAYER: // BASIC { const SfxItemSet *pArgs = rReq.GetArgs (); - USHORT nCurPage = GetLayerTabControl()->GetCurPageId (); + sal_uInt16 nCurPage = GetLayerTabControl()->GetCurPageId (); if( pArgs && pArgs->Count () == 1) { - SFX_REQUEST_ARG (rReq, pWhatLayer, SfxUInt32Item, ID_VAL_WHATLAYER, FALSE); + SFX_REQUEST_ARG (rReq, pWhatLayer, SfxUInt32Item, ID_VAL_WHATLAYER, sal_False); if( pWhatLayer ) nCurPage = (short) pWhatLayer->GetValue (); } @@ -247,8 +247,8 @@ void DrawViewShell::ExecCtrl(SfxRequest& rReq) if ( pArgs && pArgs->Count () == 2) { - SFX_REQUEST_ARG (rReq, pIsActive, SfxBoolItem, ID_VAL_ISACTIVE, FALSE); - SFX_REQUEST_ARG (rReq, pWhatKind, SfxUInt32Item, ID_VAL_WHATKIND, FALSE); + SFX_REQUEST_ARG (rReq, pIsActive, SfxBoolItem, ID_VAL_ISACTIVE, sal_False); + SFX_REQUEST_ARG (rReq, pWhatKind, SfxUInt32Item, ID_VAL_WHATKIND, sal_False); sal_Int32 nWhatKind = (sal_Int32)pWhatKind->GetValue (); if (CHECK_RANGE (PK_STANDARD, nWhatKind, PK_HANDOUT)) @@ -275,8 +275,8 @@ void DrawViewShell::ExecCtrl(SfxRequest& rReq) if ( pArgs && pArgs->Count () == 2) { - SFX_REQUEST_ARG (rReq, pWhatLayerMode, SfxBoolItem, ID_VAL_ISACTIVE, FALSE); - SFX_REQUEST_ARG (rReq, pWhatLayer, SfxUInt32Item, ID_VAL_WHATLAYER, FALSE); + SFX_REQUEST_ARG (rReq, pWhatLayerMode, SfxBoolItem, ID_VAL_ISACTIVE, sal_False); + SFX_REQUEST_ARG (rReq, pWhatLayer, SfxUInt32Item, ID_VAL_WHATLAYER, sal_False); sal_Int32 nWhatLayer = (sal_Int32)pWhatLayer->GetValue (); if (CHECK_RANGE (EM_PAGE, nWhatLayer, EM_MASTERPAGE)) @@ -374,7 +374,7 @@ void DrawViewShell::ExecCtrl(SfxRequest& rReq) case SID_RELOAD: { // #83951# - USHORT nId = Svx3DChildWindow::GetChildWindowId(); + sal_uInt16 nId = Svx3DChildWindow::GetChildWindowId(); SfxViewFrame* pFrame = GetViewFrame(); try @@ -425,7 +425,7 @@ void DrawViewShell::ExecCtrl(SfxRequest& rReq) { if( rReq.GetArgs() ) { - SFX_REQUEST_ARG(rReq, pBookmark, SfxStringItem, SID_JUMPTOMARK, FALSE); + SFX_REQUEST_ARG(rReq, pBookmark, SfxStringItem, SID_JUMPTOMARK, sal_False); if (pBookmark) { @@ -468,7 +468,7 @@ void DrawViewShell::ExecCtrl(SfxRequest& rReq) { const SfxPoolItem* pItem; if (rReq.GetArgs()->GetItemState( - SID_ATTR_YEAR2000, TRUE, &pItem) == SFX_ITEM_SET) + SID_ATTR_YEAR2000, sal_True, &pItem) == SFX_ITEM_SET) pFormShell->SetY2KState ( static_cast<const SfxUInt16Item*>(pItem)->GetValue()); } @@ -544,8 +544,8 @@ void DrawViewShell::ExecRuler(SfxRequest& rReq) long nRight = Max(0L, rLRSpace.GetRight() + aPagePos.X() + aPageSize.Width() - aViewSize.Width()); - USHORT nPageCnt = GetDoc()->GetSdPageCount(mePageKind); - USHORT i; + sal_uInt16 nPageCnt = GetDoc()->GetSdPageCount(mePageKind); + sal_uInt16 i; for ( i = 0; i < nPageCnt; i++) { SdPage* pPage = GetDoc()->GetSdPage(i, mePageKind); @@ -602,8 +602,8 @@ void DrawViewShell::ExecRuler(SfxRequest& rReq) long nLower = Max(0L, rULSpace.GetLower() + aPagePos.Y() + aPageSize.Height() - aViewSize.Height()); - USHORT nPageCnt = GetDoc()->GetSdPageCount(mePageKind); - USHORT i; + sal_uInt16 nPageCnt = GetDoc()->GetSdPageCount(mePageKind); + sal_uInt16 i; for ( i = 0; i < nPageCnt; i++) { SdPage* pPage = GetDoc()->GetSdPage(i, mePageKind); @@ -685,7 +685,7 @@ void DrawViewShell::ExecRuler(SfxRequest& rReq) { if( mpDrawView->IsTextEdit() ) { - USHORT nId = SID_ATTR_PARA_LRSPACE; + sal_uInt16 nId = SID_ATTR_PARA_LRSPACE; const SvxLRSpaceItem& rItem = (const SvxLRSpaceItem&) pArgs->Get( nId ); @@ -778,7 +778,7 @@ void DrawViewShell::GetRulerState(SfxItemSet& rSet) //Rectangle aRect = maMarkRect; const SvxLRSpaceItem& rLRSpaceItem = (const SvxLRSpaceItem&) aEditAttr.Get( EE_PARA_LRSPACE ); - USHORT nId = SID_ATTR_PARA_LRSPACE; + sal_uInt16 nId = SID_ATTR_PARA_LRSPACE; SvxLRSpaceItem aLRSpaceItem( rLRSpaceItem.GetLeft(), rLRSpaceItem.GetRight(), rLRSpaceItem.GetTxtLeft(), rLRSpaceItem.GetTxtFirstLineOfst(), nId ); @@ -813,8 +813,8 @@ void DrawViewShell::GetRulerState(SfxItemSet& rSet) rSet.DisableItem( SID_RULER_OBJECT ); // Seitenraender werden gelocked - aProtect.SetSizeProtect( TRUE ); - aProtect.SetPosProtect( TRUE ); + aProtect.SetSizeProtect( sal_True ); + aProtect.SetPosProtect( sal_True ); } if( aEditAttr.GetItemState( EE_PARA_WRITINGDIR ) >= SFX_ITEM_AVAILABLE ) @@ -829,7 +829,7 @@ void DrawViewShell::GetRulerState(SfxItemSet& rSet) rSet.DisableItem( EE_PARA_TABS ); rSet.DisableItem( SID_RULER_TEXT_RIGHT_TO_LEFT ); - if( mpDrawView->IsResizeAllowed(TRUE) ) + if( mpDrawView->IsResizeAllowed(sal_True) ) { Rectangle aResizeRect( maMarkRect ); @@ -899,9 +899,9 @@ void DrawViewShell::GetSnapItemState( SfxItemSet &rSet ) { SdrPageView* pPV; Point aMPos = GetActiveWindow()->PixelToLogic(maMousePos); - USHORT nHitLog = (USHORT) GetActiveWindow()->PixelToLogic( + sal_uInt16 nHitLog = (sal_uInt16) GetActiveWindow()->PixelToLogic( Size(FuPoor::HITPIX,0)).Width(); - USHORT nHelpLine; + sal_uInt16 nHelpLine; if ( mpDrawView->PickHelpLine(aMPos, nHitLog, *GetActiveWindow(), nHelpLine, pPV) ) { diff --git a/sd/source/ui/view/drviews4.cxx b/sd/source/ui/view/drviews4.cxx index 88027d360806..0a369bbf7c1f 100644..100755 --- a/sd/source/ui/view/drviews4.cxx +++ b/sd/source/ui/view/drviews4.cxx @@ -102,7 +102,7 @@ using namespace ::com::sun::star::drawing; void DrawViewShell::DeleteActualPage() { - USHORT nPage = maTabControl.GetCurPageId() - 1; + sal_uInt16 nPage = maTabControl.GetCurPageId() - 1; mpDrawView->SdrEndTextEdit(); @@ -132,13 +132,13 @@ void DrawViewShell::DeleteActualLayer() String aString(SdResId(STR_ASK_DELETE_LAYER)); // Platzhalter ersetzen - USHORT nPos = aString.Search(sal_Unicode('$')); + sal_uInt16 nPos = aString.Search(sal_Unicode('$')); aString.Erase(nPos, 1); aString.Insert(rName, nPos); if (QueryBox(GetActiveWindow(), WB_YES_NO, aString).Execute() == RET_YES) { - const SdrLayer* pLayer = rAdmin.GetLayer(rName, FALSE); + const SdrLayer* pLayer = rAdmin.GetLayer(rName, sal_False); mpDrawView->DeleteLayer( pLayer->GetName() ); // damit TabBar und Window neu gezeichnet werden; @@ -158,9 +158,9 @@ void DrawViewShell::DeleteActualLayer() |* \************************************************************************/ -BOOL DrawViewShell::KeyInput (const KeyEvent& rKEvt, ::sd::Window* pWin) +sal_Bool DrawViewShell::KeyInput (const KeyEvent& rKEvt, ::sd::Window* pWin) { - BOOL bRet = FALSE; + sal_Bool bRet = sal_False; if ( !IsInputLocked() || ( rKEvt.GetKeyCode().GetCode() == KEY_ESCAPE ) ) { @@ -186,7 +186,7 @@ BOOL DrawViewShell::KeyInput (const KeyEvent& rKEvt, ::sd::Window* pWin) // look for a new candidate, a successor of pOldObj SdrObjListIter aIter(*pActualPage, IM_DEEPNOGROUPS); - BOOL bDidVisitOldObject(FALSE); + sal_Bool bDidVisitOldObject(sal_False); while(aIter.IsMore() && !pCandidate) { @@ -206,7 +206,7 @@ BOOL DrawViewShell::KeyInput (const KeyEvent& rKEvt, ::sd::Window* pWin) if(pObj == pOldObj) { - bDidVisitOldObject = TRUE; + bDidVisitOldObject = sal_True; } } } @@ -254,13 +254,13 @@ void DrawViewShell::StartRulerDrag ( if ( rRuler.GetExtraRect().IsInside(rMEvt.GetPosPixel()) ) { mpDrawView->BegSetPageOrg(aWPos); - mbIsRulerDrag = TRUE; + mbIsRulerDrag = sal_True; } else { // #i34536# if no guide-lines are visible yet, that show them if( ! mpDrawView->IsHlplVisible()) - mpDrawView->SetHlplVisible( TRUE ); + mpDrawView->SetHlplVisible( sal_True ); SdrHelpLineKind eKind; @@ -272,7 +272,7 @@ void DrawViewShell::StartRulerDrag ( eKind = SDRHELPLINE_VERTICAL; mpDrawView->BegDragHelpLine(aWPos, eKind); - mbIsRulerDrag = TRUE; + mbIsRulerDrag = sal_True; } } @@ -293,7 +293,7 @@ void DrawViewShell::MouseButtonDown(const MouseEvent& rMEvt, // would work on deleted objects or the context menu has no parent anymore) // See #126086# and #128122# SfxInPlaceClient* pIPClient = GetViewShell()->GetIPClient(); - BOOL bIsOleActive = ( pIPClient && pIPClient->IsObjectInPlaceActive() ); + sal_Bool bIsOleActive = ( pIPClient && pIPClient->IsObjectInPlaceActive() ); if ( bIsOleActive && PopupMenu::IsInExecute() ) return; @@ -324,7 +324,7 @@ void DrawViewShell::MouseMove(const MouseEvent& rMEvt, ::sd::Window* pWin) if ( !aOutputArea.IsInside(rMEvt.GetPosPixel()) ) { - BOOL bInsideOtherWindow = FALSE; + sal_Bool bInsideOtherWindow = sal_False; if (mpContentWindow.get() != NULL) { @@ -333,7 +333,7 @@ void DrawViewShell::MouseMove(const MouseEvent& rMEvt, ::sd::Window* pWin) Point aPos = mpContentWindow->GetPointerPosPixel(); if ( aOutputArea.IsInside(aPos) ) - bInsideOtherWindow = TRUE; + bInsideOtherWindow = sal_True; } if (! GetActiveWindow()->HasFocus ()) @@ -422,9 +422,9 @@ void DrawViewShell::MouseMove(const MouseEvent& rMEvt, ::sd::Window* pWin) } ( (SvxBmpMask*) GetViewFrame()->GetChildWindow( SvxBmpMaskChildWindow::GetChildWindowId() )->GetWindow() )-> - SetColor( Color( (BYTE) ( nRed / fDiv + .5 ), - (BYTE) ( nGreen / fDiv + .5 ), - (BYTE) ( nBlue / fDiv + .5 ) ) ); + SetColor( Color( (sal_uInt8) ( nRed / fDiv + .5 ), + (sal_uInt8) ( nGreen / fDiv + .5 ), + (sal_uInt8) ( nBlue / fDiv + .5 ) ) ); } } } @@ -467,7 +467,7 @@ void DrawViewShell::MouseButtonUp(const MouseEvent& rMEvt, ::sd::Window* pWin) } GetActiveWindow()->ReleaseMouse(); - mbIsRulerDrag = FALSE; + mbIsRulerDrag = sal_False; } else ViewShell::MouseButtonUp(rMEvt, pWin); @@ -488,7 +488,7 @@ void DrawViewShell::Command(const CommandEvent& rCEvt, ::sd::Window* pWin) // windows and code on the stack. // For more information, see #126086# and #128122# SfxInPlaceClient* pIPClient = GetViewShell()->GetIPClient(); - BOOL bIsOleActive = ( pIPClient && pIPClient->IsObjectInPlaceActive() ); + sal_Bool bIsOleActive = ( pIPClient && pIPClient->IsObjectInPlaceActive() ); if ( bIsOleActive && ( rCEvt.GetCommand() == COMMAND_CONTEXTMENU )) { // Deactivate OLE object @@ -516,7 +516,7 @@ void DrawViewShell::Command(const CommandEvent& rCEvt, ::sd::Window* pWin) if( GetActiveWindow() ) aPos = GetActiveWindow()->PixelToLogic( rCEvt.GetMousePosPixel() ); - if( !mpDrawView->InsertData( aDataHelper, aPos, nDnDAction, FALSE ) ) + if( !mpDrawView->InsertData( aDataHelper, aPos, nDnDAction, sal_False ) ) { INetBookmark aINetBookmark( aEmptyStr, aEmptyStr ); @@ -535,18 +535,18 @@ void DrawViewShell::Command(const CommandEvent& rCEvt, ::sd::Window* pWin) else if( rCEvt.GetCommand() == COMMAND_CONTEXTMENU && !bNativeShow && pWin != NULL && !mpDrawView->IsAction() && !SD_MOD()->GetWaterCan() ) { - USHORT nSdResId = 0; // ResourceID fuer Popup-Menue - BOOL bGraphicShell = this->ISA(GraphicViewShell); + sal_uInt16 nSdResId = 0; // ResourceID fuer Popup-Menue + sal_Bool bGraphicShell = this->ISA(GraphicViewShell); // Ist ein Fangobjekt unter dem Mauszeiger? SdrPageView* pPV; Point aMPos = pWin->PixelToLogic( maMousePos ); - USHORT nHitLog = (USHORT) GetActiveWindow()->PixelToLogic( + sal_uInt16 nHitLog = (sal_uInt16) GetActiveWindow()->PixelToLogic( Size(FuPoor::HITPIX, 0 ) ).Width(); - USHORT nHelpLine; + sal_uInt16 nHelpLine; // fuer Klebepunkt SdrObject* pObj = NULL; - USHORT nPickId = 0; + sal_uInt16 nPickId = 0; // fuer Feldbefehl OutlinerView* pOLV = mpDrawView->GetTextEditOutlinerView(); const SvxFieldItem* pFldItem = NULL; @@ -597,10 +597,10 @@ void DrawViewShell::Command(const CommandEvent& rCEvt, ::sd::Window* pWin) //pOLV->DeleteSelected(); <-- fehlt leider ! // Feld selektieren, so dass es beim Insert geloescht wird ESelection aSel = pOLV->GetSelection(); - BOOL bSel = TRUE; + sal_Bool bSel = sal_True; if( aSel.nStartPos == aSel.nEndPos ) { - bSel = FALSE; + bSel = sal_False; aSel.nEndPos++; } pOLV->SetSelection( aSel ); @@ -672,8 +672,8 @@ void DrawViewShell::Command(const CommandEvent& rCEvt, ::sd::Window* pWin) } else { - UINT32 nInv = pObj->GetObjInventor(); - UINT16 nId = pObj->GetObjIdentifier(); + sal_uInt32 nInv = pObj->GetObjInventor(); + sal_uInt16 nId = pObj->GetObjIdentifier(); if (nInv == SdrInventor) { @@ -824,7 +824,7 @@ void DrawViewShell::Command(const CommandEvent& rCEvt, ::sd::Window* pWin) //open context menu at that point GetViewFrame()->GetDispatcher()->ExecutePopup(SdResId(nSdResId),GetActiveWindow(),&aMenuPos); } - mbMousePosFreezed = FALSE; + mbMousePosFreezed = sal_False; } } else @@ -849,7 +849,7 @@ void DrawViewShell::ShowMousePosInfo(const Rectangle& rRect, RulerLine pVLines[2]; long nHOffs = 0L; long nVOffs = 0L; - USHORT nCnt; + sal_uInt16 nCnt; if (mpHorizontalRuler.get() != NULL) mpHorizontalRuler->SetLines(); @@ -940,7 +940,7 @@ void DrawViewShell::UnlockInput() void DrawViewShell::ShowSnapLineContextMenu ( SdrPageView& rPageView, - const USHORT nSnapLineIndex, + const sal_uInt16 nSnapLineIndex, const Point& rMouseLocation) { const SdrHelpLine& rHelpLine (rPageView.GetHelpLines()[nSnapLineIndex]); @@ -967,9 +967,9 @@ void DrawViewShell::ShowSnapLineContextMenu ( String(SdResId(STR_POPUP_DELETE_SNAPLINE))); } - pMenu->RemoveDisabledEntries(FALSE, FALSE); + pMenu->RemoveDisabledEntries(sal_False, sal_False); - const USHORT nResult = pMenu->Execute( + const sal_uInt16 nResult = pMenu->Execute( GetActiveWindow(), Rectangle(rMouseLocation, Size(10,10)), POPUPMENU_EXECUTE_DOWN); diff --git a/sd/source/ui/view/drviews5.cxx b/sd/source/ui/view/drviews5.cxx index 433a4e4fa6c1..e872435d604c 100755 --- a/sd/source/ui/view/drviews5.cxx +++ b/sd/source/ui/view/drviews5.cxx @@ -91,10 +91,10 @@ void DrawViewShell::ModelHasChanged() { Invalidate(); // Damit der Navigator auch einen aktuellen Status bekommt - GetViewFrame()->GetBindings().Invalidate( SID_NAVIGATOR_STATE, TRUE, FALSE ); + GetViewFrame()->GetBindings().Invalidate( SID_NAVIGATOR_STATE, sal_True, sal_False ); //Update3DWindow(); - SfxBoolItem aItem( SID_3D_STATE, TRUE ); + SfxBoolItem aItem( SID_3D_STATE, sal_True ); GetViewFrame()->GetDispatcher()->Execute( SID_3D_STATE, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, &aItem, 0L ); @@ -149,11 +149,11 @@ void DrawViewShell::ArrangeGUIElements (void) OSL_ASSERT (GetViewShell()!=NULL); Client* pIPClient = static_cast<Client*>(GetViewShell()->GetIPClient()); - BOOL bClientActive = FALSE; + sal_Bool bClientActive = sal_False; if ( pIPClient && pIPClient->IsObjectInPlaceActive() ) - bClientActive = TRUE; + bClientActive = sal_True; - BOOL bInPlaceActive = GetViewFrame()->GetFrame().IsInPlace(); + sal_Bool bInPlaceActive = GetViewFrame()->GetFrame().IsInPlace(); if ( mbZoomOnPage && !bInPlaceActive && !bClientActive ) { @@ -275,7 +275,7 @@ void DrawViewShell::ReadFrameViewData(FrameView* pView) // Definition: // grosse Handles: 9 // kleine Handles: 7 - USHORT nTmp = mpDrawView->GetMarkHdlSizePixel(); + sal_uInt16 nTmp = mpDrawView->GetMarkHdlSizePixel(); //DBG_ASSERT(nTmp != 7, "HandleSize != 7 oder 9"); if( nTmp == 9 && !pView->IsBigHandles() ) mpDrawView->SetMarkHdlSizePixel( 7 ); @@ -315,7 +315,7 @@ void DrawViewShell::ReadFrameViewData(FrameView* pView) if ( mpDrawView->GetActiveLayer() != pView->GetActiveLayer() ) mpDrawView->SetActiveLayer( pView->GetActiveLayer() ); - USHORT nSelectedPage = 0; + sal_uInt16 nSelectedPage = 0; if (mePageKind != PK_HANDOUT) { @@ -323,7 +323,7 @@ void DrawViewShell::ReadFrameViewData(FrameView* pView) } EditMode eNewEditMode = pView->GetViewShEditMode(mePageKind); - BOOL bNewLayerMode = pView->IsLayerMode(); + sal_Bool bNewLayerMode = pView->IsLayerMode(); ChangeEditMode(eNewEditMode, bNewLayerMode); SwitchPage(nSelectedPage); @@ -502,7 +502,7 @@ void DrawViewShell::Paint(const Rectangle& rRect, ::sd::Window* pWin) void DrawViewShell::SetZoomFactor(const Fraction& rZoomX, const Fraction& rZoomY) { ViewShell::SetZoomFactor(rZoomX, rZoomY); - mbZoomOnPage = FALSE; + mbZoomOnPage = sal_False; Point aOrigin = GetActiveWindow()->GetViewOrigin(); GetActiveWindow()->SetWinViewPos(aOrigin); } @@ -534,7 +534,7 @@ Size DrawViewShell::GetOptimalSizePixel() const // 1:1 Darstellung MapMode aMapMode(MAP_100TH_MM); aSize = GetActiveWindow()->LogicToPixel( pPage->GetSize(), aMapMode ); - const_cast< DrawViewShell* >(this)->mbZoomOnPage = TRUE; + const_cast< DrawViewShell* >(this)->mbZoomOnPage = sal_True; } } } @@ -553,7 +553,7 @@ void DrawViewShell::HidePage() { FmFormShell* pFormShell = GetViewShellBase().GetFormShellManager()->GetFormShell(); if (pFormShell != NULL) - pFormShell->PrepareClose (FALSE); + pFormShell->PrepareClose (sal_False); } @@ -707,8 +707,8 @@ void DrawViewShell::SetActiveTabLayerIndex (int nIndex) if (nIndex>=0 && nIndex<pBar->GetPageCount()) { // Tell the draw view and the tab control of the new active layer. - mpDrawView->SetActiveLayer (pBar->GetPageText (pBar->GetPageId ((USHORT)nIndex))); - pBar->SetCurPageId (pBar->GetPageId ((USHORT)nIndex)); + mpDrawView->SetActiveLayer (pBar->GetPageText (pBar->GetPageId ((sal_uInt16)nIndex))); + pBar->SetCurPageId (pBar->GetPageId ((sal_uInt16)nIndex)); } } } diff --git a/sd/source/ui/view/drviews6.cxx b/sd/source/ui/view/drviews6.cxx index 681192ff351b..800ee2756c97 100755 --- a/sd/source/ui/view/drviews6.cxx +++ b/sd/source/ui/view/drviews6.cxx @@ -110,12 +110,12 @@ void DrawViewShell::ExecFormText(SfxRequest& rReq) if ( mpDrawView->IsTextEdit() ) mpDrawView->SdrEndTextEdit(); - if ( rSet.GetItemState(XATTR_FORMTXTSTDFORM, TRUE, &pItem) == + if ( rSet.GetItemState(XATTR_FORMTXTSTDFORM, sal_True, &pItem) == SFX_ITEM_SET && ((const XFormTextStdFormItem*) pItem)->GetValue() != XFTFORM_NONE ) { - USHORT nId = SvxFontWorkChildWindow::GetChildWindowId(); + sal_uInt16 nId = SvxFontWorkChildWindow::GetChildWindowId(); SvxFontWorkDialog* pDlg = (SvxFontWorkDialog*)GetViewFrame()-> GetChildWindow(nId)->GetWindow(); @@ -148,7 +148,7 @@ void DrawViewShell::GetFormTextState(SfxItemSet& rSet) const SdrObject* pObj = NULL; SvxFontWorkDialog* pDlg = NULL; - USHORT nId = SvxFontWorkChildWindow::GetChildWindowId(); + sal_uInt16 nId = SvxFontWorkChildWindow::GetChildWindowId(); if ( GetViewFrame()->HasChildWindow(nId) ) pDlg = (SvxFontWorkDialog*)(GetViewFrame()->GetChildWindow(nId)->GetWindow()); @@ -161,7 +161,7 @@ void DrawViewShell::GetFormTextState(SfxItemSet& rSet) { // automatisches Auf/Zuklappen des FontWork-Dialog; erstmal deaktiviert // if ( pDlg ) -// pDlg->SetActive(FALSE); +// pDlg->SetActive(sal_False); rSet.DisableItem(XATTR_FORMTXTSTYLE); rSet.DisableItem(XATTR_FORMTXTADJUST); @@ -204,7 +204,7 @@ void DrawViewShell::ExecAnimationWin( SfxRequest& rReq ) CheckLineTo (rReq); - USHORT nSId = rReq.GetSlot(); + sal_uInt16 nSId = rReq.GetSlot(); switch( nSId ) { @@ -213,7 +213,7 @@ void DrawViewShell::ExecAnimationWin( SfxRequest& rReq ) case SID_ANIMATOR_CREATE: { AnimationWindow* pAnimWin; - USHORT nId = AnimationChildWindow::GetChildWindowId(); + sal_uInt16 nId = AnimationChildWindow::GetChildWindowId(); //((const SfxUInt16Item&)(rReq.GetArgs()->Get(nSId))).GetValue(); pAnimWin = static_cast<AnimationWindow*>( @@ -248,10 +248,10 @@ void DrawViewShell::ExecAnimationWin( SfxRequest& rReq ) void DrawViewShell::GetAnimationWinState( SfxItemSet& rSet ) { // Hier koennten Buttons etc. disabled werden - UINT16 nValue; + sal_uInt16 nValue; const SdrMarkList& rMarkList = mpDrawView->GetMarkedObjectList(); - ULONG nMarkCount = rMarkList.GetMarkCount(); + sal_uLong nMarkCount = rMarkList.GetMarkCount(); if( nMarkCount == 0 ) nValue = 0; @@ -260,14 +260,14 @@ void DrawViewShell::GetAnimationWinState( SfxItemSet& rSet ) else // 1 Objekt { const SdrObject* pObj = rMarkList.GetMark( 0 )->GetMarkedSdrObj(); - UINT32 nInv = pObj->GetObjInventor(); - UINT16 nId = pObj->GetObjIdentifier(); + sal_uInt32 nInv = pObj->GetObjInventor(); + sal_uInt16 nId = pObj->GetObjIdentifier(); // 1 selektiertes Gruppenobjekt if( nInv == SdrInventor && nId == OBJ_GRUP ) nValue = 3; else if( nInv == SdrInventor && nId == OBJ_GRAF ) // Anim. GIF ? { - USHORT nCount = 0; + sal_uInt16 nCount = 0; if( ( (SdrGrafObj*) pObj )->IsAnimated() ) nCount = ( (SdrGrafObj*) pObj )->GetGraphic().GetAnimation().Count(); @@ -293,52 +293,52 @@ void DrawViewShell::SetChildWindowState( SfxItemSet& rSet ) // Stati der SfxChild-Windows (Animator, Fontwork etc.) if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_FONTWORK ) ) { - USHORT nId = SvxFontWorkChildWindow::GetChildWindowId(); + sal_uInt16 nId = SvxFontWorkChildWindow::GetChildWindowId(); rSet.Put(SfxBoolItem(SID_FONTWORK, GetViewFrame()->HasChildWindow(nId))); } if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_COLOR_CONTROL ) ) { - USHORT nId = SvxColorChildWindow::GetChildWindowId(); + sal_uInt16 nId = SvxColorChildWindow::GetChildWindowId(); rSet.Put(SfxBoolItem(SID_COLOR_CONTROL, GetViewFrame()->HasChildWindow(nId))); } if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_ANIMATION_OBJECTS ) ) { - USHORT nId = AnimationChildWindow::GetChildWindowId(); + sal_uInt16 nId = AnimationChildWindow::GetChildWindowId(); rSet.Put( SfxBoolItem( SID_ANIMATION_OBJECTS, GetViewFrame()->HasChildWindow( nId ) ) ); } if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_NAVIGATOR ) ) { - USHORT nId = SID_NAVIGATOR; + sal_uInt16 nId = SID_NAVIGATOR; rSet.Put( SfxBoolItem( SID_NAVIGATOR, GetViewFrame()->HasChildWindow( nId ) ) ); } if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_BMPMASK ) ) { - USHORT nId = SvxBmpMaskChildWindow::GetChildWindowId(); + sal_uInt16 nId = SvxBmpMaskChildWindow::GetChildWindowId(); rSet.Put( SfxBoolItem( SID_BMPMASK, GetViewFrame()->HasChildWindow( nId ) ) ); } if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_GALLERY ) ) { - USHORT nId = GalleryChildWindow::GetChildWindowId(); + sal_uInt16 nId = GalleryChildWindow::GetChildWindowId(); rSet.Put( SfxBoolItem( SID_GALLERY, GetViewFrame()->HasChildWindow( nId ) ) ); } if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_IMAP ) ) { - USHORT nId = SvxIMapDlgChildWindow::GetChildWindowId(); + sal_uInt16 nId = SvxIMapDlgChildWindow::GetChildWindowId(); rSet.Put( SfxBoolItem( SID_IMAP, GetViewFrame()->HasChildWindow( nId ) ) ); } if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_LAYER_DIALOG_WIN ) ) { - USHORT nId = LayerDialogChildWindow::GetChildWindowId(); + sal_uInt16 nId = LayerDialogChildWindow::GetChildWindowId(); rSet.Put( SfxBoolItem( SID_LAYER_DIALOG_WIN, GetViewFrame()->HasChildWindow( nId ) ) ); } if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_3D_WIN ) ) { - USHORT nId = Svx3DChildWindow::GetChildWindowId(); + sal_uInt16 nId = Svx3DChildWindow::GetChildWindowId(); rSet.Put( SfxBoolItem( SID_3D_WIN, GetViewFrame()->HasChildWindow( nId ) ) ); } if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_AVMEDIA_PLAYER ) ) { - USHORT nId = ::avmedia::MediaPlayer::GetChildWindowId(); + sal_uInt16 nId = ::avmedia::MediaPlayer::GetChildWindowId(); rSet.Put( SfxBoolItem( SID_AVMEDIA_PLAYER, GetViewFrame()->HasChildWindow( nId ) ) ); } } @@ -374,7 +374,7 @@ void DrawViewShell::ExecBmpMask( SfxRequest& rReq ) if ( pObj && !mpDrawView->IsTextEdit() ) { SdrGrafObj* pNewObj = (SdrGrafObj*) pObj->Clone(); - BOOL bCont = TRUE; + sal_Bool bCont = sal_True; if( pNewObj->IsLinkedGraphic() ) { @@ -386,7 +386,7 @@ void DrawViewShell::ExecBmpMask( SfxRequest& rReq ) else { delete pNewObj; - bCont = FALSE; + bCont = sal_False; } } @@ -401,7 +401,7 @@ void DrawViewShell::ExecBmpMask( SfxRequest& rReq ) { SdrPageView* pPV = mpDrawView->GetSdrPageView(); - pNewObj->SetEmptyPresObj( FALSE ); + pNewObj->SetEmptyPresObj( sal_False ); pNewObj->SetGraphic( ( (SvxBmpMask*) GetViewFrame()->GetChildWindow( SvxBmpMaskChildWindow::GetChildWindowId() )->GetWindow() )-> Mask( pNewObj->GetGraphic() ) ); @@ -433,9 +433,9 @@ void DrawViewShell::GetBmpMaskState( SfxItemSet& rSet ) { const SdrMarkList& rMarkList = mpDrawView->GetMarkedObjectList(); const SdrObject* pObj = NULL; - USHORT nId = SvxBmpMaskChildWindow::GetChildWindowId(); + sal_uInt16 nId = SvxBmpMaskChildWindow::GetChildWindowId(); SvxBmpMask* pDlg = NULL; - BOOL bEnable = FALSE; + sal_Bool bEnable = sal_False; if ( GetViewFrame()->HasChildWindow( nId ) ) { @@ -450,7 +450,7 @@ void DrawViewShell::GetBmpMaskState( SfxItemSet& rSet ) // valid graphic object? if( pObj && pObj->ISA( SdrGrafObj ) && !( (SdrGrafObj*) pObj )->IsEPS() && !mpDrawView->IsTextEdit() ) - bEnable = TRUE; + bEnable = sal_True; // put value rSet.Put( SfxBoolItem( SID_BMPMASK_EXEC, bEnable ) ); @@ -464,7 +464,7 @@ void DrawViewShell::GetBmpMaskState( SfxItemSet& rSet ) void DrawViewShell::FuTemp04(SfxRequest& rReq) { - USHORT nSId = rReq.GetSlot(); + sal_uInt16 nSId = rReq.GetSlot(); switch( nSId ) { case SID_FONTWORK: @@ -632,13 +632,13 @@ void DrawViewShell::FuTemp04(SfxRequest& rReq) case SID_CONVERT_TO_3D_LATHE_FAST: { // Der Aufruf ist ausreichend. Die Initialisierung per Start3DCreation und CreateMirrorPolygons - // ist nicht mehr noetig, falls der Parameter TRUE uebergeben wird. Dann wird sofort und + // ist nicht mehr noetig, falls der Parameter sal_True uebergeben wird. Dann wird sofort und // ohne Benutzereingriff ein gekippter Rotationskoerper mit einer Achse links neben dem // Umschliessenden Rechteck der slektierten Objekte gezeichnet. mpDrawView->SdrEndTextEdit(); if(GetActiveWindow()) GetActiveWindow()->EnterWait(); - mpDrawView->End3DCreation(TRUE); + mpDrawView->End3DCreation(sal_True); Cancel(); rReq.Ignore(); if(GetActiveWindow()) @@ -716,11 +716,11 @@ void DrawViewShell::FuTemp04(SfxRequest& rReq) { SetOfByte aVisibleLayers = pPage->TRG_GetMasterPageVisibleLayers(); SdrLayerAdmin& rLayerAdmin = GetDoc()->GetLayerAdmin(); - BYTE aLayerId; + sal_uInt8 aLayerId; if (nSId == SID_DISPLAY_MASTER_BACKGROUND) - aLayerId = rLayerAdmin.GetLayerID(String(SdResId(STR_LAYER_BCKGRND)), FALSE); + aLayerId = rLayerAdmin.GetLayerID(String(SdResId(STR_LAYER_BCKGRND)), sal_False); else - aLayerId = rLayerAdmin.GetLayerID(String(SdResId(STR_LAYER_BCKGRNDOBJ)), FALSE); + aLayerId = rLayerAdmin.GetLayerID(String(SdResId(STR_LAYER_BCKGRNDOBJ)), sal_False); aVisibleLayers.Set(aLayerId, !aVisibleLayers.IsSet(aLayerId)); pPage->TRG_SetMasterPageVisibleLayers(aVisibleLayers); } diff --git a/sd/source/ui/view/drviews7.cxx b/sd/source/ui/view/drviews7.cxx index ab70090c5263..acdcb58b5daf 100755 --- a/sd/source/ui/view/drviews7.cxx +++ b/sd/source/ui/view/drviews7.cxx @@ -227,7 +227,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) } ViewShell::GetMenuState(rSet); - BOOL bDisableVerticalText = !SvtLanguageOptions().IsVerticalTextEnabled(); + sal_Bool bDisableVerticalText = !SvtLanguageOptions().IsVerticalTextEnabled(); if ( bDisableVerticalText ) { @@ -237,10 +237,10 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) rSet.DisableItem( SID_DRAW_TEXT_VERTICAL ); } - FASTBOOL bConvertToPathPossible = mpDrawView->IsConvertToPathObjPossible(FALSE); + FASTBOOL bConvertToPathPossible = mpDrawView->IsConvertToPathObjPossible(sal_False); const SdrMarkList& rMarkList = mpDrawView->GetMarkedObjectList(); - const ULONG nMarkCount = rMarkList.GetMarkCount(); + const sal_uLong nMarkCount = rMarkList.GetMarkCount(); //format paintbrush FuFormatPaintBrush::GetMenuState( *this, rSet ); @@ -249,16 +249,16 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) SetChildWindowState( rSet ); // Images der Toolboxen mappen (nur Zoom) - UpdateToolboxImages( rSet, FALSE ); + UpdateToolboxImages( rSet, sal_False ); if(HasCurrentFunction()) { - USHORT nSId = GetCurrentFunction()->GetSlotID(); + sal_uInt16 nSId = GetCurrentFunction()->GetSlotID(); - rSet.Put( SfxBoolItem( nSId, TRUE ) ); + rSet.Put( SfxBoolItem( nSId, sal_True ) ); // Bewirkt ein uncheck eines simulierten Slots - USHORT nId = GetIdBySubId( nSId ); + sal_uInt16 nId = GetIdBySubId( nSId ); // Images der Toolboxen mappen UpdateToolboxImages( rSet ); @@ -400,15 +400,15 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_PRESENTATION ) || SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_REHEARSE_TIMINGS ) ) { - BOOL bDisable = TRUE; - USHORT nCount = GetDoc()->GetSdPageCount( PK_STANDARD ); + sal_Bool bDisable = sal_True; + sal_uInt16 nCount = GetDoc()->GetSdPageCount( PK_STANDARD ); - for( USHORT i = 0; i < nCount && bDisable; i++ ) + for( sal_uInt16 i = 0; i < nCount && bDisable; i++ ) { SdPage* pPage = GetDoc()->GetSdPage(i, PK_STANDARD); if( !pPage->IsExcluded() ) - bDisable = FALSE; + bDisable = sal_False; } if( bDisable || GetDocSh()->IsPreview()) @@ -454,12 +454,12 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) else { // Horizontale Ausrichtung - USHORT nHorz = mpDrawView->GetMarkedGluePointsAlign( FALSE ); + sal_uInt16 nHorz = mpDrawView->GetMarkedGluePointsAlign( sal_False ); rSet.Put( SfxBoolItem( SID_GLUE_HORZALIGN_CENTER, nHorz == SDRHORZALIGN_CENTER ) ); rSet.Put( SfxBoolItem( SID_GLUE_HORZALIGN_LEFT, nHorz == SDRHORZALIGN_LEFT ) ); rSet.Put( SfxBoolItem( SID_GLUE_HORZALIGN_RIGHT, nHorz == SDRHORZALIGN_RIGHT ) ); // Vertikale Ausrichtung - USHORT nVert = mpDrawView->GetMarkedGluePointsAlign( TRUE ); + sal_uInt16 nVert = mpDrawView->GetMarkedGluePointsAlign( sal_True ); rSet.Put( SfxBoolItem( SID_GLUE_VERTALIGN_CENTER, nVert == SDRVERTALIGN_CENTER ) ); rSet.Put( SfxBoolItem( SID_GLUE_VERTALIGN_TOP, nVert == SDRVERTALIGN_TOP ) ); rSet.Put( SfxBoolItem( SID_GLUE_VERTALIGN_BOTTOM, nVert == SDRVERTALIGN_BOTTOM ) ); @@ -503,16 +503,16 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) } if (!mpDrawView->IsFrameDragSingles()) - rSet.Put(SfxBoolItem(SID_BEZIER_EDIT, TRUE)); + rSet.Put(SfxBoolItem(SID_BEZIER_EDIT, sal_True)); else - rSet.Put(SfxBoolItem(SID_BEZIER_EDIT, FALSE)); + rSet.Put(SfxBoolItem(SID_BEZIER_EDIT, sal_False)); if(dynamic_cast<FuEditGluePoints*>( GetCurrentFunction().get())) - rSet.Put(SfxBoolItem(SID_GLUE_EDITMODE, TRUE)); + rSet.Put(SfxBoolItem(SID_GLUE_EDITMODE, sal_True)); else - rSet.Put(SfxBoolItem(SID_GLUE_EDITMODE, FALSE)); + rSet.Put(SfxBoolItem(SID_GLUE_EDITMODE, sal_False)); - if( !mpDrawView->IsMirrorAllowed( TRUE, TRUE ) ) + if( !mpDrawView->IsMirrorAllowed( sal_True, sal_True ) ) { rSet.DisableItem( SID_HORIZONTAL ); rSet.DisableItem( SID_VERTICAL ); @@ -562,12 +562,12 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) if ( !mpDrawView->IsGroupEntered() ) { rSet.DisableItem( SID_LEAVE_GROUP ); - rSet.Put( SfxBoolItem( SID_LEAVE_ALL_GROUPS, FALSE ) ); + rSet.Put( SfxBoolItem( SID_LEAVE_ALL_GROUPS, sal_False ) ); rSet.ClearItem( SID_LEAVE_ALL_GROUPS ); rSet.DisableItem( SID_LEAVE_ALL_GROUPS ); } else - rSet.Put( SfxBoolItem( SID_LEAVE_ALL_GROUPS, TRUE ) ); + rSet.Put( SfxBoolItem( SID_LEAVE_ALL_GROUPS, sal_True ) ); if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_THESAURUS ) ) { @@ -622,14 +622,14 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) // create listener mpClipEvtLstnr = new TransferableClipboardListener( LINK( this, DrawViewShell, ClipboardChanged ) ); mpClipEvtLstnr->acquire(); - mpClipEvtLstnr->AddRemoveListener( GetActiveWindow(), TRUE ); + mpClipEvtLstnr->AddRemoveListener( GetActiveWindow(), sal_True ); // get initial state TransferableDataHelper aDataHelper( TransferableDataHelper::CreateFromSystemClipboard( GetActiveWindow() ) ); mbPastePossible = ( aDataHelper.GetFormatCount() != 0 ); } else - mbPastePossible = FALSE; + mbPastePossible = sal_False; } if( !mbPastePossible ) @@ -662,10 +662,10 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) return; } - if( !( mpDrawView->IsConvertToPolyObjPossible(FALSE) || mpDrawView->IsVectorizeAllowed() ) ) + if( !( mpDrawView->IsConvertToPolyObjPossible(sal_False) || mpDrawView->IsVectorizeAllowed() ) ) rSet.DisableItem(SID_CHANGEPOLYGON); - if( !( mpDrawView->IsConvertToPolyObjPossible(FALSE) || mpDrawView->IsConvertToContourPossible() ) ) + if( !( mpDrawView->IsConvertToPolyObjPossible(sal_False) || mpDrawView->IsConvertToContourPossible() ) ) rSet.DisableItem(SID_CONVERT_TO_CONTOUR); if ( !mpDrawView->IsConvertTo3DObjPossible() ) @@ -751,19 +751,19 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) /********************************************************************** * Seiten-Modus **********************************************************************/ - rSet.Put(SfxBoolItem(SID_PAGEMODE, TRUE)); - rSet.Put(SfxBoolItem(SID_MASTERPAGE, FALSE)); - rSet.Put(SfxBoolItem(SID_SLIDE_MASTERPAGE, FALSE)); - rSet.Put(SfxBoolItem(SID_NOTES_MASTERPAGE, FALSE)); - rSet.Put(SfxBoolItem(SID_HANDOUT_MASTERPAGE, FALSE)); + rSet.Put(SfxBoolItem(SID_PAGEMODE, sal_True)); + rSet.Put(SfxBoolItem(SID_MASTERPAGE, sal_False)); + rSet.Put(SfxBoolItem(SID_SLIDE_MASTERPAGE, sal_False)); + rSet.Put(SfxBoolItem(SID_NOTES_MASTERPAGE, sal_False)); + rSet.Put(SfxBoolItem(SID_HANDOUT_MASTERPAGE, sal_False)); if (mePageKind == PK_STANDARD && rSet.GetItemState(SID_TITLE_MASTERPAGE) == SFX_ITEM_AVAILABLE) { // Gibt es eine Seite mit dem AutoLayout "Titel"? - BOOL bDisable = TRUE; - USHORT i = 0; - USHORT nCount = GetDoc()->GetSdPageCount(PK_STANDARD); + sal_Bool bDisable = sal_True; + sal_uInt16 i = 0; + sal_uInt16 nCount = GetDoc()->GetSdPageCount(PK_STANDARD); while (i < nCount && bDisable) { @@ -771,7 +771,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) if (pPage->GetAutoLayout() == AUTOLAYOUT_TITLE) { - bDisable = FALSE; + bDisable = sal_False; } i++; @@ -783,7 +783,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) } else { - rSet.Put(SfxBoolItem(SID_TITLE_MASTERPAGE, FALSE)); + rSet.Put(SfxBoolItem(SID_TITLE_MASTERPAGE, sal_False)); } } else @@ -798,28 +798,28 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) } else { - rSet.Put(SfxBoolItem(SID_PAGEMODE, FALSE)); - rSet.Put(SfxBoolItem(SID_MASTERPAGE, TRUE)); + rSet.Put(SfxBoolItem(SID_PAGEMODE, sal_False)); + rSet.Put(SfxBoolItem(SID_MASTERPAGE, sal_True)); /********************************************************************** * Hintergrundseiten-Modus **********************************************************************/ if (mePageKind == PK_STANDARD) { - rSet.Put(SfxBoolItem(SID_SLIDE_MASTERPAGE, TRUE)); - rSet.Put(SfxBoolItem(SID_NOTES_MASTERPAGE, FALSE)); - rSet.Put(SfxBoolItem(SID_HANDOUT_MASTERPAGE, FALSE)); + rSet.Put(SfxBoolItem(SID_SLIDE_MASTERPAGE, sal_True)); + rSet.Put(SfxBoolItem(SID_NOTES_MASTERPAGE, sal_False)); + rSet.Put(SfxBoolItem(SID_HANDOUT_MASTERPAGE, sal_False)); if (rSet.GetItemState(SID_TITLE_MASTERPAGE) == SFX_ITEM_AVAILABLE) { - BOOL bCheck = FALSE; - BOOL bDisable = TRUE; + sal_Bool bCheck = sal_False; + sal_Bool bDisable = sal_True; if( pPageView ) { SdPage* pMPage = dynamic_cast< SdPage* >( pPageView->GetPage() ); - USHORT i = 0; - USHORT nCount = GetDoc()->GetSdPageCount(PK_STANDARD); + sal_uInt16 i = 0; + sal_uInt16 nCount = GetDoc()->GetSdPageCount(PK_STANDARD); // Referenziert eine Seite mit dem AutoLayout "Titel" die // aktuelle MasterPage? @@ -831,7 +831,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) if (pPage->GetAutoLayout() == AUTOLAYOUT_TITLE) { // Eine Seite hat das AutoLayout "Titel" - bDisable = FALSE; + bDisable = sal_False; SdPage& rRefMPage = (SdPage&)(pPage->TRG_GetMasterPage()); @@ -839,7 +839,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) { // Eine Seite mit dem AutoLayout "Titel" // referenziert die aktuelle MasterPage - bCheck = TRUE; + bCheck = sal_True; } } @@ -849,7 +849,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) if (bCheck) { - rSet.Put(SfxBoolItem(SID_SLIDE_MASTERPAGE, FALSE)); + rSet.Put(SfxBoolItem(SID_SLIDE_MASTERPAGE, sal_False)); } rSet.Put(SfxBoolItem(SID_TITLE_MASTERPAGE, bCheck)); @@ -863,17 +863,17 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) } else if (mePageKind == PK_NOTES) { - rSet.Put(SfxBoolItem(SID_SLIDE_MASTERPAGE, FALSE)); + rSet.Put(SfxBoolItem(SID_SLIDE_MASTERPAGE, sal_False)); rSet.DisableItem(SID_TITLE_MASTERPAGE); - rSet.Put(SfxBoolItem(SID_NOTES_MASTERPAGE, TRUE)); - rSet.Put(SfxBoolItem(SID_HANDOUT_MASTERPAGE, FALSE)); + rSet.Put(SfxBoolItem(SID_NOTES_MASTERPAGE, sal_True)); + rSet.Put(SfxBoolItem(SID_HANDOUT_MASTERPAGE, sal_False)); } else if (mePageKind == PK_HANDOUT) { - rSet.Put(SfxBoolItem(SID_SLIDE_MASTERPAGE, FALSE)); + rSet.Put(SfxBoolItem(SID_SLIDE_MASTERPAGE, sal_False)); rSet.DisableItem(SID_TITLE_MASTERPAGE); - rSet.Put(SfxBoolItem(SID_NOTES_MASTERPAGE, FALSE)); - rSet.Put(SfxBoolItem(SID_HANDOUT_MASTERPAGE, TRUE)); + rSet.Put(SfxBoolItem(SID_NOTES_MASTERPAGE, sal_False)); + rSet.Put(SfxBoolItem(SID_HANDOUT_MASTERPAGE, sal_True)); } } @@ -901,10 +901,10 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) // darf der aktuelle Layer geloescht werden? if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_DELETE_LAYER ) ) { - USHORT nCurrentLayer = GetLayerTabControl()->GetCurPageId(); + sal_uInt16 nCurrentLayer = GetLayerTabControl()->GetCurPageId(); const String& rName = GetLayerTabControl()->GetPageText(nCurrentLayer); - BOOL bDisableIt = !IsLayerModeActive(); + sal_Bool bDisableIt = !IsLayerModeActive(); bDisableIt |= (rName == String(SdResId(STR_LAYER_LAYOUT))); bDisableIt |= (rName == String(SdResId(STR_LAYER_BCKGRND))); bDisableIt |= (rName == String(SdResId(STR_LAYER_BCKGRNDOBJ))); @@ -927,22 +927,22 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) // Sonderbehandlung für SID_OUTLINE_BULLET wenn Objekte // mit unterschiedlichen arten von NumBullet Items markiert // sind - BOOL bHasOutliner = FALSE; - BOOL bHasOther = FALSE; - for(ULONG nNum = 0; nNum < nMarkCount; nNum++) + sal_Bool bHasOutliner = sal_False; + sal_Bool bHasOther = sal_False; + for(sal_uLong nNum = 0; nNum < nMarkCount; nNum++) { SdrObject* pObj = rMarkList.GetMark(nNum)->GetMarkedSdrObj(); if( pObj->GetObjInventor() == SdrInventor ) { if( pObj->GetObjIdentifier() == OBJ_OUTLINETEXT ) { - bHasOutliner = TRUE; + bHasOutliner = sal_True; if(bHasOther) break; } else { - bHasOther = TRUE; + bHasOther = sal_True; if(bHasOutliner) break; } @@ -1010,7 +1010,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) // EditText aktiv if (GetViewShellBase().GetViewShellManager()->GetShell(RID_DRAW_TEXT_TOOLBOX) != NULL) { - USHORT nCurrentSId = SID_ATTR_CHAR; + sal_uInt16 nCurrentSId = SID_ATTR_CHAR; if(HasCurrentFunction()) { @@ -1021,7 +1021,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) nCurrentSId != SID_ATTR_CHAR_VERTICAL ) nCurrentSId = SID_ATTR_CHAR; - rSet.Put( SfxBoolItem( nCurrentSId, TRUE ) ); + rSet.Put( SfxBoolItem( nCurrentSId, sal_True ) ); // Kurzform von UpdateToolboxImages() rSet.Put( TbxImageItem( SID_DRAWTBX_TEXT, nCurrentSId ) ); @@ -1035,11 +1035,11 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) { if (GetDoc()->GetOnlineSpell()) { - rSet.Put(SfxBoolItem(SID_AUTOSPELL_CHECK, TRUE)); + rSet.Put(SfxBoolItem(SID_AUTOSPELL_CHECK, sal_True)); } else { - rSet.Put(SfxBoolItem(SID_AUTOSPELL_CHECK, FALSE)); + rSet.Put(SfxBoolItem(SID_AUTOSPELL_CHECK, sal_False)); } } @@ -1394,20 +1394,20 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) // get marklist SdrMarkList aMarkList = mpDrawView->GetMarkedObjectList(); - BOOL bFoundBitmap = FALSE; - BOOL bFoundMetafile = FALSE; - BOOL bFoundObjNoLine = FALSE; - BOOL bFoundObjNoArea = FALSE; - BOOL bFoundNoGraphicObj = FALSE; - BOOL bFoundAny = FALSE; + sal_Bool bFoundBitmap = sal_False; + sal_Bool bFoundMetafile = sal_False; + sal_Bool bFoundObjNoLine = sal_False; + sal_Bool bFoundObjNoArea = sal_False; + sal_Bool bFoundNoGraphicObj = sal_False; + sal_Bool bFoundAny = sal_False; bool bFoundTable = false; // const int nMarkCount = (int) aMarkList.GetMarkCount(); - for (ULONG i=0; i < nMarkCount && !bFoundAny; i++) + for (sal_uLong i=0; i < nMarkCount && !bFoundAny; i++) { SdrObject* pObj= aMarkList.GetMark(i)->GetMarkedSdrObj(); - UINT16 nId = pObj->GetObjIdentifier(); - UINT32 nInv = pObj->GetObjInventor(); + sal_uInt16 nId = pObj->GetObjIdentifier(); + sal_uInt32 nInv = pObj->GetObjInventor(); if(nInv == SdrInventor) { @@ -1420,42 +1420,42 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) case OBJ_FREELINE : case OBJ_EDGE: case OBJ_CARC : - bFoundObjNoArea = TRUE; - bFoundNoGraphicObj = TRUE; + bFoundObjNoArea = sal_True; + bFoundNoGraphicObj = sal_True; break; case OBJ_OLE2 : - bFoundObjNoLine = TRUE; - bFoundObjNoArea = TRUE; - bFoundNoGraphicObj = TRUE; + bFoundObjNoLine = sal_True; + bFoundObjNoArea = sal_True; + bFoundNoGraphicObj = sal_True; break; case OBJ_GRAF : bSingleGraphicSelected = nMarkCount == 1; switch ( ((SdrGrafObj*)pObj)->GetGraphicType() ) { case GRAPHIC_BITMAP : - bFoundBitmap = TRUE; + bFoundBitmap = sal_True; break; case GRAPHIC_GDIMETAFILE : - bFoundMetafile = TRUE; + bFoundMetafile = sal_True; break; default: break; } - // #i25616# bFoundObjNoLine = TRUE; - // #i25616# bFoundObjNoArea = TRUE; + // #i25616# bFoundObjNoLine = sal_True; + // #i25616# bFoundObjNoArea = sal_True; break; case OBJ_TABLE: bFoundTable = true; break; default : - bFoundAny = TRUE; + bFoundAny = sal_True; } } else if(nInv == E3dInventor) { // 3D objects - bFoundAny = TRUE; + bFoundAny = sal_True; } } @@ -1546,7 +1546,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) //highlight selected custom shape { - USHORT nCurrentSId = 0; + sal_uInt16 nCurrentSId = 0; if(HasCurrentFunction()) nCurrentSId = GetCurrentFunction()->GetSlotID(); @@ -1590,8 +1590,8 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) { SetOfByte aVisibleLayers = pPage->TRG_GetMasterPageVisibleLayers(); SdrLayerAdmin& rLayerAdmin = GetDoc()->GetLayerAdmin(); - BYTE aBackgroundId = rLayerAdmin.GetLayerID(String(SdResId(STR_LAYER_BCKGRND)), FALSE); - BYTE aObjectId = rLayerAdmin.GetLayerID(String(SdResId(STR_LAYER_BCKGRNDOBJ)), FALSE); + sal_uInt8 aBackgroundId = rLayerAdmin.GetLayerID(String(SdResId(STR_LAYER_BCKGRND)), sal_False); + sal_uInt8 aObjectId = rLayerAdmin.GetLayerID(String(SdResId(STR_LAYER_BCKGRNDOBJ)), sal_False); rSet.Put(SfxBoolItem(SID_DISPLAY_MASTER_BACKGROUND, aVisibleLayers.IsSet(aBackgroundId))); rSet.Put(SfxBoolItem(SID_DISPLAY_MASTER_OBJECTS, @@ -1605,25 +1605,25 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) void DrawViewShell::GetModeSwitchingMenuState (SfxItemSet &rSet) { //draview - rSet.Put(SfxBoolItem(SID_DIAMODE, FALSE)); - rSet.Put(SfxBoolItem(SID_OUTLINEMODE, FALSE)); + rSet.Put(SfxBoolItem(SID_DIAMODE, sal_False)); + rSet.Put(SfxBoolItem(SID_OUTLINEMODE, sal_False)); if (mePageKind == PK_NOTES) { - rSet.Put(SfxBoolItem(SID_DRAWINGMODE, FALSE)); - rSet.Put(SfxBoolItem(SID_NOTESMODE, TRUE)); - rSet.Put(SfxBoolItem(SID_HANDOUTMODE, FALSE)); + rSet.Put(SfxBoolItem(SID_DRAWINGMODE, sal_False)); + rSet.Put(SfxBoolItem(SID_NOTESMODE, sal_True)); + rSet.Put(SfxBoolItem(SID_HANDOUTMODE, sal_False)); } else if (mePageKind == PK_HANDOUT) { - rSet.Put(SfxBoolItem(SID_DRAWINGMODE, FALSE)); - rSet.Put(SfxBoolItem(SID_NOTESMODE, FALSE)); - rSet.Put(SfxBoolItem(SID_HANDOUTMODE, TRUE)); + rSet.Put(SfxBoolItem(SID_DRAWINGMODE, sal_False)); + rSet.Put(SfxBoolItem(SID_NOTESMODE, sal_False)); + rSet.Put(SfxBoolItem(SID_HANDOUTMODE, sal_True)); } else { - rSet.Put(SfxBoolItem(SID_DRAWINGMODE, TRUE)); - rSet.Put(SfxBoolItem(SID_NOTESMODE, FALSE)); - rSet.Put(SfxBoolItem(SID_HANDOUTMODE, FALSE)); + rSet.Put(SfxBoolItem(SID_DRAWINGMODE, sal_True)); + rSet.Put(SfxBoolItem(SID_NOTESMODE, sal_False)); + rSet.Put(SfxBoolItem(SID_HANDOUTMODE, sal_False)); } // #101976# Removed [GetDocSh()->GetCurrentFunction() ||] from the following @@ -1679,7 +1679,7 @@ void DrawViewShell::GetState (SfxItemSet& rSet) { // Iterate over all requested items in the set. SfxWhichIter aIter( rSet ); - USHORT nWhich = aIter.FirstWhich(); + sal_uInt16 nWhich = aIter.FirstWhich(); while (nWhich) { switch (nWhich) diff --git a/sd/source/ui/view/drviews8.cxx b/sd/source/ui/view/drviews8.cxx index f4d8ca90687b..c4f8968f9ad9 100755 --- a/sd/source/ui/view/drviews8.cxx +++ b/sd/source/ui/view/drviews8.cxx @@ -212,7 +212,7 @@ void DrawViewShell::FuTemp01(SfxRequest& rReq) case SID_COPYOBJECTS: { - if ( mpDrawView->IsPresObjSelected(FALSE, TRUE) ) + if ( mpDrawView->IsPresObjSelected(sal_False, sal_True) ) { ::sd::Window* pWindow = GetActiveWindow(); InfoBox(pWindow, String(SdResId(STR_ACTION_NOTPOSSIBLE) ) ).Execute(); @@ -255,7 +255,7 @@ void DrawViewShell::FuTemp01(SfxRequest& rReq) case SID_ZOOM_OUT: case SID_ZOOM_PANNING: { - mbZoomOnPage = FALSE; + mbZoomOnPage = sal_False; SetCurrentFunction( FuZoom::Create(this, GetActiveWindow(), mpDrawView, GetDoc(), rReq) ); // Beendet sich selbst, kein Cancel() notwendig! Invalidate( SID_ZOOM_TOOLBOX ); @@ -349,7 +349,7 @@ void DrawViewShell::FuTemp01(SfxRequest& rReq) case SID_CONNECTION_NEW_ROUTING: { SfxItemSet aDefAttr( GetPool(), SDRATTR_EDGELINE1DELTA, SDRATTR_EDGELINE3DELTA ); - GetView()->SetAttributes( aDefAttr, TRUE ); // (ReplaceAll) + GetView()->SetAttributes( aDefAttr, sal_True ); // (ReplaceAll) Cancel(); rReq.Done(); @@ -358,7 +358,7 @@ void DrawViewShell::FuTemp01(SfxRequest& rReq) case SID_TWAIN_SELECT: { - BOOL bDone = FALSE; + sal_Bool bDone = sal_False; if( mxScannerManager.is() ) { @@ -385,7 +385,7 @@ void DrawViewShell::FuTemp01(SfxRequest& rReq) case SID_TWAIN_TRANSFER: { - BOOL bDone = FALSE; + sal_Bool bDone = sal_False; if( mxScannerManager.is() ) { @@ -396,7 +396,7 @@ void DrawViewShell::FuTemp01(SfxRequest& rReq) if( aContexts.getLength() ) { mxScannerManager->startScan( aContexts.getConstArray()[ 0 ], mxScannerListener ); - bDone = TRUE; + bDone = sal_True; } } catch( ... ) @@ -407,9 +407,9 @@ void DrawViewShell::FuTemp01(SfxRequest& rReq) if( !bDone ) { #ifndef UNX - const USHORT nId = STR_TWAIN_NO_SOURCE; + const sal_uInt16 nId = STR_TWAIN_NO_SOURCE; #else - const USHORT nId = STR_TWAIN_NO_SOURCE_UNX; + const sal_uInt16 nId = STR_TWAIN_NO_SOURCE_UNX; #endif ::sd::Window* pWindow = GetActiveWindow(); @@ -512,7 +512,7 @@ void DrawViewShell::ScannerEvent( const ::com::sun::star::lang::EventObject& ) aPnt += Point( pPage->GetLftBorder(), pPage->GetUppBorder() ); Rectangle aRect( aPnt, aBmpSize ); SdrGrafObj* pGrafObj = NULL; - BOOL bInsertNewObject = TRUE; + sal_Bool bInsertNewObject = sal_True; if( GetView()->AreObjectsMarked() ) { @@ -529,8 +529,8 @@ void DrawViewShell::ScannerEvent( const ::com::sun::star::lang::EventObject& ) if( pGrafObj->IsEmptyPresObj() ) { - bInsertNewObject = FALSE; - pGrafObj->SetEmptyPresObj(FALSE); + bInsertNewObject = sal_False; + pGrafObj->SetEmptyPresObj(sal_False); pGrafObj->SetOutlinerParaObject(NULL); pGrafObj->SetGraphic( Graphic( aScanBmp ) ); } diff --git a/sd/source/ui/view/drviews9.cxx b/sd/source/ui/view/drviews9.cxx index 998d723aec45..9c0def97a17d 100644..100755 --- a/sd/source/ui/view/drviews9.cxx +++ b/sd/source/ui/view/drviews9.cxx @@ -100,12 +100,12 @@ void DrawViewShell::ExecGallery(SfxRequest& rReq) if ( pArgs ) { - const UINT32 nFormats = ( (SfxUInt32Item&) pArgs->Get( SID_GALLERY_FORMATS ) ).GetValue(); + const sal_uInt32 nFormats = ( (SfxUInt32Item&) pArgs->Get( SID_GALLERY_FORMATS ) ).GetValue(); GalleryExplorer* pGal = SVX_GALLERY(); if ( pGal ) { - GetDocSh()->SetWaitCursor( TRUE ); + GetDocSh()->SetWaitCursor( sal_True ); // Graphik einfuegen if (nFormats & SGA_FORMAT_GRAPHIC) @@ -158,7 +158,7 @@ void DrawViewShell::ExecGallery(SfxRequest& rReq) SdrGrafObj* pGrafObj = NULL; - BOOL bInsertNewObject = TRUE; + sal_Bool bInsertNewObject = sal_True; if ( mpDrawView->AreObjectsMarked() ) { @@ -182,10 +182,10 @@ void DrawViewShell::ExecGallery(SfxRequest& rReq) * Das leere Graphik-Objekt bekommt eine neue * Graphik ******************************************/ - bInsertNewObject = FALSE; + bInsertNewObject = sal_False; SdrGrafObj* pNewGrafObj = (SdrGrafObj*) pGrafObj->Clone(); - pNewGrafObj->SetEmptyPresObj(FALSE); + pNewGrafObj->SetEmptyPresObj(sal_False); pNewGrafObj->SetOutlinerParaObject(NULL); pNewGrafObj->SetGraphic(aGraphic); @@ -220,7 +220,7 @@ void DrawViewShell::ExecGallery(SfxRequest& rReq) GetViewFrame()->GetDispatcher()->Execute( SID_INSERT_AVMEDIA, SFX_CALLMODE_SYNCHRON, &aMediaURLItem, 0L ); } - GetDocSh()->SetWaitCursor( FALSE ); + GetDocSh()->SetWaitCursor( sal_False ); } } } @@ -271,7 +271,7 @@ void DrawViewShell::AttrExec (SfxRequest &rReq) if (pArgs) if (pArgs->Count () == 1) { - SFX_REQUEST_ARG (rReq, pFillStyle, SfxUInt32Item, ID_VAL_STYLE, FALSE); + SFX_REQUEST_ARG (rReq, pFillStyle, SfxUInt32Item, ID_VAL_STYLE, sal_False); if (CHECK_RANGE (XFILL_NONE, (sal_Int32)pFillStyle->GetValue (), XFILL_BITMAP)) { pAttr->ClearItem (XATTR_FILLSTYLE); @@ -291,7 +291,7 @@ void DrawViewShell::AttrExec (SfxRequest &rReq) if (pArgs) if (pArgs->Count () == 1) { - SFX_REQUEST_ARG (rReq, pLineStyle, SfxUInt32Item, ID_VAL_STYLE, FALSE); + SFX_REQUEST_ARG (rReq, pLineStyle, SfxUInt32Item, ID_VAL_STYLE, sal_False); if (CHECK_RANGE (XLINE_NONE, (sal_Int32)pLineStyle->GetValue (), XLINE_DASH)) { pAttr->ClearItem (XATTR_LINESTYLE); @@ -311,7 +311,7 @@ void DrawViewShell::AttrExec (SfxRequest &rReq) if (pArgs) if (pArgs->Count () == 1) { - SFX_REQUEST_ARG (rReq, pLineWidth, SfxUInt32Item, ID_VAL_WIDTH, FALSE); + SFX_REQUEST_ARG (rReq, pLineWidth, SfxUInt32Item, ID_VAL_WIDTH, sal_False); pAttr->ClearItem (XATTR_LINEWIDTH); pAttr->Put (XLineWidthItem (pLineWidth->GetValue ()), XATTR_LINEWIDTH); rBindings.Invalidate (SID_ATTR_LINE_WIDTH); @@ -325,15 +325,15 @@ void DrawViewShell::AttrExec (SfxRequest &rReq) if (pArgs) if (pArgs->Count () == 3) { - SFX_REQUEST_ARG (rReq, pRed, SfxUInt32Item, ID_VAL_RED, FALSE); - SFX_REQUEST_ARG (rReq, pGreen, SfxUInt32Item, ID_VAL_GREEN, FALSE); - SFX_REQUEST_ARG (rReq, pBlue, SfxUInt32Item, ID_VAL_BLUE, FALSE); + SFX_REQUEST_ARG (rReq, pRed, SfxUInt32Item, ID_VAL_RED, sal_False); + SFX_REQUEST_ARG (rReq, pGreen, SfxUInt32Item, ID_VAL_GREEN, sal_False); + SFX_REQUEST_ARG (rReq, pBlue, SfxUInt32Item, ID_VAL_BLUE, sal_False); pAttr->ClearItem (XATTR_FILLCOLOR); pAttr->ClearItem (XATTR_FILLSTYLE); - pAttr->Put (XFillColorItem (-1, Color ((BYTE) pRed->GetValue (), - (BYTE) pGreen->GetValue (), - (BYTE) pBlue->GetValue ())), + pAttr->Put (XFillColorItem (-1, Color ((sal_uInt8) pRed->GetValue (), + (sal_uInt8) pGreen->GetValue (), + (sal_uInt8) pBlue->GetValue ())), XATTR_FILLCOLOR); pAttr->Put (XFillStyleItem (XFILL_SOLID), XATTR_FILLSTYLE); rBindings.Invalidate (SID_ATTR_FILL_COLOR); @@ -348,14 +348,14 @@ void DrawViewShell::AttrExec (SfxRequest &rReq) if (pArgs) if (pArgs->Count () == 3) { - SFX_REQUEST_ARG (rReq, pRed, SfxUInt32Item, ID_VAL_RED, FALSE); - SFX_REQUEST_ARG (rReq, pGreen, SfxUInt32Item, ID_VAL_GREEN, FALSE); - SFX_REQUEST_ARG (rReq, pBlue, SfxUInt32Item, ID_VAL_BLUE, FALSE); + SFX_REQUEST_ARG (rReq, pRed, SfxUInt32Item, ID_VAL_RED, sal_False); + SFX_REQUEST_ARG (rReq, pGreen, SfxUInt32Item, ID_VAL_GREEN, sal_False); + SFX_REQUEST_ARG (rReq, pBlue, SfxUInt32Item, ID_VAL_BLUE, sal_False); pAttr->ClearItem (XATTR_LINECOLOR); - pAttr->Put (XLineColorItem (-1, Color ((BYTE) pRed->GetValue (), - (BYTE) pGreen->GetValue (), - (BYTE) pBlue->GetValue ())), + pAttr->Put (XLineColorItem (-1, Color ((sal_uInt8) pRed->GetValue (), + (sal_uInt8) pGreen->GetValue (), + (sal_uInt8) pBlue->GetValue ())), XATTR_LINECOLOR); rBindings.Invalidate (SID_ATTR_LINE_COLOR); break; @@ -369,16 +369,16 @@ void DrawViewShell::AttrExec (SfxRequest &rReq) if (pArgs) if (pArgs->Count () == 4) { - SFX_REQUEST_ARG (rReq, pName, SfxStringItem, ID_VAL_INDEX, FALSE); - SFX_REQUEST_ARG (rReq, pRed, SfxUInt32Item, ID_VAL_RED, FALSE); - SFX_REQUEST_ARG (rReq, pGreen, SfxUInt32Item, ID_VAL_GREEN, FALSE); - SFX_REQUEST_ARG (rReq, pBlue, SfxUInt32Item, ID_VAL_BLUE, FALSE); + SFX_REQUEST_ARG (rReq, pName, SfxStringItem, ID_VAL_INDEX, sal_False); + SFX_REQUEST_ARG (rReq, pRed, SfxUInt32Item, ID_VAL_RED, sal_False); + SFX_REQUEST_ARG (rReq, pGreen, SfxUInt32Item, ID_VAL_GREEN, sal_False); + SFX_REQUEST_ARG (rReq, pBlue, SfxUInt32Item, ID_VAL_BLUE, sal_False); XGradientList *pGradientList = GetDoc()->GetGradientList (); long nCounts = pGradientList->Count (); - Color aColor ((BYTE) pRed->GetValue (), - (BYTE) pGreen->GetValue (), - (BYTE) pBlue->GetValue ()); + Color aColor ((sal_uInt8) pRed->GetValue (), + (sal_uInt8) pGreen->GetValue (), + (sal_uInt8) pBlue->GetValue ()); long i; pAttr->ClearItem (XATTR_FILLGRADIENT); @@ -429,16 +429,16 @@ void DrawViewShell::AttrExec (SfxRequest &rReq) if (pArgs) if (pArgs->Count () == 4) { - SFX_REQUEST_ARG (rReq, pName, SfxStringItem, ID_VAL_INDEX, FALSE); - SFX_REQUEST_ARG (rReq, pRed, SfxUInt32Item, ID_VAL_RED, FALSE); - SFX_REQUEST_ARG (rReq, pGreen, SfxUInt32Item, ID_VAL_GREEN, FALSE); - SFX_REQUEST_ARG (rReq, pBlue, SfxUInt32Item, ID_VAL_BLUE, FALSE); + SFX_REQUEST_ARG (rReq, pName, SfxStringItem, ID_VAL_INDEX, sal_False); + SFX_REQUEST_ARG (rReq, pRed, SfxUInt32Item, ID_VAL_RED, sal_False); + SFX_REQUEST_ARG (rReq, pGreen, SfxUInt32Item, ID_VAL_GREEN, sal_False); + SFX_REQUEST_ARG (rReq, pBlue, SfxUInt32Item, ID_VAL_BLUE, sal_False); XHatchList *pHatchList = GetDoc()->GetHatchList (); long nCounts = pHatchList->Count (); - Color aColor ((BYTE) pRed->GetValue (), - (BYTE) pGreen->GetValue (), - (BYTE) pBlue->GetValue ()); + Color aColor ((sal_uInt8) pRed->GetValue (), + (sal_uInt8) pGreen->GetValue (), + (sal_uInt8) pBlue->GetValue ()); long i; pAttr->ClearItem (XATTR_FILLHATCH); @@ -483,13 +483,13 @@ void DrawViewShell::AttrExec (SfxRequest &rReq) if (pArgs) if (pArgs->Count () == 7) { - SFX_REQUEST_ARG (rReq, pName, SfxStringItem, ID_VAL_INDEX, FALSE); - SFX_REQUEST_ARG (rReq, pStyle, SfxUInt32Item, ID_VAL_STYLE, FALSE); - SFX_REQUEST_ARG (rReq, pDots, SfxUInt32Item, ID_VAL_DOTS, FALSE); - SFX_REQUEST_ARG (rReq, pDotLen, SfxUInt32Item, ID_VAL_DOTLEN, FALSE); - SFX_REQUEST_ARG (rReq, pDashes, SfxUInt32Item, ID_VAL_DASHES, FALSE); - SFX_REQUEST_ARG (rReq, pDashLen, SfxUInt32Item, ID_VAL_DASHLEN, FALSE); - SFX_REQUEST_ARG (rReq, pDistance, SfxUInt32Item, ID_VAL_DISTANCE, FALSE); + SFX_REQUEST_ARG (rReq, pName, SfxStringItem, ID_VAL_INDEX, sal_False); + SFX_REQUEST_ARG (rReq, pStyle, SfxUInt32Item, ID_VAL_STYLE, sal_False); + SFX_REQUEST_ARG (rReq, pDots, SfxUInt32Item, ID_VAL_DOTS, sal_False); + SFX_REQUEST_ARG (rReq, pDotLen, SfxUInt32Item, ID_VAL_DOTLEN, sal_False); + SFX_REQUEST_ARG (rReq, pDashes, SfxUInt32Item, ID_VAL_DASHES, sal_False); + SFX_REQUEST_ARG (rReq, pDashLen, SfxUInt32Item, ID_VAL_DASHLEN, sal_False); + SFX_REQUEST_ARG (rReq, pDistance, SfxUInt32Item, ID_VAL_DISTANCE, sal_False); if (CHECK_RANGE (XDASH_RECT, (sal_Int32)pStyle->GetValue (), XDASH_ROUNDRELATIVE)) { @@ -531,14 +531,14 @@ void DrawViewShell::AttrExec (SfxRequest &rReq) if (pArgs) if (pArgs->Count () == 8) { - SFX_REQUEST_ARG (rReq, pName, SfxStringItem, ID_VAL_INDEX, FALSE); - SFX_REQUEST_ARG (rReq, pStyle, SfxUInt32Item, ID_VAL_STYLE, FALSE); - SFX_REQUEST_ARG (rReq, pAngle, SfxUInt32Item, ID_VAL_ANGLE, FALSE); - SFX_REQUEST_ARG (rReq, pBorder, SfxUInt32Item, ID_VAL_BORDER, FALSE); - SFX_REQUEST_ARG (rReq, pCenterX, SfxUInt32Item, ID_VAL_CENTER_X, FALSE); - SFX_REQUEST_ARG (rReq, pCenterY, SfxUInt32Item, ID_VAL_CENTER_Y, FALSE); - SFX_REQUEST_ARG (rReq, pStart, SfxUInt32Item, ID_VAL_STARTINTENS, FALSE); - SFX_REQUEST_ARG (rReq, pEnd, SfxUInt32Item, ID_VAL_ENDINTENS, FALSE); + SFX_REQUEST_ARG (rReq, pName, SfxStringItem, ID_VAL_INDEX, sal_False); + SFX_REQUEST_ARG (rReq, pStyle, SfxUInt32Item, ID_VAL_STYLE, sal_False); + SFX_REQUEST_ARG (rReq, pAngle, SfxUInt32Item, ID_VAL_ANGLE, sal_False); + SFX_REQUEST_ARG (rReq, pBorder, SfxUInt32Item, ID_VAL_BORDER, sal_False); + SFX_REQUEST_ARG (rReq, pCenterX, SfxUInt32Item, ID_VAL_CENTER_X, sal_False); + SFX_REQUEST_ARG (rReq, pCenterY, SfxUInt32Item, ID_VAL_CENTER_Y, sal_False); + SFX_REQUEST_ARG (rReq, pStart, SfxUInt32Item, ID_VAL_STARTINTENS, sal_False); + SFX_REQUEST_ARG (rReq, pEnd, SfxUInt32Item, ID_VAL_ENDINTENS, sal_False); if (CHECK_RANGE (XGRAD_LINEAR, (sal_Int32)pStyle->GetValue (), XGRAD_RECT) && CHECK_RANGE (0, (sal_Int32)pAngle->GetValue (), 360) && @@ -606,10 +606,10 @@ void DrawViewShell::AttrExec (SfxRequest &rReq) if (pArgs) if (pArgs->Count () == 4) { - SFX_REQUEST_ARG (rReq, pName, SfxStringItem, ID_VAL_INDEX, FALSE); - SFX_REQUEST_ARG (rReq, pStyle, SfxUInt32Item, ID_VAL_STYLE, FALSE); - SFX_REQUEST_ARG (rReq, pDistance, SfxUInt32Item, ID_VAL_DISTANCE, FALSE); - SFX_REQUEST_ARG (rReq, pAngle, SfxUInt32Item, ID_VAL_ANGLE, FALSE); + SFX_REQUEST_ARG (rReq, pName, SfxStringItem, ID_VAL_INDEX, sal_False); + SFX_REQUEST_ARG (rReq, pStyle, SfxUInt32Item, ID_VAL_STYLE, sal_False); + SFX_REQUEST_ARG (rReq, pDistance, SfxUInt32Item, ID_VAL_DISTANCE, sal_False); + SFX_REQUEST_ARG (rReq, pAngle, SfxUInt32Item, ID_VAL_ANGLE, sal_False); if (CHECK_RANGE (XHATCH_SINGLE, (sal_Int32)pStyle->GetValue (), XHATCH_TRIPLE) && CHECK_RANGE (0, (sal_Int32)pAngle->GetValue (), 360)) @@ -665,7 +665,7 @@ void DrawViewShell::AttrExec (SfxRequest &rReq) if (pArgs) if (pArgs->Count () == 1) { - SFX_REQUEST_ARG (rReq, pName, SfxStringItem, ID_VAL_INDEX, FALSE); + SFX_REQUEST_ARG (rReq, pName, SfxStringItem, ID_VAL_INDEX, sal_False); XGradientList *pGradientList = GetDoc()->GetGradientList (); long nCounts = pGradientList->Count (); @@ -699,7 +699,7 @@ void DrawViewShell::AttrExec (SfxRequest &rReq) if (pArgs) if (pArgs->Count () == 1) { - SFX_REQUEST_ARG (rReq, pName, SfxStringItem, ID_VAL_INDEX, FALSE); + SFX_REQUEST_ARG (rReq, pName, SfxStringItem, ID_VAL_INDEX, sal_False); XHatchList *pHatchList = GetDoc()->GetHatchList (); long nCounts = pHatchList->Count (); @@ -780,7 +780,7 @@ void DrawViewShell::AttrExec (SfxRequest &rReq) void DrawViewShell::AttrState (SfxItemSet& rSet) { SfxWhichIter aIter (rSet); - USHORT nWhich = aIter.FirstWhich (); + sal_uInt16 nWhich = aIter.FirstWhich (); SfxItemSet aAttr( GetDoc()->GetPool() ); mpDrawView->GetAttributes( aAttr ); diff --git a/sd/source/ui/view/drviewsa.cxx b/sd/source/ui/view/drviewsa.cxx index 36e5d96c97ff..dfef973faeb8 100755 --- a/sd/source/ui/view/drviewsa.cxx +++ b/sd/source/ui/view/drviewsa.cxx @@ -95,7 +95,7 @@ static const ::rtl::OUString MASTER_VIEW_TOOL_BAR_NAME( namespace sd { -BOOL DrawViewShell::mbPipette = FALSE; +sal_Bool DrawViewShell::mbPipette = sal_False; // ------------------------ // - ScannerEventListener - @@ -168,7 +168,7 @@ DrawViewShell::~DrawViewShell() // #96642# Remove references to items within Svx3DWin // (maybe do a listening sometime in Svx3DWin) - USHORT nId = Svx3DChildWindow::GetChildWindowId(); + sal_uInt16 nId = Svx3DChildWindow::GetChildWindowId(); SfxChildWindow* pWindow = GetViewFrame() ? GetViewFrame()->GetChildWindow(nId) : NULL; if(pWindow) { @@ -186,25 +186,25 @@ DrawViewShell::~DrawViewShell() DisposeFunctions(); SdPage* pPage; - USHORT aPageCnt = GetDoc()->GetSdPageCount(mePageKind); + sal_uInt16 aPageCnt = GetDoc()->GetSdPageCount(mePageKind); - for (USHORT i = 0; i < aPageCnt; i++) + for (sal_uInt16 i = 0; i < aPageCnt; i++) { pPage = GetDoc()->GetSdPage(i, mePageKind); if (pPage == mpActualPage) { - GetDoc()->SetSelected(pPage, TRUE); + GetDoc()->SetSelected(pPage, sal_True); } else { - GetDoc()->SetSelected(pPage, FALSE); + GetDoc()->SetSelected(pPage, sal_False); } } if ( mpClipEvtLstnr ) { - mpClipEvtLstnr->AddRemoveListener( GetActiveWindow(), FALSE ); + mpClipEvtLstnr->AddRemoveListener( GetActiveWindow(), sal_False ); mpClipEvtLstnr->ClearCallbackLink(); // #103849# prevent callback if another thread is waiting mpClipEvtLstnr->release(); } @@ -227,11 +227,11 @@ DrawViewShell::~DrawViewShell() void DrawViewShell::Construct(DrawDocShell* pDocSh, PageKind eInitialPageKind) { mpActualPage = 0; - mbMousePosFreezed = FALSE; + mbMousePosFreezed = sal_False; mbReadOnly = GetDocSh()->IsReadOnly(); mpSlotArray = 0; mpClipEvtLstnr = 0; - mbPastePossible = FALSE; + mbPastePossible = sal_False; mbIsLayerModeActive = false; mpFrameView->Connect(); @@ -243,7 +243,7 @@ void DrawViewShell::Construct(DrawDocShell* pDocSh, PageKind eInitialPageKind) // Ungerader Eintrag: gemappter Slot // Achtung: Anpassen von GetIdBySubId() !!! // Reihenfolge (insbesondere Zoom) darf nicht geaendert werden !!! - mpSlotArray = new USHORT[ SLOTARRAY_COUNT ]; + mpSlotArray = new sal_uInt16[ SLOTARRAY_COUNT ]; mpSlotArray[ 0 ] = SID_OBJECT_CHOOSE_MODE; mpSlotArray[ 1 ] = SID_OBJECT_ROTATE; mpSlotArray[ 2 ] = SID_OBJECT_ALIGN; @@ -275,7 +275,7 @@ void DrawViewShell::Construct(DrawDocShell* pDocSh, PageKind eInitialPageKind) mpDrawView = new DrawView(pDocSh, GetActiveWindow(), this); mpView = mpDrawView; // Pointer der Basisklasse ViewShell - mpDrawView->SetSwapAsynchron(TRUE); // Asynchrones Laden von Graphiken + mpDrawView->SetSwapAsynchron(sal_True); // Asynchrones Laden von Graphiken // We do not read the page kind from the frame view anymore so we have // to set it in order to resync frame view and this view. @@ -369,18 +369,18 @@ void DrawViewShell::Construct(DrawDocShell* pDocSh, PageKind eInitialPageKind) // Selektionsfunktion starten SfxRequest aReq(SID_OBJECT_SELECT, 0, GetDoc()->GetItemPool()); FuPermanent(aReq); - mpDrawView->SetFrameDragSingles(TRUE); + mpDrawView->SetFrameDragSingles(sal_True); if (pDocSh->GetCreateMode() == SFX_CREATE_MODE_EMBEDDED) { - mbZoomOnPage = FALSE; + mbZoomOnPage = sal_False; } else { - mbZoomOnPage = TRUE; + mbZoomOnPage = sal_True; } - mbIsRulerDrag = FALSE; + mbIsRulerDrag = sal_False; String aName( RTL_CONSTASCII_USTRINGPARAM("DrawViewShell")); SetName (aName); @@ -512,12 +512,12 @@ void DrawViewShell::SetupPage (Size &rSize, long nRight, long nUpper, long nLower, - BOOL bSize, - BOOL bMargin, - BOOL bScaleAll) + sal_Bool bSize, + sal_Bool bMargin, + sal_Bool bScaleAll) { - USHORT nPageCnt = GetDoc()->GetMasterSdPageCount(mePageKind); - USHORT i; + sal_uInt16 nPageCnt = GetDoc()->GetMasterSdPageCount(mePageKind); + sal_uInt16 i; for (i = 0; i < nPageCnt; i++) { @@ -590,7 +590,7 @@ void DrawViewShell::SetupPage (Size &rSize, if ( mePageKind == PK_STANDARD ) { SdPage* pHandoutPage = GetDoc()->GetSdPage(0, PK_HANDOUT); - pHandoutPage->CreateTitleAndLayout(TRUE); + pHandoutPage->CreateTitleAndLayout(sal_True); } long nWidth = mpActualPage->GetSize().Width(); @@ -599,7 +599,7 @@ void DrawViewShell::SetupPage (Size &rSize, Point aPageOrg(nWidth, nHeight / 2); Size aSize( nWidth * 3, nHeight * 2); - InitWindows(aPageOrg, aSize, Point(-1, -1), TRUE); + InitWindows(aPageOrg, aSize, Point(-1, -1), sal_True); Point aVisAreaPos; @@ -642,7 +642,7 @@ void DrawViewShell::GetStatusBarState(SfxItemSet& rSet) else { SvxZoomItem* pZoomItem; - UINT16 nZoom = (UINT16) GetActiveWindow()->GetZoom(); + sal_uInt16 nZoom = (sal_uInt16) GetActiveWindow()->GetZoom(); if( mbZoomOnPage ) pZoomItem = new SvxZoomItem( SVX_ZOOM_WHOLEPAGE, nZoom ); @@ -650,7 +650,7 @@ void DrawViewShell::GetStatusBarState(SfxItemSet& rSet) pZoomItem = new SvxZoomItem( SVX_ZOOM_PERCENT, nZoom ); // Bereich einschraenken - USHORT nZoomValues = SVX_ZOOM_ENABLE_ALL; + sal_uInt16 nZoomValues = SVX_ZOOM_ENABLE_ALL; SdrPageView* pPageView = mpDrawView->GetSdrPageView(); if( ( pPageView && pPageView->GetObjList()->GetObjCount() == 0 ) ) @@ -674,7 +674,7 @@ void DrawViewShell::GetStatusBarState(SfxItemSet& rSet) else { sd::Window * pActiveWindow = GetActiveWindow(); - SvxZoomSliderItem aZoomItem( (UINT16) pActiveWindow->GetZoom(), (USHORT)pActiveWindow->GetMinZoom(), (USHORT)pActiveWindow->GetMaxZoom() ) ; + SvxZoomSliderItem aZoomItem( (sal_uInt16) pActiveWindow->GetZoom(), (sal_uInt16)pActiveWindow->GetMinZoom(), (sal_uInt16)pActiveWindow->GetMaxZoom() ) ; SdrPageView* pPageView = mpDrawView->GetSdrPageView(); if( pPageView ) @@ -771,13 +771,13 @@ void DrawViewShell::GetStatusBarState(SfxItemSet& rSet) SdrLayer* pLayer = NULL; SdrObject* pObj = NULL; const SdrMarkList& rMarkList = mpDrawView->GetMarkedObjectList(); - ULONG nMarkCount = rMarkList.GetMarkCount(); - FASTBOOL bOneLayer = TRUE; + sal_uLong nMarkCount = rMarkList.GetMarkCount(); + FASTBOOL bOneLayer = sal_True; // Use the first ten selected shapes as a (hopefully // representative) sample of all shapes of the current page. // Detect whether they belong to the same layer. - for( ULONG j = 0; j < nMarkCount && bOneLayer && j < 10; j++ ) + for( sal_uLong j = 0; j < nMarkCount && bOneLayer && j < 10; j++ ) { pObj = rMarkList.GetMark( j )->GetMarkedSdrObj(); if( pObj ) @@ -785,7 +785,7 @@ void DrawViewShell::GetStatusBarState(SfxItemSet& rSet) nLayer = pObj->GetLayer(); if( j != 0 && nLayer != nOldLayer ) - bOneLayer = FALSE; + bOneLayer = sal_False; nOldLayer = nLayer; } diff --git a/sd/source/ui/view/drviewsb.cxx b/sd/source/ui/view/drviewsb.cxx index b9f6ec9a4a96..eb3bb754698b 100755 --- a/sd/source/ui/view/drviewsb.cxx +++ b/sd/source/ui/view/drviewsb.cxx @@ -90,7 +90,7 @@ namespace sd { void DrawViewShell::FuTemp02(SfxRequest& rReq) { - USHORT nSId = rReq.GetSlot(); + sal_uInt16 nSId = rReq.GetSlot(); switch( nSId ) { case SID_INSERTLAYER: @@ -101,13 +101,13 @@ void DrawViewShell::FuTemp02(SfxRequest& rReq) } SdrLayerAdmin& rLayerAdmin = GetDoc()->GetLayerAdmin(); - USHORT nLayerCnt = rLayerAdmin.GetLayerCount(); - USHORT nLayer = nLayerCnt - 2 + 1; + sal_uInt16 nLayerCnt = rLayerAdmin.GetLayerCount(); + sal_uInt16 nLayer = nLayerCnt - 2 + 1; String aLayerName ( SdResId(STR_LAYER) ), aLayerTitle, aLayerDesc; aLayerName += String::CreateFromInt32( (sal_Int32)nLayer ); - BOOL bIsVisible = FALSE; - BOOL bIsLocked = FALSE; - BOOL bIsPrintable = FALSE; + sal_Bool bIsVisible = sal_False; + sal_Bool bIsLocked = sal_False; + sal_Bool bIsPrintable = sal_False; const SfxItemSet* pArgs = rReq.GetArgs(); @@ -130,13 +130,13 @@ void DrawViewShell::FuTemp02(SfxRequest& rReq) pDlg->SetHelpId( SD_MOD()->GetSlotPool()->GetSlot( SID_INSERTLAYER )->GetCommand() ); // Ueberpruefung auf schon vorhandene Namen - BOOL bLoop = TRUE; + sal_Bool bLoop = sal_True; while( bLoop && pDlg->Execute() == RET_OK ) { pDlg->GetAttr( aNewAttr ); aLayerName = ((SdAttrLayerName &) aNewAttr.Get (ATTR_LAYER_NAME)).GetValue (); - if( rLayerAdmin.GetLayer( aLayerName, FALSE ) + if( rLayerAdmin.GetLayer( aLayerName, sal_False ) || aLayerName.Len()==0 ) { // Name ist schon vorhanden @@ -147,7 +147,7 @@ void DrawViewShell::FuTemp02(SfxRequest& rReq) aWarningBox.Execute(); } else - bLoop = FALSE; + bLoop = sal_False; } if( bLoop ) // wurde abgebrochen { @@ -180,10 +180,10 @@ void DrawViewShell::FuTemp02(SfxRequest& rReq) } else { - SFX_REQUEST_ARG (rReq, pLayerName, SfxStringItem, ID_VAL_LAYERNAME, FALSE); - SFX_REQUEST_ARG (rReq, pIsVisible, SfxBoolItem, ID_VAL_ISVISIBLE, FALSE); - SFX_REQUEST_ARG (rReq, pIsLocked, SfxBoolItem, ID_VAL_ISLOCKED, FALSE); - SFX_REQUEST_ARG (rReq, pIsPrintable, SfxBoolItem, ID_VAL_ISPRINTABLE, FALSE); + SFX_REQUEST_ARG (rReq, pLayerName, SfxStringItem, ID_VAL_LAYERNAME, sal_False); + SFX_REQUEST_ARG (rReq, pIsVisible, SfxBoolItem, ID_VAL_ISVISIBLE, sal_False); + SFX_REQUEST_ARG (rReq, pIsLocked, SfxBoolItem, ID_VAL_ISLOCKED, sal_False); + SFX_REQUEST_ARG (rReq, pIsPrintable, SfxBoolItem, ID_VAL_ISPRINTABLE, sal_False); aLayerName = pLayerName->GetValue (); bIsVisible = pIsVisible->GetValue (); @@ -194,7 +194,7 @@ void DrawViewShell::FuTemp02(SfxRequest& rReq) String aPrevLayer = mpDrawView->GetActiveLayer(); String aName; SdrLayer* pLayer; - USHORT nPrevLayer = 0; + sal_uInt16 nPrevLayer = 0; nLayerCnt = rLayerAdmin.GetLayerCount(); for ( nLayer = 0; nLayer < nLayerCnt; nLayer++ ) @@ -205,12 +205,12 @@ void DrawViewShell::FuTemp02(SfxRequest& rReq) if ( aPrevLayer == aName ) { // nPrevLayer = nLayer; - nPrevLayer = Max(nLayer, (USHORT) 4); + nPrevLayer = Max(nLayer, (sal_uInt16) 4); } } mpDrawView->InsertNewLayer(aLayerName, nPrevLayer + 1); - pLayer = rLayerAdmin.GetLayer(aLayerName, FALSE); + pLayer = rLayerAdmin.GetLayer(aLayerName, sal_False); if( pLayer ) { pLayer->SetTitle( aLayerTitle ); @@ -225,7 +225,7 @@ void DrawViewShell::FuTemp02(SfxRequest& rReq) ResetActualLayer(); - GetDoc()->SetChanged(TRUE); + GetDoc()->SetChanged(sal_True); GetViewFrame()->GetDispatcher()->Execute(SID_SWITCHLAYER, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD); @@ -243,9 +243,9 @@ void DrawViewShell::FuTemp02(SfxRequest& rReq) } SdrLayerAdmin& rLayerAdmin = GetDoc()->GetLayerAdmin(); - USHORT nCurPage = GetLayerTabControl()->GetCurPageId(); + sal_uInt16 nCurPage = GetLayerTabControl()->GetCurPageId(); String aLayerName( GetLayerTabControl()->GetPageText(nCurPage) ); - SdrLayer* pLayer = rLayerAdmin.GetLayer(aLayerName, FALSE); + SdrLayer* pLayer = rLayerAdmin.GetLayer(aLayerName, sal_False); String aLayerTitle( pLayer->GetTitle() ); String aLayerDesc( pLayer->GetDescription() ); @@ -254,10 +254,10 @@ void DrawViewShell::FuTemp02(SfxRequest& rReq) String aOldLayerTitle( aLayerTitle ); String aOldLayerDesc( aLayerDesc ); - BOOL bIsVisible, bIsLocked, bIsPrintable; - BOOL bOldIsVisible = bIsVisible = mpDrawView->IsLayerVisible(aLayerName); - BOOL bOldIsLocked = bIsLocked = mpDrawView->IsLayerLocked(aLayerName); - BOOL bOldIsPrintable = bIsPrintable = mpDrawView->IsLayerPrintable(aLayerName); + sal_Bool bIsVisible, bIsLocked, bIsPrintable; + sal_Bool bOldIsVisible = bIsVisible = mpDrawView->IsLayerVisible(aLayerName); + sal_Bool bOldIsLocked = bIsLocked = mpDrawView->IsLayerLocked(aLayerName); + sal_Bool bOldIsPrintable = bIsPrintable = mpDrawView->IsLayerPrintable(aLayerName); const SfxItemSet* pArgs = rReq.GetArgs(); @@ -296,14 +296,14 @@ void DrawViewShell::FuTemp02(SfxRequest& rReq) pDlg->SetHelpId( SD_MOD()->GetSlotPool()->GetSlot( SID_MODIFYLAYER )->GetCommand() ); // Ueberpruefung auf schon vorhandene Namen - BOOL bLoop = TRUE; - USHORT nRet = 0; + sal_Bool bLoop = sal_True; + sal_uInt16 nRet = 0; while( bLoop && ( (nRet = pDlg->Execute()) == RET_OK ) ) { pDlg->GetAttr( aNewAttr ); aLayerName = ((SdAttrLayerName &) aNewAttr.Get (ATTR_LAYER_NAME)).GetValue (); - if( (rLayerAdmin.GetLayer( aLayerName, FALSE ) && + if( (rLayerAdmin.GetLayer( aLayerName, sal_False ) && aLayerName != aOldLayerName) || aLayerName.Len()==0 ) { // Name ist schon vorhanden @@ -314,7 +314,7 @@ void DrawViewShell::FuTemp02(SfxRequest& rReq) aWarningBox.Execute(); } else - bLoop = FALSE; + bLoop = sal_False; } switch (nRet) { @@ -338,10 +338,10 @@ void DrawViewShell::FuTemp02(SfxRequest& rReq) } else if (pArgs->Count () == 4) { - SFX_REQUEST_ARG (rReq, pLayerName, SfxStringItem, ID_VAL_LAYERNAME, FALSE); - SFX_REQUEST_ARG (rReq, pIsVisible, SfxBoolItem, ID_VAL_ISVISIBLE, FALSE); - SFX_REQUEST_ARG (rReq, pIsLocked, SfxBoolItem, ID_VAL_ISLOCKED, FALSE); - SFX_REQUEST_ARG (rReq, pIsPrintable, SfxBoolItem, ID_VAL_ISPRINTABLE, FALSE); + SFX_REQUEST_ARG (rReq, pLayerName, SfxStringItem, ID_VAL_LAYERNAME, sal_False); + SFX_REQUEST_ARG (rReq, pIsVisible, SfxBoolItem, ID_VAL_ISVISIBLE, sal_False); + SFX_REQUEST_ARG (rReq, pIsLocked, SfxBoolItem, ID_VAL_ISLOCKED, sal_False); + SFX_REQUEST_ARG (rReq, pIsPrintable, SfxBoolItem, ID_VAL_ISPRINTABLE, sal_False); aLayerName = pLayerName->GetValue (); bIsVisible = pIsVisible->GetValue (); @@ -433,8 +433,8 @@ void DrawViewShell::FuTemp02(SfxRequest& rReq) SfxFrameItem aFrm( SID_DOCFRAME, pFrame ); SfxStringItem aReferer( SID_REFERER, aReferName ); - SfxBoolItem aNewView( SID_OPEN_NEW_VIEW, FALSE ); - SfxBoolItem aBrowsing( SID_BROWSE, TRUE ); + SfxBoolItem aNewView( SID_OPEN_NEW_VIEW, sal_False ); + SfxBoolItem aBrowsing( SID_BROWSE, sal_True ); SfxViewFrame* pViewFrm = SfxViewFrame::Current(); if (pViewFrm) @@ -502,7 +502,7 @@ void DrawViewShell::FuTemp02(SfxRequest& rReq) case SID_INSERT_FLD_PAGES: case SID_INSERT_FLD_FILE: { - USHORT nMul = 1; + sal_uInt16 nMul = 1; SvxFieldItem* pFieldItem = 0; switch( nSId ) @@ -588,19 +588,19 @@ void DrawViewShell::FuTemp02(SfxRequest& rReq) { Outliner* pOutl = GetDoc()->GetInternalOutliner(); pOutl->Init( OUTLINERMODE_TEXTOBJECT ); - USHORT nOutlMode = pOutl->GetMode(); + sal_uInt16 nOutlMode = pOutl->GetMode(); pOutl->SetStyleSheet( 0, NULL ); pOutl->QuickInsertField( *pFieldItem, ESelection() ); OutlinerParaObject* pOutlParaObject = pOutl->CreateParaObject(); SdrRectObj* pRectObj = new SdrRectObj( OBJ_TEXT ); - pRectObj->SetMergedItem(SdrTextAutoGrowWidthItem(TRUE)); + pRectObj->SetMergedItem(SdrTextAutoGrowWidthItem(sal_True)); pOutl->UpdateFields(); - pOutl->SetUpdateMode( TRUE ); + pOutl->SetUpdateMode( sal_True ); Size aSize( pOutl->CalcTextSize() ); aSize.Width() *= nMul; - pOutl->SetUpdateMode( FALSE ); + pOutl->SetUpdateMode( sal_False ); Point aPos; Rectangle aRect( aPos, GetActiveWindow()->GetOutputSizePixel() ); @@ -727,9 +727,9 @@ void DrawViewShell::FuTemp02(SfxRequest& rReq) }; }; -bool DrawViewShell::RenameSlide( USHORT nPageId, const String & rName ) +bool DrawViewShell::RenameSlide( sal_uInt16 nPageId, const String & rName ) { - BOOL bOutDummy; + sal_Bool bOutDummy; if( GetDoc()->GetPageByName( rName, bOutDummy ) != SDRPAGE_NOTFOUND ) return false; @@ -743,8 +743,8 @@ bool DrawViewShell::RenameSlide( USHORT nPageId, const String & rName ) // Undo SdPage* pUndoPage = pPageToRename; SdrLayerAdmin & rLayerAdmin = GetDoc()->GetLayerAdmin(); - BYTE nBackground = rLayerAdmin.GetLayerID( String( SdResId( STR_LAYER_BCKGRND )), FALSE ); - BYTE nBgObj = rLayerAdmin.GetLayerID( String( SdResId( STR_LAYER_BCKGRNDOBJ )), FALSE ); + sal_uInt8 nBackground = rLayerAdmin.GetLayerID( String( SdResId( STR_LAYER_BCKGRND )), sal_False ); + sal_uInt8 nBgObj = rLayerAdmin.GetLayerID( String( SdResId( STR_LAYER_BCKGRNDOBJ )), sal_False ); SetOfByte aVisibleLayers = mpActualPage->TRG_GetMasterPageVisibleLayers(); // (#67720#) @@ -772,7 +772,7 @@ bool DrawViewShell::RenameSlide( USHORT nPageId, const String & rName ) GetDoc()->RenameLayoutTemplate( pPageToRename->GetLayoutName(), rName ); } - bool bSuccess = ( FALSE != rName.Equals( pPageToRename->GetName())); + bool bSuccess = ( sal_False != rName.Equals( pPageToRename->GetName())); if( bSuccess ) { @@ -780,10 +780,10 @@ bool DrawViewShell::RenameSlide( USHORT nPageId, const String & rName ) maTabControl.SetPageText( nPageId, rName ); // set document to modified state - GetDoc()->SetChanged( TRUE ); + GetDoc()->SetChanged( sal_True ); // inform navigator about change - SfxBoolItem aItem( SID_NAVIGATOR_INIT, TRUE ); + SfxBoolItem aItem( SID_NAVIGATOR_INIT, sal_True ); GetViewFrame()->GetDispatcher()->Execute( SID_NAVIGATOR_INIT, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, &aItem, 0L ); @@ -831,12 +831,12 @@ void DrawViewShell::ModifyLayer ( { if( pLayer ) { - const USHORT nPageCount = GetLayerTabControl()->GetPageCount(); - USHORT nCurPage = 0; - USHORT nPos; + const sal_uInt16 nPageCount = GetLayerTabControl()->GetPageCount(); + sal_uInt16 nCurPage = 0; + sal_uInt16 nPos; for( nPos = 0; nPos < nPageCount; nPos++ ) { - USHORT nId = GetLayerTabControl()->GetPageId( nPos ); + sal_uInt16 nId = GetLayerTabControl()->GetPageId( nPos ); if( pLayer->GetName() == GetLayerTabControl()->GetPageText( nId ) ) { nCurPage = nId; @@ -851,7 +851,7 @@ void DrawViewShell::ModifyLayer ( mpDrawView->SetLayerLocked( rLayerName, bIsLocked); mpDrawView->SetLayerPrintable(rLayerName, bIsPrintable); - GetDoc()->SetChanged(TRUE); + GetDoc()->SetChanged(sal_True); GetLayerTabControl()->SetPageText(nCurPage, rLayerName); diff --git a/sd/source/ui/view/drviewsc.cxx b/sd/source/ui/view/drviewsc.cxx index ae47111c8200..5d629c00ed49 100755 --- a/sd/source/ui/view/drviewsc.cxx +++ b/sd/source/ui/view/drviewsc.cxx @@ -84,12 +84,12 @@ namespace sd { void DrawViewShell::FuTemp03(SfxRequest& rReq) { - USHORT nSId = rReq.GetSlot(); + sal_uInt16 nSId = rReq.GetSlot(); switch( nSId ) { case SID_GROUP: // BASIC { - if ( mpDrawView->IsPresObjSelected( TRUE, TRUE, TRUE ) ) + if ( mpDrawView->IsPresObjSelected( sal_True, sal_True, sal_True ) ) { ::sd::Window* pWindow = GetActiveWindow(); InfoBox(pWindow, String(SdResId(STR_ACTION_NOTPOSSIBLE) ) ).Execute(); @@ -139,7 +139,7 @@ void DrawViewShell::FuTemp03(SfxRequest& rReq) } SfxBindings& rBindings = GetViewFrame()->GetBindings(); - rBindings.Invalidate( SID_NAVIGATOR_STATE, TRUE, FALSE ); + rBindings.Invalidate( SID_NAVIGATOR_STATE, sal_True, sal_False ); rBindings.Invalidate( SID_CONTEXT ); Cancel(); @@ -174,7 +174,7 @@ void DrawViewShell::FuTemp03(SfxRequest& rReq) } SfxBindings& rBindings = GetViewFrame()->GetBindings(); - rBindings.Invalidate( SID_NAVIGATOR_STATE, TRUE, FALSE ); + rBindings.Invalidate( SID_NAVIGATOR_STATE, sal_True, sal_False ); rBindings.Invalidate( SID_CONTEXT ); Cancel(); @@ -308,10 +308,10 @@ void DrawViewShell::FuTemp03(SfxRequest& rReq) case SID_DISMANTLE: // BASIC { - if ( mpDrawView->IsDismantlePossible(FALSE) ) + if ( mpDrawView->IsDismantlePossible(sal_False) ) { WaitObject aWait( (Window*)GetActiveWindow() ); - mpDrawView->DismantleMarkedObjects(FALSE); + mpDrawView->DismantleMarkedObjects(sal_False); } Cancel(); rReq.Done (); @@ -347,21 +347,21 @@ void DrawViewShell::FuTemp03(SfxRequest& rReq) WaitObject aWait( (Window*)GetActiveWindow() ); mpDrawView->Break3DObj(); } - else if ( mpDrawView->IsDismantlePossible(TRUE) ) + else if ( mpDrawView->IsDismantlePossible(sal_True) ) { WaitObject aWait( (Window*)GetActiveWindow() ); - mpDrawView->DismantleMarkedObjects(TRUE); + mpDrawView->DismantleMarkedObjects(sal_True); } else if ( mpDrawView->IsImportMtfPossible() ) { WaitObject aWait( (Window*)GetActiveWindow() ); const SdrMarkList& rMarkList = mpDrawView->GetMarkedObjectList(); - ULONG nAnz=rMarkList.GetMarkCount(); + sal_uLong nAnz=rMarkList.GetMarkCount(); // Summe der Metaobjekte aller sel. Metafiles erm. - ULONG nCount = 0; - for(ULONG nm=0; nm<nAnz; nm++) + sal_uLong nCount = 0; + for(sal_uLong nm=0; nm<nAnz; nm++) { SdrMark* pM=rMarkList.GetMark(nm); SdrObject* pObj=pM->GetMarkedSdrObj(); @@ -417,7 +417,7 @@ void DrawViewShell::FuTemp03(SfxRequest& rReq) } WaitObject aWait( (Window*)GetActiveWindow() ); - mpDrawView->ConvertMarkedObjTo3D(TRUE); + mpDrawView->ConvertMarkedObjTo3D(sal_True); } } @@ -577,7 +577,7 @@ void DrawViewShell::FuTemp03(SfxRequest& rReq) SfxStringItem aStyleNameItem( SID_STYLE_EDIT, pStyleSheet->GetName() ); aSet.Put(aStyleNameItem); - SfxUInt16Item aStyleFamilyItem( SID_STYLE_FAMILY, (UINT16)pStyleSheet->GetFamily() ); + SfxUInt16Item aStyleFamilyItem( SID_STYLE_FAMILY, (sal_uInt16)pStyleSheet->GetFamily() ); aSet.Put(aStyleFamilyItem); rReq.SetArgs(aSet); @@ -599,7 +599,7 @@ void DrawViewShell::FuTemp03(SfxRequest& rReq) case SID_IMAP: { SvxIMapDlg* pDlg; - USHORT nId = SvxIMapDlgChildWindow::GetChildWindowId(); + sal_uInt16 nId = SvxIMapDlgChildWindow::GetChildWindowId(); GetViewFrame()->ToggleChildWindow( nId ); GetViewFrame()->GetBindings().Invalidate( SID_IMAP ); @@ -647,9 +647,9 @@ void DrawViewShell::FuTemp03(SfxRequest& rReq) |* \************************************************************************/ -USHORT DrawViewShell::GetIdBySubId( USHORT nSId ) +sal_uInt16 DrawViewShell::GetIdBySubId( sal_uInt16 nSId ) { - USHORT nMappedSId = 0; + sal_uInt16 nMappedSId = 0; switch( nSId ) { case SID_OBJECT_ROTATE: @@ -847,13 +847,13 @@ USHORT DrawViewShell::GetIdBySubId( USHORT nSId ) |* \************************************************************************/ -void DrawViewShell::MapSlot( USHORT nSId ) +void DrawViewShell::MapSlot( sal_uInt16 nSId ) { - USHORT nMappedSId = GetIdBySubId( nSId ); + sal_uInt16 nMappedSId = GetIdBySubId( nSId ); if( nMappedSId > 0 ) { - USHORT nID = GetArrayId( nMappedSId ) + 1; + sal_uInt16 nID = GetArrayId( nMappedSId ) + 1; mpSlotArray[ nID ] = nSId; } } @@ -864,11 +864,11 @@ void DrawViewShell::MapSlot( USHORT nSId ) |* \************************************************************************/ -void DrawViewShell::UpdateToolboxImages( SfxItemSet &rSet, BOOL bPermanent ) +void DrawViewShell::UpdateToolboxImages( SfxItemSet &rSet, sal_Bool bPermanent ) { if( !bPermanent ) { - USHORT nId = GetArrayId( SID_ZOOM_TOOLBOX ) + 1; + sal_uInt16 nId = GetArrayId( SID_ZOOM_TOOLBOX ) + 1; rSet.Put( TbxImageItem( SID_ZOOM_TOOLBOX, mpSlotArray[nId] ) ); nId = GetArrayId( SID_DRAWTBX_INSERT ) + 1; @@ -882,7 +882,7 @@ void DrawViewShell::UpdateToolboxImages( SfxItemSet &rSet, BOOL bPermanent ) } else { - for( USHORT nId = 0; nId < SLOTARRAY_COUNT; nId += 2 ) + for( sal_uInt16 nId = 0; nId < SLOTARRAY_COUNT; nId += 2 ) { rSet.Put( TbxImageItem( mpSlotArray[nId], mpSlotArray[nId+1] ) ); } @@ -895,10 +895,10 @@ void DrawViewShell::UpdateToolboxImages( SfxItemSet &rSet, BOOL bPermanent ) |* \************************************************************************/ -USHORT DrawViewShell::GetMappedSlot( USHORT nSId ) +sal_uInt16 DrawViewShell::GetMappedSlot( sal_uInt16 nSId ) { - USHORT nSlot = 0; - USHORT nId = GetArrayId( nSId ); + sal_uInt16 nSlot = 0; + sal_uInt16 nId = GetArrayId( nSId ); if( nId != USHRT_MAX ) nSlot = mpSlotArray[ nId+1 ]; @@ -918,9 +918,9 @@ USHORT DrawViewShell::GetMappedSlot( USHORT nSId ) |* \************************************************************************/ -USHORT DrawViewShell::GetArrayId( USHORT nSId ) +sal_uInt16 DrawViewShell::GetArrayId( sal_uInt16 nSId ) { - for( USHORT i = 0; i < SLOTARRAY_COUNT; i += 2 ) + for( sal_uInt16 i = 0; i < SLOTARRAY_COUNT; i += 2 ) { if( mpSlotArray[ i ] == nSId ) return( i ); diff --git a/sd/source/ui/view/drviewsd.cxx b/sd/source/ui/view/drviewsd.cxx index 7e0dff5eeede..c8b5c1939133 100644..100755 --- a/sd/source/ui/view/drviewsd.cxx +++ b/sd/source/ui/view/drviewsd.cxx @@ -70,13 +70,13 @@ void DrawViewShell::ExecNavigatorWin( SfxRequest& rReq ) { CheckLineTo (rReq); - USHORT nSId = rReq.GetSlot(); + sal_uInt16 nSId = rReq.GetSlot(); switch( nSId ) { case SID_NAVIGATOR_INIT: { - USHORT nId = SID_NAVIGATOR; + sal_uInt16 nId = SID_NAVIGATOR; SfxChildWindow* pWindow = GetViewFrame()->GetChildWindow( nId ); if( pWindow ) { @@ -124,7 +124,7 @@ void DrawViewShell::ExecNavigatorWin( SfxRequest& rReq ) case PAGE_NEXT: { // Sprung zu naechster Seite - USHORT nSdPage = (mpActualPage->GetPageNum() - 1) / 2; + sal_uInt16 nSdPage = (mpActualPage->GetPageNum() - 1) / 2; if (nSdPage < GetDoc()->GetSdPageCount(mpActualPage->GetPageKind()) - 1) { @@ -136,7 +136,7 @@ void DrawViewShell::ExecNavigatorWin( SfxRequest& rReq ) case PAGE_PREVIOUS: { // Sprung zu vorheriger Seite - USHORT nSdPage = (mpActualPage->GetPageNum() - 1) / 2; + sal_uInt16 nSdPage = (mpActualPage->GetPageNum() - 1) / 2; if (nSdPage > 0) { @@ -161,7 +161,7 @@ void DrawViewShell::ExecNavigatorWin( SfxRequest& rReq ) SfxStringItem aReferer(SID_REFERER, GetDocSh()->GetMedium()->GetName()); SfxViewFrame* pFrame = GetViewFrame(); SfxFrameItem aFrameItem(SID_DOCFRAME, pFrame); - SfxBoolItem aBrowseItem(SID_BROWSE, TRUE); + SfxBoolItem aBrowseItem(SID_BROWSE, sal_True); pFrame->GetDispatcher()-> Execute(SID_OPENDOC, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, &aStrItem, &aFrameItem, &aBrowseItem, &aReferer, 0L); @@ -186,11 +186,11 @@ void DrawViewShell::ExecNavigatorWin( SfxRequest& rReq ) void DrawViewShell::GetNavigatorWinState( SfxItemSet& rSet ) { - UINT32 nState = NAVSTATE_NONE; - USHORT nCurrentPage = 0; - USHORT nFirstPage = 0; - USHORT nLastPage; - BOOL bEndless = FALSE; + sal_uInt32 nState = NAVSTATE_NONE; + sal_uInt16 nCurrentPage = 0; + sal_uInt16 nFirstPage = 0; + sal_uInt16 nLastPage; + sal_Bool bEndless = sal_False; String aPageName; rtl::Reference< SlideShow > xSlideshow( SlideShow::GetSlideShow( GetViewShellBase() ) ); @@ -199,9 +199,9 @@ void DrawViewShell::GetNavigatorWinState( SfxItemSet& rSet ) // pen activated? nState |= xSlideshow->isDrawingPossible() ? NAVBTN_PEN_CHECKED : NAVBTN_PEN_UNCHECKED; - nCurrentPage = (USHORT)xSlideshow->getCurrentPageNumber(); - nFirstPage = (USHORT)xSlideshow->getFirstPageNumber(); - nLastPage = (USHORT)xSlideshow->getLastPageNumber(); + nCurrentPage = (sal_uInt16)xSlideshow->getCurrentPageNumber(); + nFirstPage = (sal_uInt16)xSlideshow->getFirstPageNumber(); + nLastPage = (sal_uInt16)xSlideshow->getLastPageNumber(); bEndless = xSlideshow->isEndless(); // Get the page for the current page number. diff --git a/sd/source/ui/view/drviewse.cxx b/sd/source/ui/view/drviewse.cxx index 020f95b5af89..a6f379b6fc38 100755 --- a/sd/source/ui/view/drviewse.cxx +++ b/sd/source/ui/view/drviewse.cxx @@ -161,7 +161,7 @@ void DrawViewShell::FuPermanent(SfxRequest& rReq) if (SlideShow::IsRunning(GetViewShellBase())) return; - USHORT nSId = rReq.GetSlot(); + sal_uInt16 nSId = rReq.GetSlot(); if( HasCurrentFunction() && ( nSId == SID_TEXTEDIT || nSId == SID_ATTR_CHAR || nSId == SID_TEXT_FITTOSIZE || @@ -173,7 +173,7 @@ void DrawViewShell::FuPermanent(SfxRequest& rReq) if( pFuText ) { - pFuText->SetPermanent(TRUE); + pFuText->SetPermanent(sal_True); xFunc->ReceiveRequest( rReq ); MapSlot( nSId ); @@ -192,8 +192,8 @@ void DrawViewShell::FuPermanent(SfxRequest& rReq) } CheckLineTo (rReq); - USHORT nOldSId = 0; - BOOL bPermanent = FALSE; + sal_uInt16 nOldSId = 0; + sal_Bool bPermanent = sal_False; if( !mpDrawView ) return; @@ -231,7 +231,7 @@ void DrawViewShell::FuPermanent(SfxRequest& rReq) (nSId == SID_TEXTEDIT || nSId == SID_ATTR_CHAR || nSId == SID_TEXT_FITTOSIZE || nSId == SID_ATTR_CHAR_VERTICAL || nSId == SID_TEXT_FITTOSIZE_VERTICAL ))) { - bPermanent = TRUE; + bPermanent = sal_True; } GetCurrentFunction()->Deactivate(); @@ -357,22 +357,22 @@ void DrawViewShell::FuPermanent(SfxRequest& rReq) { // Implizite Wandlung in Bezier WaitObject aWait( (Window*)GetActiveWindow() ); - mpDrawView->ConvertMarkedToPathObj(FALSE); + mpDrawView->ConvertMarkedToPathObj(sal_False); } } } else if (nSlotId == SID_OBJECT_SHEAR) { - ULONG i = 0; + sal_uLong i = 0; const SdrMarkList& rMarkList = mpDrawView->GetMarkedObjectList(); - ULONG nMarkCnt = rMarkList.GetMarkCount(); - BOOL b3DObjMarked = FALSE; + sal_uLong nMarkCnt = rMarkList.GetMarkCount(); + sal_Bool b3DObjMarked = sal_False; while (i < nMarkCnt && !b3DObjMarked) { if (rMarkList.GetMark(i)->GetMarkedSdrObj()->ISA(E3dObject)) { - b3DObjMarked = TRUE; + b3DObjMarked = sal_True; } else { @@ -394,7 +394,7 @@ void DrawViewShell::FuPermanent(SfxRequest& rReq) { // Implizite Wandlung in Bezier WaitObject aWait( (Window*)GetActiveWindow() ); - mpDrawView->ConvertMarkedToPathObj(FALSE); + mpDrawView->ConvertMarkedToPathObj(sal_False); } } } @@ -558,7 +558,7 @@ void DrawViewShell::FuPermanent(SfxRequest& rReq) if(HasOldFunction()) { - USHORT nSlotId = GetOldFunction()->GetSlotID(); + sal_uInt16 nSlotId = GetOldFunction()->GetSlotID(); GetOldFunction()->Deactivate(); SetOldFunction(0); @@ -587,7 +587,7 @@ void DrawViewShell::FuPermanent(SfxRequest& rReq) { // select first object GetView()->UnmarkAllObj(); - GetView()->MarkNextObj(TRUE); + GetView()->MarkNextObj(sal_True); // ...and make it visible if(GetView()->AreObjectsMarked()) @@ -669,7 +669,7 @@ void DrawViewShell::FuSupport(SfxRequest& rReq) if( !mpDrawView ) return; - USHORT nSId = rReq.GetSlot(); + sal_uInt16 nSId = rReq.GetSlot(); // Slot wird evtl. gemapped (ToolboxImages/-Slots) MapSlot( nSId ); @@ -697,7 +697,7 @@ void DrawViewShell::FuSupport(SfxRequest& rReq) case SID_DRAWTBX_CONNECTORS: case SID_DRAWTBX_INSERT: { - USHORT nMappedSlot = GetMappedSlot( nSId ); + sal_uInt16 nMappedSlot = GetMappedSlot( nSId ); if( nMappedSlot > 0 ) { SfxRequest aReq( nMappedSlot, 0, GetDoc()->GetItemPool() ); @@ -773,7 +773,7 @@ void DrawViewShell::FuSupport(SfxRequest& rReq) case SID_CUT: { - if ( mpDrawView->IsPresObjSelected(FALSE, TRUE, FALSE, TRUE) ) + if ( mpDrawView->IsPresObjSelected(sal_False, sal_True, sal_False, sal_True) ) { ::sd::Window* pWindow = GetActiveWindow(); InfoBox(pWindow, String(SdResId(STR_ACTION_NOTPOSSIBLE) ) ).Execute(); @@ -795,7 +795,7 @@ void DrawViewShell::FuSupport(SfxRequest& rReq) case SID_COPY: { - if ( mpDrawView->IsPresObjSelected(FALSE, TRUE, FALSE, TRUE) ) + if ( mpDrawView->IsPresObjSelected(sal_False, sal_True, sal_False, sal_True) ) { ::sd::Window* pWindow = GetActiveWindow(); InfoBox(pWindow, String(SdResId(STR_ACTION_NOTPOSSIBLE) ) ).Execute(); @@ -837,11 +837,11 @@ void DrawViewShell::FuSupport(SfxRequest& rReq) WaitObject aWait( (Window*)GetActiveWindow() ); TransferableDataHelper aDataHelper( TransferableDataHelper::CreateFromSystemClipboard( GetActiveWindow() ) ); const SfxItemSet* pReqArgs = rReq.GetArgs(); - UINT32 nFormat = 0; + sal_uInt32 nFormat = 0; if( pReqArgs ) { - SFX_REQUEST_ARG( rReq, pIsActive, SfxUInt32Item, SID_CLIPBOARD_FORMAT_ITEMS, FALSE ); + SFX_REQUEST_ARG( rReq, pIsActive, SfxUInt32Item, SID_CLIPBOARD_FORMAT_ITEMS, sal_False ); nFormat = pIsActive->GetValue(); } @@ -852,7 +852,7 @@ void DrawViewShell::FuSupport(SfxRequest& rReq) if( !mpDrawView->InsertData( aDataHelper, GetActiveWindow()->PixelToLogic( Rectangle( Point(), GetActiveWindow()->GetOutputSizePixel() ).Center() ), - nAction, FALSE, nFormat ) ) + nAction, sal_False, nFormat ) ) { INetBookmark aINetBookmark( aEmptyStr, aEmptyStr ); @@ -883,7 +883,7 @@ void DrawViewShell::FuSupport(SfxRequest& rReq) pOLV->PostKeyEvent(aKEvt); } } - else if ( mpDrawView->IsPresObjSelected(FALSE, TRUE, FALSE, TRUE) ) + else if ( mpDrawView->IsPresObjSelected(sal_False, sal_True, sal_False, sal_True) ) { ::sd::Window* pWindow = GetActiveWindow(); InfoBox(pWindow, String(SdResId(STR_ACTION_NOTPOSSIBLE) ) ).Execute(); @@ -934,7 +934,7 @@ void DrawViewShell::FuSupport(SfxRequest& rReq) if ( pReqArgs ) { - SFX_REQUEST_ARG (rReq, pIsActive, SfxBoolItem, SID_MASTERPAGE, FALSE); + SFX_REQUEST_ARG (rReq, pIsActive, SfxBoolItem, SID_MASTERPAGE, sal_False); mbIsLayerModeActive = pIsActive->GetValue (); } @@ -951,9 +951,9 @@ void DrawViewShell::FuSupport(SfxRequest& rReq) nSId == SID_SLIDE_MASTERPAGE) { // Gibt es eine Seite mit dem AutoLayout "Titel"? - BOOL bFound = FALSE; - USHORT i = 0; - USHORT nCount = GetDoc()->GetSdPageCount(PK_STANDARD); + sal_Bool bFound = sal_False; + sal_uInt16 i = 0; + sal_uInt16 nCount = GetDoc()->GetSdPageCount(PK_STANDARD); while (i < nCount && !bFound) { @@ -961,12 +961,12 @@ void DrawViewShell::FuSupport(SfxRequest& rReq) if (nSId == SID_TITLE_MASTERPAGE && pPage->GetAutoLayout() == AUTOLAYOUT_TITLE) { - bFound = TRUE; + bFound = sal_True; SwitchPage((pPage->GetPageNum() - 1) / 2); } else if (nSId == SID_SLIDE_MASTERPAGE && pPage->GetAutoLayout() != AUTOLAYOUT_TITLE) { - bFound = TRUE; + bFound = sal_True; SwitchPage((pPage->GetPageNum() - 1) / 2); } @@ -1055,17 +1055,17 @@ void DrawViewShell::FuSupport(SfxRequest& rReq) const SfxItemSet* pReqArgs = rReq.GetArgs(); // #97516# Remember old ruler state - BOOL bOldHasRuler(HasRuler()); + sal_Bool bOldHasRuler(HasRuler()); if ( pReqArgs ) { - SFX_REQUEST_ARG (rReq, pIsActive, SfxBoolItem, SID_RULER, FALSE); + SFX_REQUEST_ARG (rReq, pIsActive, SfxBoolItem, SID_RULER, sal_False); SetRuler (pIsActive->GetValue ()); } else SetRuler (!HasRuler()); // #97516# Did ruler state change? Tell that to SdOptions, too. - BOOL bHasRuler(HasRuler()); + sal_Bool bHasRuler(HasRuler()); if(bOldHasRuler != bHasRuler) { @@ -1129,7 +1129,7 @@ void DrawViewShell::FuSupport(SfxRequest& rReq) case SID_SIZE_REAL: // BASIC { - mbZoomOnPage = FALSE; + mbZoomOnPage = sal_False; SetZoom( 100 ); Rectangle aVisAreaWin = GetActiveWindow()->PixelToLogic( Rectangle( Point(0,0), GetActiveWindow()->GetOutputSizePixel()) ); @@ -1144,7 +1144,7 @@ void DrawViewShell::FuSupport(SfxRequest& rReq) case SID_ZOOM_IN: // BASIC { - mbZoomOnPage = FALSE; + mbZoomOnPage = sal_False; SetZoom( Max( (long) ( GetActiveWindow()->GetZoom() / 2 ), (long) GetActiveWindow()->GetMinZoom() ) ); Rectangle aVisAreaWin = GetActiveWindow()->PixelToLogic( Rectangle( Point(0,0), GetActiveWindow()->GetOutputSizePixel()) ); @@ -1164,7 +1164,7 @@ void DrawViewShell::FuSupport(SfxRequest& rReq) if (aVisAreaSize.Height()!=0 && aVisAreaSize.Width()!=0) { - mbZoomOnPage = FALSE; + mbZoomOnPage = sal_False; SetZoomRect(aVisArea); Invalidate( SID_ZOOM_IN ); Invalidate( SID_ZOOM_OUT ); @@ -1179,7 +1179,7 @@ void DrawViewShell::FuSupport(SfxRequest& rReq) // --> Wird als Objektzoom im Programm angeboten case SID_SIZE_OPTIMAL: // BASIC { - mbZoomOnPage = FALSE; + mbZoomOnPage = sal_False; if ( mpDrawView->AreObjectsMarked() ) { maMarkRect = mpDrawView->GetAllMarkedRect(); @@ -1209,7 +1209,7 @@ void DrawViewShell::FuSupport(SfxRequest& rReq) // --> Wird als Optimal im Programm angeboten case SID_SIZE_ALL: // BASIC { - mbZoomOnPage = FALSE; + mbZoomOnPage = sal_False; SdrPageView* pPageView = mpDrawView->GetSdrPageView(); if( pPageView ) @@ -1308,14 +1308,14 @@ void DrawViewShell::FuSupport(SfxRequest& rReq) case SID_AUTOSPELL_CHECK: { - BOOL bOnlineSpell = !GetDoc()->GetOnlineSpell(); + sal_Bool bOnlineSpell = !GetDoc()->GetOnlineSpell(); GetDoc()->SetOnlineSpell(bOnlineSpell); ::Outliner* pOL = mpDrawView->GetTextEditOutliner(); if (pOL) { - ULONG nCntrl = pOL->GetControlWord(); + sal_uLong nCntrl = pOL->GetControlWord(); if (bOnlineSpell) nCntrl |= EE_CNTRL_ONLINESPELLING; @@ -1374,7 +1374,7 @@ void DrawViewShell::FuSupport(SfxRequest& rReq) mpDrawView->BegUndo(String(SdResId(STR_UNDO_COLORRESOLUTION))); const SdrMarkList& rMarkList = mpDrawView->GetMarkedObjectList(); - for (ULONG i=0; i<rMarkList.GetMarkCount(); i++) + for (sal_uLong i=0; i<rMarkList.GetMarkCount(); i++) { SdrObject* pObj = rMarkList.GetMark(i)->GetMarkedSdrObj(); @@ -1470,13 +1470,13 @@ void DrawViewShell::FuSupport(SfxRequest& rReq) case SID_UNDO : { // #96090# moved implementation to BaseClass - ImpSidUndo(TRUE, rReq); + ImpSidUndo(sal_True, rReq); } break; case SID_REDO : { // #96090# moved implementation to BaseClass - ImpSidRedo(TRUE, rReq); + ImpSidRedo(sal_True, rReq); } break; @@ -1511,7 +1511,7 @@ void DrawViewShell::InsertURLField(const String& rURL, const String& rText, { Outliner* pOutl = GetDoc()->GetInternalOutliner(); pOutl->Init( OUTLINERMODE_TEXTOBJECT ); - USHORT nOutlMode = pOutl->GetMode(); + sal_uInt16 nOutlMode = pOutl->GetMode(); SvxURLField aURLField(rURL, rText, SVXURLFORMAT_REPR); aURLField.SetTargetFrame(rTarget); @@ -1522,9 +1522,9 @@ void DrawViewShell::InsertURLField(const String& rURL, const String& rText, SdrRectObj* pRectObj = new SdrRectObj(OBJ_TEXT); pOutl->UpdateFields(); - pOutl->SetUpdateMode( TRUE ); + pOutl->SetUpdateMode( sal_True ); Size aSize(pOutl->CalcTextSize()); - pOutl->SetUpdateMode( FALSE ); + pOutl->SetUpdateMode( sal_False ); Point aPos; @@ -1558,7 +1558,7 @@ void DrawViewShell::InsertURLField(const String& rURL, const String& rText, void DrawViewShell::InsertURLButton(const String& rURL, const String& rText, const String& rTarget, const Point* pPos) { - BOOL bNewObj = TRUE; + sal_Bool bNewObj = sal_True; const OUString sTargetURL( ::URIHelper::SmartRel2Abs( INetURLObject( GetDocSh()->GetMedium()->GetBaseURL() ), rURL, URIHelper::GetMaybeFileHdl(), true, false, INetURLObject::WAS_ENCODED, @@ -1571,7 +1571,7 @@ void DrawViewShell::InsertURLButton(const String& rURL, const String& rText, // change first marked object if( (FmFormInventor == pMarkedObj->GetObjInventor() && pMarkedObj->GetObjIdentifier() == OBJ_FM_BUTTON) ) { - bNewObj = FALSE; + bNewObj = sal_False; SdrUnoObj* pUnoCtrl = static_cast< SdrUnoObj* >( pMarkedObj ); @@ -1594,7 +1594,7 @@ void DrawViewShell::InsertURLButton(const String& rURL, const String& rText, else { // add url as interaction for first selected shape - bNewObj = FALSE; + bNewObj = sal_False; SdAnimationInfo* pInfo = SdDrawDocument::GetShapeUserData(*pMarkedObj, true); pInfo->meClickAction = presentation::ClickAction_DOCUMENT; @@ -1642,7 +1642,7 @@ void DrawViewShell::InsertURLButton(const String& rURL, const String& rText, aPos.Y() -= aSize.Height() / 2; pUnoCtrl->SetLogicRect(Rectangle(aPos, aSize)); - ULONG nOptions = SDRINSERT_SETDEFLAYER; + sal_uLong nOptions = SDRINSERT_SETDEFLAYER; OSL_ASSERT (GetViewShell()!=NULL); SfxInPlaceClient* pIpClient = GetViewShell()->GetIPClient(); diff --git a/sd/source/ui/view/drviewsf.cxx b/sd/source/ui/view/drviewsf.cxx index ac6b46f3018b..84540e65d05e 100755 --- a/sd/source/ui/view/drviewsf.cxx +++ b/sd/source/ui/view/drviewsf.cxx @@ -207,16 +207,16 @@ void DrawViewShell::GetCtrlState(SfxItemSet &rSet) SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_OUTPUT_QUALITY_BLACKWHITE ) || SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_OUTPUT_QUALITY_CONTRAST ) ) { - const ULONG nMode = (sal_Int32)GetActiveWindow()->GetDrawMode(); - rSet.Put( SfxBoolItem( SID_OUTPUT_QUALITY_COLOR, (BOOL)((ULONG)OUTPUT_DRAWMODE_COLOR == nMode) ) ); - rSet.Put( SfxBoolItem( SID_OUTPUT_QUALITY_GRAYSCALE, (BOOL)((ULONG)OUTPUT_DRAWMODE_GRAYSCALE == nMode) ) ); - rSet.Put( SfxBoolItem( SID_OUTPUT_QUALITY_BLACKWHITE, (BOOL)((ULONG)OUTPUT_DRAWMODE_BLACKWHITE == nMode) ) ); - rSet.Put( SfxBoolItem( SID_OUTPUT_QUALITY_CONTRAST, (BOOL)((ULONG)OUTPUT_DRAWMODE_CONTRAST == nMode) ) ); + const sal_uLong nMode = (sal_Int32)GetActiveWindow()->GetDrawMode(); + rSet.Put( SfxBoolItem( SID_OUTPUT_QUALITY_COLOR, (sal_Bool)((sal_uLong)OUTPUT_DRAWMODE_COLOR == nMode) ) ); + rSet.Put( SfxBoolItem( SID_OUTPUT_QUALITY_GRAYSCALE, (sal_Bool)((sal_uLong)OUTPUT_DRAWMODE_GRAYSCALE == nMode) ) ); + rSet.Put( SfxBoolItem( SID_OUTPUT_QUALITY_BLACKWHITE, (sal_Bool)((sal_uLong)OUTPUT_DRAWMODE_BLACKWHITE == nMode) ) ); + rSet.Put( SfxBoolItem( SID_OUTPUT_QUALITY_CONTRAST, (sal_Bool)((sal_uLong)OUTPUT_DRAWMODE_CONTRAST == nMode) ) ); } if ( SFX_ITEM_AVAILABLE == rSet.GetItemState(SID_MAIL_SCROLLBODY_PAGEDOWN) ) { - rSet.Put( SfxBoolItem( SID_MAIL_SCROLLBODY_PAGEDOWN, TRUE ) ); + rSet.Put( SfxBoolItem( SID_MAIL_SCROLLBODY_PAGEDOWN, sal_True ) ); } if ( SFX_ITEM_AVAILABLE == rSet.GetItemState(SID_ATTR_YEAR2000) ) @@ -224,7 +224,7 @@ void DrawViewShell::GetCtrlState(SfxItemSet &rSet) FmFormShell* pFormShell = GetViewShellBase().GetFormShellManager()->GetFormShell(); if (pFormShell != NULL) { - UINT16 nState = 0; + sal_uInt16 nState = 0; if (pFormShell->GetY2KState(nState)) rSet.Put( SfxUInt16Item( SID_ATTR_YEAR2000, nState ) ); else @@ -294,14 +294,14 @@ void DrawViewShell::GetCtrlState(SfxItemSet &rSet) void DrawViewShell::GetAttrState( SfxItemSet& rSet ) { SfxWhichIter aIter( rSet ); - USHORT nWhich = aIter.FirstWhich(); + sal_uInt16 nWhich = aIter.FirstWhich(); - BOOL bAttr = FALSE; + sal_Bool bAttr = sal_False; SfxAllItemSet aAllSet( *rSet.GetPool() ); while ( nWhich ) { - USHORT nSlotId = SfxItemPool::IsWhich(nWhich) + sal_uInt16 nSlotId = SfxItemPool::IsWhich(nWhich) ? GetPool().GetSlotId(nWhich) : nWhich; switch ( nSlotId ) @@ -318,7 +318,7 @@ void DrawViewShell::GetAttrState( SfxItemSet& rSet ) case SID_ATTR_LINE_COLOR: case SID_ATTR_TEXT_FITTOSIZE: { - bAttr = TRUE; + bAttr = sal_True; } break; @@ -328,7 +328,7 @@ void DrawViewShell::GetAttrState( SfxItemSet& rSet ) mpDrawView->GetAttributes( aAttrs ); if( aAttrs.GetItemState( EE_PARA_HYPHENATE ) >= SFX_ITEM_AVAILABLE ) { - BOOL bValue = ( (const SfxBoolItem&) aAttrs.Get( EE_PARA_HYPHENATE ) ).GetValue(); + sal_Bool bValue = ( (const SfxBoolItem&) aAttrs.Get( EE_PARA_HYPHENATE ) ).GetValue(); rSet.Put( SfxBoolItem( SID_HYPHENATION, bValue ) ); } } @@ -392,7 +392,7 @@ void DrawViewShell::GetAttrState( SfxItemSet& rSet ) { ISfxTemplateCommon* pTemplateCommon = SFX_APP()->GetCurrentTemplateCommon(GetViewFrame()->GetBindings()); if (pTemplateCommon && pTemplateCommon->GetActualFamily() == SD_STYLE_FAMILY_PSEUDO) - rSet.Put(SfxBoolItem(nWhich,FALSE)); + rSet.Put(SfxBoolItem(nWhich,sal_False)); else { SfxBoolItem aItem(nWhich, SD_MOD()->GetWaterCan()); @@ -468,10 +468,10 @@ void DrawViewShell::GetAttrState( SfxItemSet& rSet ) { pSet = new SfxItemSet( GetDoc()->GetPool() ); mpDrawView->GetAttributes( *pSet ); - rSet.Put( *pSet, FALSE ); + rSet.Put( *pSet, sal_False ); } - rSet.Put( aAllSet, FALSE ); + rSet.Put( aAllSet, sal_False ); // Flaechen und/oder Linienattribute wurden geaendert if( bAttr && pSet ) @@ -496,17 +496,17 @@ void DrawViewShell::GetAttrState( SfxItemSet& rSet ) } // const SdrMarkList& rMarkList = mpDrawView->GetMarkedObjectList(); -// ULONG nMarkCount = rMarkList.GetMarkCount(); -// BOOL bDisabled = FALSE; +// sal_uLong nMarkCount = rMarkList.GetMarkCount(); +// sal_Bool bDisabled = sal_False; // -// for (ULONG i = 0; +// for (sal_uLong i = 0; // i < nMarkCount && !bDisabled && i < 50; i++) // { // SdrObject* pObj = rMarkList.GetMark(i)->GetMarkedSdrObj(); // // if (pObj->GetObjInventor() == E3dInventor) // { -// bDisabled = TRUE; +// bDisabled = sal_True; // rSet.ClearItem(SDRATTR_SHADOW); // rSet.DisableItem(SDRATTR_SHADOW); // } @@ -520,7 +520,7 @@ void DrawViewShell::GetAttrState( SfxItemSet& rSet ) |* \************************************************************************/ -String DrawViewShell::GetSelectionText(BOOL bCompleteWords) +String DrawViewShell::GetSelectionText(sal_Bool bCompleteWords) { String aStrSelection; ::Outliner* pOl = mpDrawView->GetTextEditOutliner(); @@ -552,9 +552,9 @@ String DrawViewShell::GetSelectionText(BOOL bCompleteWords) |* \************************************************************************/ -BOOL DrawViewShell::HasSelection(BOOL bText) const +sal_Bool DrawViewShell::HasSelection(sal_Bool bText) const { - BOOL bReturn = FALSE; + sal_Bool bReturn = sal_False; if (bText) { @@ -562,12 +562,12 @@ BOOL DrawViewShell::HasSelection(BOOL bText) const if (pOlView && pOlView->GetSelected().Len() != 0) { - bReturn = TRUE; + bReturn = sal_True; } } else if (mpDrawView->GetMarkedObjectList().GetMarkCount() != 0) { - bReturn = TRUE; + bReturn = sal_True; } return bReturn; diff --git a/sd/source/ui/view/drviewsg.cxx b/sd/source/ui/view/drviewsg.cxx index 41b43864a3c0..f09eaf8dd483 100644..100755 --- a/sd/source/ui/view/drviewsg.cxx +++ b/sd/source/ui/view/drviewsg.cxx @@ -106,13 +106,13 @@ void DrawViewShell::ExecIMap( SfxRequest& rReq ) void DrawViewShell::GetIMapState( SfxItemSet& rSet ) { - BOOL bDisable = TRUE; + sal_Bool bDisable = sal_True; if( GetViewFrame()->HasChildWindow( SvxIMapDlgChildWindow::GetChildWindowId() ) ) { const SdrMarkList& rMarkList = mpDrawView->GetMarkedObjectList(); const SdrObject* pObj = NULL; - ULONG nMarkCount = rMarkList.GetMarkCount(); + sal_uLong nMarkCount = rMarkList.GetMarkCount(); if ( nMarkCount == 1 ) { @@ -123,7 +123,7 @@ void DrawViewShell::GetIMapState( SfxItemSet& rSet ) && pImageMapDialog!=NULL && ( pImageMapDialog->GetEditingObject() == (void*) pObj ) ) { - bDisable = FALSE; + bDisable = sal_False; } } } @@ -143,8 +143,8 @@ void DrawViewShell::ExecOptionsBar( SfxRequest& rReq ) if(HasCurrentFunction(SID_PRESENTATION)) return; - BOOL bDefault = FALSE; - USHORT nSlot = rReq.GetSlot(); + sal_Bool bDefault = sal_False; + sal_uInt16 nSlot = rReq.GetSlot(); SdOptions* pOptions = SD_MOD()->GetSdOptions(GetDoc()->GetDocumentType()); @@ -242,7 +242,7 @@ void DrawViewShell::ExecOptionsBar( SfxRequest& rReq ) break; default: - bDefault = TRUE; + bDefault = sal_True; break; } @@ -285,7 +285,7 @@ void DrawViewShell::GetOptionsBarState( SfxItemSet& rSet ) rSet.Put( SfxBoolItem( SID_SNAP_POINTS, mpDrawView->IsOPntSnap() ) ); rSet.Put( SfxBoolItem( SID_QUICKEDIT, mpDrawView->IsQuickTextEditMode() ) ); - rSet.Put( SfxBoolItem( SID_PICK_THROUGH, (BOOL) + rSet.Put( SfxBoolItem( SID_PICK_THROUGH, (sal_Bool) mpDrawView->GetModel()->IsPickThroughTransparentTextFrames() ) ); rSet.Put( SfxBoolItem( SID_BIG_HANDLES, mpFrameView->IsBigHandles() ) ); diff --git a/sd/source/ui/view/drviewsh.cxx b/sd/source/ui/view/drviewsh.cxx index 26d0a70ba9a6..2fc5c02babc4 100644..100755 --- a/sd/source/ui/view/drviewsh.cxx +++ b/sd/source/ui/view/drviewsh.cxx @@ -65,9 +65,9 @@ namespace sd { |* \************************************************************************/ -BOOL DrawViewShell::GotoBookmark(const String& rBookmark) +sal_Bool DrawViewShell::GotoBookmark(const String& rBookmark) { - BOOL bRet = FALSE; + sal_Bool bRet = sal_False; ::sd::DrawDocShell* pDocSh = GetDocSh(); if( pDocSh ) { diff --git a/sd/source/ui/view/drviewsi.cxx b/sd/source/ui/view/drviewsi.cxx index 17ebe33ea540..d91dcf6f8da6 100644..100755 --- a/sd/source/ui/view/drviewsi.cxx +++ b/sd/source/ui/view/drviewsi.cxx @@ -83,13 +83,13 @@ void DrawViewShell::ExecEffectWin( SfxRequest& rReq ) { CheckLineTo (rReq); - USHORT nSId = rReq.GetSlot(); + sal_uInt16 nSId = rReq.GetSlot(); switch( nSId ) { case SID_3D_INIT: { - USHORT nId = Svx3DChildWindow::GetChildWindowId(); + sal_uInt16 nId = Svx3DChildWindow::GetChildWindowId(); SfxChildWindow* pWindow = GetViewFrame()->GetChildWindow( nId ); if( pWindow ) { @@ -122,7 +122,7 @@ void DrawViewShell::ExecEffectWin( SfxRequest& rReq ) \************************************************************************/ void DrawViewShell::Update3DWindow() { - USHORT nId = Svx3DChildWindow::GetChildWindowId(); + sal_uInt16 nId = Svx3DChildWindow::GetChildWindowId(); SfxChildWindow* pWindow = GetViewFrame()->GetChildWindow( nId ); if( pWindow ) { @@ -139,7 +139,7 @@ void DrawViewShell::Update3DWindow() void DrawViewShell::AssignFrom3DWindow() { - USHORT nId = Svx3DChildWindow::GetChildWindowId(); + sal_uInt16 nId = Svx3DChildWindow::GetChildWindowId(); SfxChildWindow* pWin = GetViewFrame()->GetChildWindow( nId ); if( pWin ) { @@ -161,12 +161,12 @@ void DrawViewShell::AssignFrom3DWindow() // Nur TextAttribute zuweisen SfxItemSet aTextSet( GetDoc()->GetPool(), EE_ITEMS_START, EE_ITEMS_END, 0 ); - aTextSet.Put( aSet, FALSE ); + aTextSet.Put( aSet, sal_False ); GetView()->SetAttributes( aTextSet ); // Text in 3D umwandeln - USHORT nSId = SID_CONVERT_TO_3D; - SfxBoolItem aItem( nSId, TRUE ); + sal_uInt16 nSId = SID_CONVERT_TO_3D; + SfxBoolItem aItem( nSId, sal_True ); GetViewFrame()->GetDispatcher()->Execute( nSId, SFX_CALLMODE_SYNCHRON | SFX_CALLMODE_RECORD, &aItem, 0L ); diff --git a/sd/source/ui/view/drviewsj.cxx b/sd/source/ui/view/drviewsj.cxx index ca69aeac0e59..70f0ecadc301 100644..100755 --- a/sd/source/ui/view/drviewsj.cxx +++ b/sd/source/ui/view/drviewsj.cxx @@ -82,7 +82,7 @@ void DrawViewShell::GetMenuStateSel( SfxItemSet &rSet ) // Einfachselektion const SdrMarkList& rMarkList = mpDrawView->GetMarkedObjectList(); - ULONG nMarkCount = rMarkList.GetMarkCount(); + sal_uLong nMarkCount = rMarkList.GetMarkCount(); if ( nMarkCount == 1 ) { @@ -131,8 +131,8 @@ void DrawViewShell::GetMenuStateSel( SfxItemSet &rSet ) SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_TEXTATTR_DLG ) ) { const SdrObject* pObj = rMarkList.GetMark(0)->GetMarkedSdrObj(); - UINT32 nInv = pObj->GetObjInventor(); - UINT16 nId = pObj->GetObjIdentifier(); + sal_uInt32 nInv = pObj->GetObjInventor(); + sal_uInt16 nId = pObj->GetObjIdentifier(); SdrObjTransformInfoRec aInfoRec; pObj->TakeObjInfo( aInfoRec ); @@ -223,7 +223,7 @@ void DrawViewShell::GetMenuStateSel( SfxItemSet &rSet ) rSet.DisableItem( SID_CONNECTION_DLG ); else { - BOOL bDisable = TRUE; + sal_Bool bDisable = sal_True; SfxItemSet aAttrSet( GetDoc()->GetPool() ); GetView()->GetAttributes( aAttrSet ); @@ -236,7 +236,7 @@ void DrawViewShell::GetMenuStateSel( SfxItemSet &rSet ) long nVal3 = ( ( const SdrEdgeLine3DeltaItem& ) aAttrSet.Get( SDRATTR_EDGELINE3DELTA ) ).GetValue(); { if( nVal1 != 0 || nVal2 != 0 || nVal3 != 0 ) - bDisable = FALSE; + bDisable = sal_False; } } if( bDisable ) @@ -244,7 +244,7 @@ void DrawViewShell::GetMenuStateSel( SfxItemSet &rSet ) } if ( nInv == E3dInventor || - (!mpDrawView->IsConvertToPathObjPossible(FALSE) && + (!mpDrawView->IsConvertToPathObjPossible(sal_False) && !mpDrawView->IsShearAllowed() && !mpDrawView->IsDistortAllowed()) ) { @@ -272,12 +272,12 @@ void DrawViewShell::GetMenuStateSel( SfxItemSet &rSet ) if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_DISMANTLE ) || SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_BREAK ) ) { - if ( !mpDrawView->IsDismantlePossible(FALSE) ) + if ( !mpDrawView->IsDismantlePossible(sal_False) ) { rSet.DisableItem( SID_DISMANTLE ); } - if ( !mpDrawView->IsDismantlePossible(TRUE) && + if ( !mpDrawView->IsDismantlePossible(sal_True) && !mpDrawView->IsImportMtfPossible() && !mpDrawView->IsBreak3DObjPossible() ) { @@ -346,37 +346,37 @@ void DrawViewShell::GetMenuStateSel( SfxItemSet &rSet ) // SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_OBJECT_ALIGN_MIDDLE ) || // SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_OBJECT_ALIGN_DOWN ) ) { - BOOL bText = FALSE; - BOOL bLine = FALSE; - BOOL bGroup = FALSE; - BOOL bGraf = FALSE; - BOOL bDrawObj = FALSE; - BOOL b3dObj = FALSE; - BOOL bTitOutText = FALSE; + sal_Bool bText = sal_False; + sal_Bool bLine = sal_False; + sal_Bool bGroup = sal_False; + sal_Bool bGraf = sal_False; + sal_Bool bDrawObj = sal_False; + sal_Bool b3dObj = sal_False; + sal_Bool bTitOutText = sal_False; bool bTable = false; - BOOL bMeasureObj = FALSE; - BOOL bEdgeObj = FALSE; // Connector - BOOL bE3dCompoundObject = FALSE; + sal_Bool bMeasureObj = sal_False; + sal_Bool bEdgeObj = sal_False; // Connector + sal_Bool bE3dCompoundObject = sal_False; - for( ULONG i = 0; + for( sal_uLong i = 0; i < nMarkCount && !bText && i < 50; i++ ) { SdrObject* pObj = rMarkList.GetMark(i)->GetMarkedSdrObj(); - UINT32 nInv = pObj->GetObjInventor(); - UINT16 nId = pObj->GetObjIdentifier(); + sal_uInt32 nInv = pObj->GetObjInventor(); + sal_uInt16 nId = pObj->GetObjIdentifier(); if (nInv == SdrInventor) { switch (nId) { - case OBJ_TEXT: bText = TRUE; break; + case OBJ_TEXT: bText = sal_True; break; - case OBJ_LINE: bLine = TRUE; break; + case OBJ_LINE: bLine = sal_True; break; - case OBJ_EDGE: bEdgeObj = TRUE; break; + case OBJ_EDGE: bEdgeObj = sal_True; break; - case OBJ_MEASURE: bMeasureObj = TRUE; break; + case OBJ_MEASURE: bMeasureObj = sal_True; break; case OBJ_RECT: case OBJ_CIRC: @@ -386,23 +386,23 @@ void DrawViewShell::GetMenuStateSel( SfxItemSet &rSet ) case OBJ_PATHLINE: case OBJ_SECT: case OBJ_CARC: - case OBJ_CCUT: bDrawObj = TRUE; break; + case OBJ_CCUT: bDrawObj = sal_True; break; - case OBJ_GRUP: bGroup = TRUE; break; + case OBJ_GRUP: bGroup = sal_True; break; - case OBJ_GRAF: bGraf = TRUE; break; + case OBJ_GRAF: bGraf = sal_True; break; case OBJ_TITLETEXT: - case OBJ_OUTLINETEXT: bTitOutText = TRUE; break; + case OBJ_OUTLINETEXT: bTitOutText = sal_True; break; case OBJ_TABLE: bTable = true; break; } } else if (nInv == E3dInventor) { if(pObj->ISA(E3dScene)) - b3dObj = TRUE; + b3dObj = sal_True; else if(pObj->ISA(E3dCompoundObject)) - bE3dCompoundObject = TRUE; + bE3dCompoundObject = sal_True; } } /* Kann wohl raus, da jedes(?) Objekt Text enthalten kann @@ -430,7 +430,7 @@ void DrawViewShell::GetMenuStateSel( SfxItemSet &rSet ) } if (b3dObj || - (!mpDrawView->IsConvertToPathObjPossible(FALSE) && + (!mpDrawView->IsConvertToPathObjPossible(sal_False) && !mpDrawView->IsShearAllowed() && !mpDrawView->IsDistortAllowed()) ) { @@ -476,24 +476,24 @@ void DrawViewShell::GetMenuStateSel( SfxItemSet &rSet ) } } - if ( !mpDrawView->IsDismantlePossible(FALSE) ) + if ( !mpDrawView->IsDismantlePossible(sal_False) ) { rSet.DisableItem( SID_DISMANTLE ); } - if ( !mpDrawView->IsDismantlePossible(TRUE) && + if ( !mpDrawView->IsDismantlePossible(sal_True) && !mpDrawView->IsImportMtfPossible() && !mpDrawView->IsBreak3DObjPossible() ) { rSet.DisableItem( SID_BREAK ); } - if ( !mpDrawView->IsCombinePossible(FALSE) ) + if ( !mpDrawView->IsCombinePossible(sal_False) ) { rSet.DisableItem( SID_COMBINE ); rSet.DisableItem(SID_POLY_MERGE); rSet.DisableItem(SID_POLY_SUBSTRACT); rSet.DisableItem(SID_POLY_INTERSECT); } - if ( !mpDrawView->IsCombinePossible(TRUE) ) + if ( !mpDrawView->IsCombinePossible(sal_True) ) { rSet.DisableItem( SID_CONNECT ); } diff --git a/sd/source/ui/view/frmview.cxx b/sd/source/ui/view/frmview.cxx index aca0130624ce..3f77658d5021 100644..100755 --- a/sd/source/ui/view/frmview.cxx +++ b/sd/source/ui/view/frmview.cxx @@ -78,14 +78,14 @@ FrameView::FrameView(SdDrawDocument* pDrawDoc, FrameView* pFrameView /* = NULK * { EndListening(*pDrawDoc); - EnableExtendedKeyInputDispatcher(FALSE); - EnableExtendedMouseEventDispatcher(FALSE); - EnableExtendedCommandEventDispatcher(FALSE); - - SetGridFront( FALSE ); - SetHlplFront( FALSE ); - SetOConSnap( FALSE ); - SetFrameDragSingles( TRUE ); + EnableExtendedKeyInputDispatcher(sal_False); + EnableExtendedMouseEventDispatcher(sal_False); + EnableExtendedCommandEventDispatcher(sal_False); + + SetGridFront( sal_False ); + SetHlplFront( sal_False ); + SetOConSnap( sal_False ); + SetFrameDragSingles( sal_True ); SetSlidesPerRow(4); if( NULL == pFrameView ) @@ -97,7 +97,7 @@ FrameView::FrameView(SdDrawDocument* pDrawDoc, FrameView* pFrameView /* = NULK * /********************************************************************** * Das Dokument wurde geladen, ist eine FrameView vorhanden? **********************************************************************/ - ULONG nSdViewShellCount = 0; + sal_uLong nSdViewShellCount = 0; ViewShellBase* pBase = NULL; SfxViewShell* pSfxViewSh = NULL; SfxViewFrame* pSfxViewFrame = SfxViewFrame::GetFirst(pDocShell); @@ -234,8 +234,8 @@ FrameView::FrameView(SdDrawDocument* pDrawDoc, FrameView* pFrameView /* = NULK * SetGridCoarse( Size( 1000, 1000 ) ); SetSnapGridWidth(Fraction(1000, 1), Fraction(1000, 1)); SetActiveLayer( String( SdResId(STR_LAYER_LAYOUT) ) ); - mbNoColors = TRUE; - mbNoAttribs = FALSE; + mbNoColors = sal_True; + mbNoAttribs = sal_False; maVisArea = Rectangle( Point(), Size(0, 0) ); mePageKind = PK_STANDARD; mePageKindOnLoad = PK_STANDARD; @@ -245,11 +245,11 @@ FrameView::FrameView(SdDrawDocument* pDrawDoc, FrameView* pFrameView /* = NULK * meNotesEditMode = EM_PAGE; meHandoutEditMode = EM_MASTERPAGE; SetViewShEditModeOnLoad(EM_PAGE); - mbLayerMode = FALSE; - SetEliminatePolyPoints(FALSE); - mbBigHandles = FALSE; - mbDoubleClickTextEdit = FALSE; - mbClickChangeRotation = FALSE; + mbLayerMode = sal_False; + SetEliminatePolyPoints(sal_False); + mbBigHandles = sal_False; + mbDoubleClickTextEdit = sal_False; + mbClickChangeRotation = sal_False; mnSlidesPerRow = 4; { @@ -448,8 +448,8 @@ static OUString createHelpLinesString( const SdrHelpLineList& rHelpLines ) { ::rtl::OUStringBuffer aLines; - const USHORT nCount = rHelpLines.GetCount(); - for( USHORT nHlpLine = 0; nHlpLine < nCount; nHlpLine++ ) + const sal_uInt16 nCount = rHelpLines.GetCount(); + for( sal_uInt16 nHlpLine = 0; nHlpLine < nCount; nHlpLine++ ) { const SdrHelpLine& rHelpLine = rHelpLines[nHlpLine]; const Point& rPos = rHelpLine.GetPos(); @@ -749,9 +749,9 @@ void FrameView::ReadUserDataSequence ( const ::com::sun::star::uno::Sequence < : { SdDrawDocument* pDoc = dynamic_cast< SdDrawDocument* >( GetModel() ); if( pDoc && pDoc->GetDocSh() && ( SFX_CREATE_MODE_EMBEDDED == pDoc->GetDocSh()->GetCreateMode() ) ) - SetSelectedPage( (USHORT)nInt16 ); + SetSelectedPage( (sal_uInt16)nInt16 ); - SetSelectedPageOnLoad( (USHORT)nInt16 ); + SetSelectedPageOnLoad( (sal_uInt16)nInt16 ); } } else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_IsLayerMode ) ) ) @@ -800,7 +800,7 @@ void FrameView::ReadUserDataSequence ( const ::com::sun::star::uno::Sequence < : { if( pValue->Value >>= nInt16 ) { - SetSlidesPerRow( (USHORT)nInt16 ); + SetSlidesPerRow( (sal_uInt16)nInt16 ); } } /* #107128# Product managment decided to not make this persistent @@ -811,7 +811,7 @@ void FrameView::ReadUserDataSequence ( const ::com::sun::star::uno::Sequence < : const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings(); if( rStyleSettings.GetHighContrastMode() ) continue; - SetDrawMode( (ULONG)nInt32 ); + SetDrawMode( (sal_uLong)nInt32 ); } } else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_PreviewDrawMode ) ) ) @@ -822,7 +822,7 @@ void FrameView::ReadUserDataSequence ( const ::com::sun::star::uno::Sequence < : SvtAccessibilityOptions aAccOptions; if( rStyleSettings.GetHighContrastMode() && aAccOptions.GetIsForPagePreviews() ) continue; - SetPreviewDrawMode( (ULONG)nInt32 ); + SetPreviewDrawMode( (sal_uLong)nInt32 ); } } */ @@ -1181,7 +1181,7 @@ ViewShell::ShellType FrameView::GetViewShellTypeOnLoad (void) const -void FrameView::SetSelectedPage(USHORT nPage) +void FrameView::SetSelectedPage(sal_uInt16 nPage) { mnSelectedPage = nPage; } @@ -1189,7 +1189,7 @@ void FrameView::SetSelectedPage(USHORT nPage) -USHORT FrameView::GetSelectedPage (void) const +sal_uInt16 FrameView::GetSelectedPage (void) const { return mnSelectedPage; } diff --git a/sd/source/ui/view/outlnvs2.cxx b/sd/source/ui/view/outlnvs2.cxx index 2acf143ff0b3..09777a20392b 100755 --- a/sd/source/ui/view/outlnvs2.cxx +++ b/sd/source/ui/view/outlnvs2.cxx @@ -93,7 +93,7 @@ void OutlineViewShell::FuTemporary(SfxRequest &rReq) DeactivateCurrentFunction(); OutlinerView* pOutlinerView = pOlView->GetViewByWindow( GetActiveWindow() ); - USHORT nSId = rReq.GetSlot(); + sal_uInt16 nSId = rReq.GetSlot(); switch( nSId ) { @@ -133,7 +133,7 @@ void OutlineViewShell::FuTemporary(SfxRequest &rReq) if (pArgs && pArgs->Count () == 1 ) { - SFX_REQUEST_ARG (rReq, pScale, SfxUInt16Item, SID_ATTR_ZOOMSLIDER, FALSE); + SFX_REQUEST_ARG (rReq, pScale, SfxUInt16Item, SID_ATTR_ZOOMSLIDER, sal_False); if (CHECK_RANGE (5, pScale->GetValue (), 3000)) { SetZoom (pScale->GetValue ()); @@ -233,10 +233,10 @@ void OutlineViewShell::FuTemporary(SfxRequest &rReq) case SID_SELECTALL: { ::Outliner* pOutl = pOlView->GetOutliner(); - ULONG nParaCount = pOutl->GetParagraphCount(); + sal_uLong nParaCount = pOutl->GetParagraphCount(); if (nParaCount > 0) { - pOutlinerView->SelectRange( 0, (USHORT) nParaCount ); + pOutlinerView->SelectRange( 0, (sal_uInt16) nParaCount ); } Cancel(); } @@ -262,7 +262,7 @@ void OutlineViewShell::FuTemporary(SfxRequest &rReq) case SID_COLORVIEW: { ::Outliner* pOutl = pOutlinerView->GetOutliner(); - ULONG nCntrl = pOutl->GetControlWord(); + sal_uLong nCntrl = pOutl->GetControlWord(); if ( !(nCntrl & EE_CNTRL_NOCOLORS) ) { @@ -338,7 +338,7 @@ void OutlineViewShell::FuTemporaryModify(SfxRequest &rReq) DeactivateCurrentFunction(); OutlinerView* pOutlinerView = pOlView->GetViewByWindow( GetActiveWindow() ); - USHORT nSId = rReq.GetSlot(); + sal_uInt16 nSId = rReq.GetSlot(); switch( nSId ) { @@ -431,12 +431,12 @@ void OutlineViewShell::FuTemporaryModify(SfxRequest &rReq) /* ESelection aEsel= pOutlinerView->GetSelection(); Outliner* pOutl = pOutlinerView->GetOutliner(); - pOutl->SetUpdateMode(FALSE); + pOutl->SetUpdateMode(sal_False); List* pSelectedParas = pOutlinerView->CreateSelectionList(); Paragraph* pPara = (Paragraph*)pSelectedParas->First(); while (pPara) { - ULONG nParaPos = pOutl->GetAbsPos(pPara); + sal_uLong nParaPos = pOutl->GetAbsPos(pPara); String aName; SfxStyleFamily aFamily; pOutl->GetStyleSheet(nParaPos, aName, aFamily); @@ -445,10 +445,10 @@ void OutlineViewShell::FuTemporaryModify(SfxRequest &rReq) pPara = (Paragraph*)pSelectedParas->Next(); } delete pSelectedParas; - pOutl->SetUpdateMode(TRUE); + pOutl->SetUpdateMode(sal_True); pOutlinerView->SetSelection(aEsel); */ - pOutlinerView->RemoveAttribs(TRUE); // TRUE = auch Absatzattribute + pOutlinerView->RemoveAttribs(sal_True); // sal_True = auch Absatzattribute Cancel(); rReq.Done(); } @@ -586,10 +586,10 @@ void OutlineViewShell::FuTemporaryModify(SfxRequest &rReq) //pOLV->DeleteSelected(); <-- fehlt leider ! // Feld selektieren, so dass es beim Insert geloescht wird ESelection aSel = pOutlinerView->GetSelection(); - BOOL bSel = TRUE; + sal_Bool bSel = sal_True; if( aSel.nStartPos == aSel.nEndPos ) { - bSel = FALSE; + bSel = sal_False; aSel.nEndPos++; } pOutlinerView->SetSelection( aSel ); diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx index 1282688fdd18..fcae0d528c52 100755 --- a/sd/source/ui/view/outlnvsh.cxx +++ b/sd/source/ui/view/outlnvsh.cxx @@ -146,13 +146,13 @@ TYPEINIT1( OutlineViewShell, ViewShell ); void OutlineViewShell::Construct(DrawDocShell* ) { - BOOL bModified = GetDoc()->IsChanged(); + sal_Bool bModified = GetDoc()->IsChanged(); meShellType = ST_OUTLINE; Size aSize(29700, 21000); Point aWinPos (0, 0); Point aViewOrigin(0, 0); - GetActiveWindow()->SetMinZoomAutoCalc(FALSE); + GetActiveWindow()->SetMinZoomAutoCalc(sal_False); GetActiveWindow()->SetMinZoom( MIN_ZOOM ); GetActiveWindow()->SetMaxZoom( MAX_ZOOM ); InitWindows(aViewOrigin, aSize, aWinPos); @@ -167,7 +167,7 @@ void OutlineViewShell::Construct(DrawDocShell* ) ReadFrameViewData(mpFrameView); ::Outliner* pOutl = pOlView->GetOutliner(); - pOutl->SetUpdateMode(TRUE); + pOutl->SetUpdateMode(sal_True); if (!bModified) { @@ -252,7 +252,7 @@ OutlineViewShell::~OutlineViewShell() if ( pClipEvtLstnr ) { - pClipEvtLstnr->AddRemoveListener( GetActiveWindow(), FALSE ); + pClipEvtLstnr->AddRemoveListener( GetActiveWindow(), sal_False ); pClipEvtLstnr->ClearCallbackLink(); // #103849# prevent callback if another thread is waiting pClipEvtLstnr->release(); } @@ -305,7 +305,7 @@ void OutlineViewShell::ArrangeGUIElements () ::sd::Window* pWindow = mpContentWindow.get(); if (pWindow != NULL) { - pWindow->SetMinZoomAutoCalc(FALSE); + pWindow->SetMinZoomAutoCalc(sal_False); // pWindow->SetPosSizePixel(rNewPos, Size(nSizeX, nSizeY)); @@ -341,7 +341,7 @@ void OutlineViewShell::ArrangeGUIElements () void OutlineViewShell::ExecCtrl(SfxRequest &rReq) { - USHORT nSlot = rReq.GetSlot(); + sal_uInt16 nSlot = rReq.GetSlot(); switch ( nSlot ) { case SID_MAIL_SCROLLBODY_PAGEDOWN: @@ -387,7 +387,7 @@ void OutlineViewShell::RemoveWindow (::sd::Window* pWin) |* Activate(), beim ersten Aufruf erfolgt ein Update der Felder |* \************************************************************************/ -void OutlineViewShell::Activate( BOOL bIsMDIActivate ) +void OutlineViewShell::Activate( sal_Bool bIsMDIActivate ) { if ( ! mbInitialized) { @@ -413,7 +413,7 @@ void OutlineViewShell::Activate( BOOL bIsMDIActivate ) |* Deactivate() |* \************************************************************************/ -void OutlineViewShell::Deactivate( BOOL bIsMDIActivate ) +void OutlineViewShell::Deactivate( sal_Bool bIsMDIActivate ) { pOlView->DisconnectFromApplication(); @@ -459,7 +459,7 @@ void OutlineViewShell::GetCtrlState(SfxItemSet &rSet) rSet.Put( SfxBoolItem( SID_READONLY_MODE, GetDocSh()->IsReadOnly() ) ); if ( SFX_ITEM_AVAILABLE == rSet.GetItemState(SID_MAIL_SCROLLBODY_PAGEDOWN) ) - rSet.Put( SfxBoolItem( SID_MAIL_SCROLLBODY_PAGEDOWN, TRUE ) ); + rSet.Put( SfxBoolItem( SID_MAIL_SCROLLBODY_PAGEDOWN, sal_True ) ); if ( SFX_ITEM_AVAILABLE == rSet.GetItemState(SID_TRANSLITERATE_HALFWIDTH) || SFX_ITEM_AVAILABLE == rSet.GetItemState(SID_TRANSLITERATE_FULLWIDTH) || @@ -499,8 +499,8 @@ void OutlineViewShell::FuSupport(SfxRequest &rReq) if( rReq.GetSlot() == SID_STYLE_FAMILY && rReq.GetArgs()) GetDocSh()->SetStyleFamily(((SfxUInt16Item&)rReq.GetArgs()->Get( SID_STYLE_FAMILY )).GetValue()); - BOOL bPreviewState = FALSE; - ULONG nSlot = rReq.GetSlot(); + sal_Bool bPreviewState = sal_False; + sal_uLong nSlot = rReq.GetSlot(); std::auto_ptr< OutlineViewModelChangeGuard > aGuard; if( pOlView && ( @@ -534,7 +534,7 @@ void OutlineViewShell::FuSupport(SfxRequest &rReq) pOlView->DoCut(); } rReq.Done(); - bPreviewState = TRUE; + bPreviewState = sal_True; } break; @@ -549,7 +549,7 @@ void OutlineViewShell::FuSupport(SfxRequest &rReq) pOlView->DoCopy(); } rReq.Done(); - bPreviewState = TRUE; + bPreviewState = sal_True; } break; @@ -566,7 +566,7 @@ void OutlineViewShell::FuSupport(SfxRequest &rReq) pOlView->DoPaste(); } rReq.Done(); - bPreviewState = TRUE; + bPreviewState = sal_True; } break; @@ -590,7 +590,7 @@ void OutlineViewShell::FuSupport(SfxRequest &rReq) } } rReq.Done(); - bPreviewState = TRUE; + bPreviewState = sal_True; } break; @@ -691,7 +691,7 @@ void OutlineViewShell::FuSupport(SfxRequest &rReq) } rReq.Done(); - bPreviewState = TRUE; + bPreviewState = sal_True; } break; @@ -699,13 +699,13 @@ void OutlineViewShell::FuSupport(SfxRequest &rReq) case SID_UNDO : { OutlineViewPageChangesGuard aGuard2(pOlView); - ImpSidUndo(FALSE, rReq); + ImpSidUndo(sal_False, rReq); } break; case SID_REDO : { OutlineViewPageChangesGuard aGuard2(pOlView); - ImpSidRedo(FALSE, rReq); + ImpSidRedo(sal_False, rReq); } break; @@ -799,11 +799,11 @@ void OutlineViewShell::GetMenuState( SfxItemSet &rSet ) // Vorlagenkatalog darf nicht aufgerufen werden rSet.DisableItem( SID_STYLE_CATALOG ); - rSet.Put(SfxBoolItem(SID_DIAMODE, FALSE)); - rSet.Put(SfxBoolItem(SID_DRAWINGMODE, FALSE)); - rSet.Put(SfxBoolItem(SID_OUTLINEMODE, TRUE)); - rSet.Put(SfxBoolItem(SID_NOTESMODE, FALSE)); - rSet.Put(SfxBoolItem(SID_HANDOUTMODE, FALSE)); + rSet.Put(SfxBoolItem(SID_DIAMODE, sal_False)); + rSet.Put(SfxBoolItem(SID_DRAWINGMODE, sal_False)); + rSet.Put(SfxBoolItem(SID_OUTLINEMODE, sal_True)); + rSet.Put(SfxBoolItem(SID_NOTESMODE, sal_False)); + rSet.Put(SfxBoolItem(SID_HANDOUTMODE, sal_False)); if (!mpZoomList->IsNextPossible()) { @@ -831,14 +831,14 @@ void OutlineViewShell::GetMenuState( SfxItemSet &rSet ) // 'Alles auswaehlen' zulassen? if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_SELECTALL ) ) { - ULONG nParaCount = pOutl->GetParagraphCount(); - BOOL bDisable = nParaCount == 0; + sal_uLong nParaCount = pOutl->GetParagraphCount(); + sal_Bool bDisable = nParaCount == 0; if (!bDisable && nParaCount == 1) { String aTest( pOutl->GetText( pOutl->GetParagraph( 0 ) ) ); if (aTest.Len() == 0) { - bDisable = TRUE; + bDisable = sal_True; } } if (bDisable) @@ -856,38 +856,38 @@ void OutlineViewShell::GetMenuState( SfxItemSet &rSet ) else { // Farbansicht ein/aus - ULONG nCntrl = pOutl->GetControlWord(); - BOOL bNoColor = FALSE; + sal_uLong nCntrl = pOutl->GetControlWord(); + sal_Bool bNoColor = sal_False; if (nCntrl & EE_CNTRL_NOCOLORS) - bNoColor = TRUE; + bNoColor = sal_True; rSet.Put( SfxBoolItem( SID_COLORVIEW, bNoColor ) ); } // Buttons der Werkzeugleiste // zunaechst selektionsabhaengige: COLLAPSE, EXPAND - BOOL bDisableCollapse = TRUE; - BOOL bDisableExpand = TRUE; - BOOL bUnique = TRUE; + sal_Bool bDisableCollapse = sal_True; + sal_Bool bDisableExpand = sal_True; + sal_Bool bUnique = sal_True; OutlinerView* pOutlinerView = pOlView->GetViewByWindow(GetActiveWindow()); List* pList = pOutlinerView->CreateSelectionList(); Paragraph* pPara = (Paragraph*)pList->First(); sal_Int16 nDepth; - sal_Int16 nTmpDepth = pOutl->GetDepth( (USHORT) pOutl->GetAbsPos( pPara ) ); + sal_Int16 nTmpDepth = pOutl->GetDepth( (sal_uInt16) pOutl->GetAbsPos( pPara ) ); bool bPage = pOutl->HasParaFlag( pPara, PARAFLAG_ISPAGE ); while (pPara) { - nDepth = pOutl->GetDepth( (USHORT) pOutl->GetAbsPos( pPara ) ); + nDepth = pOutl->GetDepth( (sal_uInt16) pOutl->GetAbsPos( pPara ) ); if( nDepth != nTmpDepth ) - bUnique = FALSE; + bUnique = sal_False; if( bPage != pOutl->HasParaFlag( pPara, PARAFLAG_ISPAGE ) ) - bUnique = FALSE; + bUnique = sal_False; if (!pOutl->IsExpanded(pPara) && pOutl->HasChilds(pPara)) - bDisableExpand = FALSE; + bDisableExpand = sal_False; if (pOutl->IsExpanded(pPara) && pOutl->HasChilds(pPara)) - bDisableCollapse = FALSE; + bDisableCollapse = sal_False; pPara = (Paragraph*)pList->Next(); } @@ -906,7 +906,7 @@ void OutlineViewShell::GetMenuState( SfxItemSet &rSet ) String aTest(((SfxStringItem&)aSet.Get(SID_STATUS_LAYOUT)).GetValue()); if (aTest.Len() == 0) { - bUnique = FALSE; + bUnique = sal_False; rSet.DisableItem(SID_PRESENTATION_TEMPLATES); } @@ -914,27 +914,27 @@ void OutlineViewShell::GetMenuState( SfxItemSet &rSet ) rSet.DisableItem( SID_PRESENTATIONOBJECT ); // jetzt die selektionsunabhaengigen: COLLAPSE_ALL, EXPAND_ALL - BOOL bDisableCollapseAll = TRUE; - BOOL bDisableExpandAll = TRUE; + sal_Bool bDisableCollapseAll = sal_True; + sal_Bool bDisableExpandAll = sal_True; // wenn schon die Selektion etwas kollabierbares/expandierbares enthaelt if (!bDisableCollapse) - bDisableCollapseAll = FALSE; + bDisableCollapseAll = sal_False; if (!bDisableExpand) - bDisableExpandAll = FALSE; + bDisableExpandAll = sal_False; // schade, so billig kommen wir nicht davon; alle Absaetze durchsuchen if (bDisableCollapseAll || bDisableExpandAll) { - ULONG nParaPos = 0; + sal_uLong nParaPos = 0; pPara = pOutl->GetParagraph( nParaPos ); while (pPara && (bDisableCollapseAll || bDisableExpandAll)) { if (!pOutl->IsExpanded(pPara) && pOutl->HasChilds(pPara)) - bDisableExpandAll = FALSE; + bDisableExpandAll = sal_False; if (pOutl->IsExpanded(pPara) && pOutl->HasChilds(pPara)) - bDisableCollapseAll = FALSE; + bDisableCollapseAll = sal_False; pPara = pOutl->GetParagraph( ++nParaPos ); } @@ -952,7 +952,7 @@ void OutlineViewShell::GetMenuState( SfxItemSet &rSet ) // create listener pClipEvtLstnr = new TransferableClipboardListener( LINK( this, OutlineViewShell, ClipboardChanged ) ); pClipEvtLstnr->acquire(); - pClipEvtLstnr->AddRemoveListener( GetActiveWindow(), TRUE ); + pClipEvtLstnr->AddRemoveListener( GetActiveWindow(), sal_True ); // get initial state TransferableDataHelper aDataHelper( TransferableDataHelper::CreateFromSystemClipboard( GetActiveWindow() ) ); @@ -976,7 +976,7 @@ void OutlineViewShell::GetMenuState( SfxItemSet &rSet ) if (pOlView->GetOutliner()->IsModified()) { - GetDoc()->SetChanged(TRUE); + GetDoc()->SetChanged(sal_True); } // Da �berladen, muss hier der Status gesetzt werden @@ -993,11 +993,11 @@ void OutlineViewShell::GetMenuState( SfxItemSet &rSet ) { if (GetDoc()->GetOnlineSpell()) { - rSet.Put(SfxBoolItem(SID_AUTOSPELL_CHECK, TRUE)); + rSet.Put(SfxBoolItem(SID_AUTOSPELL_CHECK, sal_True)); } else { - rSet.Put(SfxBoolItem(SID_AUTOSPELL_CHECK, FALSE)); + rSet.Put(SfxBoolItem(SID_AUTOSPELL_CHECK, sal_False)); } } @@ -1017,9 +1017,9 @@ void OutlineViewShell::GetMenuState( SfxItemSet &rSet ) if (SFX_ITEM_AVAILABLE == rSet.GetItemState(SID_EXPAND_PAGE)) { - BOOL bDisable = TRUE; - USHORT i = 0; - USHORT nCount = GetDoc()->GetSdPageCount(PK_STANDARD); + sal_Bool bDisable = sal_True; + sal_uInt16 i = 0; + sal_uInt16 nCount = GetDoc()->GetSdPageCount(PK_STANDARD); pOlView->SetSelectedPages(); while (i < nCount && bDisable) @@ -1064,9 +1064,9 @@ void OutlineViewShell::GetMenuState( SfxItemSet &rSet ) if (SFX_ITEM_AVAILABLE == rSet.GetItemState(SID_SUMMARY_PAGE)) { - BOOL bDisable = TRUE; - USHORT i = 0; - USHORT nCount = GetDoc()->GetSdPageCount(PK_STANDARD); + sal_Bool bDisable = sal_True; + sal_uInt16 i = 0; + sal_uInt16 nCount = GetDoc()->GetSdPageCount(PK_STANDARD); pOlView->SetSelectedPages(); while (i < nCount && bDisable) @@ -1079,7 +1079,7 @@ void OutlineViewShell::GetMenuState( SfxItemSet &rSet ) if (pObj && !pObj->IsEmptyPresObj()) { - bDisable = FALSE; + bDisable = sal_False; } } @@ -1114,15 +1114,15 @@ void OutlineViewShell::GetMenuState( SfxItemSet &rSet ) // Starten der Praesentation moeglich? if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_PRESENTATION ) ) { - BOOL bDisable = TRUE; - USHORT nCount = GetDoc()->GetSdPageCount( PK_STANDARD ); + sal_Bool bDisable = sal_True; + sal_uInt16 nCount = GetDoc()->GetSdPageCount( PK_STANDARD ); - for( USHORT i = 0; i < nCount && bDisable; i++ ) + for( sal_uInt16 i = 0; i < nCount && bDisable; i++ ) { SdPage* pPage = GetDoc()->GetSdPage(i, PK_STANDARD); if( !pPage->IsExcluded() ) - bDisable = FALSE; + bDisable = sal_False; } if( bDisable || GetDocSh()->IsPreview()) { @@ -1161,7 +1161,7 @@ long OutlineViewShell::VirtHScrollHdl(ScrollBar* pHScroll) pOutlinerView->HideCursor(); pOutlinerView->Scroll(-nDelta, 0); - pOutlinerView->ShowCursor(FALSE); + pOutlinerView->ShowCursor(sal_False); pOlView->InvalidateSlideNumberArea(); return 0; @@ -1191,7 +1191,7 @@ long OutlineViewShell::VirtVScrollHdl(ScrollBar* pVScroll) pOutlinerView->HideCursor(); pOutlinerView->Scroll(0, -nDelta); - pOutlinerView->ShowCursor(FALSE); + pOutlinerView->ShowCursor(sal_False); pOlView->InvalidateSlideNumberArea(); @@ -1205,10 +1205,10 @@ long OutlineViewShell::VirtVScrollHdl(ScrollBar* pVScroll) |* \************************************************************************/ -USHORT OutlineViewShell::PrepareClose( BOOL bUI, BOOL bForBrowsing ) +sal_uInt16 OutlineViewShell::PrepareClose( sal_Bool bUI, sal_Bool bForBrowsing ) { - if( ViewShell::PrepareClose(bUI, bForBrowsing) != TRUE ) - return FALSE; + if( ViewShell::PrepareClose(bUI, bForBrowsing) != sal_True ) + return sal_False; return pOlView == NULL || pOlView->PrepareClose(bUI); } @@ -1327,18 +1327,18 @@ void OutlineViewShell::ReadFrameViewData(FrameView* pView) ::Outliner* pOutl = pOlView->GetOutliner(); if ( pView->IsNoAttribs() ) - pOutl->SetFlatMode( TRUE ); // Attribut-Darstellung ausschalten + pOutl->SetFlatMode( sal_True ); // Attribut-Darstellung ausschalten else - pOutl->SetFlatMode( FALSE ); // Attribut-Darstellung einschalten + pOutl->SetFlatMode( sal_False ); // Attribut-Darstellung einschalten - ULONG nCntrl = pOutl->GetControlWord(); + sal_uLong nCntrl = pOutl->GetControlWord(); if ( pView->IsNoColors() ) pOutl->SetControlWord(nCntrl | EE_CNTRL_NOCOLORS); // Farbansicht ausschalten else pOutl->SetControlWord(nCntrl & ~EE_CNTRL_NOCOLORS); // Farbansicht einschalten - USHORT nPage = mpFrameView->GetSelectedPage(); + sal_uInt16 nPage = mpFrameView->GetSelectedPage(); pLastPage = GetDoc()->GetSdPage( nPage, PK_STANDARD ); pOlView->SetActualPage(pLastPage); } @@ -1355,10 +1355,10 @@ void OutlineViewShell::WriteFrameViewData() { ::Outliner* pOutl = pOlView->GetOutliner(); - ULONG nCntrl = pOutl->GetControlWord(); - BOOL bNoColor = FALSE; + sal_uLong nCntrl = pOutl->GetControlWord(); + sal_Bool bNoColor = sal_False; if (nCntrl & EE_CNTRL_NOCOLORS) - bNoColor = TRUE; + bNoColor = sal_True; mpFrameView->SetNoColors(bNoColor); mpFrameView->SetNoAttribs( pOutl->IsFlatMode() ); SdPage* pActualPage = pOlView->GetActualPage(); @@ -1390,12 +1390,12 @@ void OutlineViewShell::GetStatusBarState(SfxItemSet& rSet) if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_ATTR_ZOOM ) ) { SvxZoomItem* pZoomItem; - UINT16 nZoom = (UINT16) GetActiveWindow()->GetZoom(); + sal_uInt16 nZoom = (sal_uInt16) GetActiveWindow()->GetZoom(); pZoomItem = new SvxZoomItem( SVX_ZOOM_PERCENT, nZoom ); // Bereich einschraenken - USHORT nZoomValues = SVX_ZOOM_ENABLE_ALL; + sal_uInt16 nZoomValues = SVX_ZOOM_ENABLE_ALL; nZoomValues &= ~SVX_ZOOM_ENABLE_OPTIMAL; nZoomValues &= ~SVX_ZOOM_ENABLE_WHOLEPAGE; nZoomValues &= ~SVX_ZOOM_ENABLE_PAGEWIDTH; @@ -1414,7 +1414,7 @@ void OutlineViewShell::GetStatusBarState(SfxItemSet& rSet) else { sd::Window * pActiveWindow = GetActiveWindow(); - SvxZoomSliderItem aZoomItem( (UINT16) pActiveWindow->GetZoom(), (USHORT)pActiveWindow->GetMinZoom(), (USHORT)pActiveWindow->GetMaxZoom() ) ; + SvxZoomSliderItem aZoomItem( (sal_uInt16) pActiveWindow->GetZoom(), (sal_uInt16)pActiveWindow->GetMinZoom(), (sal_uInt16)pActiveWindow->GetMaxZoom() ) ; aZoomItem.AddSnappingPoint(100); rSet.Put( aZoomItem ); } @@ -1426,7 +1426,7 @@ void OutlineViewShell::GetStatusBarState(SfxItemSet& rSet) if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_STATUS_PAGE ) || SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_STATUS_LAYOUT ) ) */ - USHORT nPageCount = GetDoc()->GetSdPageCount( PK_STANDARD ); + sal_uInt16 nPageCount = GetDoc()->GetSdPageCount( PK_STANDARD ); String aPageStr, aLayoutStr; ::sd::Window* pWin = GetActiveWindow(); @@ -1448,7 +1448,7 @@ void OutlineViewShell::GetStatusBarState(SfxItemSet& rSet) if( pFirstPara == pLastPara ) { // wieviele Seiten sind vor der selektierten Seite? - ULONG nPos = 0L; + sal_uLong nPos = 0L; while( pFirstPara ) { pFirstPara = pOlView->GetPrevTitle( pFirstPara ); @@ -1459,11 +1459,11 @@ void OutlineViewShell::GetStatusBarState(SfxItemSet& rSet) if( nPos >= GetDoc()->GetSdPageCount( PK_STANDARD ) ) nPos = 0; - SdrPage* pPage = GetDoc()->GetSdPage( (USHORT) nPos, PK_STANDARD ); + SdrPage* pPage = GetDoc()->GetSdPage( (sal_uInt16) nPos, PK_STANDARD ); aPageStr = String(SdResId( STR_SD_PAGE )); aPageStr += sal_Unicode(' '); - aPageStr += String::CreateFromInt32( (sal_Int32)(nPos + 1) ); // ULONG -> sal_Int32 + aPageStr += String::CreateFromInt32( (sal_Int32)(nPos + 1) ); // sal_uLong -> sal_Int32 aPageStr.AppendAscii( RTL_CONSTASCII_STRINGPARAM( " / " )); aPageStr += String::CreateFromInt32( nPageCount ); @@ -1519,9 +1519,9 @@ void OutlineViewShell::Command( const CommandEvent& rCEvt, ::sd::Window* pWin ) |* \************************************************************************/ -BOOL OutlineViewShell::KeyInput(const KeyEvent& rKEvt, ::sd::Window* pWin) +sal_Bool OutlineViewShell::KeyInput(const KeyEvent& rKEvt, ::sd::Window* pWin) { - BOOL bReturn = FALSE; + sal_Bool bReturn = sal_False; OutlineViewPageChangesGuard aGuard(pOlView); if (pWin == NULL && HasCurrentFunction()) @@ -1594,7 +1594,7 @@ Size OutlineViewShell::GetOptimalSizePixel() const |* \************************************************************************/ -String OutlineViewShell::GetSelectionText(BOOL bCompleteWords) +String OutlineViewShell::GetSelectionText(sal_Bool bCompleteWords) { String aStrSelection; ::Outliner* pOl = pOlView->GetOutliner(); @@ -1627,9 +1627,9 @@ String OutlineViewShell::GetSelectionText(BOOL bCompleteWords) |* \************************************************************************/ -BOOL OutlineViewShell::HasSelection(BOOL bText) const +sal_Bool OutlineViewShell::HasSelection(sal_Bool bText) const { - BOOL bReturn = FALSE; + sal_Bool bReturn = sal_False; if (bText) { @@ -1637,7 +1637,7 @@ BOOL OutlineViewShell::HasSelection(BOOL bText) const if (pOutlinerView && pOutlinerView->GetSelected().Len() != 0) { - bReturn = TRUE; + bReturn = sal_True; } } @@ -1654,12 +1654,12 @@ BOOL OutlineViewShell::HasSelection(BOOL bText) const void OutlineViewShell::GetAttrState( SfxItemSet& rSet ) { SfxWhichIter aIter( rSet ); - USHORT nWhich = aIter.FirstWhich(); + sal_uInt16 nWhich = aIter.FirstWhich(); SfxAllItemSet aAllSet( *rSet.GetPool() ); while ( nWhich ) { - USHORT nSlotId = SfxItemPool::IsWhich(nWhich) + sal_uInt16 nSlotId = SfxItemPool::IsWhich(nWhich) ? GetPool().GetSlotId(nWhich) : nWhich; @@ -1742,7 +1742,7 @@ void OutlineViewShell::GetAttrState( SfxItemSet& rSet ) nWhich = aIter.NextWhich(); } - rSet.Put( aAllSet, FALSE ); + rSet.Put( aAllSet, sal_False ); } @@ -1792,7 +1792,7 @@ SdPage* OutlineViewShell::GetActualPage() } -void OutlineViewShell::UpdatePreview( SdPage* pPage, BOOL ) +void OutlineViewShell::UpdatePreview( SdPage* pPage, sal_Bool ) { const bool bNewPage = pPage != pLastPage; pLastPage = pPage; @@ -1832,13 +1832,13 @@ bool OutlineViewShell::UpdateTitleObject( SdPage* pPage, Paragraph* pPara ) { DBG_ASSERT( pOlView->isRecordingUndo(), "sd::OutlineViewShell::UpdateTitleObject(), no undo for model change!?" ); pTO = pOlView->CreateTitleTextObject(pPage); - bNewObject = TRUE; + bNewObject = sal_True; } // if we have a title object and a text, set the text if( pTO ) { - pOPO = pOutliner->CreateParaObject( (USHORT) pOutliner->GetAbsPos( pPara ), 1 ); + pOPO = pOutliner->CreateParaObject( (sal_uInt16) pOutliner->GetAbsPos( pPara ), 1 ); pOPO->SetOutlinerMode( OUTLINERMODE_TITLEOBJECT ); pOPO->SetVertical( pTO->IsVerticalWriting() ); if( pTO->GetOutlinerParaObject() && (pOPO->GetTextObject() == pTO->GetOutlinerParaObject()->GetTextObject()) ) @@ -1853,7 +1853,7 @@ bool OutlineViewShell::UpdateTitleObject( SdPage* pPage, Paragraph* pPara ) pOlView->AddUndo(GetDoc()->GetSdrUndoFactory().CreateUndoObjectSetText(*pTO,0)); pTO->SetOutlinerParaObject( pOPO ); - pTO->SetEmptyPresObj( FALSE ); + pTO->SetEmptyPresObj( sal_False ); pTO->ActionChanged(); } } @@ -1873,7 +1873,7 @@ bool OutlineViewShell::UpdateTitleObject( SdPage* pPage, Paragraph* pPara ) if( pOlView->isRecordingUndo() ) pOlView->AddUndo(GetDoc()->GetSdrUndoFactory().CreateUndoObjectSetText(*pTO,0)); pPage->RestoreDefaultText( pTO ); - pTO->SetEmptyPresObj(TRUE); + pTO->SetEmptyPresObj(sal_True); pTO->ActionChanged(); } } @@ -1908,7 +1908,7 @@ bool OutlineViewShell::UpdateOutlineObject( SdPage* pPage, Paragraph* pPara ) OutlinerParaObject* pOPO = NULL; SdrTextObj* pTO = NULL; - BOOL bNewObject = FALSE; + sal_Bool bNewObject = sal_False; sal_uInt16 eOutlinerMode = OUTLINERMODE_TITLEOBJECT; pTO = (SdrTextObj*)pPage->GetPresObj( PRESOBJ_TEXT ); @@ -1919,9 +1919,9 @@ bool OutlineViewShell::UpdateOutlineObject( SdPage* pPage, Paragraph* pPara ) } // wieviele Absaetze in der Gliederung? - ULONG nTitlePara = pOutliner->GetAbsPos( pPara ); - ULONG nPara = nTitlePara + 1; - ULONG nParasInLayout = 0L; + sal_uLong nTitlePara = pOutliner->GetAbsPos( pPara ); + sal_uLong nPara = nTitlePara + 1; + sal_uLong nParasInLayout = 0L; pPara = pOutliner->GetParagraph( nPara ); while( pPara && !pOutliner->HasParaFlag(pPara, PARAFLAG_ISPAGE) ) { @@ -1932,7 +1932,7 @@ bool OutlineViewShell::UpdateOutlineObject( SdPage* pPage, Paragraph* pPara ) { // ein OutlinerParaObject erzeugen pPara = pOutliner->GetParagraph( nTitlePara + 1 ); - pOPO = pOutliner->CreateParaObject( (USHORT) nTitlePara + 1, (USHORT) nParasInLayout ); + pOPO = pOutliner->CreateParaObject( (sal_uInt16) nTitlePara + 1, (sal_uInt16) nParasInLayout ); } if( pOPO ) @@ -1943,7 +1943,7 @@ bool OutlineViewShell::UpdateOutlineObject( SdPage* pPage, Paragraph* pPara ) if( !pTO ) { pTO = pOlView->CreateOutlineTextObject( pPage ); - bNewObject = TRUE; + bNewObject = sal_True; } // Seitenobjekt, Gliederungstext im Outliner: @@ -1963,7 +1963,7 @@ bool OutlineViewShell::UpdateOutlineObject( SdPage* pPage, Paragraph* pPara ) pOlView->AddUndo(GetDoc()->GetSdrUndoFactory().CreateUndoObjectSetText(*pTO,0)); pTO->SetOutlinerParaObject( pOPO ); - pTO->SetEmptyPresObj( FALSE ); + pTO->SetEmptyPresObj( sal_False ); pTO->ActionChanged(); } } @@ -1983,7 +1983,7 @@ bool OutlineViewShell::UpdateOutlineObject( SdPage* pPage, Paragraph* pPara ) if( pOlView->isRecordingUndo() ) pOlView->AddUndo(GetDoc()->GetSdrUndoFactory().CreateUndoObjectSetText(*pTO,0)); pPage->RestoreDefaultText( pTO ); - pTO->SetEmptyPresObj(TRUE); + pTO->SetEmptyPresObj(sal_True); pTO->ActionChanged(); } } @@ -2006,9 +2006,9 @@ bool OutlineViewShell::UpdateOutlineObject( SdPage* pPage, Paragraph* pPara ) |* \************************************************************************/ -ULONG OutlineViewShell::Read(SvStream& rInput, const String& rBaseURL, USHORT eFormat) +sal_uLong OutlineViewShell::Read(SvStream& rInput, const String& rBaseURL, sal_uInt16 eFormat) { - ULONG bRet = 0; + sal_uLong bRet = 0; ::Outliner* pOutl = pOlView->GetOutliner(); @@ -2022,10 +2022,10 @@ ULONG OutlineViewShell::Read(SvStream& rInput, const String& rBaseURL, USHORT eF SfxStyleSheet* pTitleSheet = pPage->GetStyleSheetForPresObj( PRESOBJ_TITLE ); SfxStyleSheet* pOutlSheet = pPage->GetStyleSheetForPresObj( PRESOBJ_OUTLINE ); - USHORT nParaCount = (USHORT)pOutl->GetParagraphCount(); + sal_uInt16 nParaCount = (sal_uInt16)pOutl->GetParagraphCount(); if ( nParaCount > 0 ) { - for ( USHORT nPara = 0; nPara < nParaCount; nPara++ ) + for ( sal_uInt16 nPara = 0; nPara < nParaCount; nPara++ ) { pOlView->UpdateParagraph( nPara ); @@ -2124,7 +2124,7 @@ void OutlineViewShell::GetState (SfxItemSet& rSet) { // Iterate over all requested items in the set. SfxWhichIter aIter( rSet ); - USHORT nWhich = aIter.FirstWhich(); + sal_uInt16 nWhich = aIter.FirstWhich(); while (nWhich) { switch (nWhich) @@ -2148,11 +2148,11 @@ void OutlineViewShell::GetState (SfxItemSet& rSet) void OutlineViewShell::SetCurrentPage (SdPage* pPage) { // Adapt the selection of the model. - for (USHORT i=0; i<GetDoc()->GetSdPageCount(PK_STANDARD); i++) + for (sal_uInt16 i=0; i<GetDoc()->GetSdPageCount(PK_STANDARD); i++) GetDoc()->SetSelected( GetDoc()->GetSdPage(i, PK_STANDARD), - FALSE); - GetDoc()->SetSelected (pPage, TRUE); + sal_False); + GetDoc()->SetSelected (pPage, sal_True); DrawController& rController(GetViewShellBase().GetDrawController()); rController.FireSelectionChangeListener(); diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx index ee2ac158bffa..020ecf11b42f 100755 --- a/sd/source/ui/view/outlview.cxx +++ b/sd/source/ui/view/outlview.cxx @@ -98,7 +98,7 @@ namespace sd { struct SdParaAndPos { Paragraph* pPara; - USHORT nPos; + sal_uInt16 nPos; }; TYPEINIT1( OutlineView, ::sd::View ); @@ -112,24 +112,24 @@ TYPEINIT1( OutlineView, ::sd::View ); OutlineView::OutlineView( DrawDocShell* pDocSh, ::Window* pWindow, OutlineViewShell* pOutlineViewSh) : ::sd::View(pDocSh->GetDoc(), pWindow, pOutlineViewSh) , mpOutlineViewShell(pOutlineViewSh) -, mpOutliner( mpDoc->GetOutliner(TRUE) ) +, mpOutliner( mpDoc->GetOutliner(sal_True) ) , mpOldParaOrder(NULL) , mpSelectedParas(NULL) , mnPagesToProcess(0) , mnPagesProcessed(0) -, mbFirstPaint(TRUE) +, mbFirstPaint(sal_True) , mpProgress(NULL) , mbHighContrastMode( false ) , maDocColor( COL_WHITE ) , mnPageNumberWidthPixel( 0 ) , maLRSpaceItem( 0, 0, 2000, 0, EE_PARA_OUTLLRSPACE ) { - BOOL bInitOutliner = FALSE; + sal_Bool bInitOutliner = sal_False; if (mpOutliner->GetViewCount() == 0) { // Outliner initialisieren: Referenz-Device setzen - bInitOutliner = TRUE; + bInitOutliner = sal_True; mpOutliner->Init( OUTLINERMODE_OUTLINEVIEW ); /* SfxStyleSheet* pTitleSheet = mpDoc->GetSdPage( 0, PK_STANDARD )->GetStyleSheetForPresObj( PRESOBJ_TITLE ); @@ -155,20 +155,20 @@ OutlineView::OutlineView( DrawDocShell* pDocSh, ::Window* pWindow, OutlineViewSh aBulletFont.SetUnderline(UNDERLINE_NONE); aBulletFont.SetStrikeout(STRIKEOUT_NONE); aBulletFont.SetItalic(ITALIC_NONE); - aBulletFont.SetOutline(FALSE); - aBulletFont.SetShadow(FALSE); + aBulletFont.SetOutline(sal_False); + aBulletFont.SetShadow(sal_False); aFormat.SetBulletFont( &aBulletFont ); aFormat.SetBulletChar( 0xE011 ); // StarBats: 0xF000 + 114 mpOutliner->OverwriteLevel0Bullet( aFormat ); } */ mpOutliner->SetRefDevice( SD_MOD()->GetRefDevice( *pDocSh ) ); - ULONG nWidth = OUTLINE_PAPERWIDTH; + sal_uLong nWidth = OUTLINE_PAPERWIDTH; mpOutliner->SetPaperSize(Size(nWidth, 400000000)); } // View in Outliner einfuegen - for (USHORT nView = 0; nView < MAX_OUTLINERVIEWS; nView++) + for (sal_uInt16 nView = 0; nView < MAX_OUTLINERVIEWS; nView++) { mpOutlinerView[nView] = NULL; } @@ -176,7 +176,7 @@ OutlineView::OutlineView( DrawDocShell* pDocSh, ::Window* pWindow, OutlineViewSh mpOutlinerView[0] = new OutlinerView(mpOutliner, pWindow); Rectangle aNullRect; mpOutlinerView[0]->SetOutputArea(aNullRect); - mpOutliner->SetUpdateMode(FALSE); + mpOutliner->SetUpdateMode(sal_False); mpOutliner->InsertView(mpOutlinerView[0], LIST_APPEND); onUpdateStyleSettings( true ); @@ -205,8 +205,8 @@ OutlineView::OutlineView( DrawDocShell* pDocSh, ::Window* pWindow, OutlineViewSh maBulletFont.SetUnderline(UNDERLINE_NONE); maBulletFont.SetStrikeout(STRIKEOUT_NONE); maBulletFont.SetItalic(ITALIC_NONE); - maBulletFont.SetOutline(FALSE); - maBulletFont.SetShadow(FALSE); + maBulletFont.SetOutline(sal_False); + maBulletFont.SetShadow(sal_False); Reference<XFrame> xFrame (mpOutlineViewShell->GetViewShellBase().GetFrame()->GetTopFrame().GetFrameInterface(), UNO_QUERY); @@ -239,7 +239,7 @@ OutlineView::~OutlineView() delete mpProgress; // OutlinerViews abmelden und zerstoeren - for (USHORT nView = 0; nView < MAX_OUTLINERVIEWS; nView++) + for (sal_uInt16 nView = 0; nView < MAX_OUTLINERVIEWS; nView++) { if (mpOutlinerView[nView] != NULL) { @@ -253,8 +253,8 @@ OutlineView::~OutlineView() { // Outliner deinitialisieren: Farbdarstellung einschalten ResetLinks(); - ULONG nCntrl = mpOutliner->GetControlWord(); - mpOutliner->SetUpdateMode(FALSE); // sonst wird bei SetControlWord gezeichnet + sal_uLong nCntrl = mpOutliner->GetControlWord(); + mpOutliner->SetUpdateMode(sal_False); // sonst wird bei SetControlWord gezeichnet mpOutliner->SetControlWord(nCntrl & ~EE_CNTRL_NOCOLORS); SvtAccessibilityOptions aOptions; mpOutliner->ForceAutoColor( aOptions.GetIsAutomaticFontColor() ); @@ -306,7 +306,7 @@ void OutlineView::Paint(const Rectangle& rRect, ::sd::Window* pWin) if( mnPageNumberWidthPixel == 0 ) GetPageNumberWidthPixel(); - const ULONG nParaCount = pOlView->GetOutliner()->GetParagraphCount(); + const sal_uLong nParaCount = pOlView->GetOutliner()->GetParagraphCount(); EditView& rEditView = pOlView->GetEditView(); Font aOldFont( pWin->GetFont() ); @@ -316,14 +316,14 @@ void OutlineView::Paint(const Rectangle& rRect, ::sd::Window* pWin) sal_Int32 nBulletWidth = pWin->GetTextWidth(aBulletStr); sal_Int32 nPage = 1; - for( ULONG nPara = 0; nPara < nParaCount; nPara++ ) + for( sal_uLong nPara = 0; nPara < nParaCount; nPara++ ) { Paragraph* pPara = pOlView->GetOutliner()->GetParagraph( nPara ); if( pPara->HasFlag( PARAFLAG_ISPAGE ) ) { pWin->SetFont( maPageNumberFont ); const String aStr( String::CreateFromInt32( nPage++ ) ); - Point aPos( rEditView.GetWindowPosTopLeft( (USHORT)nPara ) ); + Point aPos( rEditView.GetWindowPosTopLeft( (sal_uInt16)nPara ) ); sal_Int32 nNumberOffset = pWin->PixelToLogic( Point(mnPageNumberWidthPixel, 0) ).X() - nBulletWidth; sal_Int32 nLineHeight = pOlView->GetOutliner()->GetLineHeight( nPara, 0 ); @@ -342,7 +342,7 @@ void OutlineView::Paint(const Rectangle& rRect, ::sd::Window* pWin) pWin->SetFont( aOldFont ); */ - mbFirstPaint = FALSE; + mbFirstPaint = sal_False; } } @@ -384,11 +384,11 @@ void OutlineView::AdjustPosSizePixel(const Point &,const Size &,::sd::Window*) void OutlineView::AddWindowToPaintView(OutputDevice* pWin) { - BOOL bAdded = FALSE; - BOOL bValidArea = FALSE; + sal_Bool bAdded = sal_False; + sal_Bool bValidArea = sal_False; Rectangle aOutputArea; const Color aWhiteColor( COL_WHITE ); - USHORT nView = 0; + sal_uInt16 nView = 0; while (nView < MAX_OUTLINERVIEWS && !bAdded) { @@ -397,7 +397,7 @@ void OutlineView::AddWindowToPaintView(OutputDevice* pWin) mpOutlinerView[nView] = new OutlinerView(mpOutliner, dynamic_cast< ::sd::Window* >(pWin)); mpOutlinerView[nView]->SetBackgroundColor( aWhiteColor ); mpOutliner->InsertView(mpOutlinerView[nView], LIST_APPEND); - bAdded = TRUE; + bAdded = sal_True; if (bValidArea) { @@ -407,7 +407,7 @@ void OutlineView::AddWindowToPaintView(OutputDevice* pWin) else if (!bValidArea) { aOutputArea = mpOutlinerView[nView]->GetOutputArea(); - bValidArea = TRUE; + bValidArea = sal_True; } nView++; @@ -427,8 +427,8 @@ void OutlineView::AddWindowToPaintView(OutputDevice* pWin) void OutlineView::DeleteWindowFromPaintView(OutputDevice* pWin) { - BOOL bRemoved = FALSE; - USHORT nView = 0; + sal_Bool bRemoved = sal_False; + sal_uInt16 nView = 0; ::Window* pWindow; while (nView < MAX_OUTLINERVIEWS && !bRemoved) @@ -442,7 +442,7 @@ void OutlineView::DeleteWindowFromPaintView(OutputDevice* pWin) mpOutliner->RemoveView( mpOutlinerView[nView] ); delete mpOutlinerView[nView]; mpOutlinerView[nView] = NULL; - bRemoved = TRUE; + bRemoved = sal_True; } } @@ -461,7 +461,7 @@ void OutlineView::DeleteWindowFromPaintView(OutputDevice* pWin) OutlinerView* OutlineView::GetViewByWindow (::Window* pWin) const { OutlinerView* pOlView = NULL; - for (USHORT nView = 0; nView < MAX_OUTLINERVIEWS; nView++) + for (sal_uInt16 nView = 0; nView < MAX_OUTLINERVIEWS; nView++) { if (mpOutlinerView[nView] != NULL) { @@ -541,7 +541,7 @@ IMPL_LINK( OutlineView, ParagraphInsertedHdl, ::Outliner *, pOutliner ) Paragraph* pPara = pOutliner->GetHdlParagraph(); - USHORT nAbsPos = (USHORT)mpOutliner->GetAbsPos( pPara ); + sal_uInt16 nAbsPos = (sal_uInt16)mpOutliner->GetAbsPos( pPara ); UpdateParagraph( nAbsPos ); @@ -564,8 +564,8 @@ SdPage* OutlineView::InsertSlideForParagraph( Paragraph* pPara ) mpOutliner->SetParaFlag( pPara, PARAFLAG_ISPAGE ); // wieviele Titel sind vor dem neuen Titelabsatz? - ULONG nExample = 0L; // Position der "Vorbild"seite - ULONG nTarget = 0L; // Einfuegeposition + sal_uLong nExample = 0L; // Position der "Vorbild"seite + sal_uLong nTarget = 0L; // Einfuegeposition while(pPara) { pPara = GetPrevTitle(pPara); @@ -593,7 +593,7 @@ SdPage* OutlineView::InsertSlideForParagraph( Paragraph* pPara ) { nExample = nTarget - 1; - USHORT nPageCount = mpDoc->GetSdPageCount( PK_STANDARD ); + sal_uInt16 nPageCount = mpDoc->GetSdPageCount( PK_STANDARD ); if( nExample >= nPageCount ) nExample = nPageCount - 1; } @@ -606,13 +606,13 @@ SdPage* OutlineView::InsertSlideForParagraph( Paragraph* pPara ) **********************************************************************/ // diese Seite hat Vorbildfunktion - SdPage* pExample = (SdPage*)mpDoc->GetSdPage((USHORT)nExample, PK_STANDARD); - SdPage* pPage = (SdPage*)mpDoc->AllocPage(FALSE); + SdPage* pExample = (SdPage*)mpDoc->GetSdPage((sal_uInt16)nExample, PK_STANDARD); + SdPage* pPage = (SdPage*)mpDoc->AllocPage(sal_False); pPage->SetLayoutName(pExample->GetLayoutName()); // einfuegen (Seite) - mpDoc->InsertPage(pPage, (USHORT)(nTarget) * 2 + 1); + mpDoc->InsertPage(pPage, (sal_uInt16)(nTarget) * 2 + 1); if( isRecordingUndo() ) AddUndo(mpDoc->GetSdrUndoFactory().CreateUndoNewPage(*pPage)); @@ -633,25 +633,25 @@ SdPage* OutlineView::InsertSlideForParagraph( Paragraph* pPara ) if (eAutoLayout == AUTOLAYOUT_TITLE || eAutoLayout == AUTOLAYOUT_ONLY_TITLE) { - pPage->SetAutoLayout(AUTOLAYOUT_ENUM, TRUE); + pPage->SetAutoLayout(AUTOLAYOUT_ENUM, sal_True); } else { - pPage->SetAutoLayout(pExample->GetAutoLayout(), TRUE); + pPage->SetAutoLayout(pExample->GetAutoLayout(), sal_True); } /********************************************************************** |* jetzt die Notizseite \*********************************************************************/ - pExample = (SdPage*)mpDoc->GetSdPage((USHORT)nExample, PK_NOTES); - SdPage* pNotesPage = (SdPage*)mpDoc->AllocPage(FALSE); + pExample = (SdPage*)mpDoc->GetSdPage((sal_uInt16)nExample, PK_NOTES); + SdPage* pNotesPage = (SdPage*)mpDoc->AllocPage(sal_False); pNotesPage->SetLayoutName(pExample->GetLayoutName()); pNotesPage->SetPageKind(PK_NOTES); // einfuegen (Notizseite) - mpDoc->InsertPage(pNotesPage, (USHORT)(nTarget) * 2 + 2); + mpDoc->InsertPage(pNotesPage, (sal_uInt16)(nTarget) * 2 + 2); if( isRecordingUndo() ) AddUndo(mpDoc->GetSdrUndoFactory().CreateUndoNewPage(*pNotesPage)); @@ -666,7 +666,7 @@ SdPage* OutlineView::InsertSlideForParagraph( Paragraph* pPara ) pExample->GetLwrBorder() ); // neue Praesentationsobjekte anlegen - pNotesPage->SetAutoLayout(pExample->GetAutoLayout(), TRUE); + pNotesPage->SetAutoLayout(pExample->GetAutoLayout(), sal_True); mpOutliner->UpdateFields(); @@ -689,7 +689,7 @@ IMPL_LINK( OutlineView, ParagraphRemovingHdl, ::Outliner *, pOutliner ) if( pOutliner->HasParaFlag( pPara, PARAFLAG_ISPAGE ) ) { // wieviele Titel sind vor dem fraglichen Titelabsatz? - ULONG nPos = 0L; + sal_uLong nPos = 0L; while(pPara) { pPara = GetPrevTitle(pPara); @@ -697,13 +697,13 @@ IMPL_LINK( OutlineView, ParagraphRemovingHdl, ::Outliner *, pOutliner ) } // Seite und Notizseite loeschen - USHORT nAbsPos = (USHORT)nPos * 2 + 1; + sal_uInt16 nAbsPos = (sal_uInt16)nPos * 2 + 1; SdrPage* pPage = mpDoc->GetPage(nAbsPos); if( isRecordingUndo() ) AddUndo(mpDoc->GetSdrUndoFactory().CreateUndoDeletePage(*pPage)); mpDoc->RemovePage(nAbsPos); - nAbsPos = (USHORT)nPos * 2 + 1; + nAbsPos = (sal_uInt16)nPos * 2 + 1; pPage = mpDoc->GetPage(nAbsPos); if( isRecordingUndo() ) AddUndo(mpDoc->GetSdrUndoFactory().CreateUndoDeletePage(*pPage)); @@ -768,7 +768,7 @@ IMPL_LINK( OutlineView, DepthChangedHdl, ::Outliner *, pOutliner ) Paragraph* pParagraph = (Paragraph*)pList->First(); while (pParagraph) { - if( !pOutliner->HasParaFlag( pParagraph, PARAFLAG_ISPAGE ) && (pOutliner->GetDepth( (USHORT) pOutliner->GetAbsPos( pParagraph ) ) <= 0) ) + if( !pOutliner->HasParaFlag( pParagraph, PARAFLAG_ISPAGE ) && (pOutliner->GetDepth( (sal_uInt16) pOutliner->GetAbsPos( pParagraph ) ) <= 0) ) mnPagesToProcess++; pParagraph = (Paragraph*)pList->Next(); } @@ -787,7 +787,7 @@ IMPL_LINK( OutlineView, DepthChangedHdl, ::Outliner *, pOutliner ) } else { - mpDocSh->SetWaitCursor( TRUE ); + mpDocSh->SetWaitCursor( sal_True ); } delete pList; } @@ -812,7 +812,7 @@ IMPL_LINK( OutlineView, DepthChangedHdl, ::Outliner *, pOutliner ) mpProgress = NULL; } else - mpDocSh->SetWaitCursor( FALSE ); + mpDocSh->SetWaitCursor( sal_False ); mnPagesToProcess = 0; mnPagesProcessed = 0; @@ -824,7 +824,7 @@ IMPL_LINK( OutlineView, DepthChangedHdl, ::Outliner *, pOutliner ) // the paragraph was a page but now becomes a normal paragraph // how many titles are before the title paragraph in question? - ULONG nPos = 0L; + sal_uLong nPos = 0L; Paragraph* pParagraph = pPara; while(pParagraph) { @@ -834,13 +834,13 @@ IMPL_LINK( OutlineView, DepthChangedHdl, ::Outliner *, pOutliner ) } // Seite und Notizseite loeschen - USHORT nAbsPos = (USHORT)nPos * 2 + 1; + sal_uInt16 nAbsPos = (sal_uInt16)nPos * 2 + 1; SdrPage* pPage = mpDoc->GetPage(nAbsPos); if( isRecordingUndo() ) AddUndo(mpDoc->GetSdrUndoFactory().CreateUndoDeletePage(*pPage)); mpDoc->RemovePage(nAbsPos); - nAbsPos = (USHORT)nPos * 2 + 1; + nAbsPos = (sal_uInt16)nPos * 2 + 1; pPage = mpDoc->GetPage(nAbsPos); if( isRecordingUndo() ) AddUndo(mpDoc->GetSdrUndoFactory().CreateUndoDeletePage(*pPage)); @@ -870,7 +870,7 @@ IMPL_LINK( OutlineView, DepthChangedHdl, ::Outliner *, pOutliner ) } pOutliner->UpdateFields(); } - else if ( (pOutliner->GetPrevDepth() == 1) && ( pOutliner->GetDepth( (USHORT) pOutliner->GetAbsPos( pPara ) ) == 2 ) ) + else if ( (pOutliner->GetPrevDepth() == 1) && ( pOutliner->GetDepth( (sal_uInt16) pOutliner->GetAbsPos( pPara ) ) == 2 ) ) { // wieviele Titel sind vor dem fraglichen Titelabsatz? sal_Int32 nPos = -1L; @@ -885,7 +885,7 @@ IMPL_LINK( OutlineView, DepthChangedHdl, ::Outliner *, pOutliner ) if(nPos >= 0) { - SdPage*pPage = (SdPage*)mpDoc->GetSdPage( (USHORT) nPos, PK_STANDARD); + SdPage*pPage = (SdPage*)mpDoc->GetSdPage( (sal_uInt16) nPos, PK_STANDARD); if(pPage && pPage->GetPresObj(PRESOBJ_TEXT)) pOutliner->SetDepth( pPara, 0 ); @@ -905,13 +905,13 @@ IMPL_LINK( OutlineView, DepthChangedHdl, ::Outliner *, pOutliner ) if( nPos >= 0 ) { - SdPage* pPage = (SdPage*) mpDoc->GetSdPage( (USHORT) nPos, PK_STANDARD ); + SdPage* pPage = (SdPage*) mpDoc->GetSdPage( (sal_uInt16) nPos, PK_STANDARD ); if( pPage ) { SfxStyleSheet* pStyleSheet = NULL; - ULONG nPara = pOutliner->GetAbsPos( pPara ); - sal_Int16 nDepth = pOutliner->GetDepth( (USHORT) nPara ); + sal_uLong nPara = pOutliner->GetAbsPos( pPara ); + sal_Int16 nDepth = pOutliner->GetDepth( (sal_uInt16) nPara ); bool bSubTitle = pPage->GetPresObj(PRESOBJ_TEXT) != NULL; if( pOutliner->HasParaFlag(pPara, PARAFLAG_ISPAGE) ) @@ -938,7 +938,7 @@ IMPL_LINK( OutlineView, DepthChangedHdl, ::Outliner *, pOutliner ) // before we set the style sheet we need to preserve the bullet item // since all items will be deleted while setting a new style sheet - SfxItemSet aOldAttrs( pOutliner->GetParaAttribs( (USHORT)nPara ) ); + SfxItemSet aOldAttrs( pOutliner->GetParaAttribs( (sal_uInt16)nPara ) ); pOutliner->SetStyleSheet( nPara, pStyleSheet ); @@ -946,9 +946,9 @@ IMPL_LINK( OutlineView, DepthChangedHdl, ::Outliner *, pOutliner ) if ( pOutliner->GetPrevDepth() != -1 && nDepth != -1 && aOldAttrs.GetItemState( EE_PARA_NUMBULLET ) == SFX_ITEM_ON ) { - SfxItemSet aAttrs( pOutliner->GetParaAttribs( (USHORT)nPara ) ); + SfxItemSet aAttrs( pOutliner->GetParaAttribs( (sal_uInt16)nPara ) ); aAttrs.Put( *aOldAttrs.GetItem( EE_PARA_NUMBULLET ) ); - pOutliner->SetParaAttribs( (USHORT)nPara, aAttrs ); + pOutliner->SetParaAttribs( (sal_uInt16)nPara, aAttrs ); } } } @@ -970,8 +970,8 @@ IMPL_LINK( OutlineView, StatusEventHdl, EditStatus *, EMPTYARG ) OutlinerView* pOutlinerView = GetViewByWindow(pWin); Rectangle aVis = pOutlinerView->GetVisArea(); -// ULONG nWidth = ((SdPage*)mpDoc->GetSdPage(0, PK_STANDARD))->GetSize().Width(); - ULONG nWidth = OUTLINE_PAPERWIDTH; +// sal_uLong nWidth = ((SdPage*)mpDoc->GetSdPage(0, PK_STANDARD))->GetSize().Width(); + sal_uLong nWidth = OUTLINE_PAPERWIDTH; Rectangle aText = Rectangle(Point(0,0), Size(nWidth, mpOutliner->GetTextHeight())); @@ -1039,8 +1039,8 @@ IMPL_LINK( OutlineView, BeginMovingHdl, ::Outliner *, pOutliner ) // Die zu den selektierten Absaetzen auf Ebene 0 gehoerenden Seiten // selektieren - USHORT nPos = 0; - ULONG nParaPos = 0; + sal_uInt16 nPos = 0; + sal_uLong nParaPos = 0; pPara = pOutliner->GetParagraph( 0 ); while(pPara) @@ -1049,10 +1049,10 @@ IMPL_LINK( OutlineView, BeginMovingHdl, ::Outliner *, pOutliner ) { mpOldParaOrder->Insert(pPara, LIST_APPEND); SdPage* pPage = mpDoc->GetSdPage(nPos, PK_STANDARD); - pPage->SetSelected(FALSE); + pPage->SetSelected(sal_False); if (mpSelectedParas->Seek(pPara)) // selektiert? { - pPage->SetSelected(TRUE); + pPage->SetSelected(sal_True); } nPos++; } @@ -1080,8 +1080,8 @@ IMPL_LINK( OutlineView, EndMovingHdl, ::Outliner *, pOutliner ) Paragraph* pSearchIt = (Paragraph*)mpSelectedParas->First(); // den ersten der selektierten Paragraphen in der neuen Ordnung suchen - USHORT nPosNewOrder = 0; - ULONG nParaPos = 0; + sal_uInt16 nPosNewOrder = 0; + sal_uLong nParaPos = 0; Paragraph* pPara = pOutliner->GetParagraph( 0 ); Paragraph* pPrev = NULL; while (pPara && pPara != pSearchIt) @@ -1094,26 +1094,26 @@ IMPL_LINK( OutlineView, EndMovingHdl, ::Outliner *, pOutliner ) pPara = pOutliner->GetParagraph( ++nParaPos ); } - USHORT nPos = nPosNewOrder; // nPosNewOrder nicht veraendern + sal_uInt16 nPos = nPosNewOrder; // nPosNewOrder nicht veraendern if (nPos == 0) { - nPos = (USHORT)-1; // vor der ersten Seite einfuegen + nPos = (sal_uInt16)-1; // vor der ersten Seite einfuegen } else { // den Vorgaenger in der alten Ordnung suchen - nPos = (USHORT)mpOldParaOrder->GetPos(pPrev); + nPos = (sal_uInt16)mpOldParaOrder->GetPos(pPrev); DBG_ASSERT(nPos != 0xffff, "Absatz nicht gefunden"); } mpDoc->MovePages(nPos); // die Seiten wieder deselektieren - USHORT nPageCount = (USHORT)mpSelectedParas->Count(); + sal_uInt16 nPageCount = (sal_uInt16)mpSelectedParas->Count(); while (nPageCount) { SdPage* pPage = mpDoc->GetSdPage(nPosNewOrder, PK_STANDARD); - pPage->SetSelected(FALSE); + pPage->SetSelected(sal_False); nPosNewOrder++; nPageCount--; } @@ -1138,11 +1138,11 @@ IMPL_LINK( OutlineView, EndMovingHdl, ::Outliner *, pOutliner ) SdrTextObj* OutlineView::GetTitleTextObject(SdrPage* pPage) { - ULONG nObjectCount = pPage->GetObjCount(); + sal_uLong nObjectCount = pPage->GetObjCount(); SdrObject* pObject = NULL; SdrTextObj* pResult = NULL; - for (ULONG nObject = 0; nObject < nObjectCount; nObject++) + for (sal_uLong nObject = 0; nObject < nObjectCount; nObject++) { pObject = pPage->GetObj(nObject); if (pObject->GetObjInventor() == SdrInventor && @@ -1164,11 +1164,11 @@ SdrTextObj* OutlineView::GetTitleTextObject(SdrPage* pPage) SdrTextObj* OutlineView::GetOutlineTextObject(SdrPage* pPage) { - ULONG nObjectCount = pPage->GetObjCount(); + sal_uLong nObjectCount = pPage->GetObjCount(); SdrObject* pObject = NULL; SdrTextObj* pResult = NULL; - for (ULONG nObject = 0; nObject < nObjectCount; nObject++) + for (sal_uLong nObject = 0; nObject < nObjectCount; nObject++) { pObject = pPage->GetObj(nObject); if (pObject->GetObjInventor() == SdrInventor && @@ -1237,7 +1237,7 @@ SdrTextObj* OutlineView::CreateOutlineTextObject(SdPage* pPage) } /** updates draw model with all changes from outliner model */ -BOOL OutlineView::PrepareClose(BOOL) +sal_Bool OutlineView::PrepareClose(sal_Bool) { ::sd::UndoManager* pDocUndoMgr = dynamic_cast<sd::UndoManager*>(mpDocSh->GetUndoManager()); if (pDocUndoMgr != NULL) @@ -1249,8 +1249,8 @@ BOOL OutlineView::PrepareClose(BOOL) BegUndo(aUndoStr); UpdateDocument(); EndUndo(); - mpDoc->SetSelected(GetActualPage(), TRUE); - return TRUE; + mpDoc->SetSelected(GetActualPage(), sal_True); + return sal_True; } @@ -1260,16 +1260,16 @@ BOOL OutlineView::PrepareClose(BOOL) |* \************************************************************************/ -BOOL OutlineView::SetAttributes(const SfxItemSet& rSet, BOOL ) +sal_Bool OutlineView::SetAttributes(const SfxItemSet& rSet, sal_Bool ) { - BOOL bOk = FALSE; + sal_Bool bOk = sal_False; OutlinerView* pOlView = GetViewByWindow(mpOutlineViewShell->GetActiveWindow()); if (pOlView) { pOlView->SetAttribs(rSet); - bOk = TRUE; + bOk = sal_True; } mpOutlineViewShell->Invalidate (SID_PREVIEW_STATE); @@ -1283,29 +1283,29 @@ BOOL OutlineView::SetAttributes(const SfxItemSet& rSet, BOOL ) |* \************************************************************************/ -BOOL OutlineView::GetAttributes( SfxItemSet& rTargetSet, BOOL ) const +sal_Bool OutlineView::GetAttributes( SfxItemSet& rTargetSet, sal_Bool ) const { OutlinerView* pOlView = GetViewByWindow( mpOutlineViewShell->GetActiveWindow()); DBG_ASSERT(pOlView, "keine OutlinerView gefunden"); - rTargetSet.Put( pOlView->GetAttribs(), FALSE ); - return TRUE; + rTargetSet.Put( pOlView->GetAttribs(), sal_False ); + return sal_True; } /** creates outliner model from draw model */ void OutlineView::FillOutliner() { mpOutliner->GetUndoManager().Clear(); - mpOutliner->EnableUndo(FALSE); + mpOutliner->EnableUndo(sal_False); ResetLinks(); mpOutliner->SetUpdateMode(false); Paragraph* pTitleToSelect = NULL; - ULONG nPageCount = mpDoc->GetSdPageCount(PK_STANDARD); + sal_uLong nPageCount = mpDoc->GetSdPageCount(PK_STANDARD); // fill outliner with paragraphs from slides title & (outlines|subtitles) - for (USHORT nPage = 0; nPage < nPageCount; nPage++) + for (sal_uInt16 nPage = 0; nPage < nPageCount; nPage++) { SdPage* pPage = (SdPage*)mpDoc->GetSdPage(nPage, PK_STANDARD); Paragraph * pPara = NULL; @@ -1317,8 +1317,8 @@ void OutlineView::FillOutliner() OutlinerParaObject* pOPO = pTO->GetOutlinerParaObject(); if (pOPO) { - BOOL bVertical = pOPO->IsVertical(); - pOPO->SetVertical( FALSE ); + sal_Bool bVertical = pOPO->IsVertical(); + pOPO->SetVertical( sal_False ); mpOutliner->AddText(*pOPO); pOPO->SetVertical( bVertical ); pPara = mpOutliner->GetParagraph( mpOutliner->GetParagraphCount()-1 ); @@ -1331,7 +1331,7 @@ void OutlineView::FillOutliner() mpOutliner->SetDepth(pPara, -1); // Keine harten Attribute vom vorherigen Absatz uebernehmen - mpOutliner->SetParaAttribs( (USHORT)mpOutliner->GetAbsPos(pPara), + mpOutliner->SetParaAttribs( (sal_uInt16)mpOutliner->GetAbsPos(pPara), mpOutliner->GetEmptyItemSet() ); mpOutliner->SetStyleSheet( mpOutliner->GetAbsPos( pPara ), pPage->GetStyleSheetForPresObj( PRESOBJ_TITLE ) ); @@ -1339,9 +1339,9 @@ void OutlineView::FillOutliner() mpOutliner->SetParaFlag( pPara, PARAFLAG_ISPAGE ); - ULONG nPara = mpOutliner->GetAbsPos( pPara ); + sal_uLong nPara = mpOutliner->GetAbsPos( pPara ); - UpdateParagraph( (USHORT)nPara ); + UpdateParagraph( (sal_uInt16)nPara ); // remember paragraph of currently selected page if (pPage->IsSelected()) @@ -1359,14 +1359,14 @@ void OutlineView::FillOutliner() OutlinerParaObject* pOPO = pTO->GetOutlinerParaObject(); if (pOPO) { - USHORT nParaCount1 = (USHORT)mpOutliner->GetParagraphCount(); - BOOL bVertical = pOPO->IsVertical(); - pOPO->SetVertical( FALSE ); + sal_uInt16 nParaCount1 = (sal_uInt16)mpOutliner->GetParagraphCount(); + sal_Bool bVertical = pOPO->IsVertical(); + pOPO->SetVertical( sal_False ); mpOutliner->AddText(*pOPO); pOPO->SetVertical( bVertical ); - USHORT nParaCount2 = (USHORT)mpOutliner->GetParagraphCount(); - for (USHORT n = nParaCount1; n < nParaCount2; n++) + sal_uInt16 nParaCount2 = (sal_uInt16)mpOutliner->GetParagraphCount(); + for (sal_uInt16 n = nParaCount1; n < nParaCount2; n++) { if( bSubTitle ) { @@ -1383,16 +1383,16 @@ void OutlineView::FillOutliner() // place cursor at the start Paragraph* pFirstPara = mpOutliner->GetParagraph( 0 ); - mpOutlinerView[0]->Select( pFirstPara, TRUE, FALSE ); - mpOutlinerView[0]->Select( pFirstPara, FALSE, FALSE ); + mpOutlinerView[0]->Select( pFirstPara, sal_True, sal_False ); + mpOutlinerView[0]->Select( pFirstPara, sal_False, sal_False ); // select title of slide that was selected if (pTitleToSelect) - mpOutlinerView[0]->Select(pTitleToSelect, TRUE, FALSE); + mpOutlinerView[0]->Select(pTitleToSelect, sal_True, sal_False); SetLinks(); - mpOutliner->EnableUndo(TRUE); + mpOutliner->EnableUndo(sal_True); mpOutliner->SetUpdateMode(true); } @@ -1405,7 +1405,7 @@ void OutlineView::FillOutliner() IMPL_LINK( OutlineView, RemovingPagesHdl, OutlinerView *, EMPTYARG ) { - USHORT nNumOfPages = mpOutliner->GetSelPageCount(); + sal_uInt16 nNumOfPages = mpOutliner->GetSelPageCount(); if (nNumOfPages > PROCESS_WITH_PROGRESS_THRESHOLD) { @@ -1474,7 +1474,7 @@ SdPage* OutlineView::GetPageForParagraph( Paragraph* pPara ) } if( nPageToSelect < (sal_uInt32)mpDoc->GetSdPageCount( PK_STANDARD ) ) - return static_cast< SdPage* >( mpDoc->GetSdPage( (USHORT)nPageToSelect, PK_STANDARD) ); + return static_cast< SdPage* >( mpDoc->GetSdPage( (sal_uInt16)nPageToSelect, PK_STANDARD) ); else return 0; } @@ -1515,7 +1515,7 @@ void OutlineView::SetActualPage( SdPage* pActual ) // if we found a paragraph, select its text at the outliner view Paragraph* pPara = GetParagraphForPage( mpOutliner, pActual ); if( pPara ) - mpOutlinerView[0]->Select( pPara, TRUE, FALSE ); + mpOutlinerView[0]->Select( pPara, sal_True, sal_False ); } } @@ -1562,8 +1562,8 @@ void OutlineView::SetSelectedPages() // Die zu den selektierten Absaetzen auf Ebene 0 gehoerenden Seiten // selektieren - USHORT nPos = 0; - ULONG nParaPos = 0; + sal_uInt16 nPos = 0; + sal_uLong nParaPos = 0; pPara = mpOutliner->GetParagraph( 0 ); while(pPara) @@ -1575,10 +1575,10 @@ void OutlineView::SetSelectedPages() "Trying to select non-existing page OutlineView::SetSelectedPages()"); if (pPage != NULL) { - pPage->SetSelected(FALSE); + pPage->SetSelected(sal_False); if (pSelParas->Seek(pPara)) // selektiert? - pPage->SetSelected(TRUE); + pPage->SetSelected(sal_True); } nPos++; @@ -1644,7 +1644,7 @@ void OutlineView::ResetLinks() const |* \************************************************************************/ -sal_Int8 OutlineView::AcceptDrop( const AcceptDropEvent&, DropTargetHelper&, ::sd::Window*, USHORT, USHORT) +sal_Int8 OutlineView::AcceptDrop( const AcceptDropEvent&, DropTargetHelper&, ::sd::Window*, sal_uInt16, sal_uInt16) { return DND_ACTION_NONE; } @@ -1655,7 +1655,7 @@ sal_Int8 OutlineView::AcceptDrop( const AcceptDropEvent&, DropTargetHelper&, ::s |* \************************************************************************/ -sal_Int8 OutlineView::ExecuteDrop( const ExecuteDropEvent&, DropTargetHelper&, ::sd::Window*, USHORT, USHORT) +sal_Int8 OutlineView::ExecuteDrop( const ExecuteDropEvent&, DropTargetHelper&, ::sd::Window*, sal_uInt16, sal_uInt16) { return DND_ACTION_NONE; } @@ -1814,8 +1814,8 @@ void OutlineView::UpdateDocument() sal_uInt32 nPage; for (nPage = 0; nPage < nPageCount; nPage++) { - SdPage* pPage = mpDoc->GetSdPage( (USHORT)nPage, PK_STANDARD); - mpDoc->SetSelected(pPage, FALSE); + SdPage* pPage = mpDoc->GetSdPage( (sal_uInt16)nPage, PK_STANDARD); + mpDoc->SetSelected(pPage, sal_False); mpOutlineViewShell->UpdateTitleObject( pPage, pPara ); mpOutlineViewShell->UpdateOutlineObject( pPage, pPara ); @@ -1828,7 +1828,7 @@ void OutlineView::UpdateDocument() while( pPara ) { SdPage* pPage = InsertSlideForParagraph( pPara ); - mpDoc->SetSelected(pPage, FALSE); + mpDoc->SetSelected(pPage, sal_False); mpOutlineViewShell->UpdateTitleObject( pPage, pPara ); mpOutlineViewShell->UpdateOutlineObject( pPage, pPara ); @@ -1856,7 +1856,7 @@ void OutlineView::TryToMergeUndoActions() pEditUndo = dynamic_cast< EditUndo* >(pListAction->aUndoActions[--nAction].pAction); } - USHORT nEditPos = nAction; // we need this later to remove the merged undo actions + sal_uInt16 nEditPos = nAction; // we need this later to remove the merged undo actions // make sure it is the only EditUndo action in the top undo list while( pEditUndo && nAction ) @@ -1909,8 +1909,8 @@ void OutlineView::TryToMergeUndoActions() if( pSourceList && pDestinationList ) { - USHORT nCount = pSourceList->aUndoActions.size(); - USHORT nDestAction = pDestinationList->aUndoActions.size(); + sal_uInt16 nCount = pSourceList->aUndoActions.size(); + sal_uInt16 nDestAction = pDestinationList->aUndoActions.size(); while( nCount-- ) { SfxUndoAction* pTemp = pSourceList->aUndoActions[0].pAction; @@ -1965,7 +1965,7 @@ IMPL_LINK(OutlineView, PaintingFirstLineHdl, PaintFirstLineInfo*, pInfo) if( pPara && mpOutliner->HasParaFlag(pPara,PARAFLAG_ISPAGE) ) { long nPage = 0; // todo, printing?? - for ( USHORT n = 0; n <= pInfo->mnPara; n++ ) + for ( sal_uInt16 n = 0; n <= pInfo->mnPara; n++ ) { Paragraph* p = mpOutliner->GetParagraph( n ); if ( mpOutliner->HasParaFlag(p,PARAFLAG_ISPAGE) ) @@ -2071,7 +2071,7 @@ sal_Int32 OutlineView::GetPageNumberWidthPixel() // -------------------------------------------------------------------- -void OutlineView::UpdateParagraph( USHORT nPara ) +void OutlineView::UpdateParagraph( sal_uInt16 nPara ) { if( mpOutliner ) { diff --git a/sd/source/ui/view/presvish.cxx b/sd/source/ui/view/presvish.cxx index 11f20c7a83d4..d3c952a294a8 100644..100755 --- a/sd/source/ui/view/presvish.cxx +++ b/sd/source/ui/view/presvish.cxx @@ -134,7 +134,7 @@ void PresentationViewShell::FinishInitialization( FrameView* pFrameView ) } -SvxRuler* PresentationViewShell::CreateHRuler(::sd::Window*, BOOL) +SvxRuler* PresentationViewShell::CreateHRuler(::sd::Window*, sal_Bool) { return NULL; } @@ -145,14 +145,14 @@ SvxRuler* PresentationViewShell::CreateVRuler(::sd::Window*) } -void PresentationViewShell::Activate( BOOL bIsMDIActivate ) +void PresentationViewShell::Activate( sal_Bool bIsMDIActivate ) { DrawViewShell::Activate( bIsMDIActivate ); if( bIsMDIActivate ) { //HMH::sd::View* pView = GetView(); - SfxBoolItem aItem( SID_NAVIGATOR_INIT, TRUE ); + SfxBoolItem aItem( SID_NAVIGATOR_INIT, sal_True ); GetViewFrame()->GetDispatcher()->Execute( SID_NAVIGATOR_INIT, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, &aItem, 0L ); diff --git a/sd/source/ui/view/sdruler.cxx b/sd/source/ui/view/sdruler.cxx index 679c28bb3a93..2964f5e79219 100644..100755 --- a/sd/source/ui/view/sdruler.cxx +++ b/sd/source/ui/view/sdruler.cxx @@ -57,18 +57,18 @@ class RulerCtrlItem : public SfxControllerItem Ruler &rRuler; protected: - virtual void StateChanged( USHORT nSId, SfxItemState eState, + virtual void StateChanged( sal_uInt16 nSId, SfxItemState eState, const SfxPoolItem* pItem ); public: - RulerCtrlItem(USHORT nId, Ruler& rRlr, SfxBindings& rBind); + RulerCtrlItem(sal_uInt16 nId, Ruler& rRlr, SfxBindings& rBind); }; /************************************************************************* |* \************************************************************************/ -RulerCtrlItem::RulerCtrlItem(USHORT _nId, Ruler& rRlr, SfxBindings& rBind) +RulerCtrlItem::RulerCtrlItem(sal_uInt16 _nId, Ruler& rRlr, SfxBindings& rBind) : SfxControllerItem(_nId, rBind) , rRuler(rRlr) { @@ -79,14 +79,14 @@ RulerCtrlItem::RulerCtrlItem(USHORT _nId, Ruler& rRlr, SfxBindings& rBind) |* \************************************************************************/ -void RulerCtrlItem::StateChanged( USHORT nSId, SfxItemState, const SfxPoolItem* pState ) +void RulerCtrlItem::StateChanged( sal_uInt16 nSId, SfxItemState, const SfxPoolItem* pState ) { switch( nSId ) { case SID_RULER_NULL_OFFSET: { const SfxPointItem* pItem = dynamic_cast< const SfxPointItem* >(pState); - DBG_ASSERT(pState ? pItem != NULL : TRUE, "SfxPointItem erwartet"); + DBG_ASSERT(pState ? pItem != NULL : sal_True, "SfxPointItem erwartet"); if ( pItem ) rRuler.SetNullOffset(pItem->GetValue()); } @@ -101,7 +101,7 @@ void RulerCtrlItem::StateChanged( USHORT nSId, SfxItemState, const SfxPoolItem* |* \************************************************************************/ -Ruler::Ruler( DrawViewShell& rViewSh, ::Window* pParent, ::sd::Window* pWin, USHORT nRulerFlags, SfxBindings& rBindings, WinBits nWinStyle) +Ruler::Ruler( DrawViewShell& rViewSh, ::Window* pParent, ::sd::Window* pWin, sal_uInt16 nRulerFlags, SfxBindings& rBindings, WinBits nWinStyle) : SvxRuler(pParent, pWin, nRulerFlags, rBindings, nWinStyle) , pSdWin(pWin) , pDrViewShell(&rViewSh) @@ -112,12 +112,12 @@ Ruler::Ruler( DrawViewShell& rViewSh, ::Window* pParent, ::sd::Window* pWin, USH if ( nWinStyle & WB_HSCROLL ) { - bHorz = TRUE; + bHorz = sal_True; SetHelpId( HID_SD_RULER_HORIZONTAL ); } else { - bHorz = FALSE; + bHorz = sal_False; SetHelpId( HID_SD_RULER_VERTICAL ); } } diff --git a/sd/source/ui/view/sdview.cxx b/sd/source/ui/view/sdview.cxx index 36d55213ab78..23d57c26ad33 100755 --- a/sd/source/ui/view/sdview.cxx +++ b/sd/source/ui/view/sdview.cxx @@ -130,7 +130,7 @@ View::View(SdDrawDocument* pDrawDoc, OutputDevice* pOutDev, mnAction(DND_ACTION_NONE), mnLockRedrawSmph(0), mpLockedRedraws(NULL), - mbIsDropAllowed(TRUE), + mbIsDropAllowed(sal_True), maSmartTags(*this), mpClipboard (new ViewClipboard (*this)) { @@ -140,13 +140,13 @@ View::View(SdDrawDocument* pDrawDoc, OutputDevice* pOutDev, // #i74769#, #i75172# Use default from the configuration SetBufferedOutputAllowed(getOptionsDrawinglayer().IsPaintBuffer_DrawImpress()); - EnableExtendedKeyInputDispatcher(FALSE); - EnableExtendedMouseEventDispatcher(FALSE); - EnableExtendedCommandEventDispatcher(FALSE); + EnableExtendedKeyInputDispatcher(sal_False); + EnableExtendedMouseEventDispatcher(sal_False); + EnableExtendedCommandEventDispatcher(sal_False); - SetUseIncompatiblePathCreateInterface(FALSE); - SetMarkHdlWhenTextEdit(TRUE); - EnableTextEditOnObjectsWithoutTextIfTextTool(TRUE); + SetUseIncompatiblePathCreateInterface(sal_False); + SetMarkHdlWhenTextEdit(sal_True); + EnableTextEditOnObjectsWithoutTextIfTextTool(sal_True); SetMinMoveDistancePixel(2); SetHitTolerancePixel(2); @@ -179,7 +179,7 @@ View::~View() maSmartTags.Dispose(); // release content of selection clipboard, if we own the content - UpdateSelectionClipboard( TRUE ); + UpdateSelectionClipboard( sal_True ); maDropErrorTimer.Stop(); maDropInsertFileTimer.Stop(); @@ -576,9 +576,9 @@ void View::MarkListHasChanged() |* \************************************************************************/ -BOOL View::SetAttributes(const SfxItemSet& rSet, BOOL bReplaceAll) +sal_Bool View::SetAttributes(const SfxItemSet& rSet, sal_Bool bReplaceAll) { - BOOL bOk = FmFormView::SetAttributes(rSet, bReplaceAll); + sal_Bool bOk = FmFormView::SetAttributes(rSet, bReplaceAll); return (bOk); } @@ -589,7 +589,7 @@ BOOL View::SetAttributes(const SfxItemSet& rSet, BOOL bReplaceAll) |* \************************************************************************/ -BOOL View::GetAttributes( SfxItemSet& rTargetSet, BOOL bOnlyHardAttr ) const +sal_Bool View::GetAttributes( SfxItemSet& rTargetSet, sal_Bool bOnlyHardAttr ) const { return( FmFormView::GetAttributes( rTargetSet, bOnlyHardAttr ) ); } @@ -601,7 +601,7 @@ BOOL View::GetAttributes( SfxItemSet& rTargetSet, BOOL bOnlyHardAttr ) const |* \************************************************************************/ -BOOL View::IsPresObjSelected(BOOL bOnPage, BOOL bOnMasterPage, BOOL bCheckPresObjListOnly, BOOL bCheckLayoutOnly) const +sal_Bool View::IsPresObjSelected(sal_Bool bOnPage, sal_Bool bOnMasterPage, sal_Bool bCheckPresObjListOnly, sal_Bool bCheckLayoutOnly) const { /************************************************************************** * Ist ein Presentationsobjekt selektiert? @@ -626,8 +626,8 @@ BOOL View::IsPresObjSelected(BOOL bOnPage, BOOL bOnMasterPage, BOOL bCheckPresOb SdPage* pPage; SdrObject* pObj; - BOOL bSelected = FALSE; - BOOL bMasterPage = FALSE; + sal_Bool bSelected = sal_False; + sal_Bool bMasterPage = sal_False; long nMark; long nMarkMax = long(pMarkList->GetMarkCount()) - 1; @@ -651,11 +651,11 @@ BOOL View::IsPresObjSelected(BOOL bOnPage, BOOL bOnMasterPage, BOOL bCheckPresOb PresObjKind eKind = pPage->GetPresObjKind(pObj); if((eKind != PRESOBJ_FOOTER) && (eKind != PRESOBJ_HEADER) && (eKind != PRESOBJ_DATETIME) && (eKind != PRESOBJ_SLIDENUMBER) ) - bSelected = TRUE; + bSelected = sal_True; } else { - bSelected = TRUE; + bSelected = sal_True; } } } @@ -682,7 +682,7 @@ void View::SelectAll() { OutlinerView* pOLV = GetTextEditOutlinerView(); const ::Outliner* pOutliner = GetTextEditOutliner(); - pOLV->SelectRange( 0, (USHORT) pOutliner->GetParagraphCount() ); + pOLV->SelectRange( 0, (sal_uInt16) pOutliner->GetParagraphCount() ); } else { @@ -709,7 +709,7 @@ void View::ModelHasChanged() |* \************************************************************************/ -BOOL View::SetStyleSheet(SfxStyleSheet* pStyleSheet, BOOL bDontRemoveHardAttr) +sal_Bool View::SetStyleSheet(SfxStyleSheet* pStyleSheet, sal_Bool bDontRemoveHardAttr) { // weiter an SdrView return FmFormView::SetStyleSheet(pStyleSheet, bDontRemoveHardAttr); @@ -722,9 +722,9 @@ BOOL View::SetStyleSheet(SfxStyleSheet* pStyleSheet, BOOL bDontRemoveHardAttr) |* \************************************************************************/ -static void SetSpellOptions( SdDrawDocument* pDoc, ULONG& rCntrl ) +static void SetSpellOptions( SdDrawDocument* pDoc, sal_uLong& rCntrl ) { - BOOL bOnlineSpell = pDoc->GetOnlineSpell(); + sal_Bool bOnlineSpell = pDoc->GetOnlineSpell(); if( bOnlineSpell ) rCntrl |= EE_CNTRL_ONLINESPELLING; @@ -749,7 +749,7 @@ sal_Bool View::SdrBeginTextEdit( { pOutl->SetStyleSheetPool((SfxStyleSheetPool*) mpDoc->GetStyleSheetPool()); pOutl->SetCalcFieldValueHdl(LINK(SD_MOD(), SdModule, CalcFieldValueHdl)); - ULONG nCntrl = pOutl->GetControlWord(); + sal_uLong nCntrl = pOutl->GetControlWord(); nCntrl |= EE_CNTRL_ALLOWBIGOBJS; nCntrl |= EE_CNTRL_URLSFXEXECUTE; nCntrl |= EE_CNTRL_MARKFIELDS; @@ -805,11 +805,11 @@ sal_Bool View::SdrBeginTextEdit( } /** ends current text editing */ -SdrEndTextEditKind View::SdrEndTextEdit(BOOL bDontDeleteReally ) +SdrEndTextEditKind View::SdrEndTextEdit(sal_Bool bDontDeleteReally ) { SdrObjectWeakRef xObj( GetTextEditObject() ); - BOOL bDefaultTextRestored = RestoreDefaultText( dynamic_cast< SdrTextObj* >( GetTextEditObject() ) ); + sal_Bool bDefaultTextRestored = RestoreDefaultText( dynamic_cast< SdrTextObj* >( GetTextEditObject() ) ); SdrEndTextEditKind eKind = FmFormView::SdrEndTextEdit(bDontDeleteReally); @@ -817,7 +817,7 @@ SdrEndTextEditKind View::SdrEndTextEdit(BOOL bDontDeleteReally ) { if( xObj.is() && !xObj->IsEmptyPresObj() ) { - xObj->SetEmptyPresObj( TRUE ); + xObj->SetEmptyPresObj( sal_True ); } else { @@ -831,7 +831,7 @@ SdrEndTextEditKind View::SdrEndTextEdit(BOOL bDontDeleteReally ) { SdrPage* pPage = pObj->GetPage(); if( !pPage || !pPage->IsMasterPage() ) - pObj->SetEmptyPresObj( FALSE ); + pObj->SetEmptyPresObj( sal_False ); } } @@ -888,8 +888,8 @@ bool View::RestoreDefaultText( SdrTextObj* pTextObj ) void View::SetMarkedOriginalSize() { SdrUndoGroup* pUndoGroup = new SdrUndoGroup(*mpDoc); - ULONG nCount = GetMarkedObjectCount(); - BOOL bOK = FALSE; + sal_uLong nCount = GetMarkedObjectCount(); + sal_Bool bOK = sal_False; for( sal_uInt32 i = 0; i < nCount; i++ ) { @@ -911,7 +911,7 @@ void View::SetMarkedOriginalSize() { MapMode aMap100( MAP_100TH_MM ); aOleSize = ((SdrOle2Obj*)pObj)->GetOrigObjSize( &aMap100 ); - bOK = TRUE; + bOK = sal_True; } else { @@ -920,7 +920,7 @@ void View::SetMarkedOriginalSize() { awt::Size aSz = xObj->getVisualAreaSize( nAspect ); aOleSize = OutputDevice::LogicToLogic( Size( aSz.Width, aSz.Height ), aUnit, MAP_100TH_MM ); - bOK = TRUE; + bOK = sal_True; } catch( embed::NoVisualAreaSizeException& ) {} @@ -955,7 +955,7 @@ void View::SetMarkedOriginalSize() aRect.SetSize( aSize ); pObj->SetLogicRect( aRect ); - bOK = TRUE; + bOK = sal_True; } } } @@ -1018,17 +1018,17 @@ void View::DoConnect(SdrOle2Obj* pObj) |* \************************************************************************/ -BOOL View::IsMorphingAllowed() const +sal_Bool View::IsMorphingAllowed() const { const SdrMarkList& rMarkList = GetMarkedObjectList(); - BOOL bRet = FALSE; + sal_Bool bRet = sal_False; if ( rMarkList.GetMarkCount() == 2 ) { const SdrObject* pObj1 = rMarkList.GetMark( 0 )->GetMarkedSdrObj(); const SdrObject* pObj2 = rMarkList.GetMark( 1 )->GetMarkedSdrObj(); - const UINT16 nKind1 = pObj1->GetObjIdentifier(); - const UINT16 nKind2 = pObj2->GetObjIdentifier(); + const sal_uInt16 nKind1 = pObj1->GetObjIdentifier(); + const sal_uInt16 nKind2 = pObj2->GetObjIdentifier(); if ( ( nKind1 != OBJ_TEXT && nKind2 != OBJ_TEXT ) && ( nKind1 != OBJ_TITLETEXT && nKind2 != OBJ_TITLETEXT ) && @@ -1057,7 +1057,7 @@ BOOL View::IsMorphingAllowed() const if( ( eFillStyle1 == XFILL_NONE || eFillStyle1 == XFILL_SOLID ) && ( eFillStyle2 == XFILL_NONE || eFillStyle2 == XFILL_SOLID ) ) - bRet = TRUE; + bRet = sal_True; } } @@ -1070,17 +1070,17 @@ BOOL View::IsMorphingAllowed() const |* \************************************************************************/ -BOOL View::IsVectorizeAllowed() const +sal_Bool View::IsVectorizeAllowed() const { const SdrMarkList& rMarkList = GetMarkedObjectList(); - BOOL bRet = FALSE; + sal_Bool bRet = sal_False; if( rMarkList.GetMarkCount() == 1 ) { const SdrObject* pObj = rMarkList.GetMark( 0 )->GetMarkedSdrObj(); if( pObj->ISA( SdrGrafObj ) && ( (SdrGrafObj*) pObj )->GetGraphicType() == GRAPHIC_BITMAP ) - bRet = TRUE; + bRet = sal_True; } return bRet; @@ -1095,7 +1095,7 @@ void View::onAccessibilityOptionsChanged() { const StyleSettings& rStyleSettings = pWindow->GetSettings().GetStyleSettings(); - USHORT nOutputSlot, nPreviewSlot; + sal_uInt16 nOutputSlot, nPreviewSlot; SvtAccessibilityOptions& aAccOptions = getAccessibilityOptions(); @@ -1194,7 +1194,7 @@ SdrViewContext View::GetContext() const return FmFormView::GetContext(); } -BOOL View::HasMarkablePoints() const +sal_Bool View::HasMarkablePoints() const { if( maSmartTags.HasMarkablePoints() ) return true; @@ -1202,14 +1202,14 @@ BOOL View::HasMarkablePoints() const return FmFormView::HasMarkablePoints(); } -ULONG View::GetMarkablePointCount() const +sal_uLong View::GetMarkablePointCount() const { - ULONG nCount = FmFormView::GetMarkablePointCount(); + sal_uLong nCount = FmFormView::GetMarkablePointCount(); nCount += maSmartTags.GetMarkablePointCount(); return nCount; } -BOOL View::HasMarkedPoints() const +sal_Bool View::HasMarkedPoints() const { if( maSmartTags.HasMarkedPoints() ) return true; @@ -1217,14 +1217,14 @@ BOOL View::HasMarkedPoints() const return FmFormView::HasMarkedPoints(); } -ULONG View::GetMarkedPointCount() const +sal_uLong View::GetMarkedPointCount() const { - ULONG nCount = FmFormView::GetMarkedPointCount(); + sal_uLong nCount = FmFormView::GetMarkedPointCount(); nCount += maSmartTags.GetMarkedPointCount(); return nCount; } -BOOL View::IsPointMarkable(const SdrHdl& rHdl) const +sal_Bool View::IsPointMarkable(const SdrHdl& rHdl) const { if( maSmartTags.IsPointMarkable( rHdl ) ) return true; @@ -1232,7 +1232,7 @@ BOOL View::IsPointMarkable(const SdrHdl& rHdl) const return FmFormView::IsPointMarkable( rHdl ); } -BOOL View::MarkPoint(SdrHdl& rHdl, BOOL bUnmark ) +sal_Bool View::MarkPoint(SdrHdl& rHdl, sal_Bool bUnmark ) { if( maSmartTags.MarkPoint( rHdl, bUnmark ) ) return true; @@ -1240,7 +1240,7 @@ BOOL View::MarkPoint(SdrHdl& rHdl, BOOL bUnmark ) return FmFormView::MarkPoint( rHdl, bUnmark ); } -BOOL View::MarkPoints(const Rectangle* pRect, BOOL bUnmark) +sal_Bool View::MarkPoints(const Rectangle* pRect, sal_Bool bUnmark) { if( maSmartTags.MarkPoints( pRect, bUnmark ) ) return true; diff --git a/sd/source/ui/view/sdview2.cxx b/sd/source/ui/view/sdview2.cxx index ea4d120b1219..73f48323312f 100644..100755 --- a/sd/source/ui/view/sdview2.cxx +++ b/sd/source/ui/view/sdview2.cxx @@ -104,15 +104,15 @@ struct SdNavigatorDropEvent : public ExecuteDropEvent { DropTargetHelper& mrTargetHelper; ::sd::Window* mpTargetWindow; - USHORT mnPage; - USHORT mnLayer; + sal_uInt16 mnPage; + sal_uInt16 mnLayer; SdNavigatorDropEvent ( const ExecuteDropEvent& rEvt, DropTargetHelper& rTargetHelper, ::sd::Window* pTargetWindow, - USHORT nPage, - USHORT nLayer ) + sal_uInt16 nPage, + sal_uInt16 nLayer ) : ExecuteDropEvent( rEvt ), mrTargetHelper( rTargetHelper ), mpTargetWindow( pTargetWindow ), @@ -127,7 +127,7 @@ struct SdNavigatorDropEvent : public ExecuteDropEvent { // since SdTransferable::CopyToClipboard is called, this // dynamically created object ist destroyed automatically - SdTransferable* pTransferable = new SdTransferable( mpDoc, NULL, FALSE ); + SdTransferable* pTransferable = new SdTransferable( mpDoc, NULL, sal_False ); ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > xRet( pTransferable ); SD_MOD()->pTransferClip = pTransferable; @@ -189,7 +189,7 @@ struct SdNavigatorDropEvent : public ExecuteDropEvent ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > View::CreateDragDataObject( View* pWorkView, ::Window& rWindow, const Point& rDragPos ) { - SdTransferable* pTransferable = new SdTransferable( mpDoc, pWorkView, FALSE ); + SdTransferable* pTransferable = new SdTransferable( mpDoc, pWorkView, sal_False ); ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > xRet( pTransferable ); SD_MOD()->pTransferDrag = pTransferable; @@ -227,7 +227,7 @@ struct SdNavigatorDropEvent : public ExecuteDropEvent aObjDesc.maSize = GetAllMarkedRect().GetSize(); aObjDesc.maDragStartPos = rDragPos; aObjDesc.maDisplayName = aDisplayName; - aObjDesc.mbCanLink = FALSE; + aObjDesc.mbCanLink = sal_False; pTransferable->SetStartPos( rDragPos ); pTransferable->SetObjectDescriptor( aObjDesc ); @@ -240,7 +240,7 @@ struct SdNavigatorDropEvent : public ExecuteDropEvent ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > View::CreateSelectionDataObject( View* pWorkView, ::Window& rWindow ) { - SdTransferable* pTransferable = new SdTransferable( mpDoc, pWorkView, TRUE ); + SdTransferable* pTransferable = new SdTransferable( mpDoc, pWorkView, sal_True ); ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > xRet( pTransferable ); TransferableObjectDescriptor aObjDesc; const Rectangle aMarkRect( GetAllMarkedRect() ); @@ -265,7 +265,7 @@ struct SdNavigatorDropEvent : public ExecuteDropEvent // ----------------------------------------------------------------------------- -void View::UpdateSelectionClipboard( BOOL bForceDeselect ) +void View::UpdateSelectionClipboard( sal_Bool bForceDeselect ) { if( mpViewSh && mpViewSh->GetActiveWindow() ) { @@ -338,18 +338,18 @@ void View::DoPaste (::Window* pWindow) // remove all hard linebreaks from the title if( pOutliner && pOutliner->GetParagraphCount() > 1 ) { - BOOL bOldUpdateMode = pOutliner->GetUpdateMode(); + sal_Bool bOldUpdateMode = pOutliner->GetUpdateMode(); - pOutliner->SetUpdateMode( FALSE ); + pOutliner->SetUpdateMode( sal_False ); const EditEngine& rEdit = pOutliner->GetEditEngine(); const int nParaCount = rEdit.GetParagraphCount(); for( int nPara = nParaCount - 2; nPara >= 0; nPara-- ) { - const USHORT nParaLen = (USHORT)rEdit.GetTextLen( (USHORT)nPara ); - pOutliner->QuickDelete( ESelection( (USHORT)nPara, nParaLen, (USHORT)nPara+1, 0 ) ); - pOutliner->QuickInsertLineBreak( ESelection( (USHORT)nPara, nParaLen, (USHORT)nPara, nParaLen ) ); + const sal_uInt16 nParaLen = (sal_uInt16)rEdit.GetTextLen( (sal_uInt16)nPara ); + pOutliner->QuickDelete( ESelection( (sal_uInt16)nPara, nParaLen, (sal_uInt16)nPara+1, 0 ) ); + pOutliner->QuickInsertLineBreak( ESelection( (sal_uInt16)nPara, nParaLen, (sal_uInt16)nPara, nParaLen ) ); } DBG_ASSERT( rEdit.GetParagraphCount() <= 1, "Titelobjekt contains hard line breaks" ); @@ -360,7 +360,7 @@ void View::DoPaste (::Window* pWindow) if( !mpDoc->IsChanged() ) { if( pOutliner && pOutliner->IsModified() ) - mpDoc->SetChanged( TRUE ); + mpDoc->SetChanged( sal_True ); } } } @@ -376,7 +376,7 @@ void View::DoPaste (::Window* pWindow) if (pDrViewSh != NULL) { - if( !InsertData( aDataHelper, aPos, nDnDAction, FALSE ) ) + if( !InsertData( aDataHelper, aPos, nDnDAction, sal_False ) ) { INetBookmark aINetBookmark( aEmptyStr, aEmptyStr ); @@ -450,7 +450,7 @@ void View::DragFinished( sal_Int8 nDropAction ) if( bUndo ) BegUndo(); - ULONG nm, nAnz = mpDragSrcMarkList->GetMarkCount(); + sal_uLong nm, nAnz = mpDragSrcMarkList->GetMarkCount(); for( nm = nAnz; nm>0; ) { @@ -467,7 +467,7 @@ void View::DragFinished( sal_Int8 nDropAction ) nm--; SdrMark* pM=mpDragSrcMarkList->GetMark(nm); SdrObject* pObj=pM->GetMarkedSdrObj(); - UINT32 nOrdNum=pObj->GetOrdNumDirect(); + sal_uInt32 nOrdNum=pObj->GetOrdNumDirect(); if( pObj && pObj->GetPage() ) { @@ -484,7 +484,7 @@ void View::DragFinished( sal_Int8 nDropAction ) } if( pDragTransferable ) - pDragTransferable->SetInternalMove( FALSE ); + pDragTransferable->SetInternalMove( sal_False ); if( bUndo ) EndUndo(); @@ -496,7 +496,7 @@ void View::DragFinished( sal_Int8 nDropAction ) // ----------------------------------------------------------------------------- sal_Int8 View::AcceptDrop( const AcceptDropEvent& rEvt, DropTargetHelper& rTargetHelper, - ::sd::Window*, USHORT, USHORT nLayer ) + ::sd::Window*, sal_uInt16, sal_uInt16 nLayer ) { String aLayerName( GetActiveLayer() ); SdrPageView* pPV = GetSdrPageView(); @@ -512,7 +512,7 @@ sal_Int8 View::AcceptDrop( const AcceptDropEvent& rEvt, DropTargetHelper& rTarge if( mbIsDropAllowed && !pPV->IsLayerLocked( aLayerName ) && pPV->IsLayerVisible( aLayerName ) ) { const OutlinerView* pOLV = GetTextEditOutlinerView(); - BOOL bIsInsideOutlinerView = FALSE; + sal_Bool bIsInsideOutlinerView = sal_False; if( pOLV ) { @@ -527,7 +527,7 @@ sal_Int8 View::AcceptDrop( const AcceptDropEvent& rEvt, DropTargetHelper& rTarge if( aRect.IsInside( pOLV->GetWindow()->PixelToLogic( rEvt.maPosPixel ) ) ) { - bIsInsideOutlinerView = TRUE; + bIsInsideOutlinerView = sal_True; } } @@ -554,12 +554,12 @@ sal_Int8 View::AcceptDrop( const AcceptDropEvent& rEvt, DropTargetHelper& rTarge } else { - const BOOL bDrawing = rTargetHelper.IsDropFormatSupported( SOT_FORMATSTR_ID_DRAWING ); - const BOOL bGraphic = rTargetHelper.IsDropFormatSupported( SOT_FORMATSTR_ID_SVXB ); - const BOOL bMtf = rTargetHelper.IsDropFormatSupported( FORMAT_GDIMETAFILE ); - const BOOL bBitmap = rTargetHelper.IsDropFormatSupported( FORMAT_BITMAP ); - BOOL bBookmark = rTargetHelper.IsDropFormatSupported( SOT_FORMATSTR_ID_NETSCAPE_BOOKMARK ); - BOOL bXFillExchange = rTargetHelper.IsDropFormatSupported( SOT_FORMATSTR_ID_XFA ); + const sal_Bool bDrawing = rTargetHelper.IsDropFormatSupported( SOT_FORMATSTR_ID_DRAWING ); + const sal_Bool bGraphic = rTargetHelper.IsDropFormatSupported( SOT_FORMATSTR_ID_SVXB ); + const sal_Bool bMtf = rTargetHelper.IsDropFormatSupported( FORMAT_GDIMETAFILE ); + const sal_Bool bBitmap = rTargetHelper.IsDropFormatSupported( FORMAT_BITMAP ); + sal_Bool bBookmark = rTargetHelper.IsDropFormatSupported( SOT_FORMATSTR_ID_NETSCAPE_BOOKMARK ); + sal_Bool bXFillExchange = rTargetHelper.IsDropFormatSupported( SOT_FORMATSTR_ID_XFA ); // check handle insert if( !nRet && ( (bXFillExchange && ( SDRDRAG_GRADIENT == GetDragMode() )) || ( SDRDRAG_TRANSPARENCE == GetDragMode() ) ) ) @@ -592,8 +592,8 @@ sal_Int8 View::AcceptDrop( const AcceptDropEvent& rEvt, DropTargetHelper& rTarge SdrPageView* pPageView = NULL; ::sd::Window* pWindow = mpViewSh->GetActiveWindow(); Point aPos( pWindow->PixelToLogic( rEvt.maPosPixel ) ); - const BOOL bHasPickObj = PickObj( aPos, getHitTolLog(), pPickObj, pPageView ); - BOOL bIsPresTarget = FALSE; + const sal_Bool bHasPickObj = PickObj( aPos, getHitTolLog(), pPickObj, pPageView ); + sal_Bool bIsPresTarget = sal_False; if( bHasPickObj && pPickObj && ( pPickObj->IsEmptyPresObj() || pPickObj->GetUserCall() ) ) { @@ -620,18 +620,18 @@ sal_Int8 View::AcceptDrop( const AcceptDropEvent& rEvt, DropTargetHelper& rTarge nRet = nDropAction; } else - bXFillExchange = FALSE; + bXFillExchange = sal_False; } // check normal insert if( !nRet ) { - const BOOL bSBAFormat = rTargetHelper.IsDropFormatSupported( SOT_FORMATSTR_ID_SVX_FORMFIELDEXCH ); - const BOOL bEditEngine = rTargetHelper.IsDropFormatSupported( SOT_FORMATSTR_ID_EDITENGINE ); - const BOOL bString = rTargetHelper.IsDropFormatSupported( FORMAT_STRING ); - const BOOL bRTF = rTargetHelper.IsDropFormatSupported( FORMAT_RTF ); - const BOOL bFile = rTargetHelper.IsDropFormatSupported( FORMAT_FILE ); - const BOOL bFileList = rTargetHelper.IsDropFormatSupported( FORMAT_FILE_LIST ); + const sal_Bool bSBAFormat = rTargetHelper.IsDropFormatSupported( SOT_FORMATSTR_ID_SVX_FORMFIELDEXCH ); + const sal_Bool bEditEngine = rTargetHelper.IsDropFormatSupported( SOT_FORMATSTR_ID_EDITENGINE ); + const sal_Bool bString = rTargetHelper.IsDropFormatSupported( FORMAT_STRING ); + const sal_Bool bRTF = rTargetHelper.IsDropFormatSupported( FORMAT_RTF ); + const sal_Bool bFile = rTargetHelper.IsDropFormatSupported( FORMAT_FILE ); + const sal_Bool bFileList = rTargetHelper.IsDropFormatSupported( FORMAT_FILE_LIST ); if( mpDropMarker ) { @@ -640,7 +640,7 @@ sal_Int8 View::AcceptDrop( const AcceptDropEvent& rEvt, DropTargetHelper& rTarge } if( bBookmark && bFile && ( nDropAction & DND_ACTION_MOVE ) && mpViewSh && SlideShow::IsRunning(mpViewSh->GetViewShellBase()) ) - bBookmark = FALSE; + bBookmark = sal_False; if( bDrawing || bGraphic || bMtf || bBitmap || bBookmark || bFile || bFileList || bXFillExchange || bSBAFormat || bEditEngine || bString || bRTF ) nRet = nDropAction; @@ -671,7 +671,7 @@ sal_Int8 View::AcceptDrop( const AcceptDropEvent& rEvt, DropTargetHelper& rTarge // ----------------------------------------------------------------------------- sal_Int8 View::ExecuteDrop( const ExecuteDropEvent& rEvt, DropTargetHelper& rTargetHelper, - ::sd::Window* pTargetWindow, USHORT nPage, USHORT nLayer ) + ::sd::Window* pTargetWindow, sal_uInt16 nPage, sal_uInt16 nLayer ) { SdrPageView* pPV = GetSdrPageView(); String aActiveLayer = GetActiveLayer(); @@ -688,7 +688,7 @@ sal_Int8 View::ExecuteDrop( const ExecuteDropEvent& rEvt, DropTargetHelper& rTar if( !pPV->IsLayerLocked( aActiveLayer ) ) { const OutlinerView* pOLV = GetTextEditOutlinerView(); - BOOL bIsInsideOutlinerView = FALSE; + sal_Bool bIsInsideOutlinerView = sal_False; if( pOLV ) { @@ -705,7 +705,7 @@ sal_Int8 View::ExecuteDrop( const ExecuteDropEvent& rEvt, DropTargetHelper& rTar if( aRect.IsInside( aPos ) ) { - bIsInsideOutlinerView = TRUE; + bIsInsideOutlinerView = sal_True; } } @@ -738,7 +738,7 @@ sal_Int8 View::ExecuteDrop( const ExecuteDropEvent& rEvt, DropTargetHelper& rTar *xStm >> aFillData; const Color aColor( ( (XFillColorItem&) aFillData.GetXFillAttrSetItem()->GetItemSet().Get( XATTR_FILLCOLOR ) ).GetColorValue() ); - static_cast< SdrHdlColor* >( pIAOHandle )->SetColor( aColor, TRUE ); + static_cast< SdrHdlColor* >( pIAOHandle )->SetColor( aColor, sal_True ); nRet = nDropAction; } } @@ -747,7 +747,7 @@ sal_Int8 View::ExecuteDrop( const ExecuteDropEvent& rEvt, DropTargetHelper& rTar } // standard insert? - if( !nRet && InsertData( aDataHelper, aPos, nDropAction, TRUE, 0, nPage, nLayer ) ) + if( !nRet && InsertData( aDataHelper, aPos, nDropAction, sal_True, 0, nPage, nLayer ) ) nRet = nDropAction; // special insert? @@ -782,7 +782,7 @@ sal_Int8 View::ExecuteDrop( const ExecuteDropEvent& rEvt, DropTargetHelper& rTar // insert as clip action => jump rtl::OUString aBookmark( aINetBookmark.GetURL() ); SdAnimationInfo* pInfo = mpDoc->GetAnimationInfo( pPickObj ); - BOOL bCreated = FALSE; + sal_Bool bCreated = sal_False; if( aBookmark.getLength() ) { @@ -804,7 +804,7 @@ sal_Int8 View::ExecuteDrop( const ExecuteDropEvent& rEvt, DropTargetHelper& rTar if( !pInfo ) { pInfo = SdDrawDocument::GetShapeUserData( *pPickObj, true ); - bCreated = TRUE; + bCreated = sal_True; } // Undo-Action mit alten und neuen Groessen erzeugen @@ -822,7 +822,7 @@ sal_Int8 View::ExecuteDrop( const ExecuteDropEvent& rEvt, DropTargetHelper& rTar pAction->SetPathObj(pInfo->mpPathObj, pInfo->mpPathObj); pAction->SetClickAction(pInfo->meClickAction, eClickAction); pAction->SetBookmark(pInfo->GetBookmark(), aBookmark); -// pAction->SetInvisibleInPres(pInfo->mbInvisibleInPresentation, TRUE); +// pAction->SetInvisibleInPres(pInfo->mbInvisibleInPresentation, sal_True); pAction->SetVerb(pInfo->mnVerb, pInfo->mnVerb); pAction->SetSecondEffect(pInfo->meSecondEffect, pInfo->meSecondEffect); pAction->SetSecondSpeed(pInfo->meSecondSpeed, pInfo->meSecondSpeed); @@ -868,7 +868,7 @@ IMPL_LINK( View, ExecuteNavigatorDrop, SdNavigatorDropEvent*, pSdNavigatorDropEv List aBookmarkList; String aBookmark; SdPage* pPage = (SdPage*) GetSdrPageView()->GetPage(); - USHORT nPgPos = 0xFFFF; + sal_uInt16 nPgPos = 0xFFFF; if( pSdNavigatorDropEvent->mpTargetWindow ) aPos = pSdNavigatorDropEvent->mpTargetWindow->PixelToLogic( pSdNavigatorDropEvent->maPosPixel ); @@ -889,11 +889,11 @@ IMPL_LINK( View, ExecuteNavigatorDrop, SdNavigatorDropEvent*, pSdNavigatorDropEv // Um zu gewaehrleisten, dass alle Seitennamen eindeutig sind, werden // die einzufuegenden geprueft und gegebenenfalls in einer Ersatzliste - // aufgenommen (bNameOK == FALSE -> Benutzer hat abgebrochen) + // aufgenommen (bNameOK == sal_False -> Benutzer hat abgebrochen) List* pExchangeList = NULL; - BOOL bLink = ( NAVIGATOR_DRAGTYPE_LINK == pPageObjsTransferable->GetDragType() ? TRUE : FALSE ); - BOOL bNameOK = GetExchangeList( pExchangeList, &aBookmarkList, 2 ); - BOOL bReplace = FALSE; + sal_Bool bLink = ( NAVIGATOR_DRAGTYPE_LINK == pPageObjsTransferable->GetDragType() ? sal_True : sal_False ); + sal_Bool bNameOK = GetExchangeList( pExchangeList, &aBookmarkList, 2 ); + sal_Bool bReplace = sal_False; // Da man hier nicht weiss, ob es sich um eine Seite oder ein Objekt handelt, // wird eine Liste sowohl mit Seiten, als auch mit Objekten gefuellt. @@ -901,9 +901,9 @@ IMPL_LINK( View, ExecuteNavigatorDrop, SdNavigatorDropEvent*, pSdNavigatorDropEv if( bNameOK ) { mpDoc->InsertBookmark( &aBookmarkList, pExchangeList, - bLink, bReplace, nPgPos, FALSE, + bLink, bReplace, nPgPos, sal_False, &pPageObjsTransferable->GetDocShell(), - TRUE, &aPos ); + sal_True, &aPos ); } // Loeschen der ExchangeList @@ -925,19 +925,19 @@ IMPL_LINK( View, ExecuteNavigatorDrop, SdNavigatorDropEvent*, pSdNavigatorDropEv |* |* Rueckgabeparameter: |* pExchangeList == NULL -> Namen sind alle eindeutig -|* bNameOK == FALSE -> Benutzer hat abgebrochen +|* bNameOK == sal_False -> Benutzer hat abgebrochen |* nType == 0 -> Seiten |* nType == 1 -> Objekte |* nType == 2 -> Seiten + Objekte |* \************************************************************************/ -BOOL View::GetExchangeList( List*& rpExchangeList, List* pBookmarkList, USHORT nType ) +sal_Bool View::GetExchangeList( List*& rpExchangeList, List* pBookmarkList, sal_uInt16 nType ) { DBG_ASSERT( !rpExchangeList, "ExchangeList muss NULL sein!"); - BOOL bListIdentical = TRUE; // BookmarkList und ExchangeList sind gleich - BOOL bNameOK = TRUE; // Name ist eindeutig + sal_Bool bListIdentical = sal_True; // BookmarkList und ExchangeList sind gleich + sal_Bool bNameOK = sal_True; // Name ist eindeutig rpExchangeList = new List(); @@ -965,7 +965,7 @@ BOOL View::GetExchangeList( List*& rpExchangeList, List* pBookmarkList, USHORT n { pDlg->SetEditHelpId( HID_SD_NAMEDIALOG_OBJECT ); - bNameOK = FALSE; + bNameOK = sal_False; pDlg->SetText( aTitle ); while( !bNameOK && pDlg->Execute() == RET_OK ) @@ -973,7 +973,7 @@ BOOL View::GetExchangeList( List*& rpExchangeList, List* pBookmarkList, USHORT n pDlg->GetName( *pNewName ); if( !mpDoc->GetObj( *pNewName ) ) - bNameOK = TRUE; + bNameOK = sal_True; } delete pDlg; @@ -1030,7 +1030,7 @@ SdrModel* View::GetMarkedObjModel() const return FmFormView::GetMarkedObjModel();; } -BOOL View::Paste(const SdrModel& rMod, const Point& rPos, SdrObjList* pLst /* =NULL */, UINT32 nOptions /* =0 */) +sal_Bool View::Paste(const SdrModel& rMod, const Point& rPos, SdrObjList* pLst /* =NULL */, sal_uInt32 nOptions /* =0 */) { return FmFormView::Paste( rMod, rPos, pLst,nOptions );; } diff --git a/sd/source/ui/view/sdview3.cxx b/sd/source/ui/view/sdview3.cxx index fd709dc22038..c7f460758499 100755 --- a/sd/source/ui/view/sdview3.cxx +++ b/sd/source/ui/view/sdview3.cxx @@ -290,22 +290,22 @@ if( aPreviewSizePixel.Width() && aPreviewSizePixel.Height() ) return true; } -BOOL View::InsertData( const TransferableDataHelper& rDataHelper, - const Point& rPos, sal_Int8& rDnDAction, BOOL bDrag, - ULONG nFormat, USHORT nPage, USHORT nLayer ) +sal_Bool View::InsertData( const TransferableDataHelper& rDataHelper, + const Point& rPos, sal_Int8& rDnDAction, sal_Bool bDrag, + sal_uLong nFormat, sal_uInt16 nPage, sal_uInt16 nLayer ) { maDropPos = rPos; mnAction = rDnDAction; - mbIsDropAllowed = FALSE; + mbIsDropAllowed = sal_False; TransferableDataHelper aDataHelper( rDataHelper ); SdrObject* pPickObj = NULL; SdPage* pPage = NULL; ImageMap* pImageMap = NULL; - BOOL bReturn = FALSE; - BOOL bLink = ( ( mnAction & DND_ACTION_LINK ) != 0 ); - BOOL bCopy = ( ( ( mnAction & DND_ACTION_COPY ) != 0 ) || bLink ); - ULONG nPasteOptions = SDRINSERT_SETDEFLAYER; + sal_Bool bReturn = sal_False; + sal_Bool bLink = ( ( mnAction & DND_ACTION_LINK ) != 0 ); + sal_Bool bCopy = ( ( ( mnAction & DND_ACTION_COPY ) != 0 ) || bLink ); + sal_uLong nPasteOptions = SDRINSERT_SETDEFLAYER; if (mpViewSh != NULL) { @@ -404,10 +404,10 @@ BOOL View::InsertData( const TransferableDataHelper& rDataHelper, if( !pPV->IsLayerLocked( aLayer ) ) { - pOwnData->SetInternalMove( TRUE ); + pOwnData->SetInternalMove( sal_True ); SortMarkedObjects(); - for( ULONG nM = 0; nM < GetMarkedObjectCount(); nM++ ) + for( sal_uLong nM = 0; nM < GetMarkedObjectCount(); nM++ ) { SdrMark* pM = GetSdrMarkByIndex( nM ); SdrObject* pO = pM->GetMarkedSdrObj(); @@ -426,18 +426,18 @@ BOOL View::InsertData( const TransferableDataHelper& rDataHelper, } } - bReturn = TRUE; + bReturn = sal_True; } } else { SdrPageView* pPV = GetSdrPageView(); - BOOL bDropOnTabBar = TRUE; + sal_Bool bDropOnTabBar = sal_True; if( !pPage && pPV->GetPage()->GetPageNum() != mnDragSrcPgNum ) { pPage = (SdPage*) pPV->GetPage(); - bDropOnTabBar = FALSE; + bDropOnTabBar = sal_False; } if( pPage ) @@ -530,7 +530,7 @@ BOOL View::InsertData( const TransferableDataHelper& rDataHelper, SdrEdgeObj* pCloneEdge = (SdrEdgeObj*)pRem->pClone; // test first connection - SdrObjConnection& rConn0 = pOrigEdge->GetConnection(FALSE); + SdrObjConnection& rConn0 = pOrigEdge->GetConnection(sal_False); SdrObject* pConnObj = rConn0.GetObject(); if(pConnObj) { @@ -538,8 +538,8 @@ BOOL View::InsertData( const TransferableDataHelper& rDataHelper, if(pConnClone) { // if dest obj was cloned, too, re-establish connection - pCloneEdge->ConnectToNode(FALSE, pConnClone); - pCloneEdge->GetConnection(FALSE).SetConnectorId(rConn0.GetConnectorId()); + pCloneEdge->ConnectToNode(sal_False, pConnClone); + pCloneEdge->GetConnection(sal_False).SetConnectorId(rConn0.GetConnectorId()); } else { @@ -555,14 +555,14 @@ BOOL View::InsertData( const TransferableDataHelper& rDataHelper, Point aPosition = rGluePoint.GetAbsolutePos(*pConnObj); aPosition.X() += aVector.A(); aPosition.Y() += aVector.B(); - pCloneEdge->SetTailPoint(FALSE, aPosition); + pCloneEdge->SetTailPoint(sal_False, aPosition); } } } } // test second connection - SdrObjConnection& rConn1 = pOrigEdge->GetConnection(TRUE); + SdrObjConnection& rConn1 = pOrigEdge->GetConnection(sal_True); pConnObj = rConn1.GetObject(); if(pConnObj) { @@ -570,8 +570,8 @@ BOOL View::InsertData( const TransferableDataHelper& rDataHelper, if(pConnClone) { // if dest obj was cloned, too, re-establish connection - pCloneEdge->ConnectToNode(TRUE, pConnClone); - pCloneEdge->GetConnection(TRUE).SetConnectorId(rConn1.GetConnectorId()); + pCloneEdge->ConnectToNode(sal_True, pConnClone); + pCloneEdge->GetConnection(sal_True).SetConnectorId(rConn1.GetConnectorId()); } else { @@ -587,7 +587,7 @@ BOOL View::InsertData( const TransferableDataHelper& rDataHelper, Point aPosition = rGluePoint.GetAbsolutePos(*pConnObj); aPosition.X() += aVector.A(); aPosition.Y() += aVector.B(); - pCloneEdge->SetTailPoint(TRUE, aPosition); + pCloneEdge->SetTailPoint(sal_True, aPosition); } } } @@ -603,21 +603,21 @@ BOOL View::InsertData( const TransferableDataHelper& rDataHelper, if( pMarkList != mpDragSrcMarkList ) delete pMarkList; - bReturn = TRUE; + bReturn = sal_True; } else { maDropErrorTimer.Start(); - bReturn = FALSE; + bReturn = sal_False; } } } else { - pOwnData->SetInternalMove( TRUE ); + pOwnData->SetInternalMove( sal_True ); MoveAllMarked( Size( maDropPos.X() - pOwnData->GetStartPos().X(), maDropPos.Y() - pOwnData->GetStartPos().Y() ), bCopy ); - bReturn = TRUE; + bReturn = sal_True; } } } @@ -637,13 +637,13 @@ BOOL View::InsertData( const TransferableDataHelper& rDataHelper, String aLayout( pPage->GetLayoutName() ); aLayout.Erase( aLayout.SearchAscii( SD_LT_SEPARATOR ) ); - pPage->SetPresentationLayout( aLayout, FALSE, FALSE ); + pPage->SetPresentationLayout( aLayout, sal_False, sal_False ); pSourceDoc->CreatingDataObj( NULL ); } else { maDropErrorTimer.Start(); - bReturn = FALSE; + bReturn = sal_False; } } } @@ -663,10 +663,10 @@ BOOL View::InsertData( const TransferableDataHelper& rDataHelper, // delete pages, that are not of any interest for us for( long i = ( pWorkModel->GetPageCount() - 1 ); i >= 0; i-- ) { - SdPage* pP = static_cast< SdPage* >( pWorkModel->GetPage( (USHORT) i ) ); + SdPage* pP = static_cast< SdPage* >( pWorkModel->GetPage( (sal_uInt16) i ) ); if( pP->GetPageKind() != PK_STANDARD ) - pWorkModel->DeletePage( (USHORT) i ); + pWorkModel->DeletePage( (sal_uInt16) i ); } bReturn = Paste( *pWorkModel, maDropPos, pPage, nPasteOptions ); @@ -676,7 +676,7 @@ BOOL View::InsertData( const TransferableDataHelper& rDataHelper, String aLayout(pPage->GetLayoutName()); aLayout.Erase(aLayout.SearchAscii(SD_LT_SEPARATOR)); - pPage->SetPresentationLayout( aLayout, FALSE, FALSE ); + pPage->SetPresentationLayout( aLayout, sal_False, sal_False ); } } else if( CHECK_FORMAT_TRANS( SOT_FORMATSTR_ID_DRAWING ) ) @@ -685,7 +685,7 @@ BOOL View::InsertData( const TransferableDataHelper& rDataHelper, if( aDataHelper.GetSotStorageStream( SOT_FORMATSTR_ID_DRAWING, xStm ) ) { - BOOL bChanged = FALSE; + sal_Bool bChanged = sal_False; DrawDocShellRef xShell = new DrawDocShell(SFX_CREATE_MODE_INTERNAL); xShell->DoInitNew(0); @@ -754,7 +754,7 @@ BOOL View::InsertData( const TransferableDataHelper& rDataHelper, { SdrObject::Free(pPickObj2 ); } - bChanged = TRUE; + bChanged = sal_True; mnAction = DND_ACTION_COPY; } else if( ( mnAction & DND_ACTION_LINK ) && pPickObj && pObj && !pPickObj->ISA( SdrGrafObj ) && !pPickObj->ISA( SdrOle2Obj ) ) @@ -788,13 +788,13 @@ BOOL View::InsertData( const TransferableDataHelper& rDataHelper, aNewSet.Put( pObj->GetMergedItemSet() ); if( bUndo ) - AddUndo( new E3dAttributesUndoAction( *mpDoc, this, (E3dObject*) pPickObj, aNewSet, aOldSet, FALSE ) ); + AddUndo( new E3dAttributesUndoAction( *mpDoc, this, (E3dObject*) pPickObj, aNewSet, aOldSet, sal_False ) ); pPickObj->SetMergedItemSetAndBroadcast( aNewSet ); } if( bUndo ) EndUndo(); - bChanged = TRUE; + bChanged = sal_True; } } } @@ -840,7 +840,7 @@ BOOL View::InsertData( const TransferableDataHelper& rDataHelper, aRect.SetPos( maDropPos ); pObj->SetLogicRect( aRect ); InsertObjectAtView( pObj, *GetSdrPageView(), SDRINSERT_SETDEFLAYER ); - bReturn = TRUE; + bReturn = sal_True; } } } @@ -860,7 +860,7 @@ BOOL View::InsertData( const TransferableDataHelper& rDataHelper, if( mpDoc->GetDocSh() && ( mpDoc->GetDocSh()->GetClassName() == aObjDesc.maClassName ) ) { uno::Reference < embed::XStorage > xStore( ::comphelper::OStorageHelper::GetStorageFromInputStream( xStm ) ); - ::sd::DrawDocShellRef xDocShRef( new ::sd::DrawDocShell( SFX_CREATE_MODE_EMBEDDED, TRUE, mpDoc->GetDocumentType() ) ); + ::sd::DrawDocShellRef xDocShRef( new ::sd::DrawDocShell( SFX_CREATE_MODE_EMBEDDED, sal_True, mpDoc->GetDocumentType() ) ); // mba: BaseURL doesn't make sense for clipboard functionality SfxMedium *pMedium = new SfxMedium( xStore, String() ); @@ -883,10 +883,10 @@ BOOL View::InsertData( const TransferableDataHelper& rDataHelper, // delete pages, that are not of any interest for us for( long i = ( pModel->GetPageCount() - 1 ); i >= 0; i-- ) { - SdPage* pP = static_cast< SdPage* >( pModel->GetPage( (USHORT) i ) ); + SdPage* pP = static_cast< SdPage* >( pModel->GetPage( (sal_uInt16) i ) ); if( pP->GetPageKind() != PK_STANDARD ) - pModel->DeletePage( (USHORT) i ); + pModel->DeletePage( (sal_uInt16) i ); } bReturn = Paste( *pModel, maDropPos, pPage, nPasteOptions ); @@ -896,7 +896,7 @@ BOOL View::InsertData( const TransferableDataHelper& rDataHelper, String aLayout(pPage->GetLayoutName()); aLayout.Erase(aLayout.SearchAscii(SD_LT_SEPARATOR)); - pPage->SetPresentationLayout( aLayout, FALSE, FALSE ); + pPage->SetPresentationLayout( aLayout, sal_False, sal_False ); } xDocShRef->DoClose(); @@ -913,7 +913,7 @@ BOOL View::InsertData( const TransferableDataHelper& rDataHelper, // try to get the replacement image from the clipboard Graphic aGraphic; - ULONG nGrFormat = 0; + sal_uLong nGrFormat = 0; // (wg. Selection Manager bei Trustet Solaris) #ifndef SOLARIS @@ -990,7 +990,7 @@ BOOL View::InsertData( const TransferableDataHelper& rDataHelper, Rectangle aRect( maDropPos, aSize ); SdrOle2Obj* pObj = new SdrOle2Obj( aObjRef, aName, aRect ); SdrPageView* pPV = GetSdrPageView(); - ULONG nOptions = SDRINSERT_SETDEFLAYER; + sal_uLong nOptions = SDRINSERT_SETDEFLAYER; if (mpViewSh!=NULL) { @@ -1027,7 +1027,7 @@ BOOL View::InsertData( const TransferableDataHelper& rDataHelper, } } - bReturn = TRUE; + bReturn = sal_True; } } } @@ -1084,7 +1084,7 @@ BOOL View::InsertData( const TransferableDataHelper& rDataHelper, // try to get the replacement image from the clipboard Graphic aGraphic; - ULONG nGrFormat = 0; + sal_uLong nGrFormat = 0; // (wg. Selection Manager bei Trustet Solaris) #ifndef SOLARIS @@ -1160,7 +1160,7 @@ BOOL View::InsertData( const TransferableDataHelper& rDataHelper, Rectangle aRect( maDropPos, aSize ); SdrOle2Obj* pObj = new SdrOle2Obj( aObjRef, aName, aRect ); SdrPageView* pPV = GetSdrPageView(); - ULONG nOptions = SDRINSERT_SETDEFLAYER; + sal_uLong nOptions = SDRINSERT_SETDEFLAYER; if (mpViewSh!=NULL) { @@ -1178,7 +1178,7 @@ BOOL View::InsertData( const TransferableDataHelper& rDataHelper, // let the object stay in loaded state after insertion pObj->Unload(); - bReturn = TRUE; + bReturn = sal_True; } } } @@ -1223,7 +1223,7 @@ BOOL View::InsertData( const TransferableDataHelper& rDataHelper, ImpCheckInsertPos(aInsertPos, aImageMapSize, GetWorkArea()); InsertGraphic( aGraphic, mnAction, aInsertPos, NULL, pImageMap ); - bReturn = TRUE; + bReturn = sal_True; } } else if( ( !bLink || pPickObj ) && CHECK_FORMAT_TRANS( FORMAT_GDIMETAFILE ) ) @@ -1247,7 +1247,7 @@ BOOL View::InsertData( const TransferableDataHelper& rDataHelper, aInsertPos.Y() = pOwnData->GetStartPos().Y() + ( aSize.Height() >> 1 ); } - bReturn = InsertMetaFile( aDataHelper, aInsertPos, pImageMap, nFormat == 0 ? true : false ) ? TRUE : FALSE; + bReturn = InsertMetaFile( aDataHelper, aInsertPos, pImageMap, nFormat == 0 ? true : false ) ? sal_True : sal_False; } else if( ( !bLink || pPickObj ) && CHECK_FORMAT_TRANS( FORMAT_BITMAP ) ) { @@ -1278,7 +1278,7 @@ BOOL View::InsertData( const TransferableDataHelper& rDataHelper, ImpCheckInsertPos(aInsertPos, aImageMapSize, GetWorkArea()); InsertGraphic( aBmp, mnAction, aInsertPos, NULL, pImageMap ); - bReturn = TRUE; + bReturn = sal_True; } } else if( pPickObj && CHECK_FORMAT_TRANS( SOT_FORMATSTR_ID_XFA ) ) @@ -1308,9 +1308,9 @@ BOOL View::InsertData( const TransferableDataHelper& rDataHelper, Color aColor( rColItem.GetColorValue() ); String aName( rColItem.GetName() ); SfxItemSet aSet( mpDoc->GetPool() ); - BOOL bClosed = pPickObj->IsClosedObj(); + sal_Bool bClosed = pPickObj->IsClosedObj(); ::sd::Window* pWin = mpViewSh->GetActiveWindow(); - USHORT nHitLog = (USHORT) pWin->PixelToLogic( + sal_uInt16 nHitLog = (sal_uInt16) pWin->PixelToLogic( Size(FuPoor::HITPIX, 0 ) ).Width(); const long n2HitLog = nHitLog << 1; Point aHitPosR( rPos ); @@ -1373,8 +1373,8 @@ BOOL View::InsertData( const TransferableDataHelper& rDataHelper, if( aRect.IsInside( aPos ) || ( !bDrag && IsTextEdit() ) ) { // mba: clipboard always must contain absolute URLs (could be from alien source) - pOLV->Read( *xStm, String(), EE_FORMAT_BIN, FALSE, mpDocSh->GetHeaderAttributes() ); - bReturn = TRUE; + pOLV->Read( *xStm, String(), EE_FORMAT_BIN, sal_False, mpDocSh->GetHeaderAttributes() ); + bReturn = sal_True; } } @@ -1407,8 +1407,8 @@ BOOL View::InsertData( const TransferableDataHelper& rDataHelper, if( aRect.IsInside( aPos ) || ( !bDrag && IsTextEdit() ) ) { // mba: clipboard always must contain absolute URLs (could be from alien source) - pOLV->Read( *xStm, String(), EE_FORMAT_RTF, FALSE, mpDocSh->GetHeaderAttributes() ); - bReturn = TRUE; + pOLV->Read( *xStm, String(), EE_FORMAT_RTF, sal_False, mpDocSh->GetHeaderAttributes() ); + bReturn = sal_True; } } @@ -1426,13 +1426,13 @@ BOOL View::InsertData( const TransferableDataHelper& rDataHelper, { maDropFileVector.clear(); - for( ULONG i = 0, nCount = aDropFileList.Count(); i < nCount; i++ ) + for( sal_uLong i = 0, nCount = aDropFileList.Count(); i < nCount; i++ ) maDropFileVector.push_back( aDropFileList.GetFile( i ) ); maDropInsertFileTimer.Start(); } - bReturn = TRUE; + bReturn = sal_True; } else if( CHECK_FORMAT_TRANS( FORMAT_FILE ) ) { @@ -1445,7 +1445,7 @@ BOOL View::InsertData( const TransferableDataHelper& rDataHelper, maDropInsertFileTimer.Start(); } - bReturn = TRUE; + bReturn = sal_True; } else if( !bLink && CHECK_FORMAT_TRANS( FORMAT_STRING ) ) { @@ -1463,7 +1463,7 @@ BOOL View::InsertData( const TransferableDataHelper& rDataHelper, if( pOLV ) { pOLV->InsertText( aOUString ); - bReturn = TRUE; + bReturn = sal_True; } if( !bReturn ) @@ -1473,7 +1473,7 @@ BOOL View::InsertData( const TransferableDataHelper& rDataHelper, } MarkListHasChanged(); - mbIsDropAllowed = TRUE; + mbIsDropAllowed = sal_True; rDnDAction = mnAction; delete pImageMap; @@ -1482,7 +1482,7 @@ BOOL View::InsertData( const TransferableDataHelper& rDataHelper, extern void CreateTableFromRTF( SvStream& rStream, SdDrawDocument* pModel ); -bool View::PasteRTFTable( SotStorageStreamRef xStm, SdrPage* pPage, ULONG nPasteOptions ) +bool View::PasteRTFTable( SotStorageStreamRef xStm, SdrPage* pPage, sal_uLong nPasteOptions ) { SdDrawDocument* pModel = new SdDrawDocument( DOCUMENT_TYPE_IMPRESS, mpDocSh ); pModel->NewOrLoadCompleted(NEW_DOC); diff --git a/sd/source/ui/view/sdview4.cxx b/sd/source/ui/view/sdview4.cxx index 9932628c4f86..74719ce968d2 100755 --- a/sd/source/ui/view/sdview4.cxx +++ b/sd/source/ui/view/sdview4.cxx @@ -132,15 +132,15 @@ SdrGrafObj* View::InsertGraphic( const Graphic& rGraphic, sal_Int8& rAction, else { pNewGrafObj = new SdrGrafObj( rGraphic, pPickObj->GetLogicRect() ); - pNewGrafObj->SetEmptyPresObj(TRUE); + pNewGrafObj->SetEmptyPresObj(sal_True); } if ( pNewGrafObj->IsEmptyPresObj() ) { Rectangle aRect( pNewGrafObj->GetLogicRect() ); - pNewGrafObj->AdjustToMaxRect( aRect, FALSE ); + pNewGrafObj->AdjustToMaxRect( aRect, sal_False ); pNewGrafObj->SetOutlinerParaObject(NULL); - pNewGrafObj->SetEmptyPresObj(FALSE); + pNewGrafObj->SetEmptyPresObj(sal_False); } if (pPage && pPage->IsPresObj(pPickObj)) @@ -206,11 +206,11 @@ SdrGrafObj* View::InsertGraphic( const Graphic& rGraphic, sal_Int8& rAction, Size aPageSize( pPage->GetSize() ); aPageSize.Width() -= pPage->GetLftBorder() + pPage->GetRgtBorder(); aPageSize.Height() -= pPage->GetUppBorder() + pPage->GetLwrBorder(); - pNewGrafObj->AdjustToMaxRect( Rectangle( Point(), aPageSize ), TRUE ); -// pNewGrafObj->AdjustToMaxRect( Rectangle( pPV->GetOffset(), aPageSize ), TRUE ); + pNewGrafObj->AdjustToMaxRect( Rectangle( Point(), aPageSize ), sal_True ); +// pNewGrafObj->AdjustToMaxRect( Rectangle( pPV->GetOffset(), aPageSize ), sal_True ); - ULONG nOptions = SDRINSERT_SETDEFLAYER; - BOOL bIsPresTarget = FALSE; + sal_uLong nOptions = SDRINSERT_SETDEFLAYER; + sal_Bool bIsPresTarget = sal_False; if ((mpViewSh && mpViewSh->GetViewShell()!=NULL @@ -377,7 +377,7 @@ IMPL_LINK( View, DropInsertFileHdl, Timer*, EMPTYARG ) { String aCurrentDropFile( *aIter ); INetURLObject aURL( aCurrentDropFile ); - BOOL bOK = FALSE; + sal_Bool bOK = sal_False; if( aURL.GetProtocol() == INET_PROT_NOT_VALID ) { @@ -406,12 +406,12 @@ IMPL_LINK( View, DropInsertFileHdl, Timer*, EMPTYARG ) if( aIter == maDropFileVector.begin() ) mnAction = nTempAction; - bOK = TRUE; + bOK = sal_True; } if( !bOK ) { const SfxFilter* pFoundFilter = NULL; - SfxMedium aSfxMedium( aCurrentDropFile, STREAM_READ | STREAM_SHARE_DENYNONE, FALSE ); + SfxMedium aSfxMedium( aCurrentDropFile, STREAM_READ | STREAM_SHARE_DENYNONE, sal_False ); ErrCode nErr = SFX_APP()->GetFilterMatcher().GuessFilter( aSfxMedium, &pFoundFilter, SFX_FILTER_IMPORT, SFX_FILTER_NOTINSTALLED | SFX_FILTER_EXECUTABLE ); if( pFoundFilter && !nErr ) @@ -442,7 +442,7 @@ IMPL_LINK( View, DropInsertFileHdl, Timer*, EMPTYARG ) aReq.AppendItem( aItem1 ); aReq.AppendItem( aItem2 ); FuInsertFile::Create( mpViewSh, pWin, this, mpDoc, aReq ); - bOK = TRUE; + bOK = sal_True; } } } @@ -516,7 +516,7 @@ IMPL_LINK( View, DropInsertFileHdl, Timer*, EMPTYARG ) aRect = Rectangle( maDropPos, aSize ); SdrOle2Obj* pOleObj = new SdrOle2Obj( svt::EmbeddedObjectRef( xObj, nAspect ), aName, aRect ); - ULONG nOptions = SDRINSERT_SETDEFLAYER; + sal_uLong nOptions = SDRINSERT_SETDEFLAYER; if (mpViewSh != NULL) { @@ -574,7 +574,7 @@ IMPL_LINK( View, DropErrorHdl, Timer*, EMPTYARG ) |* \************************************************************************/ -void View::LockRedraw(BOOL bLock) +void View::LockRedraw(sal_Bool bLock) { if (bLock) { diff --git a/sd/source/ui/view/sdwindow.cxx b/sd/source/ui/view/sdwindow.cxx index ed5dda39037c..a9830295a9ec 100755 --- a/sd/source/ui/view/sdwindow.cxx +++ b/sd/source/ui/view/sdwindow.cxx @@ -102,7 +102,7 @@ Window::Window(::Window* pParent) SetUniqueId(HID_SD_WIN_DOCUMENT); // #i78183# Added after discussed with AF - EnableRTL(FALSE); + EnableRTL(sal_False); } /************************************************************************* @@ -166,13 +166,13 @@ void Window::CalcMinZoom() // area (also called application area) to completely fill the // window. Size aWinSize = PixelToLogic(GetOutputSizePixel()); - ULONG nX = (ULONG) ((double) aWinSize.Width() + sal_uLong nX = (sal_uLong) ((double) aWinSize.Width() * (double) ZOOM_MULTIPLICATOR / (double) maViewSize.Width()); - ULONG nY = (ULONG) ((double) aWinSize.Height() + sal_uLong nY = (sal_uLong) ((double) aWinSize.Height() * (double) ZOOM_MULTIPLICATOR / (double) maViewSize.Height()); // Decide whether to take the larger or the smaller factor. - ULONG nFact; + sal_uLong nFact; if (mbCalcMinZoomByMinSide) nFact = Min(nX, nY); else @@ -180,7 +180,7 @@ void Window::CalcMinZoom() // The factor is tansfomed according to the current zoom factor. nFact = nFact * nZoom / ZOOM_MULTIPLICATOR; - mnMinZoom = Max((USHORT) MIN_ZOOM, (USHORT) nFact); + mnMinZoom = Max((sal_uInt16) MIN_ZOOM, (sal_uInt16) nFact); } // If the current zoom factor is smaller than the calculated minimal // zoom factor then set the new minimal factor as the current zoom @@ -195,7 +195,7 @@ void Window::CalcMinZoom() void Window::SetMinZoom (long int nMin) { - mnMinZoom = (USHORT) nMin; + mnMinZoom = (sal_uInt16) nMin; } @@ -211,7 +211,7 @@ long Window::GetMinZoom (void) const void Window::SetMaxZoom (long int nMax) { - mnMaxZoom = (USHORT) nMax; + mnMaxZoom = (sal_uInt16) nMax; } @@ -353,7 +353,7 @@ void Window::Command(const CommandEvent& rCEvt) long Window::Notify( NotifyEvent& rNEvt ) { - long nResult = FALSE; + long nResult = sal_False; if ( mpViewShell ) { nResult = mpViewShell->Notify(rNEvt, this); @@ -518,25 +518,25 @@ long Window::GetZoomForRect( const Rectangle& rZoomRect ) // rectangle being fully visible (when translated accordingly) as // large as possible in the output area independently in both // coordinate directions . - ULONG nX(0L); - ULONG nY(0L); + sal_uLong nX(0L); + sal_uLong nY(0L); const Size aWinSize( PixelToLogic(GetOutputSizePixel()) ); if(rZoomRect.GetHeight()) { - nX = (ULONG) ((double) aWinSize.Height() + nX = (sal_uLong) ((double) aWinSize.Height() * (double) ZOOM_MULTIPLICATOR / (double) rZoomRect.GetHeight()); } if(rZoomRect.GetWidth()) { - nY = (ULONG) ((double) aWinSize.Width() + nY = (sal_uLong) ((double) aWinSize.Width() * (double) ZOOM_MULTIPLICATOR / (double) rZoomRect.GetWidth()); } // Use the smaller one of both so that the zoom rectangle will be // fully visible with respect to both coordinate directions. - ULONG nFact = Min(nX, nY); + sal_uLong nFact = Min(nX, nY); // Transform the current zoom factor so that it leads to the desired // scaling. @@ -592,24 +592,24 @@ long Window::SetZoomRect (const Rectangle& rZoomRect) // rectangle being fully visible (when translated accordingly) as // large as possible in the output area independently in both // coordinate directions . - ULONG nX(0L); - ULONG nY(0L); + sal_uLong nX(0L); + sal_uLong nY(0L); if(rZoomRect.GetHeight()) { - nX = (ULONG) ((double) aWinSize.Height() + nX = (sal_uLong) ((double) aWinSize.Height() * (double) ZOOM_MULTIPLICATOR / (double) rZoomRect.GetHeight()); } if(rZoomRect.GetWidth()) { - nY = (ULONG) ((double) aWinSize.Width() + nY = (sal_uLong) ((double) aWinSize.Width() * (double) ZOOM_MULTIPLICATOR / (double) rZoomRect.GetWidth()); } // Use the smaller one of both so that the zoom rectangle will be // fully visible with respect to both coordinate directions. - ULONG nFact = Min(nX, nY); + sal_uLong nFact = Min(nX, nY); // Transform the current zoom factor so that it leads to the desired // scaling. @@ -665,9 +665,9 @@ void Window::SetMinZoomAutoCalc (bool bAuto) |* \************************************************************************/ -void Window::UpdateMapOrigin(BOOL bInvalidate) +void Window::UpdateMapOrigin(sal_Bool bInvalidate) { - BOOL bChanged = FALSE; + sal_Bool bChanged = sal_False; Size aWinSize = PixelToLogic(GetOutputSizePixel()); if ( mbCenterAllowed ) @@ -675,22 +675,22 @@ void Window::UpdateMapOrigin(BOOL bInvalidate) if ( maWinPos.X() > maViewSize.Width() - aWinSize.Width() ) { maWinPos.X() = maViewSize.Width() - aWinSize.Width(); - bChanged = TRUE; + bChanged = sal_True; } if ( maWinPos.Y() > maViewSize.Height() - aWinSize.Height() ) { maWinPos.Y() = maViewSize.Height() - aWinSize.Height(); - bChanged = TRUE; + bChanged = sal_True; } if ( aWinSize.Width() > maViewSize.Width() || maWinPos.X() < 0 ) { maWinPos.X() = maViewSize.Width() / 2 - aWinSize.Width() / 2; - bChanged = TRUE; + bChanged = sal_True; } if ( aWinSize.Height() > maViewSize.Height() || maWinPos.Y() < 0 ) { maWinPos.Y() = maViewSize.Height() / 2 - aWinSize.Height() / 2; - bChanged = TRUE; + bChanged = sal_True; } } @@ -792,7 +792,7 @@ void Window::SetVisibleXY(double fX, double fY) maWinPos.X() = (long) (fX * maViewSize.Width()); if ( fY >= 0 ) maWinPos.Y() = (long) (fY * maViewSize.Height()); - UpdateMapOrigin(FALSE); + UpdateMapOrigin(sal_False); // Size sz(nOldX - aWinPos.X(), nOldY - aWinPos.Y()); // sz = LogicToPixel(sz); Scroll(nOldX - maWinPos.X(), nOldY - maWinPos.Y(), SCROLL_CHILDREN); @@ -950,8 +950,8 @@ void Window::DataChanged( const DataChangedEvent& rDCEvt ) { const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings(); SvtAccessibilityOptions aAccOptions; - ULONG nOutputMode; - USHORT nPreviewSlot; + sal_uLong nOutputMode; + sal_uInt16 nPreviewSlot; if( rStyleSettings.GetHighContrastMode() ) nOutputMode = ViewShell::OUTPUT_DRAWMODE_CONTRAST; @@ -1029,7 +1029,7 @@ void Window::DataChanged( const DataChangedEvent& rDCEvt ) { DrawDocShell* pDocSh = mpViewShell->GetDocSh(); if( pDocSh ) - pDocSh->SetPrinter( pDocSh->GetPrinter( TRUE ) ); + pDocSh->SetPrinter( pDocSh->GetPrinter( sal_True ) ); } } @@ -1046,7 +1046,7 @@ void Window::DataChanged( const DataChangedEvent& rDCEvt ) { DrawDocShell* pDocSh = mpViewShell->GetDocSh(); if( pDocSh ) - pDocSh->SetPrinter( pDocSh->GetPrinter( TRUE ) ); + pDocSh->SetPrinter( pDocSh->GetPrinter( sal_True ) ); } } diff --git a/sd/source/ui/view/tabcontr.cxx b/sd/source/ui/view/tabcontr.cxx index d9d074eee395..150e4287bfa4 100644..100755 --- a/sd/source/ui/view/tabcontr.cxx +++ b/sd/source/ui/view/tabcontr.cxx @@ -97,7 +97,7 @@ TabControl::TabControl(DrawViewShell* pViewSh, Window* pParent) : DragSourceHelper( this ), DropTargetHelper( this ), pDrViewSh(pViewSh), - bInternalMove(FALSE) + bInternalMove(sal_False) { EnableEditMode(); SetSizePixel(Size(0, 0)); @@ -138,7 +138,7 @@ void TabControl::MouseButtonDown(const MouseEvent& rMEvt) && !rMEvt.IsShift()) { Point aPos = PixelToLogic( rMEvt.GetPosPixel() ); - USHORT aPageId = GetPageId(aPos); + sal_uInt16 aPageId = GetPageId(aPos); if (aPageId == 0) { @@ -198,7 +198,7 @@ void TabControl::DoubleClick() void TabControl::StartDrag( sal_Int8, const Point& ) { - bInternalMove = TRUE; + bInternalMove = sal_True; // object is delete by reference mechanismn ( new TabControl::TabControlTransferable( *this ) )->StartDrag( this, DND_ACTION_COPYMOVE ); @@ -212,7 +212,7 @@ void TabControl::StartDrag( sal_Int8, const Point& ) void TabControl::DragFinished( sal_Int8 ) { - bInternalMove = FALSE; + bInternalMove = sal_False; } /************************************************************************* @@ -249,9 +249,9 @@ sal_Int8 TabControl::AcceptDrop( const AcceptDropEvent& rEvt ) sal_Int32 nPageId = GetPageId( aPos ) - 1; - if( ( nPageId >= 0 ) && pDoc->GetPage( (USHORT)nPageId ) ) + if( ( nPageId >= 0 ) && pDoc->GetPage( (sal_uInt16)nPageId ) ) { - nRet = pDrViewSh->AcceptDrop( rEvt, *this, NULL, (USHORT)nPageId, SDRLAYER_NOTFOUND ); + nRet = pDrViewSh->AcceptDrop( rEvt, *this, NULL, (sal_uInt16)nPageId, SDRLAYER_NOTFOUND ); SwitchPage( aPos ); } } @@ -274,7 +274,7 @@ sal_Int8 TabControl::ExecuteDrop( const ExecuteDropEvent& rEvt ) if( bInternalMove ) { - USHORT nPageId = ShowDropPos( aPos ) - 1; + sal_uInt16 nPageId = ShowDropPos( aPos ) - 1; switch (rEvt.mnAction) { @@ -297,21 +297,21 @@ sal_Int8 TabControl::ExecuteDrop( const ExecuteDropEvent& rEvt ) if (pDrViewSh->IsSwitchPageAllowed()) { // 1. Create a copy. - USHORT nPageNumOfCopy = pDoc->DuplicatePage (GetCurPageId() - 1); + sal_uInt16 nPageNumOfCopy = pDoc->DuplicatePage (GetCurPageId() - 1); // 2. Move page. For this first switch to the copy: // MovePages operates on the currently selected page(s). pDrViewSh->SwitchPage (nPageNumOfCopy); // Adapt target page id when necessary, i.e. page copy // has been inserted in front of the target page. - USHORT nPageNum = nPageId; - if ((nPageNumOfCopy <= nPageNum) && (nPageNum != (USHORT)-1)) + sal_uInt16 nPageNum = nPageId; + if ((nPageNumOfCopy <= nPageNum) && (nPageNum != (sal_uInt16)-1)) nPageNum += 1; if (pDoc->MovePages(nPageNum)) { // 3. Switch to the copy that has been moved to its // final destination. Use an asynchron slot call to // be executed after the still pending ones. - if (nPageNumOfCopy >= nPageNum || (nPageNum == (USHORT)-1)) + if (nPageNumOfCopy >= nPageNum || (nPageNum == (sal_uInt16)-1)) nPageNum += 1; SetCurPageId (GetPageId(nPageNum)); SfxDispatcher* pDispatcher = pDrViewSh->GetViewFrame()->GetDispatcher(); @@ -330,9 +330,9 @@ sal_Int8 TabControl::ExecuteDrop( const ExecuteDropEvent& rEvt ) { sal_Int32 nPageId = GetPageId( aPos ) - 1; - if( ( nPageId >= 0 ) && pDoc->GetPage( (USHORT)nPageId ) ) + if( ( nPageId >= 0 ) && pDoc->GetPage( (sal_uInt16)nPageId ) ) { - nRet = pDrViewSh->ExecuteDrop( rEvt, *this, NULL, (USHORT)nPageId, SDRLAYER_NOTFOUND ); + nRet = pDrViewSh->ExecuteDrop( rEvt, *this, NULL, (sal_uInt16)nPageId, SDRLAYER_NOTFOUND ); } } @@ -348,12 +348,12 @@ sal_Int8 TabControl::ExecuteDrop( const ExecuteDropEvent& rEvt ) void TabControl::Command(const CommandEvent& rCEvt) { - USHORT nCmd = rCEvt.GetCommand(); + sal_uInt16 nCmd = rCEvt.GetCommand(); if ( nCmd == COMMAND_CONTEXTMENU ) { - BOOL bGraphicShell = pDrViewSh->ISA(GraphicViewShell); - USHORT nResId = bGraphicShell ? RID_GRAPHIC_PAGETAB_POPUP : + sal_Bool bGraphicShell = pDrViewSh->ISA(GraphicViewShell); + sal_uInt16 nResId = bGraphicShell ? RID_GRAPHIC_PAGETAB_POPUP : RID_DRAW_PAGETAB_POPUP; SfxDispatcher* pDispatcher = pDrViewSh->GetViewFrame()->GetDispatcher(); pDispatcher->ExecutePopup( SdResId( nResId ) ); @@ -366,11 +366,11 @@ void TabControl::Command(const CommandEvent& rCEvt) long TabControl::StartRenaming() { - BOOL bOK = FALSE; + sal_Bool bOK = sal_False; if (pDrViewSh->GetPageKind() == PK_STANDARD) { - bOK = TRUE; + bOK = sal_True; ::sd::View* pView = pDrViewSh->GetView(); @@ -387,7 +387,7 @@ long TabControl::StartRenaming() long TabControl::AllowRenaming() { - BOOL bOK = TRUE; + sal_Bool bOK = sal_True; String aNewName( GetEditText() ); String aCompareName( GetPageText( GetEditPageId() ) ); @@ -402,7 +402,7 @@ long TabControl::AllowRenaming() } else { - bOK = FALSE; + bOK = sal_False; } } return( bOK ); diff --git a/sd/source/ui/view/unmodpg.cxx b/sd/source/ui/view/unmodpg.cxx index 66e5c7a506e5..f88799118577 100755 --- a/sd/source/ui/view/unmodpg.cxx +++ b/sd/source/ui/view/unmodpg.cxx @@ -60,8 +60,8 @@ ModifyPageUndoAction::ModifyPageUndoAction( SdPage* pThePage, String aTheNewName, AutoLayout eTheNewAutoLayout, - BOOL bTheNewBckgrndVisible, - BOOL bTheNewBckgrndObjsVisible) + sal_Bool bTheNewBckgrndVisible, + sal_Bool bTheNewBckgrndObjsVisible) : SdUndoAction(pTheDoc) { DBG_ASSERT(pThePage, "Undo ohne Seite ???"); @@ -78,8 +78,8 @@ ModifyPageUndoAction::ModifyPageUndoAction( { maOldName = mpPage->GetName(); SdrLayerAdmin& rLayerAdmin = mpDoc->GetLayerAdmin(); - BYTE aBckgrnd = rLayerAdmin.GetLayerID(String(SdResId(STR_LAYER_BCKGRND)), FALSE); - BYTE aBckgrndObj = rLayerAdmin.GetLayerID(String(SdResId(STR_LAYER_BCKGRNDOBJ)), FALSE); + sal_uInt8 aBckgrnd = rLayerAdmin.GetLayerID(String(SdResId(STR_LAYER_BCKGRND)), sal_False); + sal_uInt8 aBckgrndObj = rLayerAdmin.GetLayerID(String(SdResId(STR_LAYER_BCKGRNDOBJ)), sal_False); SetOfByte aVisibleLayers = mpPage->TRG_GetMasterPageVisibleLayers(); mbOldBckgrndVisible = aVisibleLayers.IsSet(aBckgrnd); @@ -126,8 +126,8 @@ void ModifyPageUndoAction::Undo() } SdrLayerAdmin& rLayerAdmin = mpDoc->GetLayerAdmin(); - BYTE aBckgrnd = rLayerAdmin.GetLayerID(String(SdResId(STR_LAYER_BCKGRND)), FALSE); - BYTE aBckgrndObj = rLayerAdmin.GetLayerID(String(SdResId(STR_LAYER_BCKGRNDOBJ)), FALSE); + sal_uInt8 aBckgrnd = rLayerAdmin.GetLayerID(String(SdResId(STR_LAYER_BCKGRND)), sal_False); + sal_uInt8 aBckgrndObj = rLayerAdmin.GetLayerID(String(SdResId(STR_LAYER_BCKGRNDOBJ)), sal_False); SetOfByte aVisibleLayers; aVisibleLayers.Set(aBckgrnd, mbOldBckgrndVisible); aVisibleLayers.Set(aBckgrndObj, mbOldBckgrndObjsVisible); @@ -175,8 +175,8 @@ void ModifyPageUndoAction::Redo() } SdrLayerAdmin& rLayerAdmin = mpDoc->GetLayerAdmin(); - BYTE aBckgrnd = rLayerAdmin.GetLayerID(String(SdResId(STR_LAYER_BCKGRND)), FALSE); - BYTE aBckgrndObj = rLayerAdmin.GetLayerID(String(SdResId(STR_LAYER_BCKGRNDOBJ)), FALSE); + sal_uInt8 aBckgrnd = rLayerAdmin.GetLayerID(String(SdResId(STR_LAYER_BCKGRND)), sal_False); + sal_uInt8 aBckgrndObj = rLayerAdmin.GetLayerID(String(SdResId(STR_LAYER_BCKGRNDOBJ)), sal_False); SetOfByte aVisibleLayers; aVisibleLayers.Set(aBckgrnd, mbNewBckgrndVisible); aVisibleLayers.Set(aBckgrndObj, mbNewBckgrndObjsVisible); @@ -217,8 +217,8 @@ RenameLayoutTemplateUndoAction::RenameLayoutTemplateUndoAction( SdDrawDocument* , maNewName( rNewLayoutName ) , maComment(SdResId(STR_TITLE_RENAMESLIDE)) { - USHORT nPos = maOldName.SearchAscii( SD_LT_SEPARATOR ); - if( nPos != (USHORT)-1 ) + sal_uInt16 nPos = maOldName.SearchAscii( SD_LT_SEPARATOR ); + if( nPos != (sal_uInt16)-1 ) maOldName.Erase(nPos); } diff --git a/sd/source/ui/view/viewoverlaymanager.cxx b/sd/source/ui/view/viewoverlaymanager.cxx index c1e1d9634844..b35eb25d45b6 100755 --- a/sd/source/ui/view/viewoverlaymanager.cxx +++ b/sd/source/ui/view/viewoverlaymanager.cxx @@ -80,12 +80,12 @@ class ImageButtonHdl; // -------------------------------------------------------------------- -static USHORT gButtonSlots[] = { SID_INSERT_TABLE, SID_INSERT_DIAGRAM, SID_INSERT_GRAPHIC, SID_INSERT_AVMEDIA }; -static USHORT gButtonToolTips[] = { STR_INSERT_TABLE, STR_INSERT_CHART, STR_INSERT_PICTURE, STR_INSERT_MOVIE }; +static sal_uInt16 gButtonSlots[] = { SID_INSERT_TABLE, SID_INSERT_DIAGRAM, SID_INSERT_GRAPHIC, SID_INSERT_AVMEDIA }; +static sal_uInt16 gButtonToolTips[] = { STR_INSERT_TABLE, STR_INSERT_CHART, STR_INSERT_PICTURE, STR_INSERT_MOVIE }; // -------------------------------------------------------------------- -static BitmapEx loadImageResource( USHORT nId ) +static BitmapEx loadImageResource( sal_uInt16 nId ) { SdResId aResId( nId ); aResId.SetRT( RSC_BITMAP ); @@ -152,10 +152,10 @@ private: class ImageButtonHdl : public SmartHdl { public: - ImageButtonHdl( const SmartTagReference& xTag, /* USHORT nSID, const Image& rImage, const Image& rImageMO, */ const Point& rPnt ); + ImageButtonHdl( const SmartTagReference& xTag, /* sal_uInt16 nSID, const Image& rImage, const Image& rImageMO, */ const Point& rPnt ); virtual ~ImageButtonHdl(); virtual void CreateB2dIAObject(); - virtual BOOL IsFocusHdl() const; + virtual sal_Bool IsFocusHdl() const; virtual Pointer GetPointer() const; virtual bool isMarkable() const; @@ -171,12 +171,12 @@ private: int mnHighlightId; Size maImageSize; - ULONG mnTip; + sal_uLong mnTip; }; // -------------------------------------------------------------------- -ImageButtonHdl::ImageButtonHdl( const SmartTagReference& xTag /*, USHORT nSID, const Image& rImage, const Image& rImageMO*/, const Point& rPnt ) +ImageButtonHdl::ImageButtonHdl( const SmartTagReference& xTag /*, sal_uInt16 nSID, const Image& rImage, const Image& rImageMO*/, const Point& rPnt ) : SmartHdl( xTag, rPnt ) , mxTag( dynamic_cast< ChangePlaceholderTag* >( xTag.get() ) ) , mnHighlightId( -1 ) @@ -298,7 +298,7 @@ void ImageButtonHdl::CreateB2dIAObject() // -------------------------------------------------------------------- -BOOL ImageButtonHdl::IsFocusHdl() const +sal_Bool ImageButtonHdl::IsFocusHdl() const { return false; } @@ -340,7 +340,7 @@ bool ChangePlaceholderTag::MouseButtonDown( const MouseEvent& /*rMEvt*/, SmartHd int nHighlightId = static_cast< ImageButtonHdl& >(rHdl).getHighlightId(); if( nHighlightId >= 0 ) { - USHORT nSID = gButtonSlots[nHighlightId]; + sal_uInt16 nSID = gButtonSlots[nHighlightId]; if( mxPlaceholderObj.get() ) { @@ -349,7 +349,7 @@ bool ChangePlaceholderTag::MouseButtonDown( const MouseEvent& /*rMEvt*/, SmartHd { SdrPageView* pPV = mrView.GetSdrPageView(); mrView.UnmarkAllObj(pPV ); - mrView.MarkObj(mxPlaceholderObj.get(), pPV, FALSE); + mrView.MarkObj(mxPlaceholderObj.get(), pPV, sal_False); } } @@ -363,7 +363,7 @@ bool ChangePlaceholderTag::MouseButtonDown( const MouseEvent& /*rMEvt*/, SmartHd /** returns true if the SmartTag consumes this event. */ bool ChangePlaceholderTag::KeyInput( const KeyEvent& rKEvt ) { - USHORT nCode = rKEvt.GetKeyCode().GetCode(); + sal_uInt16 nCode = rKEvt.GetKeyCode().GetCode(); switch( nCode ) { case KEY_DOWN: @@ -407,7 +407,7 @@ BitmapEx ChangePlaceholderTag::createOverlayImage( int nHighlight ) const Rectangle aRectSrc( Point( 0, 0 ), aSize ); aRet = *(getButtonImage((nHighlight == 0) ? 4 : 0, bLarge)); - aRet.Expand( aSize.Width(), aSize.Height(), NULL, TRUE ); + aRet.Expand( aSize.Width(), aSize.Height(), NULL, sal_True ); aRet.CopyPixel( Rectangle( Point( aSize.Width(), 0 ), aSize ), aRectSrc, getButtonImage((nHighlight == 1) ? 5 : 1, bLarge) ); aRet.CopyPixel( Rectangle( Point( 0, aSize.Height() ), aSize ), aRectSrc, getButtonImage((nHighlight == 2) ? 6 : 2, bLarge) ); diff --git a/sd/source/ui/view/viewshe2.cxx b/sd/source/ui/view/viewshe2.cxx index 616516782be3..637e3ac1793d 100755 --- a/sd/source/ui/view/viewshe2.cxx +++ b/sd/source/ui/view/viewshe2.cxx @@ -127,8 +127,8 @@ void ViewShell::UpdateScrollBars() if(IsPageFlipMode()) // ie in zoom mode where no panning { SdPage* pPage = static_cast<DrawViewShell*>(this)->GetActualPage(); - USHORT nCurPage = (pPage->GetPageNum() - 1) / 2; - USHORT nTotalPages = GetDoc()->GetSdPageCount(pPage->GetPageKind()); + sal_uInt16 nCurPage = (pPage->GetPageNum() - 1) / 2; + sal_uInt16 nTotalPages = GetDoc()->GetSdPageCount(pPage->GetPageKind()); mpVerticalScrollBar->SetRange(Range(0,256*nTotalPages)); mpVerticalScrollBar->SetVisibleSize(256); mpVerticalScrollBar->SetThumbPos(256*nCurPage); @@ -241,8 +241,8 @@ long ViewShell::VirtVScrollHdl(ScrollBar* pVScroll) if(IsPageFlipMode()) { SdPage* pPage = static_cast<DrawViewShell*>(this)->GetActualPage(); - USHORT nCurPage = (pPage->GetPageNum() - 1) >> 1; - USHORT nNewPage = (USHORT)pVScroll->GetThumbPos()/256; + sal_uInt16 nCurPage = (pPage->GetPageNum() - 1) >> 1; + sal_uInt16 nNewPage = (sal_uInt16)pVScroll->GetThumbPos()/256; if( nCurPage != nNewPage ) static_cast<DrawViewShell*>(this)->SwitchPage(nNewPage); } @@ -286,7 +286,7 @@ long ViewShell::VirtVScrollHdl(ScrollBar* pVScroll) return 0; } -SvxRuler* ViewShell::CreateHRuler(::sd::Window* , BOOL ) +SvxRuler* ViewShell::CreateHRuler(::sd::Window* , sal_Bool ) { return NULL; } @@ -472,7 +472,7 @@ void ViewShell::SetZoomRect(const Rectangle& rZoomRect) \************************************************************************/ void ViewShell::InitWindows(const Point& rViewOrigin, const Size& rViewSize, - const Point& rWinPos, BOOL bUpdate) + const Point& rWinPos, sal_Bool bUpdate) { if (mpContentWindow.get() != NULL) { @@ -534,9 +534,9 @@ void ViewShell::DrawMarkRect(const Rectangle& rRect) const void ViewShell::SetPageSizeAndBorder(PageKind ePageKind, const Size& rNewSize, long nLeft, long nRight, - long nUpper, long nLower, BOOL bScaleAll, - Orientation eOrientation, USHORT nPaperBin, - BOOL bBackgroundFullSize) + long nUpper, long nLower, sal_Bool bScaleAll, + Orientation eOrientation, sal_uInt16 nPaperBin, + sal_Bool bBackgroundFullSize) { SdPage* pPage = 0; SdUndoGroup* pUndoGroup = NULL; @@ -546,7 +546,7 @@ void ViewShell::SetPageSizeAndBorder(PageKind ePageKind, const Size& rNewSize, SfxViewShell* pViewShell = GetViewShell(); OSL_ASSERT (pViewShell!=NULL); - USHORT i, nPageCnt = GetDoc()->GetMasterSdPageCount(ePageKind); + sal_uInt16 i, nPageCnt = GetDoc()->GetMasterSdPageCount(ePageKind); Broadcast (ViewShellHint(ViewShellHint::HINT_PAGE_RESIZE_START)); @@ -655,7 +655,7 @@ void ViewShell::SetPageSizeAndBorder(PageKind ePageKind, const Size& rNewSize, // Handoutseite an neues Format der Standardseiten anpassen if( (ePageKind == PK_STANDARD) || (ePageKind == PK_HANDOUT) ) - GetDoc()->GetSdPage(0, PK_HANDOUT)->CreateTitleAndLayout(TRUE); + GetDoc()->GetSdPage(0, PK_HANDOUT)->CreateTitleAndLayout(sal_True); // Undo Gruppe dem Undo Manager uebergeben pViewShell->GetViewFrame()->GetObjectShell() @@ -667,7 +667,7 @@ void ViewShell::SetPageSizeAndBorder(PageKind ePageKind, const Size& rNewSize, Point aPageOrg = Point(nWidth, nHeight / 2); Size aViewSize = Size(nWidth * 3, nHeight * 2); - InitWindows(aPageOrg, aViewSize, Point(-1, -1), TRUE); + InitWindows(aPageOrg, aViewSize, Point(-1, -1), sal_True); Point aVisAreaPos; @@ -761,9 +761,9 @@ void ViewShell::SetActiveWindow (::sd::Window* pWin) |* \************************************************************************/ -BOOL ViewShell::RequestHelp(const HelpEvent& rHEvt, ::sd::Window*) +sal_Bool ViewShell::RequestHelp(const HelpEvent& rHEvt, ::sd::Window*) { - BOOL bReturn = FALSE; + sal_Bool bReturn = sal_False; if (rHEvt.GetMode()) { @@ -827,13 +827,13 @@ void ViewShell::WriteFrameViewData() |* \************************************************************************/ -BOOL ViewShell::ActivateObject(SdrOle2Obj* pObj, long nVerb) +sal_Bool ViewShell::ActivateObject(SdrOle2Obj* pObj, long nVerb) { ErrCode aErrCode = 0; SfxErrorContext aEC(ERRCTX_SO_DOVERB, GetActiveWindow(), RID_SO_ERRCTX); - BOOL bAbort = FALSE; - GetDocSh()->SetWaitCursor( TRUE ); + sal_Bool bAbort = sal_False; + GetDocSh()->SetWaitCursor( sal_True ); SfxViewShell* pViewShell = GetViewShell(); OSL_ASSERT (pViewShell!=NULL); bool bChangeDefaultsForChart = false; @@ -875,16 +875,16 @@ BOOL ViewShell::ActivateObject(SdrOle2Obj* pObj, long nVerb) aName = String(); // Dialog "OLE-Objekt einfuegen" aufrufen - GetDocSh()->SetWaitCursor( FALSE ); + GetDocSh()->SetWaitCursor( sal_False ); pViewShell->GetViewFrame()->GetDispatcher()->Execute( SID_INSERT_OBJECT, SFX_CALLMODE_SYNCHRON | SFX_CALLMODE_RECORD); xObj = pObj->GetObjRef(); - GetDocSh()->SetWaitCursor( TRUE ); + GetDocSh()->SetWaitCursor( sal_True ); if (!xObj.is()) { - bAbort = TRUE; + bAbort = sal_True; } } @@ -893,7 +893,7 @@ BOOL ViewShell::ActivateObject(SdrOle2Obj* pObj, long nVerb) /****************************************************** * OLE-Objekt ist nicht mehr leer ******************************************************/ - pObj->SetEmptyPresObj(FALSE); + pObj->SetEmptyPresObj(sal_False); pObj->SetOutlinerParaObject(NULL); pObj->SetGraphic(NULL); @@ -976,10 +976,10 @@ BOOL ViewShell::ActivateObject(SdrOle2Obj* pObj, long nVerb) pSdClient->DoVerb(nVerb); // ErrCode wird ggf. vom Sfx ausgegeben pViewShell->GetViewFrame()->GetBindings().Invalidate( - SID_NAVIGATOR_STATE, TRUE, FALSE); + SID_NAVIGATOR_STATE, sal_True, sal_False); } - GetDocSh()->SetWaitCursor( FALSE ); + GetDocSh()->SetWaitCursor( sal_False ); if (aErrCode != 0 && !bAbort) { @@ -1033,7 +1033,7 @@ void ViewShell::WriteUserData(String&) |* \************************************************************************/ -void ViewShell::SetRuler(BOOL bRuler) +void ViewShell::SetRuler(sal_Bool bRuler) { mbHasRulers = ( bRuler && !GetDocSh()->IsPreview() ); // no rulers on preview mode @@ -1076,8 +1076,8 @@ sal_Int8 ViewShell::AcceptDrop ( const AcceptDropEvent& rEvt, DropTargetHelper& rTargetHelper, ::sd::Window* pTargetWindow, - USHORT nPage, - USHORT nLayer) + sal_uInt16 nPage, + sal_uInt16 nLayer) { ::sd::View* pView = GetView(); return( pView ? pView->AcceptDrop( rEvt, rTargetHelper, pTargetWindow, nPage, nLayer ) : DND_ACTION_NONE ); @@ -1093,8 +1093,8 @@ sal_Int8 ViewShell::ExecuteDrop ( const ExecuteDropEvent& rEvt, DropTargetHelper& rTargetHelper, ::sd::Window* pTargetWindow, - USHORT nPage, - USHORT nLayer) + sal_uInt16 nPage, + sal_uInt16 nLayer) { ::sd::View* pView = GetView(); return( pView ? pView->ExecuteDrop( rEvt, rTargetHelper, pTargetWindow, nPage, nLayer ) : DND_ACTION_NONE ); diff --git a/sd/source/ui/view/viewshe3.cxx b/sd/source/ui/view/viewshe3.cxx index ab4b9e6732f5..384fe3fc6b10 100644 --- a/sd/source/ui/view/viewshe3.cxx +++ b/sd/source/ui/view/viewshe3.cxx @@ -107,7 +107,7 @@ void ViewShell::GetMenuState( SfxItemSet &rSet ) { if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_STYLE_FAMILY ) ) { - UINT16 nFamily = (UINT16)GetDocSh()->GetStyleFamily(); + sal_uInt16 nFamily = (sal_uInt16)GetDocSh()->GetStyleFamily(); SdrView* pDrView = GetDrawView(); @@ -152,13 +152,13 @@ void ViewShell::GetMenuState( SfxItemSet &rSet ) if(SFX_ITEM_AVAILABLE == rSet.GetItemState(SID_UNDO)) { ::svl::IUndoManager* pUndoManager = ImpGetUndoManager(); - sal_Bool bActivate(FALSE); + sal_Bool bActivate(sal_False); if(pUndoManager) { if(pUndoManager->GetUndoActionCount() != 0) { - bActivate = TRUE; + bActivate = sal_True; } } @@ -180,13 +180,13 @@ void ViewShell::GetMenuState( SfxItemSet &rSet ) if(SFX_ITEM_AVAILABLE == rSet.GetItemState(SID_REDO)) { ::svl::IUndoManager* pUndoManager = ImpGetUndoManager(); - sal_Bool bActivate(FALSE); + sal_Bool bActivate(sal_False); if(pUndoManager) { if(pUndoManager->GetRedoActionCount() != 0) { - bActivate = TRUE; + bActivate = sal_True; } } @@ -219,11 +219,11 @@ SdPage* ViewShell::CreateOrDuplicatePage ( SdPage* pPage, const sal_Int32 nInsertPosition) { - USHORT nSId = rRequest.GetSlot(); + sal_uInt16 nSId = rRequest.GetSlot(); SdDrawDocument* pDocument = GetDoc(); SdrLayerAdmin& rLayerAdmin = pDocument->GetLayerAdmin(); - BYTE aBckgrnd = rLayerAdmin.GetLayerID(String(SdResId(STR_LAYER_BCKGRND)), FALSE); - BYTE aBckgrndObj = rLayerAdmin.GetLayerID(String(SdResId(STR_LAYER_BCKGRNDOBJ)), FALSE); + sal_uInt8 aBckgrnd = rLayerAdmin.GetLayerID(String(SdResId(STR_LAYER_BCKGRND)), sal_False); + sal_uInt8 aBckgrndObj = rLayerAdmin.GetLayerID(String(SdResId(STR_LAYER_BCKGRNDOBJ)), sal_False); SetOfByte aVisibleLayers; // Determine the page from which to copy some values, such as layers, // size, master page, to the new page. This is usually the given page. @@ -241,8 +241,8 @@ SdPage* ViewShell::CreateOrDuplicatePage ( String aNotesPageName; AutoLayout eStandardLayout (AUTOLAYOUT_NONE); AutoLayout eNotesLayout (AUTOLAYOUT_NOTES); - BOOL bIsPageBack = aVisibleLayers.IsSet(aBckgrnd); - BOOL bIsPageObj = aVisibleLayers.IsSet(aBckgrndObj); + sal_Bool bIsPageBack = aVisibleLayers.IsSet(aBckgrnd); + sal_Bool bIsPageObj = aVisibleLayers.IsSet(aBckgrndObj); // 1. Process the arguments. const SfxItemSet* pArgs = rRequest.GetArgs(); @@ -279,7 +279,7 @@ SdPage* ViewShell::CreateOrDuplicatePage ( else if (pArgs->Count() == 1) { pDocument->StopWorkStartupDelay(); - SFX_REQUEST_ARG (rRequest, pLayout, SfxUInt32Item, ID_VAL_WHATLAYOUT, FALSE); + SFX_REQUEST_ARG (rRequest, pLayout, SfxUInt32Item, ID_VAL_WHATLAYOUT, sal_False); if( pLayout ) { if (ePageKind == PK_NOTES) @@ -297,10 +297,10 @@ SdPage* ViewShell::CreateOrDuplicatePage ( // AutoLayouts muessen fertig sein pDocument->StopWorkStartupDelay(); - SFX_REQUEST_ARG (rRequest, pPageName, SfxStringItem, ID_VAL_PAGENAME, FALSE); - SFX_REQUEST_ARG (rRequest, pLayout, SfxUInt32Item, ID_VAL_WHATLAYOUT, FALSE); - SFX_REQUEST_ARG (rRequest, pIsPageBack, SfxBoolItem, ID_VAL_ISPAGEBACK, FALSE); - SFX_REQUEST_ARG (rRequest, pIsPageObj, SfxBoolItem, ID_VAL_ISPAGEOBJ, FALSE); + SFX_REQUEST_ARG (rRequest, pPageName, SfxStringItem, ID_VAL_PAGENAME, sal_False); + SFX_REQUEST_ARG (rRequest, pLayout, SfxUInt32Item, ID_VAL_WHATLAYOUT, sal_False); + SFX_REQUEST_ARG (rRequest, pIsPageBack, SfxBoolItem, ID_VAL_ISPAGEBACK, sal_False); + SFX_REQUEST_ARG (rRequest, pIsPageObj, SfxBoolItem, ID_VAL_ISPAGEOBJ, sal_False); if (CHECK_RANGE (AUTOLAYOUT__START, (AutoLayout) pLayout->GetValue (), AUTOLAYOUT__END)) { @@ -348,7 +348,7 @@ SdPage* ViewShell::CreateOrDuplicatePage ( if( bUndo ) pDrView->BegUndo( String( SdResId(STR_INSERTPAGE) ) ); - USHORT nNewPageIndex = 0xffff; + sal_uInt16 nNewPageIndex = 0xffff; switch (nSId) { case SID_INSERTPAGE: @@ -382,8 +382,8 @@ SdPage* ViewShell::CreateOrDuplicatePage ( bIsPageObj, nInsertPosition); // Select exactly the new page. - USHORT nPageCount (pDocument->GetSdPageCount(ePageKind)); - for (USHORT i=0; i<nPageCount; i++) + sal_uInt16 nPageCount (pDocument->GetSdPageCount(ePageKind)); + for (sal_uInt16 i=0; i<nPageCount; i++) { pDocument->GetSdPage(i, PK_STANDARD)->SetSelected( i == nNewPageIndex); @@ -391,7 +391,7 @@ SdPage* ViewShell::CreateOrDuplicatePage ( i == nNewPageIndex); } // Move the selected page to the head of the document - pDocument->MovePages ((USHORT)-1); + pDocument->MovePages ((sal_uInt16)-1); nNewPageIndex = 0; } else diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx index 7f142ded077e..62ea8a71407e 100755 --- a/sd/source/ui/view/viewshel.cxx +++ b/sd/source/ui/view/viewshel.cxx @@ -137,7 +137,7 @@ namespace sd { static const int DELTA_ZOOM = 10; -BOOL ViewShell::IsPageFlipMode(void) const +sal_Bool ViewShell::IsPageFlipMode(void) const { return this->ISA(DrawViewShell) && mpContentWindow.get() != NULL && mpContentWindow->GetVisibleHeight() >= 1.0; @@ -203,7 +203,7 @@ void ViewShell::construct(void) mpView = 0; mpFrameView = 0; mpZoomList = 0; - mbStartShowWithDialog = FALSE; + mbStartShowWithDialog = sal_False; mnPrintedHandoutPageNum = 1; mnPrintedHandoutPageCount = 0; mpWindowUpdater.reset( new ::sd::WindowUpdater() ); @@ -236,7 +236,7 @@ void ViewShell::construct(void) { // Create scroll bars and the filler between the scroll bars. mpHorizontalScrollBar.reset (new ScrollBar(GetParentWindow(), WinBits(WB_HSCROLL | WB_DRAG))); - mpHorizontalScrollBar->EnableRTL (FALSE); + mpHorizontalScrollBar->EnableRTL (sal_False); mpHorizontalScrollBar->SetRange(Range(0, 32000)); mpHorizontalScrollBar->SetScrollHdl(LINK(this, ViewShell, HScrollHdl)); mpHorizontalScrollBar->Show(); @@ -256,7 +256,7 @@ void ViewShell::construct(void) String aName( RTL_CONSTASCII_USTRINGPARAM( "ViewShell" )); SetName (aName); - GetDoc()->StartOnlineSpelling(FALSE); + GetDoc()->StartOnlineSpelling(sal_False); mpWindowUpdater->SetViewShell (*this); mpWindowUpdater->SetDocument (GetDoc()); @@ -299,7 +299,7 @@ void ViewShell::Exit (void) pView->UnmarkAll(); } - Deactivate (TRUE); + Deactivate (sal_True); if (IsMainViewShell()) { @@ -318,7 +318,7 @@ void ViewShell::Exit (void) |* \************************************************************************/ -void ViewShell::Activate(BOOL bIsMDIActivate) +void ViewShell::Activate(sal_Bool bIsMDIActivate) { SfxShell::Activate(bIsMDIActivate); @@ -329,14 +329,14 @@ void ViewShell::Activate(BOOL bIsMDIActivate) //GetViewFrame()->GetWindow().GrabFocus(); if (mpHorizontalRuler.get() != NULL) - mpHorizontalRuler->SetActive(TRUE); + mpHorizontalRuler->SetActive(sal_True); if (mpVerticalRuler.get() != NULL) - mpVerticalRuler->SetActive(TRUE); + mpVerticalRuler->SetActive(sal_True); if (bIsMDIActivate) { // Damit der Navigator auch einen aktuellen Status bekommt - SfxBoolItem aItem( SID_NAVIGATOR_INIT, TRUE ); + SfxBoolItem aItem( SID_NAVIGATOR_INIT, sal_True ); if (GetDispatcher() != NULL) GetDispatcher()->Execute( SID_NAVIGATOR_INIT, @@ -347,7 +347,7 @@ void ViewShell::Activate(BOOL bIsMDIActivate) SfxViewShell* pViewShell = GetViewShell(); OSL_ASSERT (pViewShell!=NULL); SfxBindings& rBindings = pViewShell->GetViewFrame()->GetBindings(); - rBindings.Invalidate( SID_3D_STATE, TRUE, FALSE ); + rBindings.Invalidate( SID_3D_STATE, sal_True, sal_False ); rtl::Reference< SlideShow > xSlideShow( SlideShow::GetSlideShow( GetViewShellBase() ) ); if(xSlideShow.is() && xSlideShow->isRunning() ) @@ -360,7 +360,7 @@ void ViewShell::Activate(BOOL bIsMDIActivate) } if(!GetDocSh()->IsUIActive()) - UpdatePreview( GetActualPage(), TRUE ); + UpdatePreview( GetActualPage(), sal_True ); //HMH::sd::View* pView = GetView(); @@ -398,7 +398,7 @@ void ViewShell::UIDeactivated( SfxInPlaceClient* ) |* \************************************************************************/ -void ViewShell::Deactivate(BOOL bIsMDIActivate) +void ViewShell::Deactivate(sal_Bool bIsMDIActivate) { // remove view from a still active drag'n'drop session SdTransferable* pDragTransferable = SD_MOD()->pTransferDrag; @@ -428,9 +428,9 @@ void ViewShell::Deactivate(BOOL bIsMDIActivate) } if (mpHorizontalRuler.get() != NULL) - mpHorizontalRuler->SetActive(FALSE); + mpHorizontalRuler->SetActive(sal_False); if (mpVerticalRuler.get() != NULL) - mpVerticalRuler->SetActive(FALSE); + mpVerticalRuler->SetActive(sal_False); SfxShell::Deactivate(bIsMDIActivate); } @@ -452,9 +452,9 @@ void ViewShell::Shutdown (void) |* \************************************************************************/ -BOOL ViewShell::KeyInput(const KeyEvent& rKEvt, ::sd::Window* pWin) +sal_Bool ViewShell::KeyInput(const KeyEvent& rKEvt, ::sd::Window* pWin) { - BOOL bReturn(FALSE); + sal_Bool bReturn(sal_False); if(pWin) { @@ -467,7 +467,7 @@ BOOL ViewShell::KeyInput(const KeyEvent& rKEvt, ::sd::Window* pWin) // give key input first to SfxViewShell to give CTRL+Key // (e.g. CTRL+SHIFT+'+', to front) priority. OSL_ASSERT (GetViewShell()!=NULL); - bReturn = (BOOL)GetViewShell()->KeyInput(rKEvt); + bReturn = (sal_Bool)GetViewShell()->KeyInput(rKEvt); } if(!bReturn) @@ -494,7 +494,7 @@ BOOL ViewShell::KeyInput(const KeyEvent& rKEvt, ::sd::Window* pWin) } else { - bReturn = TRUE; + bReturn = sal_True; } } } @@ -508,7 +508,7 @@ BOOL ViewShell::KeyInput(const KeyEvent& rKEvt, ::sd::Window* pWin) && aKeyCode.GetCode() == KEY_R) { InvalidateWindows(); - bReturn = TRUE; + bReturn = sal_True; } } @@ -645,7 +645,7 @@ void ViewShell::MouseButtonUp(const MouseEvent& rMEvt, ::sd::Window* pWin) void ViewShell::Command(const CommandEvent& rCEvt, ::sd::Window* pWin) { - BOOL bDone = HandleScrollCommand (rCEvt, pWin); + sal_Bool bDone = HandleScrollCommand (rCEvt, pWin); if( !bDone ) { @@ -674,7 +674,7 @@ void ViewShell::Command(const CommandEvent& rCEvt, ::sd::Window* pWin) long ViewShell::Notify(NotifyEvent& rNEvt, ::sd::Window* pWin) { // handle scroll commands when they arrived at child windows - long nRet = FALSE; + long nRet = sal_False; if( rNEvt.GetType() == EVENT_COMMAND ) { // note: dynamic_cast is not possible as GetData() returns a void* @@ -744,7 +744,7 @@ bool ViewShell::HandleScrollCommand(const CommandEvent& rCEvt, ::sd::Window* pWi { if( mpContentWindow.get() == pWin ) { - ULONG nScrollLines = pData->GetScrollLines(); + sal_uLong nScrollLines = pData->GetScrollLines(); if(IsPageFlipMode()) nScrollLines = COMMAND_WHEEL_PAGESCROLL; CommandWheelData aWheelData( pData->GetDelta(),pData->GetNotchDelta(), @@ -753,7 +753,7 @@ bool ViewShell::HandleScrollCommand(const CommandEvent& rCEvt, ::sd::Window* pWi rCEvt.IsMouseEvent(),(const void *) &aWheelData ); bDone = pWin->HandleScrollCommand( aReWrite, mpHorizontalScrollBar.get(), - mpVerticalScrollBar.get()) == TRUE; + mpVerticalScrollBar.get()) == sal_True; } } } @@ -781,17 +781,17 @@ void ViewShell::SetupRulers (void) if ( mpVerticalRuler.get() != NULL ) { nHRulerOfs = mpVerticalRuler->GetSizePixel().Width(); - mpVerticalRuler->SetActive(TRUE); + mpVerticalRuler->SetActive(sal_True); mpVerticalRuler->Show(); } } if ( mpHorizontalRuler.get() == NULL ) { - mpHorizontalRuler.reset(CreateHRuler(GetActiveWindow(), TRUE)); + mpHorizontalRuler.reset(CreateHRuler(GetActiveWindow(), sal_True)); if ( mpHorizontalRuler.get() != NULL ) { mpHorizontalRuler->SetWinPos(nHRulerOfs); - mpHorizontalRuler->SetActive(TRUE); + mpHorizontalRuler->SetActive(sal_True); mpHorizontalRuler->Show(); } } @@ -801,7 +801,7 @@ void ViewShell::SetupRulers (void) -BOOL ViewShell::HasRuler (void) +sal_Bool ViewShell::HasRuler (void) { return mbHasRulers; } @@ -1008,7 +1008,7 @@ void ViewShell::SetUIUnit(FieldUnit eUnit) |* DefTab an den horizontalen Linealen setzen |* \************************************************************************/ -void ViewShell::SetDefTabHRuler( UINT16 nDefTab ) +void ViewShell::SetDefTabHRuler( sal_uInt16 nDefTab ) { if (mpHorizontalRuler.get() != NULL) mpHorizontalRuler->SetDefTabDist( nDefTab ); @@ -1020,9 +1020,9 @@ void ViewShell::SetDefTabHRuler( UINT16 nDefTab ) /** Tell the FmFormShell that the view shell is closing. Give it the oportunity to prevent that. */ -USHORT ViewShell::PrepareClose (BOOL bUI, BOOL bForBrowsing) +sal_uInt16 ViewShell::PrepareClose (sal_Bool bUI, sal_Bool bForBrowsing) { - USHORT nResult = TRUE; + sal_uInt16 nResult = sal_True; FmFormShell* pFormShell = GetViewShellBase().GetFormShellManager()->GetFormShell(); if (pFormShell != NULL) @@ -1034,7 +1034,7 @@ USHORT ViewShell::PrepareClose (BOOL bUI, BOOL bForBrowsing) -void ViewShell::UpdatePreview (SdPage*, BOOL ) +void ViewShell::UpdatePreview (SdPage*, sal_Bool ) { // Do nothing. After the actual preview has been removed, // OutlineViewShell::UpdatePreview() is the place where something @@ -1150,7 +1150,7 @@ void ViewShell::ImpGetRedoStrings(SfxItemSet &rSet) const // ----------------------------------------------------------------------------- -void ViewShell::ImpSidUndo(BOOL, SfxRequest& rReq) +void ViewShell::ImpSidUndo(sal_Bool, SfxRequest& rReq) { ::svl::IUndoManager* pUndoManager = ImpGetUndoManager(); sal_uInt16 nNumber(1); @@ -1199,7 +1199,7 @@ void ViewShell::ImpSidUndo(BOOL, SfxRequest& rReq) // ----------------------------------------------------------------------------- -void ViewShell::ImpSidRedo(BOOL, SfxRequest& rReq) +void ViewShell::ImpSidRedo(sal_Bool, SfxRequest& rReq) { ::svl::IUndoManager* pUndoManager = ImpGetUndoManager(); sal_uInt16 nNumber(1); @@ -1250,7 +1250,7 @@ void ViewShell::ImpSidRedo(BOOL, SfxRequest& rReq) void ViewShell::ExecReq( SfxRequest& rReq ) { - USHORT nSlot = rReq.GetSlot(); + sal_uInt16 nSlot = rReq.GetSlot(); switch( nSlot ) { case SID_MAIL_SCROLLBODY_PAGEDOWN: @@ -1272,7 +1272,7 @@ void ViewShell::ExecReq( SfxRequest& rReq ) case SID_OUTPUT_QUALITY_BLACKWHITE: case SID_OUTPUT_QUALITY_CONTRAST: { - ULONG nMode = OUTPUT_DRAWMODE_COLOR; + sal_uLong nMode = OUTPUT_DRAWMODE_COLOR; switch( nSlot ) { diff --git a/sd/source/ui/view/zoomlist.cxx b/sd/source/ui/view/zoomlist.cxx index 9ae178e3d7a6..97932bc15033 100755 --- a/sd/source/ui/view/zoomlist.cxx +++ b/sd/source/ui/view/zoomlist.cxx @@ -69,9 +69,9 @@ ZoomList::ZoomList(ViewShell* pViewShell) ZoomList::~ZoomList() { #if ( defined GCC && defined C272 ) - for (ULONG nObject=0; nObject<List::Count(); nObject++) + for (sal_uLong nObject=0; nObject<List::Count(); nObject++) #else - for (ULONG nObject=0; nObject<Count(); nObject++) + for (sal_uLong nObject=0; nObject<Count(); nObject++) #endif { // Ggf. ZoomRects loeschen @@ -88,12 +88,12 @@ ZoomList::~ZoomList() void ZoomList::InsertZoomRect(const Rectangle& rRect) { - ULONG nRectCount = Count(); + sal_uLong nRectCount = Count(); if (nRectCount >= MAX_ENTRYS) { delete ((Rectangle*) GetObject(0)); - Remove((ULONG) 0); + Remove((sal_uLong) 0); } else if (nRectCount == 0) { @@ -121,7 +121,7 @@ void ZoomList::InsertZoomRect(const Rectangle& rRect) Rectangle ZoomList::GetNextZoomRect() { mnCurPos++; - ULONG nRectCount = Count(); + sal_uLong nRectCount = Count(); if (nRectCount > 0 && mnCurPos > nRectCount - 1) { @@ -163,14 +163,14 @@ Rectangle ZoomList::GetPreviousZoomRect() |* \************************************************************************/ -BOOL ZoomList::IsNextPossible() const +sal_Bool ZoomList::IsNextPossible() const { - BOOL bPossible = FALSE; - ULONG nRectCount = Count(); + sal_Bool bPossible = sal_False; + sal_uLong nRectCount = Count(); if (nRectCount > 0 && mnCurPos < nRectCount - 1) { - bPossible = TRUE; + bPossible = sal_True; } return (bPossible); @@ -182,13 +182,13 @@ BOOL ZoomList::IsNextPossible() const |* \************************************************************************/ -BOOL ZoomList::IsPreviousPossible() const +sal_Bool ZoomList::IsPreviousPossible() const { - BOOL bPossible = FALSE; + sal_Bool bPossible = sal_False; if (mnCurPos > 0) { - bPossible = TRUE; + bPossible = sal_True; } return (bPossible); |