diff options
Diffstat (limited to 'sd/source/ui/view')
59 files changed, 1819 insertions, 1987 deletions
diff --git a/sd/source/ui/view/DocumentRenderer.cxx b/sd/source/ui/view/DocumentRenderer.cxx index c321bd4de391..3ccbf373dc7e 100644 --- a/sd/source/ui/view/DocumentRenderer.cxx +++ b/sd/source/ui/view/DocumentRenderer.cxx @@ -154,7 +154,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; @@ -328,7 +328,7 @@ namespace { {} const Printer* mpPrinter; - ULONG mnDrawMode; + sal_uLong mnDrawMode; ::rtl::OUString msTimeDate; ::rtl::OUString msPageString; Size maPrintSize; @@ -437,9 +437,10 @@ namespace { aOpt.GetModuleName( mbImpress ? SvtModuleOptions::E_SIMPRESS : SvtModuleOptions::E_SDRAW ) ); AddDialogControl( vcl::PrinterOptionsHelper::getGroupControlOpt( aAppGroupname, - rtl::OUString() + rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".HelpID:vcl:PrintDialog:TabPage:AppPage" ) ) ) ); + uno::Sequence< rtl::OUString > aHelpIds; if( mbImpress ) { vcl::PrinterOptionsHelper::UIControlOptions aPrintOpt; @@ -450,9 +451,11 @@ namespace { aPrintOpt ) ); + aHelpIds.realloc( 1 ); + aHelpIds[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".HelpID:vcl:PrintDialog:PageContentType:ListBox" ) ); AddDialogControl( vcl::PrinterOptionsHelper::getChoiceControlOpt( String( SdResId( _STR_IMPRESS_PRINT_UI_CONTENT ) ), - CreateChoice(_STR_IMPRESS_PRINT_UI_CONTENT_HELP), + aHelpIds, OUString( RTL_CONSTASCII_USTRINGPARAM( "PageContentType" ) ), CreateChoice(_STR_IMPRESS_PRINT_UI_CONTENT_CHOICES), 0, @@ -460,28 +463,32 @@ namespace { ) ); + aHelpIds[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".HelpID:vcl:PrintDialog:SlidesPerPage:ListBox" ) ); vcl::PrinterOptionsHelper::UIControlOptions aContentOpt( OUString( RTL_CONSTASCII_USTRINGPARAM( "PageContentType" ) ), 1 ); AddDialogControl( vcl::PrinterOptionsHelper::getChoiceControlOpt( String( SdResId( _STR_IMPRESS_PRINT_UI_SLIDESPERPAGE ) ), - CreateChoice(_STR_IMPRESS_PRINT_UI_SLIDESPERPAGE_CHOICES_HELP), + aHelpIds, OUString( RTL_CONSTASCII_USTRINGPARAM( "SlidesPerPage" ) ), GetSlidesPerPageSequence(), 0, OUString( RTL_CONSTASCII_USTRINGPARAM( "List" ) ), + Sequence< sal_Bool >(), aContentOpt ) ); + aHelpIds[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".HelpID:vcl:PrintDialog:SlidesPerPageOrder:ListBox" ) ); vcl::PrinterOptionsHelper::UIControlOptions aSlidesPerPageOpt( OUString( RTL_CONSTASCII_USTRINGPARAM( "SlidesPerPage" ) ), -1, sal_True ); AddDialogControl( vcl::PrinterOptionsHelper::getChoiceControlOpt( String( SdResId( _STR_IMPRESS_PRINT_UI_ORDER ) ), - CreateChoice(_STR_IMPRESS_PRINT_UI_ORDER_CHOICES_HELP), + aHelpIds, OUString( RTL_CONSTASCII_USTRINGPARAM( "SlidesPerPageOrder" ) ), CreateChoice(_STR_IMPRESS_PRINT_UI_ORDER_CHOICES), 0, OUString( RTL_CONSTASCII_USTRINGPARAM( "List" ) ), + Sequence< sal_Bool >(), aSlidesPerPageOpt ) ); } @@ -494,7 +501,7 @@ namespace { { AddDialogControl( vcl::PrinterOptionsHelper::getBoolControlOpt( String( SdResId(_STR_IMPRESS_PRINT_UI_IS_PRINT_NAME) ), - String( SdResId(_STR_IMPRESS_PRINT_UI_IS_PRINT_NAME_HELP) ), + OUString( RTL_CONSTASCII_USTRINGPARAM( ".HelpID:vcl:PrintDialog:IsPrintName:CheckBox" ) ), OUString( RTL_CONSTASCII_USTRINGPARAM( "IsPrintName" ) ), sal_False ) @@ -504,7 +511,7 @@ namespace { { AddDialogControl( vcl::PrinterOptionsHelper::getBoolControlOpt( String( SdResId(_STR_DRAW_PRINT_UI_IS_PRINT_NAME) ), - String( SdResId(_STR_DRAW_PRINT_UI_IS_PRINT_NAME_HELP) ), + OUString( RTL_CONSTASCII_USTRINGPARAM( ".HelpID:vcl:PrintDialog:IsPrintName:CheckBox" ) ), OUString( RTL_CONSTASCII_USTRINGPARAM( "IsPrintName" ) ), sal_False ) @@ -513,7 +520,7 @@ namespace { AddDialogControl( vcl::PrinterOptionsHelper::getBoolControlOpt( String( SdResId(_STR_IMPRESS_PRINT_UI_IS_PRINT_DATE) ), - String( SdResId(_STR_IMPRESS_PRINT_UI_IS_PRINT_DATE_HELP) ), + OUString( RTL_CONSTASCII_USTRINGPARAM( ".HelpID:vcl:PrintDialog:IsPrintDateTime:CheckBox" ) ), OUString( RTL_CONSTASCII_USTRINGPARAM( "IsPrintDateTime" ) ), sal_False ) @@ -523,7 +530,7 @@ namespace { { AddDialogControl( vcl::PrinterOptionsHelper::getBoolControlOpt( String( SdResId(_STR_IMPRESS_PRINT_UI_IS_PRINT_HIDDEN) ), - String( SdResId(_STR_IMPRESS_PRINT_UI_IS_PRINT_HIDDEN_HELP) ), + OUString( RTL_CONSTASCII_USTRINGPARAM( ".HelpID:vcl:PrintDialog:IsPrintHidden:CheckBox" ) ), OUString( RTL_CONSTASCII_USTRINGPARAM( "IsPrintHidden" ) ), sal_False ) @@ -533,9 +540,13 @@ namespace { AddDialogControl( vcl::PrinterOptionsHelper::getSubgroupControlOpt( String( SdResId(_STR_IMPRESS_PRINT_UI_QUALITY) ), rtl::OUString() ) ); + aHelpIds.realloc( 3 ); + aHelpIds[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".HelpID:vcl:PrintDialog:Quality:RadioButton:0" ) ); + aHelpIds[1] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".HelpID:vcl:PrintDialog:Quality:RadioButton:1" ) ); + aHelpIds[2] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".HelpID:vcl:PrintDialog:Quality:RadioButton:2" ) ); AddDialogControl( vcl::PrinterOptionsHelper::getChoiceControlOpt( rtl::OUString(), - CreateChoice(_STR_IMPRESS_PRINT_UI_QUALITY_CHOICES_HELP), + aHelpIds, OUString( RTL_CONSTASCII_USTRINGPARAM( "Quality" ) ), CreateChoice(_STR_IMPRESS_PRINT_UI_QUALITY_CHOICES), 0 @@ -545,6 +556,11 @@ namespace { AddDialogControl( vcl::PrinterOptionsHelper::getSubgroupControlOpt( String( SdResId(_STR_IMPRESS_PRINT_UI_PAGE_OPTIONS) ), rtl::OUString() ) ); + aHelpIds.realloc( 4 ); + aHelpIds[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".HelpID:vcl:PrintDialog:PageOptions:RadioButton:0" ) ); + aHelpIds[1] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".HelpID:vcl:PrintDialog:PageOptions:RadioButton:1" ) ); + aHelpIds[2] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".HelpID:vcl:PrintDialog:PageOptions:RadioButton:2" ) ); + aHelpIds[3] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".HelpID:vcl:PrintDialog:PageOptions:RadioButton:3" ) ); if( mbImpress ) { // FIXME: additional dependency on PrintProspect = false @@ -552,11 +568,12 @@ namespace { aPageOptionsOpt( OUString( RTL_CONSTASCII_USTRINGPARAM( "PageContentType" ) ), 0 ); AddDialogControl( vcl::PrinterOptionsHelper::getChoiceControlOpt( rtl::OUString(), - CreateChoice(_STR_IMPRESS_PRINT_UI_PAGE_OPTIONS_CHOICES_HELP), + aHelpIds, OUString( RTL_CONSTASCII_USTRINGPARAM( "PageOptions" ) ), CreateChoice(_STR_IMPRESS_PRINT_UI_PAGE_OPTIONS_CHOICES), 0, OUString( RTL_CONSTASCII_USTRINGPARAM( "Radio" ) ), + Sequence< sal_Bool >(), aPageOptionsOpt ) ); @@ -567,11 +584,12 @@ namespace { aPageOptionsOpt( OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintProspect" ) ), sal_False ); AddDialogControl( vcl::PrinterOptionsHelper::getChoiceControlOpt( rtl::OUString(), - CreateChoice(_STR_IMPRESS_PRINT_UI_PAGE_OPTIONS_CHOICES_HELP), + aHelpIds, OUString( RTL_CONSTASCII_USTRINGPARAM( "PageOptions" ) ), CreateChoice(_STR_IMPRESS_PRINT_UI_PAGE_OPTIONS_CHOICES_DRAW), 0, OUString( RTL_CONSTASCII_USTRINGPARAM( "Radio" ) ), + Sequence< sal_Bool >(), aPageOptionsOpt ) ); @@ -586,7 +604,7 @@ namespace { // brochure printing AddDialogControl( vcl::PrinterOptionsHelper::getBoolControlOpt( String( SdResId(_STR_IMPRESS_PRINT_UI_BROCHURE) ), - String( SdResId(_STR_IMPRESS_PRINT_UI_BROCHURE_HELP) ), + rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".HelpID:vcl:PrintDialog:PrintProspect:CheckBox" ) ), OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintProspect" ) ), sal_False, aBrochureOpt @@ -596,13 +614,16 @@ namespace { vcl::PrinterOptionsHelper::UIControlOptions aIncludeOpt( OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintProspect" ) ), -1, sal_False ); aIncludeOpt.maGroupHint = OUString( RTL_CONSTASCII_USTRINGPARAM( "LayoutPage" ) ); + aHelpIds.realloc( 1 ); + aHelpIds[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".HelpID:vcl:PrintDialog:PrintProspectInclude:ListBox" ) ); AddDialogControl( vcl::PrinterOptionsHelper::getChoiceControlOpt( String( SdResId(_STR_IMPRESS_PRINT_UI_BROCHURE_INCLUDE) ), - CreateChoice(_STR_IMPRESS_PRINT_UI_BROCHURE_INCLUDE_LIST_HELP), + aHelpIds, OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintProspectInclude" ) ), CreateChoice(_STR_IMPRESS_PRINT_UI_BROCHURE_INCLUDE_LIST), 0, OUString( RTL_CONSTASCII_USTRINGPARAM( "List" ) ), + Sequence< sal_Bool >(), aIncludeOpt ) ); @@ -612,7 +633,7 @@ namespace { aPaperTrayOpt.maGroupHint = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "OptionsPageOptGroup" ) ); AddDialogControl( vcl::PrinterOptionsHelper::getBoolControlOpt( String( SdResId(_STR_IMPRESS_PRINT_UI_PAPER_TRAY) ), - String( SdResId(_STR_IMPRESS_PRINT_UI_PAPER_TRAY_HELP) ), + rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".HelpID:vcl:PrintDialog:PrintPaperFromSetup:CheckBox" ) ), OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintPaperFromSetup" ) ), sal_False, aPaperTrayOpt @@ -630,8 +651,12 @@ namespace { // create a choice for the content to create rtl::OUString aPrintRangeName( RTL_CONSTASCII_USTRINGPARAM( "PrintContent" ) ); + aHelpIds.realloc( 3 ); + aHelpIds[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".HelpID:vcl:PrintDialog:PrintContent:RadioButton:0" ) ); + aHelpIds[1] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".HelpID:vcl:PrintDialog:PrintContent:RadioButton:1" ) ); + aHelpIds[2] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".HelpID:vcl:PrintDialog:PrintContent:RadioButton:2" ) ); AddDialogControl( vcl::PrinterOptionsHelper::getChoiceControlOpt( rtl::OUString(), - CreateChoice(_STR_IMPRESS_PRINT_UI_PAGE_RANGE_CHOICE_HELP), + aHelpIds, aPrintRangeName, CreateChoice(mbImpress ? _STR_IMPRESS_PRINT_UI_PAGE_RANGE_CHOICE @@ -641,7 +666,7 @@ namespace { // create a an Edit dependent on "Pages" selected vcl::PrinterOptionsHelper::UIControlOptions aPageRangeOpt( aPrintRangeName, 1, sal_True ); AddDialogControl( vcl::PrinterOptionsHelper::getEditControlOpt( rtl::OUString(), - rtl::OUString(), + rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".HelpID:vcl:PrintDialog:PageRange:Edit" ) ), rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PageRange" ) ), rtl::OUString(), aPageRangeOpt ) @@ -657,7 +682,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); @@ -705,9 +730,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), @@ -730,9 +755,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; @@ -740,9 +765,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; }; @@ -755,15 +780,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) @@ -799,7 +824,7 @@ namespace { } private: - const USHORT mnPageIndex; + const sal_uInt16 mnPageIndex; }; @@ -812,15 +837,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), @@ -884,7 +909,7 @@ namespace { } private: - const USHORT mnPageIndex; + const sal_uInt16 mnPageIndex; const sal_Int32 mnGap; }; @@ -895,16 +920,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), @@ -959,8 +984,8 @@ namespace { } private: - const USHORT mnFirstPageIndex; - const USHORT mnSecondPageIndex; + const sal_uInt16 mnFirstPageIndex; + const sal_uInt16 mnSecondPageIndex; const Point maFirstOffset; const Point maSecondOffset; }; @@ -974,14 +999,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), @@ -1017,7 +1042,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(); @@ -1106,8 +1131,8 @@ namespace { } private: - const USHORT mnHandoutPageIndex; - const ::std::vector<USHORT> maPageIndices; + const sal_uInt16 mnHandoutPageIndex; + const ::std::vector<sal_uInt16> maPageIndices; }; @@ -1124,9 +1149,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) @@ -1159,13 +1184,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); @@ -1246,6 +1271,7 @@ public: return; bool bIsValueChanged = processProperties( rOptions ); + bool bIsPaperChanged = false; // The RenderDevice property is handled specially: its value is // stored in mpPrinter instead of being retrieved on demand. @@ -1257,14 +1283,21 @@ public: VCLXDevice* pDevice = VCLXDevice::GetImplementation(xRenderDevice); OutputDevice* pOut = pDevice ? pDevice->GetOutputDevice() : NULL; mpPrinter = dynamic_cast<Printer*>(pOut); + Size aPageSizePixel = mpPrinter ? mpPrinter->GetPaperSizePixel() : Size(); + if( aPageSizePixel != maPrinterPageSizePixel ) + { + bIsPaperChanged = true; + maPrinterPageSizePixel = aPageSizePixel; + } } if (bIsValueChanged) { if ( ! mpOptions ) mpOptions.reset(new PrintOptions(*this, maSlidesPerPage)); - PreparePages(); } + if( bIsValueChanged || bIsPaperChanged ) + PreparePages(); } @@ -1340,9 +1373,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. @@ -1394,6 +1427,7 @@ private: ViewShellBase& mrBase; bool mbIsDisposed; Printer* mpPrinter; + Size maPrinterPageSizePixel; ::boost::scoped_ptr<PrintOptions> mpOptions; ::std::vector< ::boost::shared_ptr< ::sd::PrinterPage> > maPrinterPages; ::boost::scoped_ptr<DrawView> mpPrintView; @@ -1471,15 +1505,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()) @@ -1489,7 +1523,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(), @@ -1628,7 +1662,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; @@ -1664,7 +1698,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; @@ -1705,16 +1739,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; @@ -1776,7 +1810,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() @@ -1791,7 +1825,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); } } @@ -1803,9 +1837,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 ) @@ -1846,7 +1880,7 @@ private: const bool bScalePage (mpOptions->IsPageSize()); - USHORT nPaperBin; + sal_uInt16 nPaperBin; if ( ! mpOptions->IsPaperBin()) nPaperBin = rHandoutPage.GetPaperBin(); else @@ -1909,15 +1943,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; @@ -1997,7 +2031,7 @@ private: pViewShell->WriteFrameViewData(); Point aPtZero; - for (USHORT + for (sal_uInt16 nIndex=0, nCount=mrBase.GetDocument()->GetSdPageCount(PK_STANDARD); nIndex < nCount; @@ -2121,8 +2155,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; @@ -2134,14 +2168,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++ ] ) ); @@ -2164,7 +2198,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; @@ -2200,7 +2234,7 @@ private: const PageKind ePageKind, const PrintInfo& rInfo) { - USHORT nPaperBin; + sal_uInt16 nPaperBin; if ( ! mpOptions->IsPaperBin()) nPaperBin = rPage.GetPaperBin(); else @@ -2209,7 +2243,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, @@ -2234,7 +2268,7 @@ private: { const Point aPageOffset (rInfo.mpPrinter->GetPageOffset()); - USHORT nPaperBin; + sal_uInt16 nPaperBin; if ( ! mpOptions->IsPaperBin()) nPaperBin = rPage.GetPaperBin(); else @@ -2259,7 +2293,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, @@ -2295,7 +2329,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/DocumentRenderer.hrc b/sd/source/ui/view/DocumentRenderer.hrc index 3dd57429dd13..aad07d909def 100644..100755 --- a/sd/source/ui/view/DocumentRenderer.hrc +++ b/sd/source/ui/view/DocumentRenderer.hrc @@ -30,48 +30,33 @@ #define _STR_IMPRESS_PRINT_UI_PRINT_CONTENT 2 #define _STR_IMPRESS_PRINT_UI_PRINT_GROUP 3 #define _STR_IMPRESS_PRINT_UI_CONTENT 4 -#define _STR_IMPRESS_PRINT_UI_CONTENT_HELP 5 #define _STR_IMPRESS_PRINT_UI_CONTENT_CHOICES 6 #define _STR_IMPRESS_PRINT_UI_SLIDESPERPAGE 7 #define _STR_IMPRESS_PRINT_UI_SLIDESPERPAGE_CHOICES 8 -#define _STR_IMPRESS_PRINT_UI_SLIDESPERPAGE_CHOICES_HELP 9 #define _STR_IMPRESS_PRINT_UI_ORDER 10 #define _STR_IMPRESS_PRINT_UI_ORDER_CHOICES 11 -#define _STR_IMPRESS_PRINT_UI_ORDER_CHOICES_HELP 12 #define _STR_IMPRESS_PRINT_UI_INCLUDE_CONTENT 13 #define _STR_IMPRESS_PRINT_UI_IS_PRINT_NAME 14 -#define _STR_IMPRESS_PRINT_UI_IS_PRINT_NAME_HELP 15 #define _STR_IMPRESS_PRINT_UI_IS_PRINT_DATE 16 -#define _STR_IMPRESS_PRINT_UI_IS_PRINT_DATE_HELP 17 #define _STR_IMPRESS_PRINT_UI_IS_PRINT_TIME 18 -#define _STR_IMPRESS_PRINT_UI_IS_PRINT_TIME_HELP 19 #define _STR_IMPRESS_PRINT_UI_IS_PRINT_HIDDEN 20 -#define _STR_IMPRESS_PRINT_UI_IS_PRINT_HIDDEN_HELP 21 #define _STR_IMPRESS_PRINT_UI_OUTPUT_OPTIONS_GROUP 22 #define _STR_IMPRESS_PRINT_UI_QUALITY 23 #define _STR_IMPRESS_PRINT_UI_QUALITY_CHOICES 24 -#define _STR_IMPRESS_PRINT_UI_QUALITY_CHOICES_HELP 25 #define _STR_IMPRESS_PRINT_UI_PAGE_OPTIONS 26 #define _STR_IMPRESS_PRINT_UI_PAGE_OPTIONS_CHOICES 27 #define _STR_IMPRESS_PRINT_UI_PAGE_OPTIONS_CHOICES_DRAW 28 -#define _STR_IMPRESS_PRINT_UI_PAGE_OPTIONS_CHOICES_HELP 29 #define _STR_IMPRESS_PRINT_UI_BROCHURE 30 -#define _STR_IMPRESS_PRINT_UI_BROCHURE_HELP 31 #define _STR_IMPRESS_PRINT_UI_PAGE_SIDES 32 #define _STR_IMPRESS_PRINT_UI_BROCHURE_INCLUDE 33 -#define _STR_IMPRESS_PRINT_UI_BROCHURE_INCLUDE_HELP 34 #define _STR_IMPRESS_PRINT_UI_BROCHURE_INCLUDE_LIST 35 -#define _STR_IMPRESS_PRINT_UI_BROCHURE_INCLUDE_LIST_HELP 36 #define _STR_IMPRESS_PRINT_UI_PAPER_TRAY_GROUP 37 #define _STR_IMPRESS_PRINT_UI_PAPER_TRAY 38 -#define _STR_IMPRESS_PRINT_UI_PAPER_TRAY_HELP 39 #define _STR_IMPRESS_PRINT_UI_PAGE_RANGE 40 #define _STR_IMPRESS_PRINT_UI_PAGE_RANGE_CHOICE 41 -#define _STR_IMPRESS_PRINT_UI_PAGE_RANGE_CHOICE_HELP 42 #define _STR_DRAW_PRINT_UI_PAGE_RANGE_CHOICE 43 #define _STR_DRAW_PRINT_UI_IS_PRINT_NAME 44 -#define _STR_DRAW_PRINT_UI_IS_PRINT_NAME_HELP 45 diff --git a/sd/source/ui/view/DocumentRenderer.src b/sd/source/ui/view/DocumentRenderer.src index abd82ea0d397..df4e2a30de02 100755 --- a/sd/source/ui/view/DocumentRenderer.src +++ b/sd/source/ui/view/DocumentRenderer.src @@ -46,14 +46,6 @@ Resource _STR_IMPRESS_PRINT_UI_OPTIONS { Text [ en-US ] = "Document"; }; - StringArray _STR_IMPRESS_PRINT_UI_CONTENT_HELP - { - ItemList [ en-US ] = - { - < "Select which parts of the document should be printed"; >; - < "Select which parts of the document should be printed"; >; - }; - }; StringArray _STR_IMPRESS_PRINT_UI_CONTENT_CHOICES { ItemList [ en-US ] = @@ -81,14 +73,6 @@ Resource _STR_IMPRESS_PRINT_UI_OPTIONS < "9" ; > ; }; }; - StringArray _STR_IMPRESS_PRINT_UI_SLIDESPERPAGE_CHOICES_HELP - { - ItemList [ en-US ] = - { - < "Select how many slides to print per page." ; >; - < "Select how many slides to print per page." ; >; - }; - }; String _STR_IMPRESS_PRINT_UI_ORDER { Text [ en-US ] = "Order" ; @@ -101,15 +85,6 @@ Resource _STR_IMPRESS_PRINT_UI_OPTIONS < "Top to bottom, then right" ; > ; }; }; - StringArray _STR_IMPRESS_PRINT_UI_ORDER_CHOICES_HELP - { - ItemList [ en-US ] = - { - < "Specify how to arrange slides on the printed page." ; > ; - < "Arrange slides horizontally" ; > ; - < "Arrange slides vertically" ; > ; - }; - }; String _STR_IMPRESS_PRINT_UI_INCLUDE_CONTENT { Text [ en-US ] = "~Contents"; @@ -118,35 +93,18 @@ Resource _STR_IMPRESS_PRINT_UI_OPTIONS { Text [ en-US ] = "~Slide name"; }; - String _STR_IMPRESS_PRINT_UI_IS_PRINT_NAME_HELP - { - Text [ en-US ] = "Specifies whether to print the page name of a document."; - }; String _STR_DRAW_PRINT_UI_IS_PRINT_NAME { Text [ en-US ] = "P~age name"; }; - String _STR_DRAW_PRINT_UI_IS_PRINT_NAME_HELP - { - Text [ en-US ] = "Specifies whether to print the page name of a document."; - }; String _STR_IMPRESS_PRINT_UI_IS_PRINT_DATE { Text [ en-US ] = "~Date and time"; }; - String _STR_IMPRESS_PRINT_UI_IS_PRINT_DATE_HELP - { - Text [ en-US ] = "Specifies whether to print the current date and time."; - }; String _STR_IMPRESS_PRINT_UI_IS_PRINT_HIDDEN { Text [ en-US ] = "Hidden pages"; }; - String _STR_IMPRESS_PRINT_UI_IS_PRINT_HIDDEN_HELP - { - Text [ en-US ] = "Specifies whether to print the pages that are currently hidden from the application."; - }; - String _STR_IMPRESS_PRINT_UI_OUTPUT_OPTIONS_GROUP { Text [ en-US ] = "Output options"; @@ -164,17 +122,6 @@ Resource _STR_IMPRESS_PRINT_UI_OPTIONS < "Black & white" ; > ; }; }; - StringArray _STR_IMPRESS_PRINT_UI_QUALITY_CHOICES_HELP - { - ItemList [ en-US ] = - { - < "Specify how to treat colors in the printout."; >; - < "Specifies that you want to print in original colors." ; > ; - < "Specifies that you want to print colors as grayscale." ; > ; - < "Specifies that you want to print in black and white." ; > ; - }; - }; - String _STR_IMPRESS_PRINT_UI_PAGE_OPTIONS { Text [ en-US ] = "~Size"; @@ -199,24 +146,10 @@ Resource _STR_IMPRESS_PRINT_UI_OPTIONS < "Tile sheet of paper with repeated pages" ; > ; }; }; - StringArray _STR_IMPRESS_PRINT_UI_PAGE_OPTIONS_CHOICES_HELP - { - ItemList [ en-US ] = - { - < "Specify how to scale slides in the printout."; >; - < "Specifies that you do not want to further scale pages when printing." ; > ; - < "Specifies whether to scale down objects that are beyond the margins of the current printer so they fit on the paper in the printer." ; > ; - < "Specifies that pages are to be printed in tiled format. If the pages or slides are smaller than the paper, several pages or slides will be printed on one page of paper." ; > ; - }; - }; String _STR_IMPRESS_PRINT_UI_BROCHURE { Text [en-US] = "Brochure"; }; - String _STR_IMPRESS_PRINT_UI_BROCHURE_HELP - { - Text [en-US] = "Select the \"Brochure\" option to print the document in brochure format."; - }; String _STR_IMPRESS_PRINT_UI_PAGE_SIDES { Text [ en-US ] = "Page sides"; @@ -225,10 +158,6 @@ Resource _STR_IMPRESS_PRINT_UI_OPTIONS { Text [ en-US ] = "Include"; }; - String _STR_IMPRESS_PRINT_UI_BROCHURE_INCLUDE_HELP - { - Text [ en-US ] = "Select which pages of a brochure to print."; - }; StringArray _STR_IMPRESS_PRINT_UI_BROCHURE_INCLUDE_LIST { ItemList [ en-US ] = @@ -238,15 +167,6 @@ Resource _STR_IMPRESS_PRINT_UI_OPTIONS < "Back sides / left pages" ; > ; }; }; - StringArray _STR_IMPRESS_PRINT_UI_BROCHURE_INCLUDE_LIST_HELP - { - ItemList [ en-US ] = - { - < "Print all pages of a brochure." ; > ; - < "Print only front pages of a brochure." ; > ; - < "Print only back pages of a brochure." ; > ; - }; - }; String _STR_IMPRESS_PRINT_UI_PAPER_TRAY_GROUP { @@ -256,10 +176,6 @@ Resource _STR_IMPRESS_PRINT_UI_OPTIONS { Text [ en-US ] = "~Use only paper tray from printer preferences"; }; - String _STR_IMPRESS_PRINT_UI_PAPER_TRAY_HELP - { - Text [ en-US ] = "Determines that the paper tray to be used is the one defined in the printer setup."; - }; String _STR_IMPRESS_PRINT_UI_PAGE_RANGE { Text [en-US] = "Print range"; @@ -274,16 +190,6 @@ Resource _STR_IMPRESS_PRINT_UI_OPTIONS }; }; - StringArray _STR_IMPRESS_PRINT_UI_PAGE_RANGE_CHOICE_HELP - { - ItemList [ en-US ] = - { - < "Print the whole document."; >; - < "Print a specified range of the document."; >; - < "Print only the currently selected content."; >; - }; - }; - StringArray _STR_DRAW_PRINT_UI_PAGE_RANGE_CHOICE { ItemList [ en-US ] = diff --git a/sd/source/ui/view/GraphicObjectBar.cxx b/sd/source/ui/view/GraphicObjectBar.cxx index c4f0dbb8d380..ffd717fec19d 100644..100755 --- a/sd/source/ui/view/GraphicObjectBar.cxx +++ b/sd/source/ui/view/GraphicObjectBar.cxx @@ -129,14 +129,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 ec01fd057303..ca182e9680ba 100644 --- a/sd/source/ui/view/GraphicViewShellBase.cxx +++ b/sd/source/ui/view/GraphicViewShellBase.cxx @@ -46,12 +46,6 @@ TYPEINIT1(GraphicViewShellBase, ViewShellBase); // We have to expand the SFX_IMPL_VIEWFACTORY macro to call LateInit() after a // new GraphicViewShellBase object has been constructed. -/* -SFX_IMPL_VIEWFACTORY(GraphicViewShellBase, SdResId(STR_DEFAULTVIEW)) -{ - SFX_VIEW_REGISTRATION(GraphicDocShell); -} -*/ SfxViewFactory* GraphicViewShellBase::pFactory; SfxViewShell* GraphicViewShellBase::CreateInstance ( SfxViewFrame *pFrame, SfxViewShell *pOldView) @@ -60,7 +54,7 @@ SfxViewShell* 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"); @@ -97,7 +91,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 fd039bcccc67..5ed10762b5d1 100644 --- a/sd/source/ui/view/ImpressViewShellBase.cxx +++ b/sd/source/ui/view/ImpressViewShellBase.cxx @@ -46,12 +46,6 @@ TYPEINIT1(ImpressViewShellBase, ViewShellBase); // We have to expand the SFX_IMPL_VIEWFACTORY macro to call LateInit() after a // new ImpressViewShellBase object has been constructed. -/* -SFX_IMPL_VIEWFACTORY(ImpressViewShellBase, SdResId(STR_DEFAULTVIEW)) -{ - SFX_VIEW_REGISTRATION(DrawDocShell); -} -*/ SfxViewFactory* ImpressViewShellBase::pFactory; SfxViewShell* ImpressViewShellBase::CreateInstance ( SfxViewFrame *pFrame, SfxViewShell *pOldView) @@ -60,7 +54,7 @@ SfxViewShell* 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"); @@ -99,7 +93,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 d2d9bf767fa2..25ab35f4df67 100644..100755 --- a/sd/source/ui/view/MediaObjectBar.cxx +++ b/sd/source/ui/view/MediaObjectBar.cxx @@ -99,7 +99,7 @@ MediaObjectBar::~MediaObjectBar() void MediaObjectBar::GetState( SfxItemSet& rSet ) { SfxWhichIter aIter( rSet ); - USHORT nWhich = aIter.FirstWhich(); + sal_uInt16 nWhich = aIter.FirstWhich(); while( nWhich ) { @@ -141,7 +141,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 c2035eb896d7..795426a84cbd 100644 --- a/sd/source/ui/view/OutlineViewShellBase.cxx +++ b/sd/source/ui/view/OutlineViewShellBase.cxx @@ -44,12 +44,6 @@ TYPEINIT1(OutlineViewShellBase, ViewShellBase); // We have to expand the SFX_IMPL_VIEWFACTORY macro to call LateInit() after a // new OutlineViewShellBase object has been constructed. -/* -SFX_IMPL_VIEWFACTORY(OutlineViewShellBase, SdResId(STR_DEFAULTVIEW)) -{ - SFX_VIEW_REGISTRATION(DrawDocShell); -} -*/ SfxViewFactory* OutlineViewShellBase::pFactory; SfxViewShell* OutlineViewShellBase::CreateInstance ( SfxViewFrame *pFrame, SfxViewShell *pOldView) @@ -58,7 +52,7 @@ SfxViewShell* 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 3a00103479ef..5d133e2dcb60 100644 --- a/sd/source/ui/view/Outliner.cxx +++ b/sd/source/ui/view/Outliner.cxx @@ -145,7 +145,7 @@ private: |* \************************************************************************/ -Outliner::Outliner( SdDrawDocument* pDoc, USHORT nMode ) +Outliner::Outliner( SdDrawDocument* pDoc, sal_uInt16 nMode ) : SdrOutliner( &pDoc->GetItemPool(), nMode ), mpImpl(new Implementation()), meMode(SEARCH), @@ -155,13 +155,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(), @@ -173,7 +173,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), @@ -192,13 +192,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(); @@ -290,13 +290,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(); @@ -367,7 +367,7 @@ void Outliner::EndSpelling (void) mpImpl->ReleaseOutlinerView(); } - SetUpdateMode(TRUE); + SetUpdateMode(sal_True); } // Before clearing the modify flag use it as a hint that @@ -375,9 +375,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); } // now clear the modify flag to have a specified state of @@ -397,7 +397,7 @@ void Outliner::EndSpelling (void) -BOOL Outliner::SpellNextDocument (void) +sal_Bool Outliner::SpellNextDocument (void) { if (mpViewShell->ISA(OutlineViewShell)) { @@ -409,8 +409,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); @@ -420,11 +420,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; } @@ -484,11 +484,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()); @@ -522,11 +522,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 @@ -537,11 +537,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; @@ -685,7 +685,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); @@ -709,7 +709,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; } @@ -720,7 +720,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) @@ -741,7 +741,7 @@ bool Outliner::SearchAndReplaceOnce (void) } } - mpDrawDocument->GetDocSh()->SetWaitCursor( FALSE ); + mpDrawDocument->GetDocSh()->SetWaitCursor( sal_False ); return mbEndOfSearch; } @@ -771,7 +771,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) ) ); @@ -817,7 +817,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. @@ -890,7 +890,7 @@ void Outliner::RememberStartPosition (void) } else { - mnStartPageIndex = (USHORT)-1; + mnStartPageIndex = (sal_uInt16)-1; } } @@ -902,7 +902,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) @@ -974,7 +974,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) ) ); @@ -1047,7 +1047,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. @@ -1112,7 +1112,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); } @@ -1123,9 +1123,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 @@ -1142,7 +1142,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); } @@ -1192,8 +1192,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))); @@ -1215,7 +1215,7 @@ void Outliner::PrepareSpellCheck (void) } } - EnterEditMode( FALSE ); + EnterEditMode( sal_False ); } } @@ -1231,7 +1231,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(); @@ -1250,7 +1250,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; @@ -1309,7 +1309,7 @@ void Outliner::SetViewMode (PageKind ePageKind) -void Outliner::SetPage (EditMode eEditMode, USHORT nPageIndex) +void Outliner::SetPage (EditMode eEditMode, sal_uInt16 nPageIndex) { if ( ! mbRestrictSearchToSelection) { @@ -1318,7 +1318,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); } } @@ -1327,7 +1327,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) @@ -1356,8 +1356,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; } } @@ -1373,7 +1373,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; @@ -1395,7 +1395,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 @@ -1420,7 +1420,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; } @@ -1460,7 +1460,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(); } @@ -1502,17 +1502,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 @@ -1525,10 +1525,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; @@ -1564,12 +1564,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. } @@ -1592,12 +1592,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(); @@ -1626,7 +1626,7 @@ sal_Bool Outliner::ConvertNextDocument() if( mpViewShell && mpViewShell->ISA(OutlineViewShell) ) return false; - mpDrawDocument->GetDocSh()->SetWaitCursor( TRUE ); + mpDrawDocument->GetDocSh()->SetWaitCursor( sal_True ); Initialize ( true ); @@ -1638,7 +1638,7 @@ sal_Bool Outliner::ConvertNextDocument() } ProvideNextTextObject (); - mpDrawDocument->GetDocSh()->SetWaitCursor( FALSE ); + mpDrawDocument->GetDocSh()->SetWaitCursor( sal_False ); ClearModifyFlag(); // for text conversion we automaticly wrap around one @@ -1659,7 +1659,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 @@ -1690,13 +1690,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; } @@ -1768,12 +1768,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 8778ee8f8c9d..aa89f3699d9c 100644 --- a/sd/source/ui/view/OutlinerIterator.cxx +++ b/sd/source/ui/view/OutlinerIterator.cxx @@ -717,11 +717,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 2db726e80b0c..d131aec83d76 100644 --- a/sd/source/ui/view/PresentationViewShellBase.cxx +++ b/sd/source/ui/view/PresentationViewShellBase.cxx @@ -53,12 +53,6 @@ TYPEINIT1(PresentationViewShellBase, ViewShellBase); // We have to expand the SFX_IMPL_VIEWFACTORY macro to call LateInit() after a // new PresentationViewShellBase object has been constructed. -/* -SFX_IMPL_VIEWFACTORY(PresentationViewShellBase, SdResId(STR_DEFAULTVIEW)) -{ - SFX_VIEW_REGISTRATION(DrawDocShell); -} -*/ SfxViewFactory* PresentationViewShellBase::pFactory; SfxViewShell* PresentationViewShellBase::CreateInstance ( SfxViewFrame *_pFrame, SfxViewShell *pOldView) @@ -68,7 +62,7 @@ SfxViewShell* 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"); @@ -119,7 +113,6 @@ PresentationViewShellBase::~PresentationViewShellBase (void) - void PresentationViewShellBase::InitializeFramework (void) { com::sun::star::uno::Reference<com::sun::star::frame::XController> diff --git a/sd/source/ui/view/SlideSorterViewShellBase.cxx b/sd/source/ui/view/SlideSorterViewShellBase.cxx index 21e5e21756a2..98a762aa4811 100644 --- a/sd/source/ui/view/SlideSorterViewShellBase.cxx +++ b/sd/source/ui/view/SlideSorterViewShellBase.cxx @@ -44,12 +44,6 @@ TYPEINIT1(SlideSorterViewShellBase, ViewShellBase); // We have to expand the SFX_IMPL_VIEWFACTORY macro to call LateInit() after a // new SlideSorterViewShellBase object has been constructed. -/* -SFX_IMPL_VIEWFACTORY(SlideSorterViewShellBase, SdResId(STR_DEFAULTVIEW)) -{ - SFX_VIEW_REGISTRATION(DrawDocShell); -} -*/ SfxViewFactory* SlideSorterViewShellBase::pFactory; SfxViewShell* SlideSorterViewShellBase::CreateInstance ( SfxViewFrame *pFrame, SfxViewShell *pOldView) @@ -62,7 +56,7 @@ SfxViewShell* 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 55a9f171ca51..e62aa1635414 100644 --- a/sd/source/ui/view/ToolBarManager.cxx +++ b/sd/source/ui/view/ToolBarManager.cxx @@ -343,8 +343,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 47958e7806c2..dd3c114a34b5 100644 --- a/sd/source/ui/view/ViewClipboard.cxx +++ b/sd/source/ui/view/ViewClipboard.cxx @@ -104,12 +104,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) { @@ -171,7 +171,7 @@ void ViewClipboard::AssignMasterPage ( // appended again by SetMasterPage() to the given name. Don't ask. String sLayoutSuffix (RTL_CONSTASCII_USTRINGPARAM(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)) @@ -181,24 +181,24 @@ 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. ); } -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 ); @@ -212,14 +212,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; @@ -230,7 +230,7 @@ USHORT ViewClipboard::InsertSlides ( // pages are inserted. pBookmarkList = &rTransferable.GetPageBookmarks(); pDataDocSh = rTransferable.GetPageDocShell(); - nInsertPgCnt = (USHORT)pBookmarkList->Count(); + nInsertPgCnt = (sal_uInt16)pBookmarkList->Count(); } else { @@ -247,7 +247,7 @@ USHORT ViewClipboard::InsertSlides ( { const SolarMutexGuard aGuard; ::sd::Window* pWin = mrView.GetViewShell()->GetActiveWindow(); - const BOOL bWait = pWin && pWin->IsWait(); + const sal_Bool bWait = pWin && pWin->IsWait(); if( bWait ) pWin->LeaveWait(); @@ -255,14 +255,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 061ba1a17292..fe631fc3c574 100644 --- a/sd/source/ui/view/ViewShellBase.cxx +++ b/sd/source/ui/view/ViewShellBase.cxx @@ -242,12 +242,6 @@ TYPEINIT1(ViewShellBase, SfxViewShell); // We have to expand the SFX_IMPL_VIEWFACTORY macro to call LateInit() after a // new ViewShellBase object has been constructed. -/* -SFX_IMPL_VIEWFACTORY(ViewShellBase, SdResId(STR_DEFAULTVIEW)) -{ - SFX_VIEW_REGISTRATION(DrawDocShell); -} -*/ SfxViewFactory* ViewShellBase::pFactory; SfxViewShell* ViewShellBase::CreateInstance ( SfxViewFrame *pFrame, SfxViewShell *pOldView) @@ -256,7 +250,7 @@ SfxViewShell* 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"); @@ -346,8 +340,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(); @@ -557,7 +551,7 @@ void ViewShellBase::Rearrange (void) OSL_TRACE("Rearrange: window missing"); } - GetViewFrame()->Resize(TRUE); + GetViewFrame()->Resize(sal_True); } @@ -587,7 +581,7 @@ Reference<view::XRenderable> ViewShellBase::GetRenderable (void) -SfxPrinter* ViewShellBase::GetPrinter (BOOL bCreate) +SfxPrinter* ViewShellBase::GetPrinter (sal_Bool bCreate) { OSL_ASSERT(mpImpl.get()!=NULL); @@ -597,9 +591,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); @@ -615,7 +609,7 @@ USHORT ViewShellBase::SetPrinter ( pNewPrinter->SetMapMode(aMap); Size aNewSize = pNewPrinter->GetOutputSize(); - BOOL bScaleAll = FALSE; + sal_Bool bScaleAll = sal_False; if ( bIsAPI ) { WarningBox aWarnBox ( @@ -650,15 +644,6 @@ USHORT ViewShellBase::SetPrinter ( -PrintDialog* ViewShellBase::CreatePrintDialog (::Window *pParent) -{ - (void)pParent; - return NULL; -} - - - - SfxTabPage* ViewShellBase::CreatePrintOptionsPage( ::Window *pParent, const SfxItemSet &rOptions) @@ -671,39 +656,6 @@ SfxTabPage* ViewShellBase::CreatePrintOptionsPage( -USHORT ViewShellBase::Print(SfxProgress&, BOOL bIsAPI, PrintDialog* pDlg) -{ - (void)bIsAPI; - (void)pDlg; - return 0; -} - - - - -ErrCode ViewShellBase::DoPrint ( - SfxPrinter* pPrinter, - PrintDialog* pPrintDialog, - BOOL bSilent, BOOL bIsAPI ) -{ - (void)pPrinter; - (void)pPrintDialog; - (void)bSilent; - (void)bIsAPI; - return 0; -} - - - - -void ViewShellBase::PreparePrint (PrintDialog* pPrintDialog) -{ - SfxViewShell::PreparePrint (pPrintDialog); -} - - - - void ViewShellBase::UIActivating( SfxInPlaceClient* pClient ) { mpImpl->ShowViewTabBar(false); @@ -745,7 +697,7 @@ SvBorder ViewShellBase::GetBorder (bool ) void ViewShellBase::Execute (SfxRequest& rRequest) { - USHORT nSlotId = rRequest.GetSlot(); + sal_uInt16 nSlotId = rRequest.GetSlot(); switch (nSlotId) { @@ -889,7 +841,7 @@ void ViewShellBase::ReadUserDataSequence ( -void ViewShellBase::Activate (BOOL bIsMDIActivate) +void ViewShellBase::Activate (sal_Bool bIsMDIActivate) { SfxViewShell::Activate(bIsMDIActivate); @@ -907,7 +859,7 @@ void ViewShellBase::Activate (BOOL bIsMDIActivate) -void ViewShellBase::Deactivate (BOOL bIsMDIActivate) +void ViewShellBase::Deactivate (sal_Bool bIsMDIActivate) { SfxViewShell::Deactivate(bIsMDIActivate); } @@ -929,11 +881,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; @@ -949,7 +901,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); @@ -962,7 +914,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); @@ -1327,9 +1279,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(); } } @@ -1405,8 +1357,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(); @@ -1593,7 +1545,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; @@ -1605,14 +1557,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 a51ee7f09273..1d6f52adbed9 100644 --- a/sd/source/ui/view/ViewShellImplementation.cxx +++ b/sd/source/ui/view/ViewShellImplementation.cxx @@ -110,18 +110,18 @@ 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; String aOldName; AutoLayout aNewAutoLayout; - BOOL bBVisible; - BOOL bBObjsVisible; + sal_Bool bBVisible; + sal_Bool bBObjsVisible; const SfxItemSet* pArgs = rRequest.GetArgs(); if (pCurrentPage != NULL && pCurrentPage->TRG_HasMasterPage()) @@ -143,14 +143,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(); @@ -176,10 +176,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) @@ -197,7 +197,7 @@ void ViewShell::Implementation::ProcessModifyPageSlot ( } if (ePageKind == PK_HANDOUT) { - bHandoutMode = TRUE; + bHandoutMode = sal_True; pHandoutMPage = pDocument->GetMasterSdPage(0, PK_HANDOUT); } } @@ -211,7 +211,7 @@ void ViewShell::Implementation::ProcessModifyPageSlot ( SdPage* pUndoPage = bHandoutMode ? pHandoutMPage : pCurrentPage; - SfxUndoManager* pUndoManager = mrViewShell.GetDocSh()->GetUndoManager(); + ::svl::IUndoManager* pUndoManager = mrViewShell.GetDocSh()->GetUndoManager(); DBG_ASSERT(pUndoManager, "No UNDO MANAGER ?!?"); if( pUndoManager ) @@ -219,7 +219,7 @@ void ViewShell::Implementation::ProcessModifyPageSlot ( String aComment( SdResId(STR_UNDO_MODIFY_PAGE) ); pUndoManager->EnterListAction(aComment, aComment); ModifyPageUndoAction* pAction = new ModifyPageUndoAction( - pUndoManager, pDocument, pUndoPage, aNewName, aNewAutoLayout, bBVisible, bBObjsVisible); + pDocument, pUndoPage, aNewName, aNewAutoLayout, bBVisible, bBObjsVisible); pUndoManager->AddUndoAction(pAction); // Clear the selection because the selectec object may be removed as @@ -234,34 +234,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 ) ); @@ -278,8 +278,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 ) @@ -288,7 +288,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 ) @@ -304,8 +304,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 cdedb01ee7e0..4d34950ad9f6 100644 --- a/sd/source/ui/view/ViewShellManager.cxx +++ b/sd/source/ui/view/ViewShellManager.cxx @@ -230,8 +230,10 @@ private: DECL_LINK(WindowEventHandler, VclWindowEvent*); +#ifdef VERBOSE void DumpShellStack (const ShellStack& rStack); void DumpSfxShellStack (void); +#endif /** To be called before a shell is taken fom the SFX shell stack. This method deactivates an active text editing to avoid problems with @@ -907,7 +909,7 @@ void ViewShellManager::Implementation::UpdateShellStack (void) // Remember the undo manager from the top-most shell on the stack. SfxShell* pTopMostShell = mrBase.GetSubShell(0); - SfxUndoManager* pUndoManager = (pTopMostShell!=NULL) + ::svl::IUndoManager* pUndoManager = (pTopMostShell!=NULL) ? pTopMostShell->GetUndoManager() : NULL; @@ -922,7 +924,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); @@ -1008,7 +1010,7 @@ void ViewShellManager::Implementation::TakeShellsFromStack (const SfxShell* pShe // Remember the undo manager from the top-most shell on the stack. SfxShell* pTopMostShell = mrBase.GetSubShell(0); - SfxUndoManager* pUndoManager = (pTopMostShell!=NULL) + ::svl::IUndoManager* pUndoManager = (pTopMostShell!=NULL) ? pTopMostShell->GetUndoManager() : NULL; @@ -1019,7 +1021,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) @@ -1037,7 +1039,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); @@ -1180,7 +1182,7 @@ IMPL_LINK(ViewShellManager::Implementation, WindowEventHandler, VclWindowEvent*, break; } } - return TRUE; + return sal_True; } @@ -1314,6 +1316,7 @@ void ViewShellManager::Implementation::Shutdown (void) +#ifdef VERBOSE void ViewShellManager::Implementation::DumpShellStack (const ShellStack& rStack) { ShellStack::const_reverse_iterator iEntry; @@ -1332,7 +1335,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); @@ -1340,7 +1343,7 @@ void ViewShellManager::Implementation::DumpSfxShellStack (void) aSfxShellStack.push_back(mrBase.GetSubShell(nIndex)); DumpShellStack(aSfxShellStack); } - +#endif @@ -1365,7 +1368,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 270ace5928c2..49d3a6bd4baf 100644 --- a/sd/source/ui/view/ViewTabBar.cxx +++ b/sd/source/ui/view/ViewTabBar.cxx @@ -199,7 +199,7 @@ void ViewTabBar::disposing (void) { const SolarMutexGuard aSolarGuard; // 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(); @@ -454,7 +454,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( @@ -553,7 +553,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); @@ -568,7 +568,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)) @@ -629,7 +629,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) { @@ -647,8 +647,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/drawview.cxx b/sd/source/ui/view/drawview.cxx index 8553401c8608..7aaac3e01326 100644 --- a/sd/source/ui/view/drawview.cxx +++ b/sd/source/ui/view/drawview.cxx @@ -157,10 +157,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 ) @@ -175,11 +175,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 || @@ -199,7 +199,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) { @@ -209,8 +209,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)); @@ -222,8 +222,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 ); @@ -263,17 +263,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 { @@ -285,15 +285,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); @@ -314,13 +314,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)(' '); @@ -371,7 +371,7 @@ BOOL DrawView::SetAttributes(const SfxItemSet& rSet, nWhich = aWhichIter.NextWhich(); } - bOk = TRUE; + bOk = sal_True; } } } @@ -434,7 +434,7 @@ void DrawView::Notify(SfxBroadcaster& rBC, const SfxHint& rHint) |* \************************************************************************/ -void DrawView::BlockPageOrderChangedHint(BOOL bBlock) +void DrawView::BlockPageOrderChangedHint(sal_Bool bBlock) { if (bBlock) mnPOCHSmph++; @@ -452,19 +452,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 { @@ -492,7 +492,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) @@ -505,7 +505,7 @@ void DrawView::CompleteRedraw(OutputDevice* pOutDev, const Region& rReg, sdr::co { if( pShowWindow == pOutDev ) PresPaint(rReg); - bStandardPaint = FALSE; + bStandardPaint = sal_False; } } } @@ -537,7 +537,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);; } @@ -589,11 +589,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 b8c6924f79e7..19c6c0e57fdb 100644..100755 --- a/sd/source/ui/view/drbezob.cxx +++ b/sd/source/ui/view/drbezob.cxx @@ -126,7 +126,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() ); @@ -134,13 +134,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)); } } @@ -188,8 +188,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; } } @@ -205,9 +205,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()) @@ -220,8 +220,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; } } @@ -242,7 +242,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 8fa63b3297fd..a6a8f378a9f1 100644 --- a/sd/source/ui/view/drtxtob.cxx +++ b/sd/source/ui/view/drtxtob.cxx @@ -167,7 +167,7 @@ TextObjectBar::~TextObjectBar() void TextObjectBar::GetAttrState( SfxItemSet& rSet ) { SfxWhichIter aIter( rSet ); - USHORT nWhich = aIter.FirstWhich(); + sal_uInt16 nWhich = aIter.FirstWhich(); 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) ) { @@ -243,10 +243,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)) @@ -255,7 +255,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 ) ) @@ -266,7 +266,7 @@ void TextObjectBar::GetAttrState( SfxItemSet& rSet ) Paragraph* pPara = (Paragraph*) pList->First(); // find out if we are a OutlineView - BOOL bIsOutlineView(OUTLINERMODE_OUTLINEVIEW == pOLV->GetOutliner()->GetMode()); + sal_Bool bIsOutlineView(OUTLINERMODE_OUTLINEVIEW == pOLV->GetOutliner()->GetMode()); // This is ONLY for OutlineViews if(bIsOutlineView) @@ -276,7 +276,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 @@ -285,25 +285,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() ); @@ -313,7 +313,7 @@ void TextObjectBar::GetAttrState( SfxItemSet& rSet ) ( pOutl->GetParagraphCount() > 1 || !bOutlineViewSh) ) { // Nicht letzter Absatz - bDisableDown = FALSE; + bDisableDown = sal_False; } // disable when first para and 2nd is not a title @@ -325,7 +325,7 @@ void TextObjectBar::GetAttrState( SfxItemSet& rSet ) && !pOutl->HasParaFlag( pOutl->GetParagraph(1), PARAFLAG_ISPAGE ) ) { // Needs to be disabled - bDisableDown = TRUE; + bDisableDown = sal_True; } delete pList; @@ -352,13 +352,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; @@ -412,7 +412,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 @@ -440,17 +440,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() ); } @@ -469,16 +469,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; @@ -503,13 +503,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; // The case for the superordinate object is missing. @@ -539,26 +539,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; } } @@ -568,9 +568,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 b0a9fd98e527..78357508e71c 100644 --- a/sd/source/ui/view/drtxtob1.cxx +++ b/sd/source/ui/view/drtxtob1.cxx @@ -95,15 +95,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()); @@ -149,14 +149,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) @@ -164,8 +164,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(); @@ -177,7 +177,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 ) @@ -187,12 +187,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 ); } } } @@ -218,7 +218,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 ) @@ -228,7 +228,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; @@ -241,7 +241,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; @@ -254,7 +254,7 @@ void TextObjectBar::Execute( SfxRequest &rReq ) // Ensure bold/italic etc. icon state updates Invalidate(); // 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(); } @@ -269,7 +269,7 @@ void TextObjectBar::Execute( SfxRequest &rReq ) // Ensure bold/italic etc. icon state updates Invalidate(); // 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(); } @@ -282,7 +282,7 @@ void TextObjectBar::Execute( SfxRequest &rReq ) pOLV->AdjustHeight( -1 ); // 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(); } @@ -295,7 +295,7 @@ void TextObjectBar::Execute( SfxRequest &rReq ) pOLV->AdjustHeight( 1 ); // 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(); } @@ -313,7 +313,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; @@ -489,7 +489,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 @@ -501,7 +501,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 @@ -511,7 +511,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; @@ -551,8 +551,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 ) @@ -579,7 +579,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(); @@ -599,7 +599,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 c2810502dc2f..f31c56f5bc2c 100644 --- a/sd/source/ui/view/drviews1.cxx +++ b/sd/source/ui/view/drviews1.cxx @@ -105,7 +105,7 @@ using namespace com::sun::star; namespace sd { -void DrawViewShell::Activate(BOOL bIsMDIActivate) +void DrawViewShell::Activate(sal_Bool bIsMDIActivate) { ViewShell::Activate(bIsMDIActivate); } @@ -137,7 +137,7 @@ void DrawViewShell::UIDeactivated( SfxInPlaceClient* pCli ) |* \************************************************************************/ -void DrawViewShell::Deactivate(BOOL bIsMDIActivate) +void DrawViewShell::Deactivate(sal_Bool bIsMDIActivate) { ViewShell::Deactivate(bIsMDIActivate); } @@ -173,7 +173,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 ); @@ -188,8 +188,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) { @@ -202,7 +202,7 @@ void DrawViewShell::SelectionHasChanged (void) } ViewShellBase& rBase = GetViewShellBase(); - rBase.SetVerbs(0); + rBase.SetVerbs( uno::Sequence< embed::VerbDescriptor >() ); try { @@ -278,7 +278,7 @@ void DrawViewShell::SelectionHasChanged (void) // Invalidate for every subshell GetViewShellBase().GetViewShellManager()->InvalidateAllSubShells(this); - mpDrawView->UpdateSelectionClipboard( FALSE ); + mpDrawView->UpdateSelectionClipboard( sal_False ); GetViewShellBase().GetDrawController().FireSelectionChangeListener(); } @@ -294,7 +294,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 ); @@ -322,16 +322,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(); @@ -359,7 +359,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); @@ -408,9 +408,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(); @@ -432,7 +432,7 @@ void DrawViewShell::ChangeEditMode(EditMode eEMode, bool bIsLayerModeActive) * MASTERPAGE ******************************************************************/ GetViewFrame()->SetChildWindow( - AnimationChildWindow::GetChildWindowId(), FALSE ); + AnimationChildWindow::GetChildWindowId(), sal_False ); if (!mpActualPage) { @@ -441,10 +441,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()); @@ -534,11 +534,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 ) { @@ -555,10 +555,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 ) ); @@ -582,17 +582,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()); // 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 ) ); @@ -687,11 +687,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); } } @@ -707,10 +707,10 @@ void DrawViewShell::ResetActualPage() if (!GetDoc()) return; - 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; @@ -723,7 +723,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(); @@ -739,10 +739,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()); @@ -779,8 +779,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) { @@ -799,9 +799,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() ) { @@ -827,7 +827,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 @@ -836,7 +836,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))); @@ -848,10 +848,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 @@ -869,7 +869,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) @@ -880,7 +880,7 @@ BOOL DrawViewShell::SwitchPage(USHORT nSelectedPage) { ModifyGuard aGuard2( GetDoc() ); - bOK = TRUE; + bOK = sal_True; if (mpActualPage) { @@ -902,7 +902,7 @@ BOOL DrawViewShell::SwitchPage(USHORT nSelectedPage) && sPageText == maTabControl.GetPageText(nSelectedPage+1)) { // this slide is already visible - return TRUE; + return sal_True; } } } @@ -924,7 +924,7 @@ BOOL DrawViewShell::SwitchPage(USHORT nSelectedPage) && pNewPage->GetName() == maTabControl.GetPageText(nSelectedPage+1)) { // this slide is already visible - return TRUE; + return sal_True; } } } @@ -944,8 +944,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())) @@ -958,7 +958,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())) @@ -970,10 +970,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) @@ -984,7 +984,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 ) ) @@ -1001,7 +1001,7 @@ BOOL DrawViewShell::SwitchPage(USHORT nSelectedPage) /********************************************************************** * PAGEMODE **********************************************************************/ - GetDoc()->SetSelected(mpActualPage, TRUE); + GetDoc()->SetSelected(mpActualPage, sal_True); SdrPageView* pPageView = mpDrawView->GetSdrPageView(); @@ -1093,7 +1093,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); @@ -1155,12 +1155,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(); @@ -1176,12 +1176,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; @@ -1202,8 +1202,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 @@ -1217,11 +1217,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(); @@ -1317,8 +1317,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(); @@ -1339,8 +1339,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 3c2dff7872c5..e4950bd79910 100644 --- a/sd/source/ui/view/drviews2.cxx +++ b/sd/source/ui/view/drviews2.cxx @@ -115,7 +115,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) DeactivateCurrentFunction(); - USHORT nSId = rReq.GetSlot(); + sal_uInt16 nSId = rReq.GetSlot(); // Slot wird gemapped (ToolboxImages/-Slots) MapSlot( nSId ); @@ -167,49 +167,49 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) { if( rReq.GetArgs() ) { - BOOL bMergeUndo = FALSE; - SfxUndoManager* pUndoManager = GetDocSh()->GetUndoManager(); + sal_Bool bMergeUndo = sal_False; + ::svl::IUndoManager* pUndoManager = GetDocSh()->GetUndoManager(); // Anpassungen Start/EndWidth if(nSId == SID_ATTR_LINE_WIDTH) { 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); // 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)); } // 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)); } @@ -224,11 +224,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(); @@ -249,7 +249,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) // daher hart attributieren: Fuellung setzen if (!bMergeUndo) { - bMergeUndo = TRUE; + bMergeUndo = sal_True; pUndoManager->EnterListAction( String(), String() ); mpDrawView->BegUndo(); } @@ -311,12 +311,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 ); } @@ -324,7 +324,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) { OSL_FAIL(" 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 ); } @@ -358,13 +358,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); } } @@ -385,7 +385,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, @@ -422,7 +422,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() ); @@ -484,13 +484,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; } @@ -507,17 +507,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; } @@ -533,7 +533,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 ()); @@ -558,7 +558,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 ()); @@ -583,7 +583,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) case SID_ATTR_ZOOM: { const SfxItemSet* pArgs = rReq.GetArgs(); - mbZoomOnPage = FALSE; + mbZoomOnPage = sal_False; if ( pArgs ) { @@ -643,7 +643,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) if( rReq.GetSlot() == SID_CHANGEBEZIER ) { WaitObject aWait( (Window*)GetActiveWindow() ); - mpDrawView->ConvertMarkedToPathObj(FALSE); + mpDrawView->ConvertMarkedToPathObj(sal_False); } else { @@ -652,7 +652,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) else { WaitObject aWait( (Window*)GetActiveWindow() ); - mpDrawView->ConvertMarkedToPolyObj(FALSE); + mpDrawView->ConvertMarkedToPolyObj(sal_False); } } @@ -684,7 +684,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) else { WaitObject aWait( (Window*)GetActiveWindow() ); - mpDrawView->ConvertMarkedToPathObj(TRUE); + mpDrawView->ConvertMarkedToPathObj(sal_True); Invalidate(SID_CONVERT_TO_CONTOUR); } @@ -788,24 +788,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++ ) { @@ -821,9 +821,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++ ) { @@ -834,11 +834,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"); @@ -848,7 +848,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) if( nLevel == 1 ) // Textrahmen hoert auf StyleSheet der Ebene1 - pObj->NbcSetStyleSheet(pSheet, FALSE); + pObj->NbcSetStyleSheet(pSheet, sal_False); } } @@ -888,11 +888,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) ) { @@ -975,7 +975,8 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) SdPage* DrawViewShell::CreateOrDuplicatePage ( SfxRequest& rRequest, PageKind ePageKind, - SdPage* pPage) + SdPage* pPage, + const sal_Int32 nInsertPosition) { SdPage* pNewPage = NULL; if (ePageKind == PK_STANDARD && meEditMode != EM_MASTERPAGE) @@ -984,7 +985,7 @@ SdPage* DrawViewShell::CreateOrDuplicatePage ( { mpDrawView->SdrEndTextEdit(); } - pNewPage = ViewShell::CreateOrDuplicatePage (rRequest, ePageKind, pPage); + pNewPage = ViewShell::CreateOrDuplicatePage (rRequest, ePageKind, pPage, nInsertPosition); } return pNewPage; } diff --git a/sd/source/ui/view/drviews3.cxx b/sd/source/ui/view/drviews3.cxx index 0d763d0dea71..6503e70066d1 100644 --- a/sd/source/ui/view/drviews3.cxx +++ b/sd/source/ui/view/drviews3.cxx @@ -131,7 +131,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: @@ -147,7 +147,7 @@ void DrawViewShell::ExecCtrl(SfxRequest& rReq) } } - // USHORT nSlot = rReq.GetSlot(); + // sal_uInt16 nSlot = rReq.GetSlot(); switch (nSlot) { case SID_SWITCHPAGE: // BASIC @@ -155,13 +155,13 @@ void DrawViewShell::ExecCtrl(SfxRequest& rReq) // 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) { @@ -169,8 +169,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 (); @@ -219,11 +219,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 (); } @@ -242,8 +242,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)) @@ -270,8 +270,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)) @@ -368,7 +368,7 @@ void DrawViewShell::ExecCtrl(SfxRequest& rReq) case SID_RELOAD: { - USHORT nId = Svx3DChildWindow::GetChildWindowId(); + sal_uInt16 nId = Svx3DChildWindow::GetChildWindowId(); SfxViewFrame* pFrame = GetViewFrame(); try @@ -419,7 +419,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) { @@ -462,7 +462,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()); } @@ -538,8 +538,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); @@ -596,8 +596,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); @@ -678,7 +678,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 ); @@ -827,7 +827,7 @@ void DrawViewShell::GetRulerState(SfxItemSet& rSet) rSet.Put( rItem ); 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 ); @@ -876,8 +876,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 ) @@ -892,7 +892,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 ); @@ -961,9 +961,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 34f547d21349..e9ca32594cd7 100644..100755 --- a/sd/source/ui/view/drviews4.cxx +++ b/sd/source/ui/view/drviews4.cxx @@ -94,7 +94,7 @@ using namespace ::com::sun::star::drawing; void DrawViewShell::DeleteActualPage() { - USHORT nPage = maTabControl.GetCurPageId() - 1; + sal_uInt16 nPage = maTabControl.GetCurPageId() - 1; mpDrawView->SdrEndTextEdit(); @@ -124,13 +124,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; @@ -150,9 +150,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 ) ) { @@ -177,7 +177,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) { @@ -197,7 +197,7 @@ BOOL DrawViewShell::KeyInput (const KeyEvent& rKEvt, ::sd::Window* pWin) if(pObj == pOldObj) { - bDidVisitOldObject = TRUE; + bDidVisitOldObject = sal_True; } } } @@ -245,13 +245,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; @@ -263,7 +263,7 @@ void DrawViewShell::StartRulerDrag ( eKind = SDRHELPLINE_VERTICAL; mpDrawView->BegDragHelpLine(aWPos, eKind); - mbIsRulerDrag = TRUE; + mbIsRulerDrag = sal_True; } } @@ -283,7 +283,7 @@ void DrawViewShell::MouseButtonDown(const MouseEvent& rMEvt, // the contex menu is closed by VCL asynchronously which in the end // would work on deleted objects or the context menu has no parent anymore) SfxInPlaceClient* pIPClient = GetViewShell()->GetIPClient(); - BOOL bIsOleActive = ( pIPClient && pIPClient->IsObjectInPlaceActive() ); + sal_Bool bIsOleActive = ( pIPClient && pIPClient->IsObjectInPlaceActive() ); if ( bIsOleActive && PopupMenu::IsInExecute() ) return; @@ -314,7 +314,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) { @@ -323,7 +323,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 ()) @@ -411,9 +411,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 ) ) ); } } } @@ -456,7 +456,7 @@ void DrawViewShell::MouseButtonUp(const MouseEvent& rMEvt, ::sd::Window* pWin) } GetActiveWindow()->ReleaseMouse(); - mbIsRulerDrag = FALSE; + mbIsRulerDrag = sal_False; } else ViewShell::MouseButtonUp(rMEvt, pWin); @@ -476,7 +476,7 @@ void DrawViewShell::Command(const CommandEvent& rCEvt, ::sd::Window* pWin) // deactivate the inplace client without any problem regarding parent // windows and code on the stack. SfxInPlaceClient* pIPClient = GetViewShell()->GetIPClient(); - BOOL bIsOleActive = ( pIPClient && pIPClient->IsObjectInPlaceActive() ); + sal_Bool bIsOleActive = ( pIPClient && pIPClient->IsObjectInPlaceActive() ); if ( bIsOleActive && ( rCEvt.GetCommand() == COMMAND_CONTEXTMENU )) { // Deactivate OLE object @@ -504,7 +504,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 ); @@ -523,18 +523,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; @@ -583,10 +583,10 @@ void DrawViewShell::Command(const CommandEvent& rCEvt, ::sd::Window* pWin) SvxFieldItem aFieldItem( *pField, EE_FEATURE_FIELD ); // 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 ); @@ -657,8 +657,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) { @@ -813,7 +813,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 @@ -838,7 +838,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(); @@ -917,7 +917,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]); @@ -944,9 +944,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 71b852ff0328..7c62e2d7bbe1 100644..100755 --- a/sd/source/ui/view/drviews5.cxx +++ b/sd/source/ui/view/drviews5.cxx @@ -50,7 +50,7 @@ #include "res_bmp.hrc" #include "glob.hrc" #include "app.hrc" - +#include "helpids.h" #include "optsitem.hxx" #include "app.hxx" #include "FrameView.hxx" @@ -90,9 +90,9 @@ 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 ); - 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 ); @@ -147,11 +147,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 ) { @@ -271,7 +271,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 ); @@ -311,7 +311,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) { @@ -319,7 +319,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); @@ -498,7 +498,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); } @@ -530,7 +530,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; } } } @@ -549,7 +549,7 @@ void DrawViewShell::HidePage() { FmFormShell* pFormShell = GetViewShellBase().GetFormShellManager()->GetFormShell(); if (pFormShell != NULL) - pFormShell->PrepareClose (FALSE); + pFormShell->PrepareClose (sal_False); } @@ -593,20 +593,20 @@ void DrawViewShell::ReadUserDataSequence ( const ::com::sun::star::uno::Sequence if (mePageKind == PK_NOTES) { SetHelpId( SID_NOTESMODE ); - GetActiveWindow()->SetHelpId( SID_NOTESMODE ); - GetActiveWindow()->SetUniqueId( SID_NOTESMODE ); + GetActiveWindow()->SetHelpId( CMD_SID_NOTESMODE ); + GetActiveWindow()->SetUniqueId( CMD_SID_NOTESMODE ); } else if (mePageKind == PK_HANDOUT) { SetHelpId( SID_HANDOUTMODE ); - GetActiveWindow()->SetHelpId( SID_HANDOUTMODE ); - GetActiveWindow()->SetUniqueId( SID_HANDOUTMODE ); + GetActiveWindow()->SetHelpId( CMD_SID_HANDOUTMODE ); + GetActiveWindow()->SetUniqueId( CMD_SID_HANDOUTMODE ); } else { SetHelpId( SD_IF_SDDRAWVIEWSHELL ); - GetActiveWindow()->SetHelpId( SD_IF_SDDRAWVIEWSHELL ); - GetActiveWindow()->SetUniqueId( SD_IF_SDDRAWVIEWSHELL ); + GetActiveWindow()->SetHelpId( HID_SDDRAWVIEWSHELL ); + GetActiveWindow()->SetUniqueId( HID_SDDRAWVIEWSHELL ); } } @@ -704,8 +704,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 4674a3f04acc..b178aa5fef1c 100644 --- a/sd/source/ui/view/drviews6.cxx +++ b/sd/source/ui/view/drviews6.cxx @@ -99,12 +99,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(); @@ -137,7 +137,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()); @@ -190,7 +190,7 @@ void DrawViewShell::ExecAnimationWin( SfxRequest& rReq ) CheckLineTo (rReq); - USHORT nSId = rReq.GetSlot(); + sal_uInt16 nSId = rReq.GetSlot(); switch( nSId ) { @@ -199,7 +199,7 @@ void DrawViewShell::ExecAnimationWin( SfxRequest& rReq ) case SID_ANIMATOR_CREATE: { AnimationWindow* pAnimWin; - USHORT nId = AnimationChildWindow::GetChildWindowId(); + sal_uInt16 nId = AnimationChildWindow::GetChildWindowId(); pAnimWin = static_cast<AnimationWindow*>( GetViewFrame()->GetChildWindow(nId)->GetWindow()); @@ -233,10 +233,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; @@ -245,14 +245,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(); @@ -278,52 +278,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 ) ) ); } } @@ -359,7 +359,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() ) { @@ -371,7 +371,7 @@ void DrawViewShell::ExecBmpMask( SfxRequest& rReq ) else { delete pNewObj; - bCont = FALSE; + bCont = sal_False; } } @@ -386,7 +386,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() ) ); @@ -412,9 +412,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 ) ) { @@ -429,7 +429,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 ) ); @@ -443,7 +443,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: @@ -611,13 +611,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()) @@ -695,11 +695,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 d896ccb07c86..5d69c6580ec5 100644 --- a/sd/source/ui/view/drviews7.cxx +++ b/sd/source/ui/view/drviews7.cxx @@ -36,6 +36,7 @@ #include <svx/svdouno.hxx> #include <editeng/eeitem.hxx> #include <editeng/flditem.hxx> +#include <editeng/outlobj.hxx> #include <svx/svxids.hrc> #include <svx/svdpagv.hxx> #include <svx/clipfmtitem.hxx> @@ -225,7 +226,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) } ViewShell::GetMenuState(rSet); - BOOL bDisableVerticalText = !SvtLanguageOptions().IsVerticalTextEnabled(); + sal_Bool bDisableVerticalText = !SvtLanguageOptions().IsVerticalTextEnabled(); if ( bDisableVerticalText ) { @@ -235,10 +236,10 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) rSet.DisableItem( SID_DRAW_TEXT_VERTICAL ); } - bool bConvertToPathPossible = mpDrawView->IsConvertToPathObjPossible(FALSE); + bool 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 ); @@ -247,16 +248,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 ); @@ -305,7 +306,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) if(bDisable) { - rSet.DisableItem(SID_EXPAND_PAGE); + rSet.DisableItem(SID_ASSIGN_LAYOUT); } } @@ -320,9 +321,26 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) { SdrObject* pObj = pPage->GetPresObj(PRESOBJ_OUTLINE); - if(pObj && !pObj->IsEmptyPresObj()) + if (pObj!=NULL ) { - bDisable = false; + if( !pObj->IsEmptyPresObj() ) + { + bDisable = false; + } + else + { + // check if the object is in edit, than its temporarely not empty + SdrTextObj* pTextObj = dynamic_cast< SdrTextObj* >( pObj ); + if( pTextObj ) + { + OutlinerParaObject* pParaObj = pTextObj->GetEditOutlinerParaObject(); + if( pParaObj ) + { + delete pParaObj; + bDisable = false; + } + } + } } } } @@ -381,15 +399,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()) @@ -435,12 +453,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 ) ); @@ -484,16 +502,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 ); @@ -543,12 +561,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 ) ) { @@ -603,14 +621,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 ) @@ -642,10 +660,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() ) @@ -731,19 +749,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) { @@ -751,7 +769,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) if (pPage->GetAutoLayout() == AUTOLAYOUT_TITLE) { - bDisable = FALSE; + bDisable = sal_False; } i++; @@ -763,7 +781,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) } else { - rSet.Put(SfxBoolItem(SID_TITLE_MASTERPAGE, FALSE)); + rSet.Put(SfxBoolItem(SID_TITLE_MASTERPAGE, sal_False)); } } else @@ -778,28 +796,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? @@ -811,7 +829,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()); @@ -819,7 +837,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) { // Eine Seite mit dem AutoLayout "Titel" // referenziert die aktuelle MasterPage - bCheck = TRUE; + bCheck = sal_True; } } @@ -829,7 +847,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)); @@ -843,17 +861,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)); } } @@ -881,10 +899,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))); @@ -904,25 +922,25 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) { OutlinerView* pOlView = mpDrawView->GetTextEditOutlinerView(); - // Sonderbehandlung für SID_OUTLINE_BULLET wenn Objekte + // 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; } @@ -951,7 +969,6 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) rSet.DisableItem( SID_INSERT_PLUGIN ); rSet.DisableItem( SID_INSERT_SOUND ); rSet.DisableItem( SID_INSERT_VIDEO ); - rSet.DisableItem( SID_INSERT_APPLET ); rSet.DisableItem( SID_INSERT_FLOATINGFRAME ); rSet.DisableItem( SID_INSERT_MATH ); rSet.DisableItem( SID_INSERT_DIAGRAM ); @@ -961,7 +978,6 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) rSet.DisableItem( SID_SIZE_ALL ); rSet.DisableItem( SID_SIZE_PAGE_WIDTH ); rSet.DisableItem( SID_SIZE_PAGE ); -// rSet.DisableItem( SID_INSERTPAGE ); rSet.DisableItem( SID_DUPLICATE_PAGE ); rSet.DisableItem( SID_ZOOM_TOOLBOX ); } @@ -992,7 +1008,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()) { @@ -1003,7 +1019,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 ) ); @@ -1017,11 +1033,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)); } } @@ -1052,7 +1068,6 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) rSet.DisableItem( SID_INSERT_PLUGIN ); rSet.DisableItem( SID_INSERT_SOUND ); rSet.DisableItem( SID_INSERT_VIDEO ); - rSet.DisableItem( SID_INSERT_APPLET ); rSet.DisableItem( SID_INSERT_FLOATINGFRAME ); rSet.DisableItem( SID_INSERT_MATH ); @@ -1355,20 +1370,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) { @@ -1381,42 +1396,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; } } @@ -1502,7 +1517,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) //highlight selected custom shape { - USHORT nCurrentSId = 0; + sal_uInt16 nCurrentSId = 0; if(HasCurrentFunction()) nCurrentSId = GetCurrentFunction()->GetSlotID(); @@ -1526,7 +1541,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) if ( bDisableEditHyperlink ) rSet.DisableItem( SID_OPEN_HYPERLINK ); -#if defined WIN || defined WNT || defined UNX +#if defined WNT || defined UNX if( !mxScannerManager.is() ) { rSet.DisableItem( SID_TWAIN_SELECT ); @@ -1534,11 +1549,6 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) } #endif -// Fuer Win16 -#ifndef SOLAR_JAVA - rSet.DisableItem( SID_INSERT_APPLET ); -#endif - // Set the state of two entries in the 'Slide' context sub-menu // concerning the visibility of master page background and master page // shapes. @@ -1551,8 +1561,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, @@ -1566,25 +1576,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)); } // Removed [GetDocSh()->GetCurrentFunction() ||] from the following @@ -1640,7 +1650,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 62f19d5b2930..b12c10e276e7 100644 --- a/sd/source/ui/view/drviews8.cxx +++ b/sd/source/ui/view/drviews8.cxx @@ -188,7 +188,6 @@ void DrawViewShell::FuTemp01(SfxRequest& rReq) case SID_INSERT_PLUGIN: case SID_INSERT_SOUND: case SID_INSERT_VIDEO: - case SID_INSERT_APPLET: case SID_INSERT_FLOATINGFRAME: case SID_INSERT_MATH: case SID_INSERT_DIAGRAM: @@ -205,7 +204,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(); @@ -248,7 +247,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 ); @@ -342,7 +341,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(); @@ -376,7 +375,7 @@ void DrawViewShell::FuTemp01(SfxRequest& rReq) case SID_TWAIN_TRANSFER: { - BOOL bDone = FALSE; + sal_Bool bDone = sal_False; if( mxScannerManager.is() ) { @@ -387,7 +386,7 @@ void DrawViewShell::FuTemp01(SfxRequest& rReq) if( aContexts.getLength() ) { mxScannerManager->startScan( aContexts.getConstArray()[ 0 ], mxScannerListener ); - bDone = TRUE; + bDone = sal_True; } } catch( ... ) @@ -398,9 +397,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(); @@ -503,7 +502,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() ) { @@ -520,8 +519,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 bcaac6d8b866..c1b3cbf249f1 100644..100755 --- a/sd/source/ui/view/drviews9.cxx +++ b/sd/source/ui/view/drviews9.cxx @@ -97,12 +97,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) @@ -155,7 +155,7 @@ void DrawViewShell::ExecGallery(SfxRequest& rReq) SdrGrafObj* pGrafObj = NULL; - BOOL bInsertNewObject = TRUE; + sal_Bool bInsertNewObject = sal_True; if ( mpDrawView->AreObjectsMarked() ) { @@ -179,10 +179,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); @@ -217,7 +217,7 @@ void DrawViewShell::ExecGallery(SfxRequest& rReq) GetViewFrame()->GetDispatcher()->Execute( SID_INSERT_AVMEDIA, SFX_CALLMODE_SYNCHRON, &aMediaURLItem, 0L ); } - GetDocSh()->SetWaitCursor( FALSE ); + GetDocSh()->SetWaitCursor( sal_False ); } } } @@ -268,7 +268,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); @@ -288,7 +288,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); @@ -308,7 +308,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); @@ -322,15 +322,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); @@ -345,14 +345,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; @@ -366,16 +366,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); @@ -426,16 +426,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); @@ -480,13 +480,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)) { @@ -528,14 +528,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) && @@ -603,10 +603,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)) @@ -662,7 +662,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 (); @@ -696,7 +696,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 (); @@ -777,7 +777,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 48f5d5b0c3d9..954b2104f24f 100644 --- a/sd/source/ui/view/drviewsa.cxx +++ b/sd/source/ui/view/drviewsa.cxx @@ -60,6 +60,7 @@ #include <sfx2/dispatch.hxx> #include <svtools/cliplistener.hxx> #include <svx/float3d.hxx> +#include "helpids.h" #include "view/viewoverlaymanager.hxx" #include "app.hrc" @@ -93,7 +94,7 @@ static const ::rtl::OUString MASTER_VIEW_TOOL_BAR_NAME( namespace sd { -BOOL DrawViewShell::mbPipette = FALSE; +sal_Bool DrawViewShell::mbPipette = sal_False; // ------------------------ // - ScannerEventListener - @@ -166,7 +167,7 @@ DrawViewShell::~DrawViewShell() // 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) { @@ -184,25 +185,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(); // prevent callback if another thread is waiting mpClipEvtLstnr->release(); } @@ -225,11 +226,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(); @@ -241,7 +242,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; @@ -273,7 +274,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. @@ -333,16 +334,16 @@ void DrawViewShell::Construct(DrawDocShell* pDocSh, PageKind eInitialPageKind) if( eDocType == DOCUMENT_TYPE_DRAW ) { SetHelpId( SD_IF_SDGRAPHICVIEWSHELL ); - GetActiveWindow()->SetHelpId( SD_IF_SDGRAPHICVIEWSHELL ); - GetActiveWindow()->SetUniqueId( SD_IF_SDGRAPHICVIEWSHELL ); + GetActiveWindow()->SetHelpId( HID_SDGRAPHICVIEWSHELL ); + GetActiveWindow()->SetUniqueId( HID_SDGRAPHICVIEWSHELL ); } else { if (mePageKind == PK_NOTES) { SetHelpId( SID_NOTESMODE ); - GetActiveWindow()->SetHelpId( SID_NOTESMODE ); - GetActiveWindow()->SetUniqueId( SID_NOTESMODE ); + GetActiveWindow()->SetHelpId( CMD_SID_NOTESMODE ); + GetActiveWindow()->SetUniqueId( CMD_SID_NOTESMODE ); // AutoLayouts muessen erzeugt sein GetDoc()->StopWorkStartupDelay(); @@ -350,8 +351,8 @@ void DrawViewShell::Construct(DrawDocShell* pDocSh, PageKind eInitialPageKind) else if (mePageKind == PK_HANDOUT) { SetHelpId( SID_HANDOUTMODE ); - GetActiveWindow()->SetHelpId( SID_HANDOUTMODE ); - GetActiveWindow()->SetUniqueId( SID_HANDOUTMODE ); + GetActiveWindow()->SetHelpId( CMD_SID_HANDOUTMODE ); + GetActiveWindow()->SetUniqueId( CMD_SID_HANDOUTMODE ); // AutoLayouts muessen erzeugt sein GetDoc()->StopWorkStartupDelay(); @@ -359,26 +360,26 @@ void DrawViewShell::Construct(DrawDocShell* pDocSh, PageKind eInitialPageKind) else { SetHelpId( SD_IF_SDDRAWVIEWSHELL ); - GetActiveWindow()->SetHelpId( SD_IF_SDDRAWVIEWSHELL ); - GetActiveWindow()->SetUniqueId( SD_IF_SDDRAWVIEWSHELL ); + GetActiveWindow()->SetHelpId( HID_SDDRAWVIEWSHELL ); + GetActiveWindow()->SetUniqueId( HID_SDDRAWVIEWSHELL ); } } // 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); @@ -510,12 +511,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++) { @@ -588,7 +589,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(); @@ -597,7 +598,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; @@ -640,7 +641,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 ); @@ -648,7 +649,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 ) ) @@ -672,7 +673,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 ) @@ -769,13 +770,13 @@ void DrawViewShell::GetStatusBarState(SfxItemSet& rSet) SdrLayer* pLayer = NULL; SdrObject* pObj = NULL; const SdrMarkList& rMarkList = mpDrawView->GetMarkedObjectList(); - ULONG nMarkCount = rMarkList.GetMarkCount(); - bool bOneLayer = TRUE; + sal_uLong nMarkCount = rMarkList.GetMarkCount(); + bool bOneLayer = 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 ) @@ -783,7 +784,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 62284abda129..d3fec090aef7 100644..100755 --- a/sd/source/ui/view/drviewsb.cxx +++ b/sd/source/ui/view/drviewsb.cxx @@ -32,7 +32,7 @@ #include <comphelper/processfactory.hxx> #include <svx/svdlayer.hxx> #include <svx/svxids.hrc> - +#include <sfx2/msgpool.hxx> #include <sfx2/viewfrm.hxx> #include <svx/hlnkitem.hxx> #include <tools/urlobj.hxx> @@ -86,7 +86,7 @@ namespace sd { void DrawViewShell::FuTemp02(SfxRequest& rReq) { - USHORT nSId = rReq.GetSlot(); + sal_uInt16 nSId = rReq.GetSlot(); switch( nSId ) { case SID_INSERTLAYER: @@ -97,13 +97,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(); @@ -123,16 +123,16 @@ void DrawViewShell::FuTemp02(SfxRequest& rReq) AbstractSdInsertLayerDlg* pDlg = pFact ? pFact->CreateSdInsertLayerDlg(NULL, aNewAttr, true, String( SdResId( STR_INSERTLAYER ) ) ) : 0; if( pDlg ) { - pDlg->SetHelpId( SID_INSERTLAYER ); + 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 @@ -143,7 +143,7 @@ void DrawViewShell::FuTemp02(SfxRequest& rReq) aWarningBox.Execute(); } else - bLoop = FALSE; + bLoop = sal_False; } if( bLoop ) // wurde abgebrochen { @@ -174,10 +174,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 (); @@ -188,7 +188,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++ ) @@ -198,12 +198,12 @@ void DrawViewShell::FuTemp02(SfxRequest& rReq) if ( aPrevLayer == aName ) { - 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 ); @@ -218,7 +218,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); @@ -236,9 +236,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() ); @@ -247,10 +247,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(); @@ -286,17 +286,17 @@ void DrawViewShell::FuTemp02(SfxRequest& rReq) AbstractSdInsertLayerDlg* pDlg = pFact ? pFact->CreateSdInsertLayerDlg(NULL, aNewAttr, bDelete, String( SdResId( STR_MODIFYLAYER ) ) ) : 0; if( pDlg ) { - pDlg->SetHelpId( SID_MODIFYLAYER ); + 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 @@ -307,7 +307,7 @@ void DrawViewShell::FuTemp02(SfxRequest& rReq) aWarningBox.Execute(); } else - bLoop = FALSE; + bLoop = sal_False; } switch (nRet) { @@ -331,10 +331,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 (); @@ -349,7 +349,7 @@ void DrawViewShell::FuTemp02(SfxRequest& rReq) break; } - SfxUndoManager* pManager = GetDoc()->GetDocSh()->GetUndoManager(); + ::svl::IUndoManager* pManager = GetDoc()->GetDocSh()->GetUndoManager(); SdLayerModifyUndoAction* pAction = new SdLayerModifyUndoAction( GetDoc(), pLayer, @@ -426,8 +426,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) @@ -495,7 +495,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 ) @@ -579,19 +579,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() ); @@ -717,9 +717,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; @@ -733,13 +733,13 @@ 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(); - SfxUndoManager* pManager = GetDoc()->GetDocSh()->GetUndoManager(); + ::svl::IUndoManager* pManager = GetDoc()->GetDocSh()->GetUndoManager(); ModifyPageUndoAction* pAction = new ModifyPageUndoAction( - pManager, GetDoc(), pUndoPage, rName, pUndoPage->GetAutoLayout(), + GetDoc(), pUndoPage, rName, pUndoPage->GetAutoLayout(), aVisibleLayers.IsSet( nBackground ), aVisibleLayers.IsSet( nBgObj )); pManager->AddUndoAction( pAction ); @@ -761,7 +761,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 ) { @@ -769,10 +769,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 ); @@ -820,12 +820,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; @@ -840,7 +840,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 7540a9b4149b..5b6477ca29db 100644..100755 --- a/sd/source/ui/view/drviewsc.cxx +++ b/sd/source/ui/view/drviewsc.cxx @@ -78,12 +78,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(); @@ -133,7 +133,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(); @@ -168,7 +168,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(); @@ -302,10 +302,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 (); @@ -341,21 +341,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(); @@ -411,7 +411,7 @@ void DrawViewShell::FuTemp03(SfxRequest& rReq) } WaitObject aWait( (Window*)GetActiveWindow() ); - mpDrawView->ConvertMarkedObjTo3D(TRUE); + mpDrawView->ConvertMarkedObjTo3D(sal_True); } } @@ -571,7 +571,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); @@ -593,7 +593,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 ); @@ -641,9 +641,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: @@ -793,7 +793,6 @@ USHORT DrawViewShell::GetIdBySubId( USHORT nSId ) case SID_INSERT_PLUGIN: case SID_INSERT_SOUND: case SID_INSERT_VIDEO: - case SID_INSERT_APPLET: case SID_INSERT_TABLE: { nMappedSId = SID_DRAWTBX_INSERT; @@ -842,13 +841,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; } } @@ -859,11 +858,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; @@ -877,7 +876,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] ) ); } @@ -890,10 +889,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 ]; @@ -913,9 +912,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 6f446b16937f..6d46b298b3ec 100644..100755 --- a/sd/source/ui/view/drviewsd.cxx +++ b/sd/source/ui/view/drviewsd.cxx @@ -67,13 +67,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 ) { @@ -121,7 +121,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) { @@ -133,7 +133,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) { @@ -158,7 +158,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); @@ -183,11 +183,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() ) ); @@ -196,9 +196,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 74dbd463ba86..b26c3452675b 100644 --- a/sd/source/ui/view/drviewse.cxx +++ b/sd/source/ui/view/drviewse.cxx @@ -162,7 +162,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 || @@ -174,7 +174,7 @@ void DrawViewShell::FuPermanent(SfxRequest& rReq) if( pFuText ) { - pFuText->SetPermanent(TRUE); + pFuText->SetPermanent(sal_True); xFunc->ReceiveRequest( rReq ); MapSlot( nSId ); @@ -193,8 +193,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; @@ -232,7 +232,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(); @@ -329,6 +329,16 @@ void DrawViewShell::FuPermanent(SfxRequest& rReq) { short nSlotId = rReq.GetSlot(); + if( nSlotId == SID_OBJECT_ROTATE ) + { + // togle rotation + if( nOldSId == nSlotId ) + { + nSlotId = SID_OBJECT_SELECT; + rReq.SetSlot( nSlotId ); + } + } + if (nSlotId == SID_OBJECT_CROOK_ROTATE || nSlotId == SID_OBJECT_CROOK_SLANT || nSlotId == SID_OBJECT_CROOK_STRETCH) @@ -347,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 { @@ -384,7 +394,7 @@ void DrawViewShell::FuPermanent(SfxRequest& rReq) { // Implizite Wandlung in Bezier WaitObject aWait( (Window*)GetActiveWindow() ); - mpDrawView->ConvertMarkedToPathObj(FALSE); + mpDrawView->ConvertMarkedToPathObj(sal_False); } } } @@ -548,7 +558,7 @@ void DrawViewShell::FuPermanent(SfxRequest& rReq) if(HasOldFunction()) { - USHORT nSlotId = GetOldFunction()->GetSlotID(); + sal_uInt16 nSlotId = GetOldFunction()->GetSlotID(); GetOldFunction()->Deactivate(); SetOldFunction(0); @@ -577,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()) @@ -659,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 ); @@ -687,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() ); @@ -763,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(); @@ -785,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(); @@ -827,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(); } @@ -842,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 ); @@ -873,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(); @@ -924,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 (); } @@ -941,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) { @@ -951,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); } @@ -1045,17 +1055,17 @@ void DrawViewShell::FuSupport(SfxRequest& rReq) const SfxItemSet* pReqArgs = rReq.GetArgs(); // 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()); // Did ruler state change? Tell that to SdOptions, too. - BOOL bHasRuler(HasRuler()); + sal_Bool bHasRuler(HasRuler()); if(bOldHasRuler != bHasRuler) { @@ -1119,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()) ); @@ -1134,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()) ); @@ -1154,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 ); @@ -1169,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(); @@ -1199,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 ) @@ -1298,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; @@ -1364,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(); @@ -1460,13 +1470,13 @@ void DrawViewShell::FuSupport(SfxRequest& rReq) case SID_UNDO : { // moved implementation to BaseClass - ImpSidUndo(TRUE, rReq); + ImpSidUndo(sal_True, rReq); } break; case SID_REDO : { // moved implementation to BaseClass - ImpSidRedo(TRUE, rReq); + ImpSidRedo(sal_True, rReq); } break; @@ -1501,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); @@ -1512,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; @@ -1548,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, @@ -1561,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 ); @@ -1583,7 +1593,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; @@ -1630,7 +1640,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 a7912a89e44a..d0a0d89fc8a2 100644 --- a/sd/source/ui/view/drviewsf.cxx +++ b/sd/source/ui/view/drviewsf.cxx @@ -200,16 +200,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) ) @@ -217,7 +217,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 @@ -287,14 +287,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 ) @@ -311,7 +311,7 @@ void DrawViewShell::GetAttrState( SfxItemSet& rSet ) case SID_ATTR_LINE_COLOR: case SID_ATTR_TEXT_FITTOSIZE: { - bAttr = TRUE; + bAttr = sal_True; } break; @@ -321,7 +321,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 ) ); } } @@ -384,7 +384,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()); @@ -460,10 +460,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,7 +496,7 @@ void DrawViewShell::GetAttrState( SfxItemSet& rSet ) |* \************************************************************************/ -String DrawViewShell::GetSelectionText(BOOL bCompleteWords) +String DrawViewShell::GetSelectionText(sal_Bool bCompleteWords) { String aStrSelection; ::Outliner* pOl = mpDrawView->GetTextEditOutliner(); @@ -528,9 +528,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) { @@ -538,12 +538,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 9b33f3b60427..5928ddba641e 100644..100755 --- a/sd/source/ui/view/drviewsg.cxx +++ b/sd/source/ui/view/drviewsg.cxx @@ -90,13 +90,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 ) { @@ -107,7 +107,7 @@ void DrawViewShell::GetIMapState( SfxItemSet& rSet ) && pImageMapDialog!=NULL && ( pImageMapDialog->GetEditingObject() == (void*) pObj ) ) { - bDisable = FALSE; + bDisable = sal_False; } } } @@ -127,8 +127,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()); @@ -226,7 +226,7 @@ void DrawViewShell::ExecOptionsBar( SfxRequest& rReq ) break; default: - bDefault = TRUE; + bDefault = sal_True; break; } @@ -269,7 +269,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 758ed5f49f18..fffb35d155bf 100644..100755 --- a/sd/source/ui/view/drviewsh.cxx +++ b/sd/source/ui/view/drviewsh.cxx @@ -64,9 +64,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 bb011c5af2fb..26054a73e689 100644..100755 --- a/sd/source/ui/view/drviewsi.cxx +++ b/sd/source/ui/view/drviewsi.cxx @@ -80,13 +80,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 ) { @@ -119,7 +119,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 ) { @@ -136,7 +136,7 @@ void DrawViewShell::Update3DWindow() void DrawViewShell::AssignFrom3DWindow() { - USHORT nId = Svx3DChildWindow::GetChildWindowId(); + sal_uInt16 nId = Svx3DChildWindow::GetChildWindowId(); SfxChildWindow* pWin = GetViewFrame()->GetChildWindow( nId ); if( pWin ) { @@ -158,12 +158,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 59634aff8cde..ad4c67927abb 100644..100755 --- a/sd/source/ui/view/drviewsj.cxx +++ b/sd/source/ui/view/drviewsj.cxx @@ -77,7 +77,7 @@ void DrawViewShell::GetMenuStateSel( SfxItemSet &rSet ) // Einfachselektion const SdrMarkList& rMarkList = mpDrawView->GetMarkedObjectList(); - ULONG nMarkCount = rMarkList.GetMarkCount(); + sal_uLong nMarkCount = rMarkList.GetMarkCount(); if ( nMarkCount == 1 ) { @@ -124,8 +124,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 ); @@ -207,7 +207,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 ); @@ -220,7 +220,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 ) @@ -228,7 +228,7 @@ void DrawViewShell::GetMenuStateSel( SfxItemSet &rSet ) } if ( nInv == E3dInventor || - (!mpDrawView->IsConvertToPathObjPossible(FALSE) && + (!mpDrawView->IsConvertToPathObjPossible(sal_False) && !mpDrawView->IsShearAllowed() && !mpDrawView->IsDistortAllowed()) ) { @@ -256,12 +256,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() ) { @@ -318,36 +318,36 @@ void DrawViewShell::GetMenuStateSel( SfxItemSet &rSet ) rSet.DisableItem( SID_MODIFY_FIELD ); { - BOOL bText = FALSE; - BOOL bLine = FALSE; - BOOL bGroup = FALSE; - BOOL bGraf = FALSE; - BOOL bDrawObj = FALSE; - BOOL b3dObj = 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; 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: @@ -357,11 +357,11 @@ 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_TABLE: bTable = true; break; } @@ -369,9 +369,9 @@ void DrawViewShell::GetMenuStateSel( SfxItemSet &rSet ) 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 @@ -398,7 +398,7 @@ void DrawViewShell::GetMenuStateSel( SfxItemSet &rSet ) } if (b3dObj || - (!mpDrawView->IsConvertToPathObjPossible(FALSE) && + (!mpDrawView->IsConvertToPathObjPossible(sal_False) && !mpDrawView->IsShearAllowed() && !mpDrawView->IsDistortAllowed()) ) { @@ -444,24 +444,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 a79e6a7efa9d..22ef286bbd10 100644..100755 --- a/sd/source/ui/view/frmview.cxx +++ b/sd/source/ui/view/frmview.cxx @@ -77,14 +77,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 ) @@ -96,7 +96,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); @@ -231,8 +231,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; @@ -242,11 +242,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; { @@ -443,8 +443,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(); @@ -704,9 +704,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 ) ) ) @@ -741,7 +741,7 @@ void FrameView::ReadUserDataSequence ( const ::com::sun::star::uno::Sequence < : { if( pValue->Value >>= nInt16 ) { - SetSlidesPerRow( (USHORT)nInt16 ); + SetSlidesPerRow( (sal_uInt16)nInt16 ); } } else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_EditModeStandard ) ) ) @@ -1048,7 +1048,7 @@ ViewShell::ShellType FrameView::GetViewShellTypeOnLoad (void) const -void FrameView::SetSelectedPage(USHORT nPage) +void FrameView::SetSelectedPage(sal_uInt16 nPage) { mnSelectedPage = nPage; } @@ -1056,7 +1056,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 42e0ff3481aa..366d16fa760e 100644 --- a/sd/source/ui/view/outlnvs2.cxx +++ b/sd/source/ui/view/outlnvs2.cxx @@ -92,7 +92,7 @@ void OutlineViewShell::FuTemporary(SfxRequest &rReq) DeactivateCurrentFunction(); OutlinerView* pOutlinerView = pOlView->GetViewByWindow( GetActiveWindow() ); - USHORT nSId = rReq.GetSlot(); + sal_uInt16 nSId = rReq.GetSlot(); switch( nSId ) { @@ -132,7 +132,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 ()); @@ -232,10 +232,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(); } @@ -261,7 +261,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) ) { @@ -337,7 +337,7 @@ void OutlineViewShell::FuTemporaryModify(SfxRequest &rReq) DeactivateCurrentFunction(); OutlinerView* pOutlinerView = pOlView->GetViewByWindow( GetActiveWindow() ); - USHORT nSId = rReq.GetSlot(); + sal_uInt16 nSId = rReq.GetSlot(); switch( nSId ) { @@ -419,7 +419,7 @@ void OutlineViewShell::FuTemporaryModify(SfxRequest &rReq) case SID_SET_DEFAULT: { - pOutlinerView->RemoveAttribs(TRUE); // TRUE = also paragraph attributes + pOutlinerView->RemoveAttribs(sal_True); // sal_True = also paragraph attributes Cancel(); rReq.Done(); } @@ -557,10 +557,10 @@ void OutlineViewShell::FuTemporaryModify(SfxRequest &rReq) //pOLV->DeleteSelected(); <-- unfortunately missing! // select field, so it gets deleted on Insert 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 fca35482a20f..e5f588165f5b 100644 --- a/sd/source/ui/view/outlnvsh.cxx +++ b/sd/source/ui/view/outlnvsh.cxx @@ -33,7 +33,7 @@ #include "ViewShellImplementation.hxx" #include <memory> - +#include "helpids.h" #include "app.hrc" #include <svx/hyperdlg.hxx> #include <svx/zoomslideritem.hxx> @@ -145,13 +145,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); @@ -166,7 +166,7 @@ void OutlineViewShell::Construct(DrawDocShell* ) ReadFrameViewData(mpFrameView); ::Outliner* pOutl = pOlView->GetOutliner(); - pOutl->SetUpdateMode(TRUE); + pOutl->SetUpdateMode(sal_True); if (!bModified) { @@ -179,8 +179,8 @@ void OutlineViewShell::Construct(DrawDocShell* ) SetName (aName); SetHelpId( SD_IF_SDOUTLINEVIEWSHELL ); - GetActiveWindow()->SetHelpId( SD_IF_SDOUTLINEVIEWSHELL ); - GetActiveWindow()->SetUniqueId( SD_IF_SDOUTLINEVIEWSHELL ); + GetActiveWindow()->SetHelpId( HID_SDOUTLINEVIEWSHELL ); + GetActiveWindow()->SetUniqueId( HID_SDOUTLINEVIEWSHELL ); } @@ -251,7 +251,7 @@ OutlineViewShell::~OutlineViewShell() if ( pClipEvtLstnr ) { - pClipEvtLstnr->AddRemoveListener( GetActiveWindow(), FALSE ); + pClipEvtLstnr->AddRemoveListener( GetActiveWindow(), sal_False ); pClipEvtLstnr->ClearCallbackLink(); // prevent callback if another thread is waiting pClipEvtLstnr->release(); } @@ -304,7 +304,7 @@ void OutlineViewShell::ArrangeGUIElements () ::sd::Window* pWindow = mpContentWindow.get(); if (pWindow != NULL) { - pWindow->SetMinZoomAutoCalc(FALSE); + pWindow->SetMinZoomAutoCalc(sal_False); // change OuputArea of the OutlinerView @@ -338,7 +338,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: @@ -384,7 +384,7 @@ void OutlineViewShell::RemoveWindow (::sd::Window* pWin) |* Activate(): during the first invocation the fields get updated |* \************************************************************************/ -void OutlineViewShell::Activate( BOOL bIsMDIActivate ) +void OutlineViewShell::Activate( sal_Bool bIsMDIActivate ) { if ( ! mbInitialized) { @@ -410,7 +410,7 @@ void OutlineViewShell::Activate( BOOL bIsMDIActivate ) |* Deactivate() |* \************************************************************************/ -void OutlineViewShell::Deactivate( BOOL bIsMDIActivate ) +void OutlineViewShell::Deactivate( sal_Bool bIsMDIActivate ) { pOlView->DisconnectFromApplication(); @@ -454,7 +454,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) || @@ -494,8 +494,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 && ( @@ -528,7 +528,7 @@ void OutlineViewShell::FuSupport(SfxRequest &rReq) pOlView->DoCut(); } rReq.Done(); - bPreviewState = TRUE; + bPreviewState = sal_True; } break; @@ -543,7 +543,7 @@ void OutlineViewShell::FuSupport(SfxRequest &rReq) pOlView->DoCopy(); } rReq.Done(); - bPreviewState = TRUE; + bPreviewState = sal_True; } break; @@ -560,7 +560,7 @@ void OutlineViewShell::FuSupport(SfxRequest &rReq) pOlView->DoPaste(); } rReq.Done(); - bPreviewState = TRUE; + bPreviewState = sal_True; } break; @@ -584,7 +584,7 @@ void OutlineViewShell::FuSupport(SfxRequest &rReq) } } rReq.Done(); - bPreviewState = TRUE; + bPreviewState = sal_True; } break; @@ -683,7 +683,7 @@ void OutlineViewShell::FuSupport(SfxRequest &rReq) } rReq.Done(); - bPreviewState = TRUE; + bPreviewState = sal_True; } break; @@ -691,13 +691,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; @@ -791,11 +791,11 @@ void OutlineViewShell::GetMenuState( SfxItemSet &rSet ) // Style catalog must not be called 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()) { @@ -823,14 +823,14 @@ void OutlineViewShell::GetMenuState( SfxItemSet &rSet ) // allow 'Select All'? 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) @@ -848,38 +848,38 @@ void OutlineViewShell::GetMenuState( SfxItemSet &rSet ) else { // Enable color view? - 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 of toolbar // first the selection dependent ones: 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(); } @@ -898,7 +898,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); } @@ -906,27 +906,27 @@ void OutlineViewShell::GetMenuState( SfxItemSet &rSet ) rSet.DisableItem( SID_PRESENTATIONOBJECT ); // now the selection independent ones: COLLAPSE_ALL, EXPAND_ALL - BOOL bDisableCollapseAll = TRUE; - BOOL bDisableExpandAll = TRUE; + sal_Bool bDisableCollapseAll = sal_True; + sal_Bool bDisableExpandAll = sal_True; // does the selection contain something collapsable/expandable? if (!bDisableCollapse) - bDisableCollapseAll = FALSE; + bDisableCollapseAll = sal_False; if (!bDisableExpand) - bDisableExpandAll = FALSE; + bDisableExpandAll = sal_False; // otherwise look through all paragraphs 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 ); } @@ -944,7 +944,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() ) ); @@ -968,7 +968,7 @@ void OutlineViewShell::GetMenuState( SfxItemSet &rSet ) if (pOlView->GetOutliner()->IsModified()) { - GetDoc()->SetChanged(TRUE); + GetDoc()->SetChanged(sal_True); } // the status has to be set here because of overloading @@ -985,11 +985,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)); } } @@ -1009,9 +1009,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) @@ -1022,9 +1022,26 @@ void OutlineViewShell::GetMenuState( SfxItemSet &rSet ) { SdrObject* pObj = pPage->GetPresObj(PRESOBJ_OUTLINE); - if (pObj && !pObj->IsEmptyPresObj()) + if (pObj!=NULL ) { - bDisable = FALSE; + if( !pObj->IsEmptyPresObj() ) + { + bDisable = false; + } + else + { + // check if the object is in edit, than its temporarely not empty + SdrTextObj* pTextObj = dynamic_cast< SdrTextObj* >( pObj ); + if( pTextObj ) + { + OutlinerParaObject* pParaObj = pTextObj->GetEditOutlinerParaObject(); + if( pParaObj ) + { + delete pParaObj; + bDisable = false; + } + } + } } } @@ -1039,9 +1056,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) @@ -1054,7 +1071,7 @@ void OutlineViewShell::GetMenuState( SfxItemSet &rSet ) if (pObj && !pObj->IsEmptyPresObj()) { - bDisable = FALSE; + bDisable = sal_False; } } @@ -1089,15 +1106,15 @@ void OutlineViewShell::GetMenuState( SfxItemSet &rSet ) // is starting the presentation possible? 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()) { @@ -1133,7 +1150,7 @@ long OutlineViewShell::VirtHScrollHdl(ScrollBar* pHScroll) pOutlinerView->HideCursor(); pOutlinerView->Scroll(-nDelta, 0); - pOutlinerView->ShowCursor(FALSE); + pOutlinerView->ShowCursor(sal_False); pOlView->InvalidateSlideNumberArea(); return 0; @@ -1157,7 +1174,7 @@ long OutlineViewShell::VirtVScrollHdl(ScrollBar* pVScroll) pOutlinerView->HideCursor(); pOutlinerView->Scroll(0, -nDelta); - pOutlinerView->ShowCursor(FALSE); + pOutlinerView->ShowCursor(sal_False); pOlView->InvalidateSlideNumberArea(); @@ -1171,10 +1188,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); } @@ -1290,19 +1307,16 @@ void OutlineViewShell::ReadFrameViewData(FrameView* pView) { ::Outliner* pOutl = pOlView->GetOutliner(); - if ( pView->IsNoAttribs() ) - pOutl->SetFlatMode( TRUE ); - else - pOutl->SetFlatMode( FALSE ); + pOutl->SetFlatMode( static_cast<bool>(pView->IsNoAttribs()) ); - ULONG nCntrl = pOutl->GetControlWord(); + sal_uLong nCntrl = pOutl->GetControlWord(); if ( pView->IsNoColors() ) pOutl->SetControlWord(nCntrl | EE_CNTRL_NOCOLORS); else pOutl->SetControlWord(nCntrl & ~EE_CNTRL_NOCOLORS); - USHORT nPage = mpFrameView->GetSelectedPage(); + sal_uInt16 nPage = mpFrameView->GetSelectedPage(); pLastPage = GetDoc()->GetSdPage( nPage, PK_STANDARD ); pOlView->SetActualPage(pLastPage); } @@ -1319,10 +1333,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(); @@ -1354,12 +1368,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 ); // limit area - 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; @@ -1378,7 +1392,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 ); } @@ -1387,7 +1401,7 @@ void OutlineViewShell::GetStatusBarState(SfxItemSet& rSet) // page view and layout - USHORT nPageCount = GetDoc()->GetSdPageCount( PK_STANDARD ); + sal_uInt16 nPageCount = GetDoc()->GetSdPageCount( PK_STANDARD ); String aPageStr, aLayoutStr; ::sd::Window* pWin = GetActiveWindow(); @@ -1409,7 +1423,7 @@ void OutlineViewShell::GetStatusBarState(SfxItemSet& rSet) if( pFirstPara == pLastPara ) { // how many pages are we before the selected page? - ULONG nPos = 0L; + sal_uLong nPos = 0L; while( pFirstPara ) { pFirstPara = pOlView->GetPrevTitle( pFirstPara ); @@ -1420,11 +1434,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 ); @@ -1479,9 +1493,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()) @@ -1553,7 +1567,7 @@ Size OutlineViewShell::GetOptimalSizePixel() const |* \************************************************************************/ -String OutlineViewShell::GetSelectionText(BOOL bCompleteWords) +String OutlineViewShell::GetSelectionText(sal_Bool bCompleteWords) { String aStrSelection; ::Outliner* pOl = pOlView->GetOutliner(); @@ -1586,9 +1600,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) { @@ -1596,7 +1610,7 @@ BOOL OutlineViewShell::HasSelection(BOOL bText) const if (pOutlinerView && pOutlinerView->GetSelected().Len() != 0) { - bReturn = TRUE; + bReturn = sal_True; } } @@ -1613,12 +1627,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; @@ -1701,7 +1715,7 @@ void OutlineViewShell::GetAttrState( SfxItemSet& rSet ) nWhich = aIter.NextWhich(); } - rSet.Put( aAllSet, FALSE ); + rSet.Put( aAllSet, sal_False ); } @@ -1751,104 +1765,7 @@ SdPage* OutlineViewShell::GetActualPage() } -/************************************************************************* -|* -|* Retrieve range of marked pages -|* -\************************************************************************/ - -String OutlineViewShell::GetPageRangeString() -{ - ::sd::Window* pWin = GetActiveWindow(); - OutlinerView* pActiveView = pOlView->GetViewByWindow(pWin); - ::Outliner* pOutl = pActiveView->GetOutliner(); - List* pSelList = (List*)pActiveView->CreateSelectionList(); - Paragraph* pPara = (Paragraph*)pSelList->First(); - - String aStrPageRange; - BOOL bFirstPageNo = TRUE; - BOOL bOpenRange = FALSE; - USHORT nLastPage = 0; - USHORT nLastUsedPage = (USHORT)-1; - - USHORT nPageCount = 0; - for( USHORT n = 0; n< GetDoc()->GetPageCount(); n++ ) - if( ( (SdPage*)GetDoc()->GetPage( n ) )->GetPageKind() == PK_STANDARD ) - nPageCount++; - - while ( pPara ) - { - if ( !pOutl->HasParaFlag(pPara, PARAFLAG_ISPAGE) ) - { - pPara = pOlView->GetPrevTitle(pPara); - } - USHORT nPageToSelect = 0; - while(pPara) - { - pPara = pOlView->GetPrevTitle(pPara); - if (pPara) - nPageToSelect++; - } - - if( bFirstPageNo ) - { - bFirstPageNo = FALSE; - aStrPageRange = String::CreateFromInt32( sal_Int32( nPageToSelect+1 ) ); - nLastUsedPage = nPageToSelect; - nPageCount--; - } - else - { - if( nPageToSelect != nLastPage ) - { - if( nPageToSelect == nLastPage+1 ) - { - bOpenRange = TRUE; - nPageCount--; - } - else - { - if( bOpenRange ) - { - if( nLastPage == nLastUsedPage+1 ) - aStrPageRange.Append( sal_Unicode(',') ); - else - aStrPageRange.Append( sal_Unicode('-') ); - - aStrPageRange.Append( String::CreateFromInt32( sal_Int32( nLastPage+1 ) ) ); - } - aStrPageRange.Append( sal_Unicode(',') ); - aStrPageRange.Append( String::CreateFromInt32( sal_Int32( nPageToSelect+1 ) ) ); - nLastUsedPage = nPageToSelect; - bOpenRange = FALSE; - nPageCount--; - } - } - } - - nLastPage = nPageToSelect; - pPara = (Paragraph*)pSelList->Next(); - } - - if( bOpenRange ) - { - if( nLastPage == nLastUsedPage+1 ) - aStrPageRange.Append( sal_Unicode(',') ); - else - aStrPageRange.Append( sal_Unicode('-') ); - - aStrPageRange.Append( String::CreateFromInt32( sal_Int32( nLastPage+1 ) ) ); - } - - if( nPageCount == 0 ) - aStrPageRange.Erase(); - - delete pSelList; // has been created only for us - - return aStrPageRange; -} - -void OutlineViewShell::UpdatePreview( SdPage* pPage, BOOL ) +void OutlineViewShell::UpdatePreview( SdPage* pPage, sal_Bool ) { const bool bNewPage = pPage != pLastPage; pLastPage = pPage; @@ -1888,13 +1805,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()) ) @@ -1909,7 +1826,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(); } } @@ -1929,7 +1846,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(); } } @@ -1964,7 +1881,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 ); @@ -1975,9 +1892,9 @@ bool OutlineViewShell::UpdateOutlineObject( SdPage* pPage, Paragraph* pPara ) } // how many paragraphs in the outline? - 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) ) { @@ -1988,7 +1905,7 @@ bool OutlineViewShell::UpdateOutlineObject( SdPage* pPage, Paragraph* pPara ) { // create an OutlinerParaObject 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 ) @@ -1999,7 +1916,7 @@ bool OutlineViewShell::UpdateOutlineObject( SdPage* pPage, Paragraph* pPara ) if( !pTO ) { pTO = pOlView->CreateOutlineTextObject( pPage ); - bNewObject = TRUE; + bNewObject = sal_True; } // page object, outline text in Outliner: @@ -2019,7 +1936,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(); } } @@ -2040,7 +1957,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(); } } @@ -2063,9 +1980,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(); @@ -2079,10 +1996,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 ); @@ -2181,7 +2098,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) @@ -2205,11 +2122,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 d2d180734d86..0bc619036739 100644 --- 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,31 +112,31 @@ 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) , 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) { // initialize Outliner: set Reference Device - bInitOutliner = TRUE; + bInitOutliner = sal_True; mpOutliner->Init( OUTLINERMODE_OUTLINEVIEW ); mpOutliner->SetRefDevice( SD_MOD()->GetRefDevice( *pDocSh ) ); - ULONG nWidth = OUTLINE_PAPERWIDTH; + sal_uLong nWidth = OUTLINE_PAPERWIDTH; mpOutliner->SetPaperSize(Size(nWidth, 400000000)); } // insert View into Outliner - for (USHORT nView = 0; nView < MAX_OUTLINERVIEWS; nView++) + for (sal_uInt16 nView = 0; nView < MAX_OUTLINERVIEWS; nView++) { mpOutlinerView[nView] = NULL; } @@ -144,7 +144,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 ); @@ -173,8 +173,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); @@ -207,7 +207,7 @@ OutlineView::~OutlineView() delete mpProgress; // unregister OutlinerViews and destroy them - for (USHORT nView = 0; nView < MAX_OUTLINERVIEWS; nView++) + for (sal_uInt16 nView = 0; nView < MAX_OUTLINERVIEWS; nView++) { if (mpOutlinerView[nView] != NULL) { @@ -221,8 +221,8 @@ OutlineView::~OutlineView() { // uninitialize Outliner: enable color display ResetLinks(); - ULONG nCntrl = mpOutliner->GetControlWord(); - mpOutliner->SetUpdateMode(FALSE); // otherwise there will be drawn on SetControlWord + sal_uLong nCntrl = mpOutliner->GetControlWord(); + mpOutliner->SetUpdateMode(sal_False); // otherwise there will be drawn on SetControlWord mpOutliner->SetControlWord(nCntrl & ~EE_CNTRL_NOCOLORS); SvtAccessibilityOptions aOptions; mpOutliner->ForceAutoColor( aOptions.GetIsAutomaticFontColor() ); @@ -270,7 +270,7 @@ void OutlineView::Paint(const Rectangle& rRect, ::sd::Window* pWin) pOlView->ShowCursor(mbFirstPaint); - mbFirstPaint = FALSE; + mbFirstPaint = sal_False; } } @@ -296,11 +296,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) { @@ -309,7 +309,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) { @@ -319,7 +319,7 @@ void OutlineView::AddWindowToPaintView(OutputDevice* pWin) else if (!bValidArea) { aOutputArea = mpOutlinerView[nView]->GetOutputArea(); - bValidArea = TRUE; + bValidArea = sal_True; } nView++; @@ -339,8 +339,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) @@ -354,7 +354,7 @@ void OutlineView::DeleteWindowFromPaintView(OutputDevice* pWin) mpOutliner->RemoveView( mpOutlinerView[nView] ); delete mpOutlinerView[nView]; mpOutlinerView[nView] = NULL; - bRemoved = TRUE; + bRemoved = sal_True; } } @@ -373,7 +373,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) { @@ -451,7 +451,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 ); @@ -474,8 +474,8 @@ SdPage* OutlineView::InsertSlideForParagraph( Paragraph* pPara ) mpOutliner->SetParaFlag( pPara, PARAFLAG_ISPAGE ); // how many titles are there before the new title paragraph? - ULONG nExample = 0L; // position of the "example" page - ULONG nTarget = 0L; // position of insertion + sal_uLong nExample = 0L; // position of the "example" page + sal_uLong nTarget = 0L; // position of insertion while(pPara) { pPara = GetPrevTitle(pPara); @@ -501,7 +501,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; } @@ -513,13 +513,13 @@ SdPage* OutlineView::InsertSlideForParagraph( Paragraph* pPara ) **********************************************************************/ // this page is exemplary - 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()); // insert (page) - mpDoc->InsertPage(pPage, (USHORT)(nTarget) * 2 + 1); + mpDoc->InsertPage(pPage, (sal_uInt16)(nTarget) * 2 + 1); if( isRecordingUndo() ) AddUndo(mpDoc->GetSdrUndoFactory().CreateUndoNewPage(*pPage)); @@ -540,25 +540,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); } /********************************************************************** |* now the notes page \*********************************************************************/ - 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); // insert (notes page) - mpDoc->InsertPage(pNotesPage, (USHORT)(nTarget) * 2 + 2); + mpDoc->InsertPage(pNotesPage, (sal_uInt16)(nTarget) * 2 + 2); if( isRecordingUndo() ) AddUndo(mpDoc->GetSdrUndoFactory().CreateUndoNewPage(*pNotesPage)); @@ -573,7 +573,7 @@ SdPage* OutlineView::InsertSlideForParagraph( Paragraph* pPara ) pExample->GetLwrBorder() ); // create presentation objects - pNotesPage->SetAutoLayout(pExample->GetAutoLayout(), TRUE); + pNotesPage->SetAutoLayout(pExample->GetAutoLayout(), sal_True); mpOutliner->UpdateFields(); @@ -596,7 +596,7 @@ IMPL_LINK( OutlineView, ParagraphRemovingHdl, ::Outliner *, pOutliner ) if( pOutliner->HasParaFlag( pPara, PARAFLAG_ISPAGE ) ) { // how many titles are in front of the title paragraph in question? - ULONG nPos = 0L; + sal_uLong nPos = 0L; while(pPara) { pPara = GetPrevTitle(pPara); @@ -604,13 +604,13 @@ IMPL_LINK( OutlineView, ParagraphRemovingHdl, ::Outliner *, pOutliner ) } // delete page and notes page - 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)); @@ -674,7 +674,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(); } @@ -693,7 +693,7 @@ IMPL_LINK( OutlineView, DepthChangedHdl, ::Outliner *, pOutliner ) } else { - mpDocSh->SetWaitCursor( TRUE ); + mpDocSh->SetWaitCursor( sal_True ); } delete pList; } @@ -718,7 +718,7 @@ IMPL_LINK( OutlineView, DepthChangedHdl, ::Outliner *, pOutliner ) mpProgress = NULL; } else - mpDocSh->SetWaitCursor( FALSE ); + mpDocSh->SetWaitCursor( sal_False ); mnPagesToProcess = 0; mnPagesProcessed = 0; @@ -730,7 +730,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) { @@ -740,13 +740,13 @@ IMPL_LINK( OutlineView, DepthChangedHdl, ::Outliner *, pOutliner ) } // delete page and notes page - 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)); @@ -776,7 +776,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 ) ) { // how many titles are in front of the title paragraph in question? sal_Int32 nPos = -1L; @@ -791,7 +791,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 ); @@ -811,13 +811,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) ) @@ -844,7 +844,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 ); @@ -852,9 +852,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 ); } } } @@ -875,7 +875,7 @@ IMPL_LINK( OutlineView, StatusEventHdl, EditStatus *, EMPTYARG ) ::sd::Window* pWin = mpOutlineViewShell->GetActiveWindow(); OutlinerView* pOutlinerView = GetViewByWindow(pWin); Rectangle aVis = pOutlinerView->GetVisArea(); - ULONG nWidth = OUTLINE_PAPERWIDTH; + sal_uLong nWidth = OUTLINE_PAPERWIDTH; Rectangle aText = Rectangle(Point(0,0), Size(nWidth, mpOutliner->GetTextHeight())); @@ -942,8 +942,8 @@ IMPL_LINK( OutlineView, BeginMovingHdl, ::Outliner *, pOutliner ) } // select the pages belonging to the paragraphs on level 0 to select - USHORT nPos = 0; - ULONG nParaPos = 0; + sal_uInt16 nPos = 0; + sal_uLong nParaPos = 0; pPara = pOutliner->GetParagraph( 0 ); while(pPara) @@ -952,10 +952,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)) // selected? { - pPage->SetSelected(TRUE); + pPage->SetSelected(sal_True); } nPos++; } @@ -983,8 +983,8 @@ IMPL_LINK( OutlineView, EndMovingHdl, ::Outliner *, pOutliner ) Paragraph* pSearchIt = (Paragraph*)mpSelectedParas->First(); // look for the first of the selected paragraphs in the new ordering - 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) @@ -997,26 +997,26 @@ IMPL_LINK( OutlineView, EndMovingHdl, ::Outliner *, pOutliner ) pPara = pOutliner->GetParagraph( ++nParaPos ); } - USHORT nPos = nPosNewOrder; // don't change nPosNewOrder + sal_uInt16 nPos = nPosNewOrder; // don't change nPosNewOrder if (nPos == 0) { - nPos = (USHORT)-1; // insert before the first page + nPos = (sal_uInt16)-1; // insert before the first page } else { // look for the predecessor in the old ordering - nPos = (USHORT)mpOldParaOrder->GetPos(pPrev); + nPos = (sal_uInt16)mpOldParaOrder->GetPos(pPrev); DBG_ASSERT(nPos != 0xffff, "Absatz nicht gefunden"); } mpDoc->MovePages(nPos); // deselect the pages again - 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--; } @@ -1041,11 +1041,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 && @@ -1067,11 +1067,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 && @@ -1140,7 +1140,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) @@ -1152,8 +1152,8 @@ BOOL OutlineView::PrepareClose(BOOL) BegUndo(aUndoStr); UpdateDocument(); EndUndo(); - mpDoc->SetSelected(GetActualPage(), TRUE); - return TRUE; + mpDoc->SetSelected(GetActualPage(), sal_True); + return sal_True; } @@ -1163,16 +1163,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); @@ -1186,29 +1186,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; @@ -1220,8 +1220,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 ); @@ -1234,7 +1234,7 @@ void OutlineView::FillOutliner() mpOutliner->SetDepth(pPara, -1); // do not apply hard attributes from the previous paragraph - mpOutliner->SetParaAttribs( (USHORT)mpOutliner->GetAbsPos(pPara), + mpOutliner->SetParaAttribs( (sal_uInt16)mpOutliner->GetAbsPos(pPara), mpOutliner->GetEmptyItemSet() ); mpOutliner->SetStyleSheet( mpOutliner->GetAbsPos( pPara ), pPage->GetStyleSheetForPresObj( PRESOBJ_TITLE ) ); @@ -1242,9 +1242,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()) @@ -1262,14 +1262,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 ) { @@ -1286,16 +1286,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); } @@ -1308,7 +1308,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) { @@ -1354,7 +1354,7 @@ SdPage* OutlineView::GetActualPage() SdPage* pCurrent = GetPageForParagraph(static_cast<Paragraph*>(pSelList->First()) ); DBG_ASSERT( pCurrent || - (mpDocSh->GetUndoManager() && static_cast< sd::UndoManager *>(mpDocSh->GetUndoManager())->isInUndo()) || + (mpDocSh->GetUndoManager() && static_cast< sd::UndoManager *>(mpDocSh->GetUndoManager())->IsDoing()) || maDragAndDropModelGuard.get(), "sd::OutlineView::GetActualPage(), no current page?" ); if( pCurrent ) @@ -1377,7 +1377,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; } @@ -1418,7 +1418,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 ); } } @@ -1464,8 +1464,8 @@ void OutlineView::SetSelectedPages() } // select the pages belonging to the paragraphs on level 0 to select - USHORT nPos = 0; - ULONG nParaPos = 0; + sal_uInt16 nPos = 0; + sal_uLong nParaPos = 0; pPara = mpOutliner->GetParagraph( 0 ); while(pPara) @@ -1477,10 +1477,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)) // selected? - pPage->SetSelected(TRUE); + pPage->SetSelected(sal_True); } nPos++; @@ -1545,7 +1545,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; } @@ -1556,7 +1556,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; } @@ -1673,7 +1673,7 @@ void OutlineView::EndModelChange() { UpdateDocument(); - SfxUndoManager* pDocUndoMgr = mpDocSh->GetUndoManager(); + ::svl::IUndoManager* pDocUndoMgr = mpDocSh->GetUndoManager(); bool bHasUndoActions = pDocUndoMgr->GetUndoActionCount() != 0; @@ -1691,6 +1691,9 @@ void OutlineView::EndModelChange() if( bHasUndoActions && mpOutliner->GetEditEngine().HasTriedMergeOnLastAddUndo() ) TryToMergeUndoActions(); + + mpOutlineViewShell->Invalidate( SID_UNDO ); + mpOutlineViewShell->Invalidate( SID_REDO ); } /** updates all changes in the outliner model to the draw model */ @@ -1701,8 +1704,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 ); @@ -1715,7 +1718,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 ); @@ -1728,7 +1731,7 @@ void OutlineView::UpdateDocument() /** merge edit engine undo actions if possible */ void OutlineView::TryToMergeUndoActions() { - SfxUndoManager& rOutlineUndo = mpOutliner->GetUndoManager(); + ::svl::IUndoManager& rOutlineUndo = mpOutliner->GetUndoManager(); if( rOutlineUndo.GetUndoActionCount() > 1 ) { SfxListUndoAction* pListAction = dynamic_cast< SfxListUndoAction* >( rOutlineUndo.GetUndoAction(0) ); @@ -1736,19 +1739,19 @@ void OutlineView::TryToMergeUndoActions() if( pListAction && pPrevListAction ) { // find the top EditUndo action in the top undo action list - USHORT nAction = pListAction->aUndoActions.Count(); + size_t nAction = pListAction->aUndoActions.size(); EditUndo* pEditUndo = 0; while( !pEditUndo && nAction ) { - pEditUndo = dynamic_cast< EditUndo* >(pListAction->aUndoActions[--nAction]); + 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 ) { - if( dynamic_cast< EditUndo* >(pListAction->aUndoActions[--nAction]) ) + if( dynamic_cast< EditUndo* >(pListAction->aUndoActions[--nAction].pAction) ) pEditUndo = 0; } @@ -1757,10 +1760,10 @@ void OutlineView::TryToMergeUndoActions() { // yes, see if we can merge it with the prev undo list - nAction = pPrevListAction->aUndoActions.Count(); + nAction = pPrevListAction->aUndoActions.size(); EditUndo* pPrevEditUndo = 0; while( !pPrevEditUndo && nAction ) - pPrevEditUndo = dynamic_cast< EditUndo* >(pPrevListAction->aUndoActions[--nAction]); + pPrevEditUndo = dynamic_cast< EditUndo* >(pPrevListAction->aUndoActions[--nAction].pAction); if( pPrevEditUndo && pPrevEditUndo->Merge( pEditUndo ) ) { @@ -1768,22 +1771,23 @@ void OutlineView::TryToMergeUndoActions() // the top EditUndo of the previous undo list // first remove the merged undo action - DBG_ASSERT( pListAction->aUndoActions[nEditPos] == pEditUndo, "sd::OutlineView::TryToMergeUndoActions(), wrong edit pos!" ); + DBG_ASSERT( pListAction->aUndoActions[nEditPos].pAction == pEditUndo, + "sd::OutlineView::TryToMergeUndoActions(), wrong edit pos!" ); pListAction->aUndoActions.Remove(nEditPos); delete pEditUndo; // now check if we also can merge the draw undo actions - SfxUndoManager* pDocUndoManager = mpDocSh->GetUndoManager(); - if( pDocUndoManager && ( pListAction->aUndoActions.Count() == 1 )) + ::svl::IUndoManager* pDocUndoManager = mpDocSh->GetUndoManager(); + if( pDocUndoManager && ( pListAction->aUndoActions.size() == 1 )) { - SfxLinkUndoAction* pLinkAction = dynamic_cast< SfxLinkUndoAction* >( pListAction->aUndoActions[0] ); + SfxLinkUndoAction* pLinkAction = dynamic_cast< SfxLinkUndoAction* >( pListAction->aUndoActions[0].pAction ); SfxLinkUndoAction* pPrevLinkAction = 0; if( pLinkAction ) { - nAction = pPrevListAction->aUndoActions.Count(); + nAction = pPrevListAction->aUndoActions.size(); while( !pPrevLinkAction && nAction ) - pPrevLinkAction = dynamic_cast< SfxLinkUndoAction* >(pPrevListAction->aUndoActions[--nAction]); + pPrevLinkAction = dynamic_cast< SfxLinkUndoAction* >(pPrevListAction->aUndoActions[--nAction].pAction); } if( pLinkAction && pPrevLinkAction && @@ -1795,15 +1799,15 @@ void OutlineView::TryToMergeUndoActions() if( pSourceList && pDestinationList ) { - USHORT nCount = pSourceList->aUndoActions.Count(); - USHORT nDestAction = pDestinationList->aUndoActions.Count(); + sal_uInt16 nCount = pSourceList->aUndoActions.size(); + sal_uInt16 nDestAction = pDestinationList->aUndoActions.size(); while( nCount-- ) { - const SfxUndoAction* pTemp = pSourceList->aUndoActions.GetObject(0); + SfxUndoAction* pTemp = pSourceList->aUndoActions[0].pAction; pSourceList->aUndoActions.Remove(0); pDestinationList->aUndoActions.Insert( pTemp, nDestAction++ ); } - pDestinationList->nCurUndoAction = pDestinationList->aUndoActions.Count(); + pDestinationList->nCurUndoAction = pDestinationList->aUndoActions.size(); pListAction->aUndoActions.Remove(0); delete pLinkAction; @@ -1813,21 +1817,21 @@ void OutlineView::TryToMergeUndoActions() } } - if( pListAction->aUndoActions.Count() ) + if ( !pListAction->aUndoActions.empty() ) { // now we have to move all remaining doc undo actions from the top undo // list to the previous undo list and remove the top undo list - USHORT nCount = pListAction->aUndoActions.Count(); - USHORT nDestAction = pPrevListAction->aUndoActions.Count(); + size_t nCount = pListAction->aUndoActions.size(); + size_t nDestAction = pPrevListAction->aUndoActions.size(); while( nCount-- ) { - const SfxUndoAction* pTemp = pListAction->aUndoActions.GetObject(0); + SfxUndoAction* pTemp = pListAction->aUndoActions[0].pAction; pListAction->aUndoActions.Remove(0); if( pTemp ) pPrevListAction->aUndoActions.Insert( pTemp, nDestAction++ ); } - pPrevListAction->nCurUndoAction = pPrevListAction->aUndoActions.Count(); + pPrevListAction->nCurUndoAction = pPrevListAction->aUndoActions.size(); } rOutlineUndo.RemoveLastUndoAction(); @@ -1851,7 +1855,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) ) @@ -1926,7 +1930,7 @@ IMPL_LINK(OutlineView, PaintingFirstLineHdl, PaintFirstLineInfo*, pInfo) // -------------------------------------------------------------------- -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 2ee54375f9be..ebde93d01d9d 100644..100755 --- a/sd/source/ui/view/presvish.cxx +++ b/sd/source/ui/view/presvish.cxx @@ -131,7 +131,7 @@ void PresentationViewShell::FinishInitialization( FrameView* pFrameView ) } -SvxRuler* PresentationViewShell::CreateHRuler(::sd::Window*, BOOL) +SvxRuler* PresentationViewShell::CreateHRuler(::sd::Window*, sal_Bool) { return NULL; } @@ -142,13 +142,13 @@ SvxRuler* PresentationViewShell::CreateVRuler(::sd::Window*) } -void PresentationViewShell::Activate( BOOL bIsMDIActivate ) +void PresentationViewShell::Activate( sal_Bool bIsMDIActivate ) { DrawViewShell::Activate( bIsMDIActivate ); if( bIsMDIActivate ) { - 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 1b63c322678f..fbf6fc2f3f07 100644..100755 --- a/sd/source/ui/view/sdruler.cxx +++ b/sd/source/ui/view/sdruler.cxx @@ -56,27 +56,27 @@ 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) { } -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()); } @@ -91,7 +91,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) @@ -102,12 +102,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 fe22a81b38f1..bfd4e48564af 100644 --- a/sd/source/ui/view/sdview.cxx +++ b/sd/source/ui/view/sdview.cxx @@ -129,7 +129,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)) { @@ -139,13 +139,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); @@ -178,7 +178,7 @@ View::~View() maSmartTags.Dispose(); // release content of selection clipboard, if we own the content - UpdateSelectionClipboard( TRUE ); + UpdateSelectionClipboard( sal_True ); maDropErrorTimer.Stop(); maDropInsertFileTimer.Stop(); @@ -575,9 +575,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); } @@ -588,7 +588,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 ) ); } @@ -600,7 +600,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? @@ -625,8 +625,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; @@ -650,11 +650,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; } } } @@ -681,7 +681,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 { @@ -708,7 +708,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); @@ -721,9 +721,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; @@ -748,7 +748,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; @@ -804,11 +804,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); @@ -816,7 +816,7 @@ SdrEndTextEditKind View::SdrEndTextEdit(BOOL bDontDeleteReally ) { if( xObj.is() && !xObj->IsEmptyPresObj() ) { - xObj->SetEmptyPresObj( TRUE ); + xObj->SetEmptyPresObj( sal_True ); } else { @@ -830,7 +830,7 @@ SdrEndTextEditKind View::SdrEndTextEdit(BOOL bDontDeleteReally ) { SdrPage* pPage = pObj->GetPage(); if( !pPage || !pPage->IsMasterPage() ) - pObj->SetEmptyPresObj( FALSE ); + pObj->SetEmptyPresObj( sal_False ); } } @@ -887,8 +887,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++ ) { @@ -910,7 +910,7 @@ void View::SetMarkedOriginalSize() { MapMode aMap100( MAP_100TH_MM ); aOleSize = ((SdrOle2Obj*)pObj)->GetOrigObjSize( &aMap100 ); - bOK = TRUE; + bOK = sal_True; } else { @@ -919,7 +919,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& ) {} @@ -954,7 +954,7 @@ void View::SetMarkedOriginalSize() aRect.SetSize( aSize ); pObj->SetLogicRect( aRect ); - bOK = TRUE; + bOK = sal_True; } } } @@ -1011,17 +1011,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 ) && @@ -1050,24 +1050,24 @@ BOOL View::IsMorphingAllowed() const if( ( eFillStyle1 == XFILL_NONE || eFillStyle1 == XFILL_SOLID ) && ( eFillStyle2 == XFILL_NONE || eFillStyle2 == XFILL_SOLID ) ) - bRet = TRUE; + bRet = sal_True; } } return bRet; } -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; @@ -1082,7 +1082,7 @@ void View::onAccessibilityOptionsChanged() { const StyleSettings& rStyleSettings = pWindow->GetSettings().GetStyleSettings(); - USHORT nOutputSlot, nPreviewSlot; + sal_uInt16 nOutputSlot, nPreviewSlot; SvtAccessibilityOptions& aAccOptions = getAccessibilityOptions(); @@ -1154,7 +1154,7 @@ bool View::isRecordingUndo() const if( mpDoc && mpDoc->IsUndoEnabled() ) { sd::UndoManager* pUndoManager = mpDoc ? mpDoc->GetUndoManager() : 0; - return pUndoManager && pUndoManager->isInListAction(); + return pUndoManager && pUndoManager->IsInListAction(); } else { @@ -1181,7 +1181,7 @@ SdrViewContext View::GetContext() const return FmFormView::GetContext(); } -BOOL View::HasMarkablePoints() const +sal_Bool View::HasMarkablePoints() const { if( maSmartTags.HasMarkablePoints() ) return true; @@ -1189,14 +1189,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; @@ -1204,14 +1204,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; @@ -1219,7 +1219,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; @@ -1227,7 +1227,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 dbace8e2b261..68e9a1f6f297 100644..100755 --- a/sd/source/ui/view/sdview2.cxx +++ b/sd/source/ui/view/sdview2.cxx @@ -103,15 +103,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 ), @@ -126,7 +126,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; @@ -188,7 +188,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; @@ -226,7 +226,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 ); @@ -239,7 +239,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() ); @@ -264,7 +264,7 @@ struct SdNavigatorDropEvent : public ExecuteDropEvent // ----------------------------------------------------------------------------- -void View::UpdateSelectionClipboard( BOOL bForceDeselect ) +void View::UpdateSelectionClipboard( sal_Bool bForceDeselect ) { if( mpViewSh && mpViewSh->GetActiveWindow() ) { @@ -337,18 +337,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" ); @@ -359,7 +359,7 @@ void View::DoPaste (::Window* pWindow) if( !mpDoc->IsChanged() ) { if( pOutliner && pOutliner->IsModified() ) - mpDoc->SetChanged( TRUE ); + mpDoc->SetChanged( sal_True ); } } } @@ -375,7 +375,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 ); @@ -449,7 +449,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; ) { @@ -466,7 +466,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() ) { @@ -483,7 +483,7 @@ void View::DragFinished( sal_Int8 nDropAction ) } if( pDragTransferable ) - pDragTransferable->SetInternalMove( FALSE ); + pDragTransferable->SetInternalMove( sal_False ); if( bUndo ) EndUndo(); @@ -495,7 +495,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(); @@ -511,7 +511,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 ) { @@ -526,7 +526,7 @@ sal_Int8 View::AcceptDrop( const AcceptDropEvent& rEvt, DropTargetHelper& rTarge if( aRect.IsInside( pOLV->GetWindow()->PixelToLogic( rEvt.maPosPixel ) ) ) { - bIsInsideOutlinerView = TRUE; + bIsInsideOutlinerView = sal_True; } } @@ -553,12 +553,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() ) ) ) @@ -591,8 +591,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() ) ) { @@ -619,18 +619,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 ) { @@ -639,7 +639,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; @@ -670,7 +670,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(); @@ -687,7 +687,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 ) { @@ -704,7 +704,7 @@ sal_Int8 View::ExecuteDrop( const ExecuteDropEvent& rEvt, DropTargetHelper& rTar if( aRect.IsInside( aPos ) ) { - bIsInsideOutlinerView = TRUE; + bIsInsideOutlinerView = sal_True; } } @@ -737,7 +737,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; } } @@ -746,7 +746,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? @@ -781,7 +781,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() ) { @@ -803,7 +803,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 @@ -866,7 +866,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 ); @@ -887,11 +887,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. @@ -899,9 +899,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 ); } // Delete the ExchangeList @@ -923,19 +923,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(); @@ -963,7 +963,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 ) @@ -971,7 +971,7 @@ BOOL View::GetExchangeList( List*& rpExchangeList, List* pBookmarkList, USHORT n pDlg->GetName( *pNewName ); if( !mpDoc->GetObj( *pNewName ) ) - bNameOK = TRUE; + bNameOK = sal_True; } delete pDlg; @@ -1028,7 +1028,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 c9e2fc8904f8..5b74b8e1494d 100644..100755 --- a/sd/source/ui/view/sdview3.cxx +++ b/sd/source/ui/view/sdview3.cxx @@ -266,22 +266,22 @@ bool View::InsertMetaFile( TransferableDataHelper& rDataHelper, const Point& rPo 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) { @@ -380,10 +380,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(); @@ -402,18 +402,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 ) @@ -505,7 +505,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) { @@ -513,8 +513,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 { @@ -530,14 +530,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) { @@ -545,8 +545,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 { @@ -562,7 +562,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); } } } @@ -578,21 +578,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; } } } @@ -612,13 +612,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; } } } @@ -638,10 +638,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 ); @@ -651,7 +651,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 ) ) @@ -660,7 +660,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); @@ -729,7 +729,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 ) ) @@ -763,13 +763,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; } } } @@ -815,7 +815,7 @@ BOOL View::InsertData( const TransferableDataHelper& rDataHelper, aRect.SetPos( maDropPos ); pObj->SetLogicRect( aRect ); InsertObjectAtView( pObj, *GetSdrPageView(), SDRINSERT_SETDEFLAYER ); - bReturn = TRUE; + bReturn = sal_True; } } } @@ -835,7 +835,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() ); @@ -858,10 +858,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 ); @@ -871,7 +871,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(); @@ -888,7 +888,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 @@ -965,7 +965,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) { @@ -981,7 +981,28 @@ BOOL View::InsertData( const TransferableDataHelper& rDataHelper, if( pImageMap ) pObj->InsertUserData( new SdIMapInfo( *pImageMap ) ); - bReturn = TRUE; + if ( pObj && pObj->IsChart() ) + { + bool bDisableDataTableDialog = false; + svt::EmbeddedObjectRef::TryRunningState( xObj ); + uno::Reference< beans::XPropertySet > xProps( xObj->getComponent(), uno::UNO_QUERY ); + if ( xProps.is() && + ( xProps->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DisableDataTableDialog" ) ) ) >>= bDisableDataTableDialog ) && + bDisableDataTableDialog ) + { + xProps->setPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DisableDataTableDialog" ) ), + uno::makeAny( sal_False ) ); + xProps->setPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DisableComplexChartTypes" ) ), + uno::makeAny( sal_False ) ); + uno::Reference< util::XModifiable > xModifiable( xProps, uno::UNO_QUERY ); + if ( xModifiable.is() ) + { + xModifiable->setModified( sal_True ); + } + } + } + + bReturn = sal_True; } } } @@ -1038,7 +1059,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 @@ -1114,7 +1135,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) { @@ -1132,7 +1153,7 @@ BOOL View::InsertData( const TransferableDataHelper& rDataHelper, // let the object stay in loaded state after insertion pObj->Unload(); - bReturn = TRUE; + bReturn = sal_True; } } } @@ -1177,7 +1198,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 ) ) @@ -1201,7 +1222,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 ) ) { @@ -1232,7 +1253,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 ) ) @@ -1262,9 +1283,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 ); @@ -1327,8 +1348,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; } } @@ -1361,8 +1382,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; } } @@ -1380,13 +1401,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 ) ) { @@ -1399,7 +1420,7 @@ BOOL View::InsertData( const TransferableDataHelper& rDataHelper, maDropInsertFileTimer.Start(); } - bReturn = TRUE; + bReturn = sal_True; } else if( !bLink && CHECK_FORMAT_TRANS( FORMAT_STRING ) ) { @@ -1417,7 +1438,7 @@ BOOL View::InsertData( const TransferableDataHelper& rDataHelper, if( pOLV ) { pOLV->InsertText( aOUString ); - bReturn = TRUE; + bReturn = sal_True; } if( !bReturn ) @@ -1427,7 +1448,7 @@ BOOL View::InsertData( const TransferableDataHelper& rDataHelper, } MarkListHasChanged(); - mbIsDropAllowed = TRUE; + mbIsDropAllowed = sal_True; rDnDAction = mnAction; delete pImageMap; @@ -1436,7 +1457,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 055d2366e947..ccabe02c086b 100644 --- a/sd/source/ui/view/sdview4.cxx +++ b/sd/source/ui/view/sdview4.cxx @@ -133,15 +133,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)) @@ -207,10 +207,10 @@ 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( Point(), 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 ) { @@ -402,12 +402,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 ) @@ -438,7 +438,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; } } } @@ -512,7 +512,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) { @@ -570,7 +570,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 f6b627e917f4..811a4a15e19e 100644 --- a/sd/source/ui/view/sdwindow.cxx +++ b/sd/source/ui/view/sdwindow.cxx @@ -104,7 +104,7 @@ Window::Window(::Window* pParent) SetUniqueId(HID_SD_WIN_DOCUMENT); // #i78183# Added after discussed with AF - EnableRTL(FALSE); + EnableRTL(sal_False); } /************************************************************************* @@ -168,13 +168,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 @@ -182,7 +182,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 @@ -197,7 +197,7 @@ void Window::CalcMinZoom() void Window::SetMinZoom (long int nMin) { - mnMinZoom = (USHORT) nMin; + mnMinZoom = (sal_uInt16) nMin; } @@ -213,7 +213,7 @@ long Window::GetMinZoom (void) const void Window::SetMaxZoom (long int nMax) { - mnMaxZoom = (USHORT) nMax; + mnMaxZoom = (sal_uInt16) nMax; } @@ -355,7 +355,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); @@ -523,25 +523,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. @@ -597,24 +597,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. @@ -670,9 +670,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; const Size aWinSize = PixelToLogic(GetOutputSizePixel()); if ( mbCenterAllowed ) @@ -689,22 +689,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; } } @@ -804,7 +804,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); Scroll(nOldX - maWinPos.X(), nOldY - maWinPos.Y(), SCROLL_CHILDREN); Update(); } @@ -960,8 +960,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; @@ -1037,7 +1037,7 @@ void Window::DataChanged( const DataChangedEvent& rDCEvt ) { DrawDocShell* pDocSh = mpViewShell->GetDocSh(); if( pDocSh ) - pDocSh->SetPrinter( pDocSh->GetPrinter( TRUE ) ); + pDocSh->SetPrinter( pDocSh->GetPrinter( sal_True ) ); } } @@ -1054,7 +1054,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 3c4fabb2c6ca..da6a207b6a23 100644..100755 --- a/sd/source/ui/view/tabcontr.cxx +++ b/sd/source/ui/view/tabcontr.cxx @@ -98,7 +98,7 @@ TabControl::TabControl(DrawViewShell* pViewSh, Window* pParent) : DragSourceHelper( this ), DropTargetHelper( this ), pDrViewSh(pViewSh), - bInternalMove(FALSE) + bInternalMove(sal_False) { EnableEditMode(); SetSizePixel(Size(0, 0)); @@ -131,7 +131,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) { @@ -187,7 +187,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 ); @@ -201,7 +201,7 @@ void TabControl::StartDrag( sal_Int8, const Point& ) void TabControl::DragFinished( sal_Int8 ) { - bInternalMove = FALSE; + bInternalMove = sal_False; } /************************************************************************* @@ -238,9 +238,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 ); } } @@ -263,7 +263,7 @@ sal_Int8 TabControl::ExecuteDrop( const ExecuteDropEvent& rEvt ) if( bInternalMove ) { - USHORT nPageId = ShowDropPos( aPos ) - 1; + sal_uInt16 nPageId = ShowDropPos( aPos ) - 1; switch (rEvt.mnAction) { @@ -286,21 +286,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(); @@ -319,9 +319,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 ); } } @@ -333,12 +333,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 ) ); @@ -347,11 +347,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(); @@ -364,7 +364,7 @@ long TabControl::StartRenaming() long TabControl::AllowRenaming() { - BOOL bOK = TRUE; + sal_Bool bOK = sal_True; String aNewName( GetEditText() ); String aCompareName( GetPageText( GetEditPageId() ) ); @@ -379,7 +379,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 83884cdba948..cf5bbe3e0f18 100644..100755 --- a/sd/source/ui/view/unmodpg.cxx +++ b/sd/source/ui/view/unmodpg.cxx @@ -57,15 +57,13 @@ TYPEINIT1(ModifyPageUndoAction, SdUndoAction); \************************************************************************/ ModifyPageUndoAction::ModifyPageUndoAction( - SfxUndoManager* pTheManager, SdDrawDocument* pTheDoc, SdPage* pThePage, String aTheNewName, AutoLayout eTheNewAutoLayout, - BOOL bTheNewBckgrndVisible, - BOOL bTheNewBckgrndObjsVisible) -: SdUndoAction(pTheDoc), - mpManager(pTheManager) + sal_Bool bTheNewBckgrndVisible, + sal_Bool bTheNewBckgrndObjsVisible) +: SdUndoAction(pTheDoc) { DBG_ASSERT(pThePage, "Undo ohne Seite ???"); @@ -81,8 +79,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); @@ -129,8 +127,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); @@ -178,8 +176,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); @@ -220,8 +218,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 c2bccbbffae1..4e4f539eabbb 100644 --- a/sd/source/ui/view/viewoverlaymanager.cxx +++ b/sd/source/ui/view/viewoverlaymanager.cxx @@ -77,12 +77,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 ); @@ -149,10 +149,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; @@ -168,12 +168,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 ) @@ -295,7 +295,7 @@ void ImageButtonHdl::CreateB2dIAObject() // -------------------------------------------------------------------- -BOOL ImageButtonHdl::IsFocusHdl() const +sal_Bool ImageButtonHdl::IsFocusHdl() const { return false; } @@ -337,7 +337,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() ) { @@ -346,7 +346,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); } } @@ -360,7 +360,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: @@ -404,7 +404,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 fcbfddad198b..1fb16798b489 100644 --- a/sd/source/ui/view/viewshe2.cxx +++ b/sd/source/ui/view/viewshe2.cxx @@ -121,8 +121,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); @@ -235,8 +235,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); } @@ -280,7 +280,7 @@ long ViewShell::VirtVScrollHdl(ScrollBar* pVScroll) return 0; } -SvxRuler* ViewShell::CreateHRuler(::sd::Window* , BOOL ) +SvxRuler* ViewShell::CreateHRuler(::sd::Window* , sal_Bool ) { return NULL; } @@ -466,7 +466,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) { @@ -528,9 +528,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; @@ -540,7 +540,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)); @@ -649,7 +649,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() @@ -661,7 +661,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; @@ -755,9 +755,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()) { @@ -821,13 +821,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; @@ -869,16 +869,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; } } @@ -887,7 +887,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); @@ -970,10 +970,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) { @@ -1027,7 +1027,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 @@ -1070,8 +1070,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 ); @@ -1087,8 +1087,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 6769af6c2946..ebb8cb66f1f4 100644 --- a/sd/source/ui/view/viewshe3.cxx +++ b/sd/source/ui/view/viewshe3.cxx @@ -35,8 +35,9 @@ #include "GraphicViewShellBase.hxx" #include <sfx2/viewfrm.hxx> +#include <svtools/svtools.hrc> #include <com/sun/star/lang/Locale.hpp> - +#include <svtools/svtdata.hxx> #include <utility> #include <vector> @@ -102,7 +103,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(); @@ -143,14 +144,14 @@ void ViewShell::GetMenuState( SfxItemSet &rSet ) if(SFX_ITEM_AVAILABLE == rSet.GetItemState(SID_UNDO)) { - SfxUndoManager* pUndoManager = ImpGetUndoManager(); - sal_Bool bActivate(FALSE); + ::svl::IUndoManager* pUndoManager = ImpGetUndoManager(); + sal_Bool bActivate(sal_False); if(pUndoManager) { if(pUndoManager->GetUndoActionCount() != 0) { - bActivate = TRUE; + bActivate = sal_True; } } @@ -158,7 +159,7 @@ void ViewShell::GetMenuState( SfxItemSet &rSet ) { // Set the necessary string like in // sfx2/source/view/viewfrm.cxx ver 1.23 ln 1072 ff. - String aTmp(ResId(STR_UNDO, *SFX_APP()->GetSfxResManager())); + String aTmp( SvtResId( STR_UNDO ) ); aTmp += pUndoManager->GetUndoActionComment(0); rSet.Put(SfxStringItem(SID_UNDO, aTmp)); } @@ -170,14 +171,14 @@ void ViewShell::GetMenuState( SfxItemSet &rSet ) if(SFX_ITEM_AVAILABLE == rSet.GetItemState(SID_REDO)) { - SfxUndoManager* pUndoManager = ImpGetUndoManager(); - sal_Bool bActivate(FALSE); + ::svl::IUndoManager* pUndoManager = ImpGetUndoManager(); + sal_Bool bActivate(sal_False); if(pUndoManager) { if(pUndoManager->GetRedoActionCount() != 0) { - bActivate = TRUE; + bActivate = sal_True; } } @@ -185,7 +186,7 @@ void ViewShell::GetMenuState( SfxItemSet &rSet ) { // Set the necessary string like in // sfx2/source/view/viewfrm.cxx ver 1.23 ln 1081 ff. - String aTmp(ResId(STR_REDO, *SFX_APP()->GetSfxResManager())); + String aTmp(SvtResId(STR_REDO)); aTmp += pUndoManager->GetRedoActionComment(0); rSet.Put(SfxStringItem(SID_REDO, aTmp)); } @@ -207,13 +208,14 @@ void ViewShell::GetMenuState( SfxItemSet &rSet ) SdPage* ViewShell::CreateOrDuplicatePage ( SfxRequest& rRequest, PageKind ePageKind, - SdPage* pPage) + 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. @@ -231,8 +233,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(); @@ -246,7 +248,8 @@ SdPage* ViewShell::CreateOrDuplicatePage ( && rBase.GetMainViewShell()->GetShellType()!=ViewShell::ST_DRAW) { framework::FrameworkHelper::Instance(GetViewShellBase())->RequestTaskPanel( - framework::FrameworkHelper::msLayoutTaskPanelURL); + framework::FrameworkHelper::msLayoutTaskPanelURL, + false); } */ @@ -268,7 +271,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) @@ -286,10 +289,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)) { @@ -337,7 +340,7 @@ SdPage* ViewShell::CreateOrDuplicatePage ( if( bUndo ) pDrView->BegUndo( String( SdResId(STR_INSERTPAGE) ) ); - USHORT nNewPageIndex = 0xffff; + sal_uInt16 nNewPageIndex = 0xffff; switch (nSId) { case SID_INSERTPAGE: @@ -368,10 +371,11 @@ SdPage* ViewShell::CreateOrDuplicatePage ( eStandardLayout, eNotesLayout, bIsPageBack, - bIsPageObj); + 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); @@ -379,7 +383,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 @@ -391,7 +395,8 @@ SdPage* ViewShell::CreateOrDuplicatePage ( eStandardLayout, eNotesLayout, bIsPageBack, - bIsPageObj); + bIsPageObj, + nInsertPosition); break; case SID_DUPLICATE_PAGE: @@ -405,7 +410,8 @@ SdPage* ViewShell::CreateOrDuplicatePage ( eStandardLayout, eNotesLayout, bIsPageBack, - bIsPageObj); + bIsPageObj, + nInsertPosition); break; default: diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx index bbd7cbb4ba7e..bc16d7ec6a37 100644 --- a/sd/source/ui/view/viewshel.cxx +++ b/sd/source/ui/view/viewshel.cxx @@ -78,6 +78,7 @@ #include <svx/extrusionbar.hxx> #include <svx/fontworkbar.hxx> #include <svx/svdoutl.hxx> +#include <tools/diagnose_ex.h> #include <svl/slstitm.hxx> #include <sfx2/request.hxx> @@ -128,7 +129,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; @@ -194,7 +195,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() ); @@ -227,7 +228,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(); @@ -247,7 +248,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()); @@ -290,7 +291,7 @@ void ViewShell::Exit (void) pView->UnmarkAll(); } - Deactivate (TRUE); + Deactivate (sal_True); if (IsMainViewShell()) { @@ -309,7 +310,7 @@ void ViewShell::Exit (void) |* \************************************************************************/ -void ViewShell::Activate(BOOL bIsMDIActivate) +void ViewShell::Activate(sal_Bool bIsMDIActivate) { SfxShell::Activate(bIsMDIActivate); @@ -319,14 +320,14 @@ void ViewShell::Activate(BOOL bIsMDIActivate) // den Focus hat 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, @@ -337,7 +338,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() ) @@ -350,7 +351,7 @@ void ViewShell::Activate(BOOL bIsMDIActivate) } if(!GetDocSh()->IsUIActive()) - UpdatePreview( GetActualPage(), TRUE ); + UpdatePreview( GetActualPage(), sal_True ); } @@ -382,7 +383,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; @@ -412,9 +413,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); } @@ -436,9 +437,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) { @@ -450,7 +451,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) @@ -477,7 +478,7 @@ BOOL ViewShell::KeyInput(const KeyEvent& rKEvt, ::sd::Window* pWin) } else { - bReturn = TRUE; + bReturn = sal_True; } } } @@ -491,7 +492,7 @@ BOOL ViewShell::KeyInput(const KeyEvent& rKEvt, ::sd::Window* pWin) && aKeyCode.GetCode() == KEY_R) { InvalidateWindows(); - bReturn = TRUE; + bReturn = sal_True; } } @@ -627,7 +628,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 ) { @@ -656,7 +657,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* @@ -667,9 +668,9 @@ long ViewShell::Notify(NotifyEvent& rNEvt, ::sd::Window* pWin) } -BOOL ViewShell::HandleScrollCommand(const CommandEvent& rCEvt, ::sd::Window* pWin) +bool ViewShell::HandleScrollCommand(const CommandEvent& rCEvt, ::sd::Window* pWin) { - BOOL bDone = FALSE; + bool bDone = false; switch( rCEvt.GetCommand() ) { @@ -719,14 +720,14 @@ BOOL ViewShell::HandleScrollCommand(const CommandEvent& rCEvt, ::sd::Window* pWi Invalidate( SID_ATTR_ZOOM ); Invalidate( SID_ATTR_ZOOMSLIDER ); - bDone = TRUE; + bDone = true; } } else { 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(), @@ -735,7 +736,7 @@ BOOL ViewShell::HandleScrollCommand(const CommandEvent& rCEvt, ::sd::Window* pWi rCEvt.IsMouseEvent(),(const void *) &aWheelData ); bDone = pWin->HandleScrollCommand( aReWrite, mpHorizontalScrollBar.get(), - mpVerticalScrollBar.get()); + mpVerticalScrollBar.get()) == sal_True; } } } @@ -763,17 +764,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(); } } @@ -783,7 +784,7 @@ void ViewShell::SetupRulers (void) -BOOL ViewShell::HasRuler (void) +sal_Bool ViewShell::HasRuler (void) { return mbHasRulers; } @@ -984,7 +985,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 ); @@ -996,9 +997,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) @@ -1010,14 +1011,14 @@ 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 // usefull is still done. } -SfxUndoManager* ViewShell::ImpGetUndoManager (void) const +::svl::IUndoManager* ViewShell::ImpGetUndoManager (void) const { const ViewShell* pMainViewShell = GetViewShellBase().GetMainViewShell().get(); @@ -1058,7 +1059,7 @@ SfxUndoManager* ViewShell::ImpGetUndoManager (void) const void ViewShell::ImpGetUndoStrings(SfxItemSet &rSet) const { - SfxUndoManager* pUndoManager = ImpGetUndoManager(); + ::svl::IUndoManager* pUndoManager = ImpGetUndoManager(); if(pUndoManager) { sal_uInt16 nCount(pUndoManager->GetUndoActionCount()); @@ -1093,7 +1094,7 @@ void ViewShell::ImpGetUndoStrings(SfxItemSet &rSet) const void ViewShell::ImpGetRedoStrings(SfxItemSet &rSet) const { - SfxUndoManager* pUndoManager = ImpGetUndoManager(); + ::svl::IUndoManager* pUndoManager = ImpGetUndoManager(); if(pUndoManager) { sal_uInt16 nCount(pUndoManager->GetRedoActionCount()); @@ -1126,9 +1127,9 @@ void ViewShell::ImpGetRedoStrings(SfxItemSet &rSet) const // ----------------------------------------------------------------------------- -void ViewShell::ImpSidUndo(BOOL, SfxRequest& rReq) +void ViewShell::ImpSidUndo(sal_Bool, SfxRequest& rReq) { - SfxUndoManager* pUndoManager = ImpGetUndoManager(); + ::svl::IUndoManager* pUndoManager = ImpGetUndoManager(); sal_uInt16 nNumber(1); const SfxItemSet* pReqArgs = rReq.GetArgs(); @@ -1143,11 +1144,19 @@ void ViewShell::ImpSidUndo(BOOL, SfxRequest& rReq) sal_uInt16 nCount(pUndoManager->GetUndoActionCount()); if(nCount >= nNumber) { - // when UndoStack is cleared by ModifyPageUndoAction - // the nCount may have changed, so test GetUndoActionCount() - while(nNumber-- && pUndoManager->GetUndoActionCount()) + try { - pUndoManager->Undo(); + // when UndoStack is cleared by ModifyPageUndoAction + // the nCount may have changed, so test GetUndoActionCount() + while(nNumber-- && pUndoManager->GetUndoActionCount()) + { + pUndoManager->Undo(); + } + } + catch( const Exception& e ) + { + // no need to handle. By definition, the UndoManager handled this by clearing the + // Undo/Redo stacks } } @@ -1167,9 +1176,9 @@ void ViewShell::ImpSidUndo(BOOL, SfxRequest& rReq) // ----------------------------------------------------------------------------- -void ViewShell::ImpSidRedo(BOOL, SfxRequest& rReq) +void ViewShell::ImpSidRedo(sal_Bool, SfxRequest& rReq) { - SfxUndoManager* pUndoManager = ImpGetUndoManager(); + ::svl::IUndoManager* pUndoManager = ImpGetUndoManager(); sal_uInt16 nNumber(1); const SfxItemSet* pReqArgs = rReq.GetArgs(); @@ -1184,11 +1193,19 @@ void ViewShell::ImpSidRedo(BOOL, SfxRequest& rReq) sal_uInt16 nCount(pUndoManager->GetRedoActionCount()); if(nCount >= nNumber) { - // when UndoStack is cleared by ModifyPageRedoAction - // the nCount may have changed, so test GetRedoActionCount() - while(nNumber-- && pUndoManager->GetRedoActionCount()) + try + { + // when UndoStack is cleared by ModifyPageRedoAction + // the nCount may have changed, so test GetRedoActionCount() + while(nNumber-- && pUndoManager->GetRedoActionCount()) + { + pUndoManager->Redo(); + } + } + catch( const Exception& e ) { - pUndoManager->Redo(); + // no need to handle. By definition, the UndoManager handled this by clearing the + // Undo/Redo stacks } } @@ -1210,7 +1227,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: @@ -1232,7 +1249,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 c88e89da1ac5..0cd1909f8294 100644 --- a/sd/source/ui/view/zoomlist.cxx +++ b/sd/source/ui/view/zoomlist.cxx @@ -66,9 +66,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 { // delete ZoomRects if necessary @@ -85,12 +85,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) { @@ -118,7 +118,7 @@ void ZoomList::InsertZoomRect(const Rectangle& rRect) Rectangle ZoomList::GetNextZoomRect() { mnCurPos++; - ULONG nRectCount = Count(); + sal_uLong nRectCount = Count(); if (nRectCount > 0 && mnCurPos > nRectCount - 1) { @@ -160,14 +160,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); @@ -179,13 +179,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); |