diff options
Diffstat (limited to 'sd/source/ui/view')
58 files changed, 1611 insertions, 1611 deletions
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); |