diff options
Diffstat (limited to 'sd/source/ui/view')
68 files changed, 888 insertions, 888 deletions
diff --git a/sd/source/ui/view/DocumentRenderer.cxx b/sd/source/ui/view/DocumentRenderer.cxx index 1165b5bb3c2e..15461c06052e 100644 --- a/sd/source/ui/view/DocumentRenderer.cxx +++ b/sd/source/ui/view/DocumentRenderer.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -92,7 +92,7 @@ namespace { maSlidesPerPage(rSlidesPerPage) { } - + bool IsWarningOrientation (void) const { return GetBoolValue(NULL, true); @@ -138,7 +138,7 @@ namespace { { return GetBoolValue("PageContentType", sal_Int32(0)); } - + bool IsHandout (void) const { return GetBoolValue("PageContentType", sal_Int32(1)); @@ -282,7 +282,7 @@ namespace { { return mbIsShapeSelection; } - + /** Call with a 0 based page index. */ bool IsSelected (const sal_Int32 nIndex) const @@ -296,7 +296,7 @@ namespace { else return false; } - + private: const bool mbAreAllPagesSelected; const bool mbIsShapeSelection; @@ -326,7 +326,7 @@ namespace { maSelection(rsPrinterSelection, pView ? pView->getCurrentPage() : NULL), mbPrintMarkedOnly(maSelection.IsMarkedOnly()) {} - + const Printer* mpPrinter; ULONG mnDrawMode; ::rtl::OUString msTimeDate; @@ -417,7 +417,7 @@ namespace { maProperties.size()); } } - + ::std::vector<sal_Int32> GetSlidesPerPage (void) const { return maSlidesPerPage; @@ -434,7 +434,7 @@ namespace { SvtModuleOptions aOpt; String aAppGroupname( String( SdResId( _STR_IMPRESS_PRINT_UI_GROUP_NAME ) ) ); aAppGroupname.SearchAndReplace( String( RTL_CONSTASCII_USTRINGPARAM( "%s" ) ), - aOpt.GetModuleName( mbImpress ? SvtModuleOptions::E_SIMPRESS : SvtModuleOptions::E_SDRAW ) ); + aOpt.GetModuleName( mbImpress ? SvtModuleOptions::E_SIMPRESS : SvtModuleOptions::E_SDRAW ) ); AddDialogControl( vcl::PrinterOptionsHelper::getGroupControlOpt( aAppGroupname, rtl::OUString() @@ -449,7 +449,7 @@ namespace { rtl::OUString(), aPrintOpt ) ); - + AddDialogControl( vcl::PrinterOptionsHelper::getChoiceControlOpt( String( SdResId( _STR_IMPRESS_PRINT_UI_CONTENT ) ), CreateChoice(_STR_IMPRESS_PRINT_UI_CONTENT_HELP), @@ -459,9 +459,9 @@ namespace { OUString( RTL_CONSTASCII_USTRINGPARAM( "List" ) ) ) ); - + vcl::PrinterOptionsHelper::UIControlOptions - aContentOpt( OUString( RTL_CONSTASCII_USTRINGPARAM( "PageContentType" ) ), 1 ); + 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), @@ -472,9 +472,9 @@ namespace { aContentOpt ) ); - + vcl::PrinterOptionsHelper::UIControlOptions - aSlidesPerPageOpt( OUString( RTL_CONSTASCII_USTRINGPARAM( "SlidesPerPage" ) ), -1, sal_True ); + 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), @@ -491,7 +491,7 @@ namespace { if( mbImpress ) - { + { AddDialogControl( vcl::PrinterOptionsHelper::getBoolControlOpt( String( SdResId(_STR_IMPRESS_PRINT_UI_IS_PRINT_NAME) ), String( SdResId(_STR_IMPRESS_PRINT_UI_IS_PRINT_NAME_HELP) ), @@ -549,7 +549,7 @@ namespace { { // FIXME: additional dependency on PrintProspect = false vcl::PrinterOptionsHelper::UIControlOptions - aPageOptionsOpt( OUString( RTL_CONSTASCII_USTRINGPARAM( "PageContentType" ) ), 0 ); + aPageOptionsOpt( OUString( RTL_CONSTASCII_USTRINGPARAM( "PageContentType" ) ), 0 ); AddDialogControl( vcl::PrinterOptionsHelper::getChoiceControlOpt( rtl::OUString(), CreateChoice(_STR_IMPRESS_PRINT_UI_PAGE_OPTIONS_CHOICES_HELP), @@ -564,7 +564,7 @@ namespace { else { vcl::PrinterOptionsHelper::UIControlOptions - aPageOptionsOpt( OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintProspect" ) ), sal_False ); + aPageOptionsOpt( OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintProspect" ) ), sal_False ); AddDialogControl( vcl::PrinterOptionsHelper::getChoiceControlOpt( rtl::OUString(), CreateChoice(_STR_IMPRESS_PRINT_UI_PAGE_OPTIONS_CHOICES_HELP), @@ -578,7 +578,7 @@ namespace { } vcl::PrinterOptionsHelper::UIControlOptions aBrochureOpt; - aBrochureOpt.maGroupHint = OUString( RTL_CONSTASCII_USTRINGPARAM( "LayoutPage" ) ); + aBrochureOpt.maGroupHint = OUString( RTL_CONSTASCII_USTRINGPARAM( "LayoutPage" ) ); AddDialogControl( vcl::PrinterOptionsHelper::getSubgroupControlOpt( String( SdResId(_STR_IMPRESS_PRINT_UI_PAGE_SIDES) ), rtl::OUString(), aBrochureOpt ) ); @@ -594,8 +594,8 @@ namespace { ); vcl::PrinterOptionsHelper::UIControlOptions - aIncludeOpt( OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintProspect" ) ), -1, sal_False ); - aIncludeOpt.maGroupHint = OUString( RTL_CONSTASCII_USTRINGPARAM( "LayoutPage" ) ); + aIncludeOpt( OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintProspect" ) ), -1, sal_False ); + aIncludeOpt.maGroupHint = OUString( RTL_CONSTASCII_USTRINGPARAM( "LayoutPage" ) ); AddDialogControl( vcl::PrinterOptionsHelper::getChoiceControlOpt( String( SdResId(_STR_IMPRESS_PRINT_UI_BROCHURE_INCLUDE) ), CreateChoice(_STR_IMPRESS_PRINT_UI_BROCHURE_INCLUDE_LIST_HELP), @@ -622,12 +622,12 @@ namespace { vcl::PrinterOptionsHelper::UIControlOptions aPrintRangeOpt; aPrintRangeOpt.mbInternalOnly = sal_True; aPrintRangeOpt.maGroupHint = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintRange" ) ); - AddDialogControl( vcl::PrinterOptionsHelper::getSubgroupControlOpt( + AddDialogControl( vcl::PrinterOptionsHelper::getSubgroupControlOpt( String( SdResId( _STR_IMPRESS_PRINT_UI_PAGE_RANGE ) ), rtl::OUString(), aPrintRangeOpt ) ); - + // create a choice for the content to create rtl::OUString aPrintRangeName( RTL_CONSTASCII_USTRINGPARAM( "PrintContent" ) ); AddDialogControl( vcl::PrinterOptionsHelper::getChoiceControlOpt( rtl::OUString(), @@ -645,7 +645,7 @@ namespace { rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PageRange" ) ), rtl::OUString(), aPageRangeOpt ) - ); + ); FreeResource(); } @@ -720,7 +720,7 @@ namespace { } virtual ~PrinterPage (void) {} - + virtual void Print ( Printer& rPrinter, SdDrawDocument& rDocument, @@ -733,7 +733,7 @@ namespace { ULONG GetDrawMode (void) const { return mnDrawMode; } Orientation GetOrientation (void) const { return meOrientation; } USHORT GetPaperTray (void) const { return mnPaperTray; } - + protected: const PageKind mePageKind; const MapMode maMap; @@ -797,7 +797,7 @@ namespace { msPageString, maPageStringOffset); } - + private: const USHORT mnPageIndex; }; @@ -847,7 +847,7 @@ namespace { const Size aPageSize (pPageToPrint->GetSize()); const Size aPrintSize (rPrinter.GetOutputSize()); - + const sal_Int32 nPageWidth (aPageSize.Width() + mnGap - pPageToPrint->GetLftBorder() - pPageToPrint->GetRgtBorder()); const sal_Int32 nPageHeight (aPageSize.Height() + mnGap @@ -882,7 +882,7 @@ namespace { msPageString, maPageStringOffset); } - + private: const USHORT mnPageIndex; const sal_Int32 mnGap; @@ -915,7 +915,7 @@ namespace { } virtual ~BookletPrinterPage (void) {} - + virtual void Print ( Printer& rPrinter, SdDrawDocument& rDocument, @@ -957,7 +957,7 @@ namespace { rPrintableLayers); } } - + private: const USHORT mnFirstPageIndex; const USHORT mnSecondPageIndex; @@ -988,7 +988,7 @@ namespace { maPageIndices(rPageIndices) { } - + virtual void Print ( Printer& rPrinter, SdDrawDocument& rDocument, @@ -1030,7 +1030,7 @@ namespace { SdrPageObj* pPageObj = (*aPageObjIter++); pPageObj->SetReferencedPage(rDocument.GetSdPage(*iPageIndex, PK_STANDARD)); } - + // if there are more page objects than pages left, set the rest to invisible int nHangoverCount = 0; while (aPageObjIter != aHandoutPageObjects.end()) @@ -1104,7 +1104,7 @@ namespace { } } - + private: const USHORT mnHandoutPageIndex; const ::std::vector<USHORT> maPageIndices; @@ -1162,7 +1162,7 @@ namespace { const USHORT nSavedOutlMode (pOutliner->GetMode()); const BOOL bSavedUpdateMode (pOutliner->GetUpdateMode()); const Size aSavedPaperSize (pOutliner->GetPaperSize()); - + pOutliner->Init(OUTLINERMODE_OUTLINEVIEW); pOutliner->SetPaperSize(aOutRect.GetSize()); pOutliner->SetUpdateMode(TRUE); @@ -1187,7 +1187,7 @@ namespace { ::boost::scoped_ptr<OutlinerParaObject> mpParaObject; }; } - + //===== DocumentRenderer::Implementation ====================================== @@ -1213,8 +1213,8 @@ public: } - - + + virtual ~Implementation (void) { EndListening(mrBase); @@ -1222,7 +1222,7 @@ public: - + virtual void Notify (SfxBroadcaster& rBroadcaster, const SfxHint& rHint) { const SfxSimpleHint* pSimpleHint = dynamic_cast<const SfxSimpleHint*>(&rHint); @@ -1235,7 +1235,7 @@ public: } - + /** Process the sequence of properties given to one of the XRenderable methods. */ @@ -1244,7 +1244,7 @@ public: OSL_ASSERT(!mbIsDisposed); if (mbIsDisposed) return; - + bool bIsValueChanged = processProperties( rOptions ); // The RenderDevice property is handled specially: its value is @@ -1268,7 +1268,7 @@ public: } - + /** Return the number of pages that are to be printed. */ sal_Int32 GetPrintPageCount (void) @@ -1289,7 +1289,7 @@ public: const css::uno::Sequence<css::beans::PropertyValue>& rOptions) { (void)rOptions; - + css::uno::Sequence<css::beans::PropertyValue> aProperties (3); aProperties[0].Name = A2S("ExtraPrintUIOptions"); @@ -1297,7 +1297,7 @@ public: aProperties[1].Name = A2S("PageSize"); aProperties[1].Value <<= maPrintSize; - + // FIXME: is this always true ? aProperties[2].Name = A2S("PageIncludesNonprintableArea"); aProperties[2].Value = makeAny( sal_True ); @@ -1306,7 +1306,7 @@ public: } - + /** Print one of the prepared pages. */ @@ -1317,14 +1317,14 @@ public: return; Printer& rPrinter (*mpPrinter); - + ::boost::shared_ptr<ViewShell> pViewShell (mrBase.GetMainViewShell()); if ( ! pViewShell) return; - + SdDrawDocument* pDocument = pViewShell->GetDoc(); OSL_ASSERT(pDocument!=NULL); - + ::boost::shared_ptr<DrawViewShell> pDrawViewShell( ::boost::dynamic_pointer_cast<DrawViewShell>(mrBase.GetMainViewShell())); @@ -1333,12 +1333,12 @@ public: if (nIndex<0 || sal::static_int_cast<sal_uInt32>(nIndex)>=maPrinterPages.size()) return; - + const ::boost::shared_ptr<PrinterPage> pPage (maPrinterPages[nIndex]); OSL_ASSERT(pPage); if ( ! pPage) return; - + const Orientation eSavedOrientation (rPrinter.GetOrientation()); const ULONG nSavedDrawMode (rPrinter.GetDrawMode()); const MapMode aSavedMapMode (rPrinter.GetMapMode()); @@ -1389,7 +1389,7 @@ public: - + private: ViewShellBase& mrBase; bool mbIsDisposed; @@ -1439,12 +1439,12 @@ private: { maPrintSize = awt::Size(aPaperSize.Width(), aPaperSize.Height()); } - + return true; } - + /** Top most method for preparing printer pages. In this and the other Prepare... methods the various special cases are detected and handled. @@ -1469,7 +1469,7 @@ private: aMap.SetMapUnit(MAP_100TH_MM); aInfo.maMap = aMap; mpPrinter->SetMapMode(aMap); - + ::Outliner& rOutliner = mrBase.GetDocument()->GetDrawOutliner(); const ULONG nSavedControlWord (rOutliner.GetControlWord()); ULONG nCntrl = nSavedControlWord; @@ -1487,7 +1487,7 @@ private: aInfo.msTimeDate += GetSdrGlobalData().GetLocaleData()->getDate( Date() ); aInfo.msTimeDate += ::rtl::OUString((sal_Unicode)' '); } - + if (mpOptions->IsTime()) aInfo.msTimeDate += GetSdrGlobalData().GetLocaleData()->getTime( Time(), FALSE, FALSE ); aInfo.maPrintSize = aInfo.mpPrinter->GetOutputSize(); @@ -1502,13 +1502,13 @@ private: | DRAWMODE_BLACKTEXT | DRAWMODE_GRAYBITMAP | DRAWMODE_GRAYGRADIENT; break; - + case 2: aInfo.mnDrawMode = DRAWMODE_BLACKLINE | DRAWMODE_BLACKTEXT | DRAWMODE_WHITEFILL | DRAWMODE_GRAYBITMAP | DRAWMODE_WHITEGRADIENT; break; - + default: aInfo.mnDrawMode = DRAWMODE_DEFAULT; } @@ -1567,7 +1567,7 @@ private: SdDrawDocument& rModel = *mrBase.GetDocument(); // first, prepare handout page (not handout master) - + SdPage* pHandout = rModel.GetSdPage(0, PK_HANDOUT); if( !pHandout ) return; @@ -1575,7 +1575,7 @@ private: // delete all previous shapes from handout page while( pHandout->GetObjCount() ) { - SdrObject* pObj = pHandout->NbcRemoveObject(0); + SdrObject* pObj = pHandout->NbcRemoveObject(0); if( pObj ) SdrObject::Free( pObj ); } @@ -1589,11 +1589,11 @@ private: while( iter != aAreas.end() ) { pHandout->NbcInsertObject( new SdrPageObj((*iter++)) ); - + if( bDrawLines && (iter != aAreas.end()) ) { Rectangle aRect( (*iter++) ); - + basegfx::B2DPolygon aPoly; aPoly.insert(0, basegfx::B2DPoint( aRect.Left(), aRect.Top() ) ); aPoly.insert(1, basegfx::B2DPoint( aRect.Right(), aRect.Top() ) ); @@ -1675,8 +1675,8 @@ private: } - - + + /** Prepare the outline of the document for printing. There is no fixed number of slides whose outline data is put onto one printer page. If the current printer page has enough room for the outline of the @@ -1691,7 +1691,7 @@ private: aMap.SetScaleX(Fraction(1,2)); aMap.SetScaleY(Fraction(1,2)); mpPrinter->SetMapMode(aMap); - + Rectangle aOutRect(aPageOfs, rInfo.mpPrinter->GetOutputSize()); if( aOutRect.GetWidth() > aOutRect.GetHeight() ) { @@ -1731,7 +1731,7 @@ private: ++nIndex; if (pPage == NULL) continue; - + SdrTextObj* pTextObj = NULL; sal_uInt32 nObj (0); @@ -1784,7 +1784,7 @@ private: { pOutliner->AddText(*(pTextObj->GetOutlinerParaObject())); } - + if (bSubTitle ) { const sal_Int32 nParaCount2 (pOutliner->GetParagraphCount()); @@ -1826,7 +1826,7 @@ private: rInfo.meOrientation, rInfo.mpPrinter->GetPaperBin()))); } - + pOutliner->SetRefMapMode(aSavedMapMode); pOutliner->SetUpdateMode(bSavedUpdateMode); pOutliner->SetPaperSize(aSavedPaperSize); @@ -1834,7 +1834,7 @@ private: } - + /** Prepare handout pages for slides that are to be printed. */ @@ -1843,7 +1843,7 @@ private: SdDrawDocument* pDocument = mrBase.GetDocument(); OSL_ASSERT(pDocument != NULL); SdPage& rHandoutPage (*pDocument->GetSdPage(0, PK_HANDOUT)); - + const bool bScalePage (mpOptions->IsPageSize()); USHORT nPaperBin; @@ -1851,7 +1851,7 @@ private: nPaperBin = rHandoutPage.GetPaperBin(); else nPaperBin = rInfo.mpPrinter->GetPaperBin(); - + // Change orientation? SdPage& rMaster (dynamic_cast<SdPage&>(rHandoutPage.TRG_GetMasterPage())); rInfo.meOrientation = rMaster.GetOrientation(); @@ -1882,10 +1882,10 @@ private: const Size aPageSize (rHandoutPage.GetSize()); const Size aPrintSize (rInfo.mpPrinter->GetOutputSize()); - const double fHorz = (double) aPrintSize.Width() / aPageSize.Width(); + const double fHorz = (double) aPrintSize.Width() / aPageSize.Width(); const double fVert = (double) aPrintSize.Height() / aPageSize.Height(); - Fraction aFract; + Fraction aFract; if ( fHorz < fVert ) aFract = Fraction(aPrintSize.Width(), aPageSize.Width()); else @@ -1962,7 +1962,7 @@ private: PrintInfo& rInfo) { OSL_ASSERT(rInfo.mpPrinter != NULL); - + // Fill in page kind specific data. SdDrawDocument* pDocument = mrBase.GetMainViewShell()->GetDoc(); if (pDocument->GetSdPageCount(ePageKind) == 0) @@ -1972,7 +1972,7 @@ private: if ( ! SetupPaperOrientation(ePageKind, rInfo)) return; - + MapMode aMap (rInfo.maMap); // aMap.SetOrigin(Point() - rInfo.mpPrinter->GetPageOffset()); rInfo.maMap = aMap; @@ -2006,14 +2006,14 @@ private: SdPage* pPage = GetFilteredPage(nIndex, ePageKind, rInfo); if (pPage == NULL) continue; - + MapMode aMap (rInfo.maMap); // Kann sich die Seitengroesse geaendert haben? const Size aPageSize = pPage->GetSize(); if (mpOptions->IsPageSize()) { - const double fHorz ((double) rInfo.maPrintSize.Width() / aPageSize.Width()); + const double fHorz ((double) rInfo.maPrintSize.Width() / aPageSize.Width()); const double fVert ((double) rInfo.maPrintSize.Height() / aPageSize.Height()); Fraction aFract; @@ -2069,7 +2069,7 @@ private: } - + /** Put two slides on one printer page. */ @@ -2220,7 +2220,7 @@ private: rInfo.mnDrawMode, rInfo.meOrientation, nPaperBin))); - } + } @@ -2241,7 +2241,7 @@ private: nPaperBin = rPage.GetPaperBin(); else nPaperBin = rInfo.mpPrinter->GetPaperBin(); - + // For pages larger then the printable area there // are three options: // 1. Scale down to the page to the printable area. @@ -2255,7 +2255,7 @@ private: if (bScalePage || bCutPage) { // Handle 1 and 2. - + // if CutPage is set then do not move it, otherwise move the // scaled page to printable area maPrinterPages.push_back( @@ -2322,7 +2322,7 @@ DocumentRenderer::DocumentRenderer (ViewShellBase& rBase) mpImpl(new Implementation(rBase)) { } - + @@ -2344,7 +2344,7 @@ sal_Int32 SAL_CALL DocumentRenderer::getRendererCount ( mpImpl->ProcessProperties(rOptions); return mpImpl->GetPrintPageCount(); } - + @@ -2359,7 +2359,7 @@ Sequence<beans::PropertyValue> SAL_CALL DocumentRenderer::getRenderer ( mpImpl->ProcessProperties(rOptions); return mpImpl->GetProperties(rOptions); } - + diff --git a/sd/source/ui/view/DocumentRenderer.hrc b/sd/source/ui/view/DocumentRenderer.hrc index 3dd57429dd13..25377f1a1217 100644 --- a/sd/source/ui/view/DocumentRenderer.hrc +++ b/sd/source/ui/view/DocumentRenderer.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/view/DocumentRenderer.src b/sd/source/ui/view/DocumentRenderer.src index abd82ea0d397..7ab0643c7fa0 100755 --- a/sd/source/ui/view/DocumentRenderer.src +++ b/sd/source/ui/view/DocumentRenderer.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -62,7 +62,7 @@ Resource _STR_IMPRESS_PRINT_UI_OPTIONS < "Handouts" ; > ; < "Notes" ; > ; < "Outline" ; > ; - }; + }; }; String _STR_IMPRESS_PRINT_UI_SLIDESPERPAGE { @@ -79,7 +79,7 @@ Resource _STR_IMPRESS_PRINT_UI_OPTIONS < "4" ; > ; < "6" ; > ; < "9" ; > ; - }; + }; }; StringArray _STR_IMPRESS_PRINT_UI_SLIDESPERPAGE_CHOICES_HELP { @@ -99,7 +99,7 @@ Resource _STR_IMPRESS_PRINT_UI_OPTIONS { < "Left to right, then down" ; > ; < "Top to bottom, then right" ; > ; - }; + }; }; StringArray _STR_IMPRESS_PRINT_UI_ORDER_CHOICES_HELP { @@ -108,7 +108,7 @@ Resource _STR_IMPRESS_PRINT_UI_OPTIONS < "Specify how to arrange slides on the printed page." ; > ; < "Arrange slides horizontally" ; > ; < "Arrange slides vertically" ; > ; - }; + }; }; String _STR_IMPRESS_PRINT_UI_INCLUDE_CONTENT { @@ -162,7 +162,7 @@ Resource _STR_IMPRESS_PRINT_UI_OPTIONS < "Original colors" ; > ; < "Grayscale" ; > ; < "Black & white" ; > ; - }; + }; }; StringArray _STR_IMPRESS_PRINT_UI_QUALITY_CHOICES_HELP { @@ -172,7 +172,7 @@ Resource _STR_IMPRESS_PRINT_UI_OPTIONS < "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 @@ -187,7 +187,7 @@ Resource _STR_IMPRESS_PRINT_UI_OPTIONS < "Fit to printable page" ; > ; < "Distribute on multiple sheets of paper" ; > ; < "Tile sheet of paper with repeated slides" ; > ; - }; + }; }; StringArray _STR_IMPRESS_PRINT_UI_PAGE_OPTIONS_CHOICES_DRAW { @@ -197,7 +197,7 @@ Resource _STR_IMPRESS_PRINT_UI_OPTIONS < "Fit to printable page" ; > ; < "Distribute on multiple sheets of paper" ; > ; < "Tile sheet of paper with repeated pages" ; > ; - }; + }; }; StringArray _STR_IMPRESS_PRINT_UI_PAGE_OPTIONS_CHOICES_HELP { @@ -207,7 +207,7 @@ Resource _STR_IMPRESS_PRINT_UI_OPTIONS < "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 { @@ -236,7 +236,7 @@ Resource _STR_IMPRESS_PRINT_UI_OPTIONS < "All pages" ; > ; < "Front sides / right pages" ; > ; < "Back sides / left pages" ; > ; - }; + }; }; StringArray _STR_IMPRESS_PRINT_UI_BROCHURE_INCLUDE_LIST_HELP { @@ -245,7 +245,7 @@ Resource _STR_IMPRESS_PRINT_UI_OPTIONS < "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 diff --git a/sd/source/ui/view/FormShellManager.cxx b/sd/source/ui/view/FormShellManager.cxx index f5890b14fffd..2bd3d954165a 100644 --- a/sd/source/ui/view/FormShellManager.cxx +++ b/sd/source/ui/view/FormShellManager.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -97,7 +97,7 @@ FormShellManager::~FormShellManager (void) ViewShell* pShell = mrBase.GetMainViewShell().get(); if (pShell != NULL) mrBase.GetViewShellManager()->RemoveSubShellFactory(pShell,mpSubShellFactory); - } + } } @@ -114,7 +114,7 @@ void FormShellManager::SetFormShell (FmFormShell* pFormShell) EndListening(*mpFormShell); mpFormShell->SetView(NULL); } - + mpFormShell = pFormShell; // Connect to the new form shell. diff --git a/sd/source/ui/view/GraphicObjectBar.cxx b/sd/source/ui/view/GraphicObjectBar.cxx index c4f0dbb8d380..30e37d35c270 100644 --- a/sd/source/ui/view/GraphicObjectBar.cxx +++ b/sd/source/ui/view/GraphicObjectBar.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -85,7 +85,7 @@ GraphicObjectBar::GraphicObjectBar ( ViewShell* pSdViewShell, ::sd::View* pSdView ) : SfxShell (pSdViewShell->GetViewShell()), - mpView ( pSdView ), + mpView ( pSdView ), mpViewSh ( pSdViewShell ), nMappedSlotFilter ( SID_GRFFILTER_INVERT ) { @@ -128,8 +128,8 @@ void GraphicObjectBar::Execute( SfxRequest& rReq ) void GraphicObjectBar::GetFilterState( SfxItemSet& rSet ) { - const SdrMarkList& rMarkList = mpView->GetMarkedObjectList(); - BOOL bEnable = FALSE; + const SdrMarkList& rMarkList = mpView->GetMarkedObjectList(); + BOOL bEnable = FALSE; if( rMarkList.GetMarkCount() == 1 ) { @@ -157,15 +157,15 @@ void GraphicObjectBar::ExecuteFilter( SfxRequest& rReq ) { GraphicObject aFilterObj( ( (SdrGrafObj*) pObj )->GetGraphicObject() ); - if( SVX_GRAPHICFILTER_ERRCODE_NONE == + if( SVX_GRAPHICFILTER_ERRCODE_NONE == SvxGraphicFilter::ExecuteGrfFilterSlot( rReq, aFilterObj ) ) { SdrPageView* pPageView = mpView->GetSdrPageView(); if( pPageView ) { - SdrGrafObj* pFilteredObj = (SdrGrafObj*) pObj->Clone(); - String aStr( mpView->GetDescriptionOfMarkedObjects() ); + SdrGrafObj* pFilteredObj = (SdrGrafObj*) pObj->Clone(); + String aStr( mpView->GetDescriptionOfMarkedObjects() ); aStr.Append( sal_Unicode(' ') ); aStr.Append( String( SdResId( STR_UNDO_GRAFFILTER ) ) ); diff --git a/sd/source/ui/view/GraphicViewShellBase.cxx b/sd/source/ui/view/GraphicViewShellBase.cxx index f16fff607cbe..3c09a5d47bc8 100644 --- a/sd/source/ui/view/GraphicViewShellBase.cxx +++ b/sd/source/ui/view/GraphicViewShellBase.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -79,7 +79,7 @@ void GraphicViewShellBase::InitFactory() GraphicViewShellBase::GraphicViewShellBase ( - SfxViewFrame* _pFrame, + SfxViewFrame* _pFrame, SfxViewShell* pOldShell) : ViewShellBase (_pFrame, pOldShell) { diff --git a/sd/source/ui/view/ImpressViewShellBase.cxx b/sd/source/ui/view/ImpressViewShellBase.cxx index 9e97d198d3db..840b6dcc3c53 100644 --- a/sd/source/ui/view/ImpressViewShellBase.cxx +++ b/sd/source/ui/view/ImpressViewShellBase.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -79,7 +79,7 @@ void ImpressViewShellBase::InitFactory() ImpressViewShellBase::ImpressViewShellBase ( - SfxViewFrame* _pFrame, + SfxViewFrame* _pFrame, SfxViewShell* pOldShell) : ViewShellBase (_pFrame, pOldShell) { diff --git a/sd/source/ui/view/MediaObjectBar.cxx b/sd/source/ui/view/MediaObjectBar.cxx index d2d9bf767fa2..0c34eee8d050 100644 --- a/sd/source/ui/view/MediaObjectBar.cxx +++ b/sd/source/ui/view/MediaObjectBar.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -98,15 +98,15 @@ MediaObjectBar::~MediaObjectBar() void MediaObjectBar::GetState( SfxItemSet& rSet ) { - SfxWhichIter aIter( rSet ); - USHORT nWhich = aIter.FirstWhich(); + SfxWhichIter aIter( rSet ); + USHORT nWhich = aIter.FirstWhich(); while( nWhich ) { - if( SID_AVMEDIA_TOOLBOX == nWhich ) + if( SID_AVMEDIA_TOOLBOX == nWhich ) { SdrMarkList* pMarkList = new SdrMarkList( mpView->GetMarkedObjectList() ); - bool bDisable = true; + bool bDisable = true; if( 1 == pMarkList->GetMarkCount() ) { @@ -115,7 +115,7 @@ void MediaObjectBar::GetState( SfxItemSet& rSet ) if( pObj && pObj->ISA( SdrMediaObj ) ) { ::avmedia::MediaItem aItem( SID_AVMEDIA_TOOLBOX ); - + static_cast< sdr::contact::ViewContactOfSdrMediaObj& >( pObj->GetViewContact() ).updateMediaItem( aItem ); rSet.Put( aItem ); bDisable = false; @@ -124,7 +124,7 @@ void MediaObjectBar::GetState( SfxItemSet& rSet ) if( bDisable ) rSet.DisableItem( SID_AVMEDIA_TOOLBOX ); - + delete pMarkList; } @@ -136,14 +136,14 @@ void MediaObjectBar::GetState( SfxItemSet& rSet ) void MediaObjectBar::Execute( SfxRequest& rReq ) { - if( SID_AVMEDIA_TOOLBOX == rReq.GetSlot() ) + if( SID_AVMEDIA_TOOLBOX == rReq.GetSlot() ) { - const SfxItemSet* pArgs = rReq.GetArgs(); - const SfxPoolItem* pItem; - + const SfxItemSet* pArgs = rReq.GetArgs(); + const SfxPoolItem* pItem; + if( !pArgs || ( SFX_ITEM_SET != pArgs->GetItemState( SID_AVMEDIA_TOOLBOX, FALSE, &pItem ) ) ) pItem = NULL; - + if( pItem ) { SdrMarkList* pMarkList = new SdrMarkList( mpView->GetMarkedObjectList() ); @@ -154,7 +154,7 @@ void MediaObjectBar::Execute( SfxRequest& rReq ) if( pObj && pObj->ISA( SdrMediaObj ) ) { - static_cast< sdr::contact::ViewContactOfSdrMediaObj& >( pObj->GetViewContact() ).executeMediaItem( + static_cast< sdr::contact::ViewContactOfSdrMediaObj& >( pObj->GetViewContact() ).executeMediaItem( static_cast< const ::avmedia::MediaItem& >( *pItem ) ); } } diff --git a/sd/source/ui/view/OutlineViewShellBase.cxx b/sd/source/ui/view/OutlineViewShellBase.cxx index 682344195299..57fb37ea7343 100644 --- a/sd/source/ui/view/OutlineViewShellBase.cxx +++ b/sd/source/ui/view/OutlineViewShellBase.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -59,7 +59,7 @@ SfxViewShell* __EXPORT OutlineViewShellBase::CreateInstance ( return pBase; } void OutlineViewShellBase::RegisterFactory( USHORT nPrio ) -{ +{ pFactory = new SfxViewFactory( &CreateInstance,&InitFactory,nPrio,"Outline"); InitFactory(); @@ -73,7 +73,7 @@ void OutlineViewShellBase::InitFactory() OutlineViewShellBase::OutlineViewShellBase ( - SfxViewFrame* _pFrame, + SfxViewFrame* _pFrame, SfxViewShell* pOldShell) : ImpressViewShellBase (_pFrame, pOldShell) { diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx index e741f644665c..7637f437de2c 100644 --- a/sd/source/ui/view/Outliner.cxx +++ b/sd/source/ui/view/Outliner.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -1574,7 +1574,7 @@ void Outliner::PrepareConversion (void) mpDrawDocument->GetDocSh()->SetWaitCursor( FALSE ); // Start seach at the right end of the current object's text // depending on the search direction. -// mpOutlineView->SetSelection (GetSearchStartPosition ()); +// mpOutlineView->SetSelection (GetSearchStartPosition ()); } else { diff --git a/sd/source/ui/view/OutlinerIterator.cxx b/sd/source/ui/view/OutlinerIterator.cxx index 3dd879bf3e04..bdcfabdb752c 100644 --- a/sd/source/ui/view/OutlinerIterator.cxx +++ b/sd/source/ui/view/OutlinerIterator.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -217,18 +217,18 @@ Iterator OutlinerContainer::CreateSelectionIterator ( const ::std::vector<SdrObjectWeakRef>& rObjectList, SdDrawDocument* pDocument, const ::boost::shared_ptr<ViewShell>& rpViewShell, - bool bDirectionIsForward, + bool bDirectionIsForward, IteratorLocation aLocation) { OSL_ASSERT(rpViewShell.get()); - + sal_Int32 nObjectIndex; if (bDirectionIsForward) switch (aLocation) { case CURRENT: - case BEGIN: + case BEGIN: default: nObjectIndex = 0; break; @@ -240,7 +240,7 @@ Iterator OutlinerContainer::CreateSelectionIterator ( switch (aLocation) { case CURRENT: - case BEGIN: + case BEGIN: default: nObjectIndex = rObjectList.size()-1; break; @@ -254,13 +254,13 @@ Iterator OutlinerContainer::CreateSelectionIterator ( } Iterator OutlinerContainer::CreateDocumentIterator ( - SdDrawDocument* pDocument, + SdDrawDocument* pDocument, const ::boost::shared_ptr<ViewShell>& rpViewShell, - bool bDirectionIsForward, + bool bDirectionIsForward, IteratorLocation aLocation) { OSL_ASSERT(rpViewShell.get()); - + PageKind ePageKind; EditMode eEditMode; @@ -279,7 +279,7 @@ Iterator OutlinerContainer::CreateDocumentIterator ( eEditMode = EM_MASTERPAGE; } break; - + case END: if (bDirectionIsForward) { @@ -309,7 +309,7 @@ Iterator OutlinerContainer::CreateDocumentIterator ( break; } - sal_Int32 nPageIndex = GetPageIndex (pDocument, rpViewShell, + sal_Int32 nPageIndex = GetPageIndex (pDocument, rpViewShell, ePageKind, eEditMode, bDirectionIsForward, aLocation); return Iterator ( @@ -320,13 +320,13 @@ Iterator OutlinerContainer::CreateDocumentIterator ( sal_Int32 OutlinerContainer::GetPageIndex ( SdDrawDocument* pDocument, const ::boost::shared_ptr<ViewShell>& rpViewShell, - PageKind ePageKind, + PageKind ePageKind, EditMode eEditMode, bool bDirectionIsForward, IteratorLocation aLocation) { OSL_ASSERT(rpViewShell); - + sal_Int32 nPageIndex; sal_Int32 nPageCount; @@ -360,7 +360,7 @@ sal_Int32 OutlinerContainer::GetPageIndex ( } break; - case BEGIN: + case BEGIN: default: if (bDirectionIsForward) nPageIndex = 0; @@ -387,10 +387,10 @@ sal_Int32 OutlinerContainer::GetPageIndex ( IteratorImplBase::IteratorImplBase(SdDrawDocument* pDocument, const ::boost::weak_ptr<ViewShell>& rpViewShellWeak, bool bDirectionIsForward) -: maPosition() -, mpDocument (pDocument) -, mpViewShellWeak (rpViewShellWeak) -, mbDirectionIsForward (bDirectionIsForward) +: maPosition() +, mpDocument (pDocument) +, mpViewShellWeak (rpViewShellWeak) +, mbDirectionIsForward (bDirectionIsForward) { ::boost::shared_ptr<DrawViewShell> pDrawViewShell; if ( ! mpViewShellWeak.expired()) @@ -494,7 +494,7 @@ IteratorImplBase* SelectionIteratorImpl::Clone (IteratorImplBase* pObject) const void SelectionIteratorImpl::GotoNextText (void) { - SdrTextObj* pTextObj = dynamic_cast< SdrTextObj* >( mrObjectList.at(mnObjectIndex).get() ); + SdrTextObj* pTextObj = dynamic_cast< SdrTextObj* >( mrObjectList.at(mnObjectIndex).get() ); if (mbDirectionIsForward) { if( pTextObj ) @@ -504,7 +504,7 @@ void SelectionIteratorImpl::GotoNextText (void) { maPosition.mnText = 0; ++mnObjectIndex; - } + } } else { @@ -520,7 +520,7 @@ void SelectionIteratorImpl::GotoNextText (void) { maPosition.mnText = -1; --mnObjectIndex; - } + } } else { @@ -530,7 +530,7 @@ void SelectionIteratorImpl::GotoNextText (void) if( (maPosition.mnText == -1) && (mnObjectIndex >= 0) ) { - pTextObj = dynamic_cast< SdrTextObj* >( mrObjectList.at(mnObjectIndex).get() ); + pTextObj = dynamic_cast< SdrTextObj* >( mrObjectList.at(mnObjectIndex).get() ); if( pTextObj ) maPosition.mnText = pTextObj->getTextCount() - 1; } @@ -561,9 +561,9 @@ bool SelectionIteratorImpl::IsEqual ( { if (aType == SELECTION) { - const SelectionIteratorImpl* pSelectionIterator = + const SelectionIteratorImpl* pSelectionIterator = static_cast<const SelectionIteratorImpl*>(&rIterator); - return mpDocument == pSelectionIterator->mpDocument + return mpDocument == pSelectionIterator->mpDocument && mnObjectIndex == pSelectionIterator->mnObjectIndex; } else @@ -593,7 +593,7 @@ ViewIteratorImpl::ViewIteratorImpl ( ViewIteratorImpl::ViewIteratorImpl ( sal_Int32 nPageIndex, - SdDrawDocument* pDocument, + SdDrawDocument* pDocument, const ::boost::weak_ptr<ViewShell>& rpViewShellWeak, bool bDirectionIsForward, PageKind ePageKind, @@ -618,7 +618,7 @@ ViewIteratorImpl::~ViewIteratorImpl (void) IteratorImplBase* ViewIteratorImpl::Clone (IteratorImplBase* pObject) const { - + ViewIteratorImpl* pIterator = static_cast<ViewIteratorImpl*>(pObject); if (pIterator == NULL) pIterator = new ViewIteratorImpl ( @@ -645,7 +645,7 @@ IteratorImplBase* ViewIteratorImpl::Clone (IteratorImplBase* pObject) const void ViewIteratorImpl::GotoNextText(void) { - SdrTextObj* pTextObj = dynamic_cast< SdrTextObj* >( maPosition.mxObject.get() ); + SdrTextObj* pTextObj = dynamic_cast< SdrTextObj* >( maPosition.mxObject.get() ); if( pTextObj ) { if (mbDirectionIsForward) @@ -685,7 +685,7 @@ void ViewIteratorImpl::GotoNextText(void) maPosition.mnText = 0; if( !mbDirectionIsForward && maPosition.mxObject.is() ) { - pTextObj = dynamic_cast< SdrTextObj* >( maPosition.mxObject.get() ); + pTextObj = dynamic_cast< SdrTextObj* >( maPosition.mxObject.get() ); if( pTextObj ) maPosition.mnText = pTextObj->getTextCount() - 1; } @@ -717,11 +717,11 @@ void ViewIteratorImpl::SetPage (sal_Int32 nPageIndex) { if (maPosition.meEditMode == EM_PAGE) mpPage = mpDocument->GetSdPage ( - (USHORT)nPageIndex, + (USHORT)nPageIndex, maPosition.mePageKind); else mpPage = mpDocument->GetMasterSdPage ( - (USHORT)nPageIndex, + (USHORT)nPageIndex, maPosition.mePageKind); } else @@ -743,7 +743,7 @@ void ViewIteratorImpl::SetPage (sal_Int32 nPageIndex) maPosition.mnText = 0; if( !mbDirectionIsForward && maPosition.mxObject.is() ) { - SdrTextObj* pTextObj = dynamic_cast< SdrTextObj* >( maPosition.mxObject.get() ); + SdrTextObj* pTextObj = dynamic_cast< SdrTextObj* >( maPosition.mxObject.get() ); if( pTextObj ) maPosition.mnText = pTextObj->getTextCount() - 1; } @@ -825,14 +825,14 @@ void DocumentIteratorImpl::GotoNextText (void) if (mbDirectionIsForward) { if (maPosition.mnPageIndex >= mnPageCount) - { + { // Switch to master page. if (maPosition.meEditMode == EM_PAGE) { maPosition.meEditMode = EM_MASTERPAGE; SetPage (0); } - + // Switch to next view mode. else { @@ -861,7 +861,7 @@ void DocumentIteratorImpl::GotoNextText (void) maPosition.meEditMode = EM_PAGE; bSetToOnePastLastPage = true; } - + // Switch to previous view mode. else { @@ -888,7 +888,7 @@ void DocumentIteratorImpl::GotoNextText (void) nPageCount = mpDocument->GetSdPageCount (maPosition.mePageKind); else nPageCount = mpDocument->GetMasterSdPageCount(maPosition.mePageKind); - + // Now that we know the number of pages we can set the current page index. if (bSetToOnePastLastPage) SetPage (nPageCount); diff --git a/sd/source/ui/view/PresentationViewShellBase.cxx b/sd/source/ui/view/PresentationViewShellBase.cxx index f565bfccd4df..d289ea175ce2 100644 --- a/sd/source/ui/view/PresentationViewShellBase.cxx +++ b/sd/source/ui/view/PresentationViewShellBase.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -63,13 +63,13 @@ SfxViewFactory* PresentationViewShellBase::pFactory; SfxViewShell* __EXPORT PresentationViewShellBase::CreateInstance ( SfxViewFrame *_pFrame, SfxViewShell *pOldView) { - PresentationViewShellBase* pBase = + PresentationViewShellBase* pBase = new PresentationViewShellBase(_pFrame, pOldView); pBase->LateInit(framework::FrameworkHelper::msPresentationViewURL); return pBase; } void PresentationViewShellBase::RegisterFactory( USHORT nPrio ) -{ +{ pFactory = new SfxViewFactory( &CreateInstance,&InitFactory,nPrio,"FullScreenPresentation"); InitFactory(); @@ -83,7 +83,7 @@ void PresentationViewShellBase::InitFactory() PresentationViewShellBase::PresentationViewShellBase ( - SfxViewFrame* _pFrame, + SfxViewFrame* _pFrame, SfxViewShell* pOldShell) : ViewShellBase (_pFrame, pOldShell) { diff --git a/sd/source/ui/view/SlideSorterViewShellBase.cxx b/sd/source/ui/view/SlideSorterViewShellBase.cxx index 8ae5956caa5c..e499542a77fb 100644 --- a/sd/source/ui/view/SlideSorterViewShellBase.cxx +++ b/sd/source/ui/view/SlideSorterViewShellBase.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -63,7 +63,7 @@ SfxViewShell* __EXPORT SlideSorterViewShellBase::CreateInstance ( void SlideSorterViewShellBase::RegisterFactory( USHORT nPrio ) -{ +{ pFactory = new SfxViewFactory( &CreateInstance,&InitFactory,nPrio,"SlideSorter"); InitFactory(); @@ -84,7 +84,7 @@ void SlideSorterViewShellBase::InitFactory() SlideSorterViewShellBase::SlideSorterViewShellBase ( - SfxViewFrame* _pFrame, + SfxViewFrame* _pFrame, SfxViewShell* pOldShell) : ImpressViewShellBase (_pFrame, pOldShell) { diff --git a/sd/source/ui/view/ToolBarManager.cxx b/sd/source/ui/view/ToolBarManager.cxx index 55a9f171ca51..58a731863398 100644 --- a/sd/source/ui/view/ToolBarManager.cxx +++ b/sd/source/ui/view/ToolBarManager.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -319,7 +319,7 @@ public: void LockViewShellManager (void); void LockUpdate (void); void UnlockUpdate (void); - + ToolBarRules& GetToolBarRules (void); private: diff --git a/sd/source/ui/view/UpdateLockManager.cxx b/sd/source/ui/view/UpdateLockManager.cxx index c51e6cc86e24..7c51b4daaef2 100644 --- a/sd/source/ui/view/UpdateLockManager.cxx +++ b/sd/source/ui/view/UpdateLockManager.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -65,7 +65,7 @@ class UpdateLockManager::Implementation public: Implementation (ViewShellBase& rBase); virtual ~Implementation (void); - + void Lock (void); void Unlock (void); bool IsLocked (void) const; @@ -100,13 +100,13 @@ private: release when unlocking). */ virtual void SAL_CALL layoutEvent ( - const lang::EventObject& xSource, + const lang::EventObject& xSource, sal_Int16 eLayoutEvent, const Any& rInfo) throw (uno::RuntimeException); //===== lang::XEventListener ============================================ - virtual void SAL_CALL + virtual void SAL_CALL disposing (const lang::EventObject& rEventObject) throw (::com::sun::star::uno::RuntimeException); @@ -290,7 +290,7 @@ void UpdateLockManager::Implementation::Unlock (void) } catch (RuntimeException) { } - + // Force a rearrangement of the UI elements of the views. mrBase.Rearrange(); } @@ -317,7 +317,7 @@ void UpdateLockManager::Implementation::ForceUnlock (void) void SAL_CALL UpdateLockManager::Implementation::layoutEvent ( - const lang::EventObject&, + const lang::EventObject&, sal_Int16 eLayoutEvent, const Any& rInfo) throw (uno::RuntimeException) diff --git a/sd/source/ui/view/ViewClipboard.cxx b/sd/source/ui/view/ViewClipboard.cxx index e7e3e7c53a5a..87ad96dd2f8d 100644 --- a/sd/source/ui/view/ViewClipboard.cxx +++ b/sd/source/ui/view/ViewClipboard.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -88,7 +88,7 @@ SdPage* ViewClipboard::GetFirstMasterPage (const SdTransferable& rTransferable) const List* pBookmarks = &rTransferable.GetPageBookmarks(); if (pBookmarks == NULL) break; - + DrawDocShell* pDocShell = rTransferable.GetPageDocShell(); if (pDocShell == NULL) break; @@ -105,7 +105,7 @@ SdPage* ViewClipboard::GetFirstMasterPage (const SdTransferable& rTransferable) { String sName (*(String*) pBookmarks->GetObject(nIndex)); BOOL bIsMasterPage; - + // SdPage* GetMasterSdPage(USHORT nPgNum, PageKind ePgKind); // USHORT GetMasterSdPageCount(PageKind ePgKind) const; @@ -251,23 +251,23 @@ USHORT ViewClipboard::InsertSlides ( if( bWait ) pWin->LeaveWait(); - + pDoc->InsertBookmarkAsPage( - const_cast<List*>(pBookmarkList), - NULL, - FALSE, - FALSE, + const_cast<List*>(pBookmarkList), + NULL, + FALSE, + FALSE, nInsertPosition, (&rTransferable == SD_MOD()->pTransferDrag), - pDataDocSh, - TRUE, - bMergeMasterPages, + pDataDocSh, + TRUE, + bMergeMasterPages, FALSE); if( bWait ) pWin->EnterWait(); } - + return nInsertPgCnt; } diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx index 9fdcdff78a0b..5a0e9d2dba5e 100644 --- a/sd/source/ui/view/ViewShellBase.cxx +++ b/sd/source/ui/view/ViewShellBase.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -777,14 +777,14 @@ void ViewShellBase::Execute (SfxRequest& rRequest) framework::FrameworkHelper::msLeftDrawPaneURL, framework::FrameworkHelper::msSlideSorterURL); break; - + case SID_LEFT_PANE_IMPRESS: mpImpl->SetPaneVisibility( rRequest, framework::FrameworkHelper::msLeftImpressPaneURL, framework::FrameworkHelper::msSlideSorterURL); break; - + case SID_TASKPANE: mpImpl->SetPaneVisibility( rRequest, @@ -1035,7 +1035,7 @@ void ViewShellBase::UpdateBorder ( bool bForce /* = false */ ) bool bOuterResize ( ! GetDocShell()->IsInPlaceActive()); SvBorder aBorder (GetBorder(bOuterResize)); aBorder += pMainViewShell->GetBorder(bOuterResize); - + if (bForce || (aBorder != aCurrentBorder)) { SetBorderPixel (aBorder); @@ -1165,7 +1165,7 @@ const Rectangle& ViewShellBase::getClientRectangle (void) const { OSL_ASSERT(mpImpl.get()!=NULL); OSL_ASSERT(mpImpl->mpUpdateLockManager.get()!=NULL); - + return mpImpl->mpUpdateLockManager; } @@ -1176,7 +1176,7 @@ const Rectangle& ViewShellBase::getClientRectangle (void) const { OSL_ASSERT(mpImpl.get()!=NULL); OSL_ASSERT(mpImpl->mpToolBarManager.get()!=NULL); - + return mpImpl->mpToolBarManager; } @@ -1363,7 +1363,7 @@ void ViewShellBase::Implementation::ResizePixel ( // Forward the call to both the base class and the main stacked sub // shell only when main sub shell exists. ViewShell* pMainViewShell = mrBase.GetMainViewShell().get(); - + // Set the ViewTabBar temporarily to full size so that, when asked // later, it can return its true height. mrBase.SetWindow (mpViewWindow.get()); @@ -1386,7 +1386,7 @@ void ViewShellBase::Implementation::ResizePixel ( mpViewTabBar->GetTabControl()->SetPosSizePixel( rOrigin, Size(rSize.Width(),aBaseBorder.Top())); } - + // The view window gets the remaining space. Point aViewWindowPosition ( rOrigin.X()+aBaseBorder.Left(), @@ -1395,7 +1395,7 @@ void ViewShellBase::Implementation::ResizePixel ( rSize.Width() - aBaseBorder.Left() - aBaseBorder.Right(), rSize.Height() - aBaseBorder.Top() - aBaseBorder.Bottom()); mpViewWindow->SetPosSizePixel(aViewWindowPosition, aViewWindowSize); - + maClientArea = Rectangle(Point(0,0), aViewWindowSize); } @@ -1417,7 +1417,7 @@ void ViewShellBase::Implementation::SetPaneVisibility ( xContext, rsPaneURL)); Reference<XResourceId> xViewId (ResourceId::createWithAnchorURL( xContext, rsViewURL, rsPaneURL)); - + // Determine the new visibility state. const SfxItemSet* pArguments = rRequest.GetArgs(); BOOL bShowChildWindow; @@ -1435,10 +1435,10 @@ void ViewShellBase::Implementation::SetPaneVisibility ( xConfigurationController->getRequestedConfiguration()); if ( ! xConfiguration.is()) throw RuntimeException(); - + bShowChildWindow = ! xConfiguration->hasResource(xPaneId); } - + // Set the desired visibility state at the current configuration // and update it accordingly. Reference<XConfigurationController> xConfigurationController ( @@ -1499,7 +1499,7 @@ void ViewShellBase::Implementation::GetSlotState (SfxItemSet& rSet) xResourceId = ResourceId::create( xContext, FrameworkHelper::msLeftImpressPaneURL); break; - + case SID_LEFT_PANE_DRAW: xResourceId = ResourceId::create( xContext, FrameworkHelper::msLeftDrawPaneURL); @@ -1509,7 +1509,7 @@ void ViewShellBase::Implementation::GetSlotState (SfxItemSet& rSet) xResourceId = ResourceId::create( xContext, FrameworkHelper::msRightPaneURL); break; - + case SID_NORMAL_MULTI_PANE_GUI: xResourceId = ResourceId::createWithAnchorURL( xContext, @@ -1581,13 +1581,13 @@ void ViewShellBase::Implementation::GetSlotState (SfxItemSet& rSet) bState &= !bMasterPageMode; break; } - + case SID_HANDOUTMODE: // There is only the master page mode for the handout // view so ignore the master page flag. break; } - + // And finally set the state. rSet.Put(SfxBoolItem(nItemId, bState)); diff --git a/sd/source/ui/view/ViewShellHint.cxx b/sd/source/ui/view/ViewShellHint.cxx index efe7b6f2de74..6b3dd959228c 100644 --- a/sd/source/ui/view/ViewShellHint.cxx +++ b/sd/source/ui/view/ViewShellHint.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/view/ViewShellImplementation.cxx b/sd/source/ui/view/ViewShellImplementation.cxx index 56eee9cd32f8..661a86371eed 100644 --- a/sd/source/ui/view/ViewShellImplementation.cxx +++ b/sd/source/ui/view/ViewShellImplementation.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -186,10 +186,10 @@ void ViewShell::Implementation::ProcessModifyPageSlot ( if (aLayout >= AUTOLAYOUT__START && aLayout < AUTOLAYOUT__END) { - aNewName = pNewName->GetValue (); + aNewName = pNewName->GetValue (); aNewAutoLayout = (AutoLayout) pNewAutoLayout->GetValue (); - bBVisible = pBVisible->GetValue (); - bBObjsVisible = pBObjsVisible->GetValue (); + bBVisible = pBVisible->GetValue (); + bBObjsVisible = pBObjsVisible->GetValue (); } else { @@ -292,7 +292,7 @@ void ViewShell::Implementation::AssignLayout ( SfxRequest& rRequest, PageKind eP { pPage = pDocument->GetSdPage(static_cast<USHORT>(pWhatPage->GetValue()), ePageKind); } - + if( pPage == 0 ) pPage = mrViewShell.getCurrentPage(); @@ -302,7 +302,7 @@ void ViewShell::Implementation::AssignLayout ( SfxRequest& rRequest, PageKind eP if( pWhatLayout ) eLayout = static_cast< AutoLayout >( pWhatLayout->GetValue() ); - + // Transform the given request into the four argument form that is // understood by ProcessModifyPageSlot(). SdrLayerAdmin& rLayerAdmin (mrViewShell.GetViewShellBase().GetDocument()->GetLayerAdmin()); @@ -310,7 +310,7 @@ void ViewShell::Implementation::AssignLayout ( SfxRequest& rRequest, PageKind eP BYTE aBackgroundObject (rLayerAdmin.GetLayerID(String(SdResId(STR_LAYER_BCKGRNDOBJ)), FALSE)); SetOfByte aVisibleLayers; - + if( pPage->GetPageKind() == PK_HANDOUT ) aVisibleLayers.SetAll(); else @@ -341,7 +341,7 @@ sal_uInt16 ViewShell::Implementation::GetViewId (void) case ViewShell::ST_DRAW: return DRAW_FACTORY_ID; - + case ViewShell::ST_OUTLINE: return OUTLINE_FACTORY_ID; diff --git a/sd/source/ui/view/ViewShellManager.cxx b/sd/source/ui/view/ViewShellManager.cxx index fa7c63077280..397a825a26c9 100644 --- a/sd/source/ui/view/ViewShellManager.cxx +++ b/sd/source/ui/view/ViewShellManager.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -120,10 +120,10 @@ public: ~Implementation (void); void AddShellFactory ( - const SfxShell* pViewShell, + const SfxShell* pViewShell, const SharedShellFactory& rpFactory); void RemoveShellFactory ( - const SfxShell* pViewShell, + const SfxShell* pViewShell, const SharedShellFactory& rpFactory); void ActivateViewShell ( ViewShell* pViewShell); @@ -190,12 +190,12 @@ private: typedef ::std::list<ShellDescriptor> SubShellSubList; typedef ::std::hash_map<const SfxShell*,SubShellSubList,ShellHash> SubShellList; SubShellList maActiveSubShells; - + /** In this member we remember what shells we have pushed on the shell stack. */ typedef ::std::vector<SfxShell*> ShellStack; - + int mnUpdateLockCount; /** When this flag is set then the main view shell is always kept at the @@ -219,7 +219,7 @@ private: void GatherActiveShells (ShellStack& rShellList); void UpdateShellStack (void); - + void CreateShells (void); /** This method rebuilds the stack of shells that are stacked upon the @@ -272,7 +272,7 @@ ViewShellManager::~ViewShellManager (void) void ViewShellManager::AddSubShellFactory ( - ViewShell* pViewShell, + ViewShell* pViewShell, const SharedShellFactory& rpFactory) { if (mbValid) @@ -283,7 +283,7 @@ void ViewShellManager::AddSubShellFactory ( void ViewShellManager::RemoveSubShellFactory ( - ViewShell* pViewShell, + ViewShell* pViewShell, const SharedShellFactory& rpFactory) { if (mbValid) @@ -775,7 +775,7 @@ void ViewShellManager::Implementation::MoveToTop (const SfxShell& rShell) bMove = false; } else if (iShell == ++maActiveViewShells.begin() - && ! iShell->IsMainViewShell() + && ! iShell->IsMainViewShell() && mbKeepMainViewShellOnTop) { // The shell is a the second-to-top position, not the main view @@ -791,7 +791,7 @@ void ViewShellManager::Implementation::MoveToTop (const SfxShell& rShell) // that. bMove = false; } - + // When the shell is not at the right position it is removed from the // internal list of shells and inserted at the correct position. if (bMove) @@ -799,7 +799,7 @@ void ViewShellManager::Implementation::MoveToTop (const SfxShell& rShell) UpdateLock aLock (*this); ShellDescriptor aDescriptor(*iShell); - + TakeShellsFromStack(&rShell); maActiveViewShells.erase(iShell); @@ -913,12 +913,12 @@ void ViewShellManager::Implementation::UpdateShellStack (void) // 1. Create the missing shells. CreateShells(); - + // 2. Create the internal target stack. ShellStack aTargetStack; CreateTargetStack(aTargetStack); - + // 3. Get SFX shell stack. ShellStack aSfxShellStack; USHORT nIndex (0); @@ -936,7 +936,7 @@ void ViewShellManager::Implementation::UpdateShellStack (void) DumpShellStack(aTargetStack); #endif - + // 4. Find the lowest shell in which the two stacks differ. ShellStack::const_iterator iSfxShell (aSfxShellStack.begin()); ShellStack::iterator iTargetShell (aTargetStack.begin()); @@ -948,7 +948,7 @@ void ViewShellManager::Implementation::UpdateShellStack (void) ++iTargetShell; } - + // 5. Remove all shells above and including the differing shell from the // SFX stack starting with the shell on top of the stack. while (iSfxShell != aSfxShellStack.end()) @@ -961,7 +961,7 @@ void ViewShellManager::Implementation::UpdateShellStack (void) mrBase.RemoveSubShell(pShell); } - + // 6. Push shells from the given stack onto the SFX stack. mbShellStackIsUpToDate = false; while (iTargetShell != aTargetStack.end()) @@ -1030,7 +1030,7 @@ void ViewShellManager::Implementation::TakeShellsFromStack (const SfxShell* pShe else if (pShellOnStack == pShell) break; } - + if (pShell != NULL) { // 1. Deactivate our shells on the stack before they are removed so @@ -1112,7 +1112,7 @@ void ViewShellManager::Implementation::CreateTargetStack (ShellStack& rStack) co // stack. We can thus safly create the required shells wile still // having a valid shell stack. for (ActiveShellList::const_reverse_iterator iViewShell (maActiveViewShells.rbegin()); - iViewShell != maActiveViewShells.rend(); + iViewShell != maActiveViewShells.rend(); ++iViewShell) { // Possibly place the form shell below the current view shell. @@ -1122,7 +1122,7 @@ void ViewShellManager::Implementation::CreateTargetStack (ShellStack& rStack) co { rStack.push_back(mpFormShell); } - + // Put the view shell itself on the local stack. rStack.push_back (iViewShell->mpShell); @@ -1154,7 +1154,7 @@ IMPL_LINK(ViewShellManager::Implementation, WindowEventHandler, VclWindowEvent*, { if (pEvent != NULL) { - ::Window* pEventWindow + ::Window* pEventWindow = static_cast<VclWindowEvent*>(pEvent)->GetWindow(); switch (pEvent->GetId()) @@ -1162,7 +1162,7 @@ IMPL_LINK(ViewShellManager::Implementation, WindowEventHandler, VclWindowEvent*, case VCLEVENT_WINDOW_GETFOCUS: { for (ActiveShellList::iterator aI(maActiveViewShells.begin()); - aI!=maActiveViewShells.end(); + aI!=maActiveViewShells.end(); aI++) { if (pEventWindow == static_cast< ::Window*>(aI->GetWindow())) @@ -1212,7 +1212,7 @@ ShellDescriptor ViewShellManager::Implementation::CreateSubShell ( break; } } - + return aResult; } @@ -1223,7 +1223,7 @@ void ViewShellManager::Implementation::DestroyViewShell ( const ShellDescriptor& rDescriptor) { OSL_ASSERT(rDescriptor.mpShell != NULL); - + ::Window* pWindow = rDescriptor.GetWindow(); if (pWindow != NULL) { @@ -1284,7 +1284,7 @@ void ViewShellManager::Implementation::Shutdown (void) { UpdateLock aLock (*this); - + while ( ! maActiveViewShells.empty()) { SfxShell* pShell = maActiveViewShells.front().mpShell; @@ -1305,7 +1305,7 @@ void ViewShellManager::Implementation::Shutdown (void) } } mrBase.RemoveSubShell (NULL); - + maShellFactories.clear(); } @@ -1317,7 +1317,7 @@ void ViewShellManager::Implementation::DumpShellStack (const ShellStack& rStack) ShellStack::const_reverse_iterator iEntry; for (iEntry=rStack.rbegin(); iEntry!=rStack.rend(); ++iEntry) if (*iEntry != NULL) - OSL_TRACE (" %p : %s\r", + OSL_TRACE (" %p : %s\r", *iEntry, ::rtl::OUStringToOString((*iEntry)->GetName(),RTL_TEXTENCODING_UTF8).getStr()); else diff --git a/sd/source/ui/view/ViewTabBar.cxx b/sd/source/ui/view/ViewTabBar.cxx index 270ace5928c2..a1bde6469c79 100644 --- a/sd/source/ui/view/ViewTabBar.cxx +++ b/sd/source/ui/view/ViewTabBar.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -98,7 +98,7 @@ class ViewTabPage : public TabPage { public: ViewTabPage (Window* pParent) : TabPage(pParent) {} - virtual void Resize (void) + virtual void Resize (void) { SetPosSizePixel(Point(0,0),GetParent()->GetOutputSizePixel()); } }; @@ -153,7 +153,7 @@ ViewTabBar::ViewTabBar ( } mpTabControl->Show(); - + if (mpViewShellBase != NULL && rxViewTabBarId->isBoundToURL( FrameworkHelper::msCenterPaneURL, AnchorBindingMode_DIRECT)) @@ -204,7 +204,7 @@ void ViewTabBar::disposing (void) mpTabPage.reset(); mpTabControl.reset(); } - + mxController = NULL; } @@ -225,7 +225,7 @@ void ViewTabBar::disposing (void) { ::Window* pWindow = NULL; ViewShellBase* pBase = NULL; - + // Tunnel through the controller and use the ViewShellBase to obtain the // view frame. try @@ -274,7 +274,7 @@ void ViewTabBar::disposing (void) catch (RuntimeException&) {} } - + return pWindow; } @@ -410,7 +410,7 @@ const Sequence<sal_Int8>& ViewTabBar::getUnoTunnelId (void) sal_Int64 SAL_CALL ViewTabBar::getSomething (const Sequence<sal_Int8>& rId) throw (RuntimeException) -{ +{ sal_Int64 nResult = 0; if (rId.getLength() == 16 @@ -448,7 +448,7 @@ bool ViewTabBar::ActivatePage (void) catch (DeploymentException) { } - + Client* pIPClient = NULL; if (mpViewShellBase != NULL) pIPClient = dynamic_cast<Client*>(mpViewShellBase->GetIPClient()); @@ -476,7 +476,7 @@ bool ViewTabBar::ActivatePage (void) { DBG_UNHANDLED_EXCEPTION(); } - + return false; } @@ -530,7 +530,7 @@ void ViewTabBar::AddTabBarButton ( } } } - + AddTabBarButton(rButton,nIndex); } @@ -554,7 +554,7 @@ void ViewTabBar::AddTabBarButton ( && nPosition<=mpTabControl->GetPageCount()) { USHORT nIndex ((USHORT)nPosition); - + // Insert the button into our local array. maTabBarButtons.insert(maTabBarButtons.begin()+nIndex, rButton); UpdateTabBarButtons(); @@ -588,7 +588,7 @@ bool ViewTabBar::HasTabBarButton ( const ::com::sun::star::drawing::framework::TabBarButton& rButton) { bool bResult (false); - + for (sal_uInt32 nIndex=0; nIndex<maTabBarButtons.size(); ++nIndex) { if (IsEqual(maTabBarButtons[nIndex], rButton)) @@ -708,7 +708,7 @@ void TabBarControl::Paint (const Rectangle& rRect) void TabBarControl::ActivatePage (void) { if (mpViewTabBar->ActivatePage()) - { + { // Call the parent so that the correct tab is highlighted. this->::TabControl::ActivatePage(); } diff --git a/sd/source/ui/view/WindowUpdater.cxx b/sd/source/ui/view/WindowUpdater.cxx index 7fd41b01b11c..b52960a9707b 100644 --- a/sd/source/ui/view/WindowUpdater.cxx +++ b/sd/source/ui/view/WindowUpdater.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -177,7 +177,7 @@ void WindowUpdater::ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uI // Reformat the document for the modified state to take effect. if (mpDocument != NULL) mpDocument->ReformatAllTextObjects(); - + // Invalidate the windows to make the modified state visible. aWindowIterator = maWindowList.begin(); while (aWindowIterator != maWindowList.end()) diff --git a/sd/source/ui/view/bmcache.cxx b/sd/source/ui/view/bmcache.cxx index 9a586664d874..c52a8c57bc23 100644 --- a/sd/source/ui/view/bmcache.cxx +++ b/sd/source/ui/view/bmcache.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,7 +41,7 @@ struct BitmapCacheEntry const SdPage* pPage; GraphicObject* pGraphicObject; sal_uInt32 nSizeBytes; - long nZoom; + long nZoom; }; /************************************************************************* @@ -64,7 +64,7 @@ void BitmapCache::Remove( const SdPage* pPage ) for( ULONG nPos = 0; nPos < aEntries.Count(); ) { BitmapCacheEntry* pCand = (BitmapCacheEntry*) aEntries.GetObject( nPos ); - + if( pCand->pPage == pPage ) { pCand = (BitmapCacheEntry*) aEntries.Remove((ULONG)nPos); diff --git a/sd/source/ui/view/clview.cxx b/sd/source/ui/view/clview.cxx index e7518bc01d71..9aca8e785307 100644 --- a/sd/source/ui/view/clview.cxx +++ b/sd/source/ui/view/clview.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/view/drawview.cxx b/sd/source/ui/view/drawview.cxx index bb75f1c07773..ea0158687e32 100644 --- a/sd/source/ui/view/drawview.cxx +++ b/sd/source/ui/view/drawview.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -204,9 +204,9 @@ BOOL DrawView::SetAttributes(const SfxItemSet& rSet, else if (eObjKind == OBJ_OUTLINETEXT) { // Presentation object outline - OutlinerView* pOV = GetTextEditOutlinerView(); + OutlinerView* pOV = GetTextEditOutlinerView(); ::Outliner* pOutliner = pOV->GetOutliner(); - List* pList = (List*)pOV->CreateSelectionList(); + List* pList = (List*)pOV->CreateSelectionList(); aTemplateName += String(SdResId(STR_LAYOUT_OUTLINE)); pOutliner->SetUpdateMode(FALSE); @@ -285,7 +285,7 @@ BOOL DrawView::SetAttributes(const SfxItemSet& rSet, { // Selection const SdrMarkList& rList = GetMarkedObjectList(); - ULONG nMarkCount = rList.GetMarkCount(); + ULONG nMarkCount = rList.GetMarkCount(); for (ULONG nMark = 0; nMark < nMarkCount; nMark++) { SdrObject* pObject = rList.GetMark(nMark)->GetMarkedSdrObj(); @@ -380,7 +380,7 @@ BOOL DrawView::SetAttributes(const SfxItemSet& rSet, bOk = ::sd::View::SetAttributes(rSet, bReplaceAll); } } - else // nicht auf der Masterpage + else // nicht auf der Masterpage { bOk = ::sd::View::SetAttributes(rSet, bReplaceAll); } diff --git a/sd/source/ui/view/drbezob.cxx b/sd/source/ui/view/drbezob.cxx index b8c6924f79e7..60ee5e0232e3 100644 --- a/sd/source/ui/view/drbezob.cxx +++ b/sd/source/ui/view/drbezob.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -149,17 +149,17 @@ void BezierObjectBar::GetAttrState(SfxItemSet& rSet) // #i77187# if object is move and/or size protected, do not allow point editing at all rSet.DisableItem(SID_BEZIER_MOVE); rSet.DisableItem(SID_BEZIER_INSERT); - + rSet.DisableItem(SID_BEZIER_DELETE); rSet.DisableItem(SID_BEZIER_CUTLINE); rSet.DisableItem(SID_BEZIER_CONVERT); - + rSet.DisableItem(SID_BEZIER_EDGE); rSet.DisableItem(SID_BEZIER_SMOOTH); rSet.DisableItem(SID_BEZIER_SYMMTR); - + rSet.DisableItem(SID_BEZIER_CLOSE); - + rSet.DisableItem(SID_BEZIER_ELIMINATE_POINTS); } else @@ -226,7 +226,7 @@ void BezierObjectBar::GetAttrState(SfxItemSet& rSet) } } - if(pIPPEC == mpView) + if(pIPPEC == mpView) rSet.Put(SfxBoolItem(SID_BEZIER_ELIMINATE_POINTS, mpView->IsEliminatePolyPoints())); else rSet.DisableItem( SID_BEZIER_ELIMINATE_POINTS ); // only works for views diff --git a/sd/source/ui/view/drtxtob.cxx b/sd/source/ui/view/drtxtob.cxx index 2d9a593462a9..6685b616604d 100644 --- a/sd/source/ui/view/drtxtob.cxx +++ b/sd/source/ui/view/drtxtob.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -166,13 +166,13 @@ TextObjectBar::~TextObjectBar() void TextObjectBar::GetAttrState( SfxItemSet& rSet ) { - SfxWhichIter aIter( rSet ); - USHORT nWhich = aIter.FirstWhich(); - BOOL bTemplate = FALSE; - SfxItemSet aAttrSet( mpView->GetDoc()->GetPool() ); + SfxWhichIter aIter( rSet ); + USHORT nWhich = aIter.FirstWhich(); + BOOL bTemplate = FALSE; + SfxItemSet aAttrSet( mpView->GetDoc()->GetPool() ); SvtLanguageOptions aLangOpt; sal_Bool bDisableParagraphTextDirection = !aLangOpt.IsCTLFontEnabled(); - sal_Bool bDisableVerticalText = !aLangOpt.IsVerticalTextEnabled(); + sal_Bool bDisableVerticalText = !aLangOpt.IsVerticalTextEnabled(); mpView->GetAttributes( aAttrSet ); @@ -407,8 +407,8 @@ void TextObjectBar::GetAttrState( SfxItemSet& rSet ) //! avoid puting the same item as SfxBoolItem at the end of this function nSlotId = 0; } - break; - + break; + default: break; } diff --git a/sd/source/ui/view/drtxtob1.cxx b/sd/source/ui/view/drtxtob1.cxx index ee4e8ebf34cb..31e60731ad40 100644 --- a/sd/source/ui/view/drtxtob1.cxx +++ b/sd/source/ui/view/drtxtob1.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -318,14 +318,14 @@ void TextObjectBar::Execute( SfxRequest &rReq ) break; case FN_NUM_BULLET_ON: - if( pOLV ) + if( pOLV ) pOLV->ToggleBullets(); break; case SID_GROW_FONT_SIZE: case SID_SHRINK_FONT_SIZE: { - const SvxFontListItem* pFonts = (const SvxFontListItem*)mpViewShell->GetDocSh()->GetItem( SID_ATTR_CHAR_FONTLIST ); + const SvxFontListItem* pFonts = (const SvxFontListItem*)mpViewShell->GetDocSh()->GetItem( SID_ATTR_CHAR_FONTLIST ); const FontList* pFontList = pFonts ? pFonts->GetFontList(): 0; if( pFontList ) { @@ -345,7 +345,7 @@ void TextObjectBar::Execute( SfxRequest &rReq ) if (aReplaceText.Len() > 0) ReplaceTextWithSynonym( pOLV->GetEditView(), aReplaceText ); } - break; + break; default: { diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx index 6d9bbba22242..e9a3395830f4 100644 --- a/sd/source/ui/view/drviews1.cxx +++ b/sd/source/ui/view/drviews1.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -339,7 +339,7 @@ USHORT DrawViewShell::PrepareClose( BOOL bUI, BOOL bForBrowsing ) if ( ViewShell::PrepareClose(bUI, bForBrowsing) != TRUE ) return FALSE; - BOOL bRet = TRUE; + BOOL bRet = TRUE; if( bRet && HasCurrentFunction() ) { @@ -535,7 +535,7 @@ bool DrawViewShell::IsLayerModeActive (void) const long DrawViewShell::GetHCtrlWidth() { - // return maTabControl.GetSizePixel().Width(); + // return maTabControl.GetSizePixel().Width(); return 0; } @@ -550,11 +550,11 @@ SvxRuler* DrawViewShell::CreateHRuler (::sd::Window* pWin, BOOL bIsFirst) { Ruler* pRuler; WinBits aWBits; - USHORT nFlags = SVXRULER_SUPPORT_OBJECT; + USHORT nFlags = SVXRULER_SUPPORT_OBJECT; if ( bIsFirst ) { - aWBits = WB_HSCROLL | WB_3DLOOK | WB_BORDER | WB_EXTRAFIELD; + aWBits = WB_HSCROLL | WB_3DLOOK | WB_BORDER | WB_EXTRAFIELD; nFlags |= ( SVXRULER_SUPPORT_SET_NULLOFFSET | SVXRULER_SUPPORT_TABS | SVXRULER_SUPPORT_PARAGRAPH_MARGINS ); // Neu @@ -594,7 +594,7 @@ SvxRuler* DrawViewShell::CreateVRuler(::sd::Window* pWin) { Ruler* pRuler; WinBits aWBits = WB_VSCROLL | WB_3DLOOK | WB_BORDER; - USHORT nFlags = SVXRULER_SUPPORT_OBJECT; + USHORT nFlags = SVXRULER_SUPPORT_OBJECT; pRuler = new Ruler(*this, GetParentWindow(), pWin, nFlags, GetViewFrame()->GetBindings(), aWBits); @@ -717,7 +717,7 @@ SdPage* DrawViewShell::getCurrentPage() const void DrawViewShell::ResetActualPage() { USHORT nCurrentPage = maTabControl.GetCurPageId() - 1; - USHORT nPageCount = (meEditMode == EM_PAGE)?GetDoc()->GetSdPageCount(mePageKind):GetDoc()->GetMasterSdPageCount(mePageKind); + USHORT nPageCount = (meEditMode == EM_PAGE)?GetDoc()->GetSdPageCount(mePageKind):GetDoc()->GetMasterSdPageCount(mePageKind); if (nPageCount > 0) nCurrentPage = Min((USHORT)(nPageCount - 1), nCurrentPage); else @@ -1214,7 +1214,7 @@ BOOL DrawViewShell::SwitchPage(USHORT nSelectedPage) // set pages for all available handout presentation objects sd::ShapeList& rShapeList = pMaster->GetPresentationShapeList(); SdrObject* pObj = 0; - + while( (pObj = rShapeList.getNextShape(pObj)) != 0 ) { if( pMaster->GetPresObjKind(pObj) == PRESOBJ_HANDOUT ) diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx index 9904ef576374..d5a22330fb47 100644 --- a/sd/source/ui/view/drviews2.cxx +++ b/sd/source/ui/view/drviews2.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -552,7 +552,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) rReq.Done (); break; } - case SID_ZOOMING : // kein Menueintrag, sondern aus dem Zoomdialog generiert + case SID_ZOOMING : // kein Menueintrag, sondern aus dem Zoomdialog generiert { const SfxItemSet* pArgs = rReq.GetArgs(); @@ -663,7 +663,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) Cancel(); if( HasCurrentFunction(SID_BEZIER_EDIT) ) - { // ggf. die richtige Editfunktion aktivieren + { // ggf. die richtige Editfunktion aktivieren GetViewFrame()->GetDispatcher()->Execute(SID_SWITCH_POINTEDIT, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD); } @@ -888,10 +888,10 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) case SID_DELETE_SNAPITEM: { SdrPageView* pPV; - Point aMPos = GetActiveWindow()->PixelToLogic( maMousePos ); - USHORT nHitLog = (USHORT) GetActiveWindow()->PixelToLogic( Size( + Point aMPos = GetActiveWindow()->PixelToLogic( maMousePos ); + USHORT nHitLog = (USHORT) GetActiveWindow()->PixelToLogic( Size( FuPoor::HITPIX, 0 ) ).Width(); - USHORT nHelpLine; + USHORT nHelpLine; mbMousePosFreezed = FALSE; @@ -926,7 +926,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) case SID_DRAW_FONTWORK: case SID_DRAW_FONTWORK_VERTICAL: { - svx::FontworkBar::execute( mpView, rReq, GetViewFrame()->GetBindings() ); // SJ: can be removed (I think) + svx::FontworkBar::execute( mpView, rReq, GetViewFrame()->GetBindings() ); // SJ: can be removed (I think) Cancel(); rReq.Done(); } diff --git a/sd/source/ui/view/drviews3.cxx b/sd/source/ui/view/drviews3.cxx index 363212fe0c9f..1492c232c351 100644 --- a/sd/source/ui/view/drviews3.cxx +++ b/sd/source/ui/view/drviews3.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -147,7 +147,7 @@ void DrawViewShell::ExecCtrl(SfxRequest& rReq) } } - // USHORT nSlot = rReq.GetSlot(); + // USHORT nSlot = rReq.GetSlot(); switch (nSlot) { case SID_SWITCHPAGE: // BASIC @@ -192,8 +192,8 @@ void DrawViewShell::ExecCtrl(SfxRequest& rReq) } nSelectedPage = (short) nWhatPage; - mePageKind = (PageKind) nWhatKind; - bWasBasic = TRUE; + mePageKind = (PageKind) nWhatKind; + bWasBasic = TRUE; } } else @@ -238,7 +238,7 @@ void DrawViewShell::ExecCtrl(SfxRequest& rReq) break; } - case SID_PAGEMODE: // BASIC + case SID_PAGEMODE: // BASIC { const SfxItemSet *pArgs = rReq.GetArgs (); @@ -922,7 +922,7 @@ void DrawViewShell::GetRulerState(SfxItemSet& rSet) { rSet.DisableItem( SID_RULER_OBJECT ); rSet.DisableItem( EE_PARA_TABS ); -// rSet.DisableItem( SID_RULER_TEXT_RIGHT_TO_LEFT ); +// rSet.DisableItem( SID_RULER_TEXT_RIGHT_TO_LEFT ); } rSet.Put( aLRSpace ); @@ -971,10 +971,10 @@ void DrawViewShell::ExecStatusBar(SfxRequest& rReq) void DrawViewShell::GetSnapItemState( SfxItemSet &rSet ) { SdrPageView* pPV; - Point aMPos = GetActiveWindow()->PixelToLogic(maMousePos); - USHORT nHitLog = (USHORT) GetActiveWindow()->PixelToLogic( + Point aMPos = GetActiveWindow()->PixelToLogic(maMousePos); + USHORT nHitLog = (USHORT) GetActiveWindow()->PixelToLogic( Size(FuPoor::HITPIX,0)).Width(); - USHORT nHelpLine; + USHORT 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 79fac4455b18..936155775a36 100644 --- a/sd/source/ui/view/drviews4.cxx +++ b/sd/source/ui/view/drviews4.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -95,7 +95,7 @@ using namespace ::com::sun::star::drawing; void DrawViewShell::DeleteActualPage() { - USHORT nPage = maTabControl.GetCurPageId() - 1; + USHORT nPage = maTabControl.GetCurPageId() - 1; mpDrawView->SdrEndTextEdit(); @@ -139,7 +139,7 @@ void DrawViewShell::DeleteActualLayer() // Hint von Joe angestossen werden // ( View::Notify() --> ViewShell::ResetActualLayer() ) - mbIsLayerModeActive = false; // damit ChangeEditMode() ueberhaupt was tut + mbIsLayerModeActive = false; // damit ChangeEditMode() ueberhaupt was tut ChangeEditMode(GetEditMode(), true); } } @@ -393,14 +393,14 @@ void DrawViewShell::MouseMove(const MouseEvent& rMEvt, ::sd::Window* pWin) if ( mbPipette && GetViewFrame()->HasChildWindow( SvxBmpMaskChildWindow::GetChildWindowId() ) ) { - const long nStartX = maMousePos.X() - PIPETTE_RANGE; - const long nEndX = maMousePos.X() + PIPETTE_RANGE; - const long nStartY = maMousePos.Y() - PIPETTE_RANGE; - const long nEndY = maMousePos.Y() + PIPETTE_RANGE; - long nRed = 0; - long nGreen = 0; - long nBlue = 0; - const double fDiv = ( ( PIPETTE_RANGE << 1 ) + 1 ) * ( ( PIPETTE_RANGE << 1 ) + 1 ); + const long nStartX = maMousePos.X() - PIPETTE_RANGE; + const long nEndX = maMousePos.X() + PIPETTE_RANGE; + const long nStartY = maMousePos.Y() - PIPETTE_RANGE; + const long nEndY = maMousePos.Y() + PIPETTE_RANGE; + long nRed = 0; + long nGreen = 0; + long nBlue = 0; + const double fDiv = ( ( PIPETTE_RANGE << 1 ) + 1 ) * ( ( PIPETTE_RANGE << 1 ) + 1 ); for ( long nY = nStartY; nY <= nEndY; nY++ ) { @@ -511,7 +511,7 @@ void DrawViewShell::Command(const CommandEvent& rCEvt, ::sd::Window* pWin) if( !mpDrawView->InsertData( aDataHelper, aPos, nDnDAction, FALSE ) ) { - INetBookmark aINetBookmark( aEmptyStr, aEmptyStr ); + INetBookmark aINetBookmark( aEmptyStr, aEmptyStr ); if( ( aDataHelper.HasFormat( SOT_FORMATSTR_ID_NETSCAPE_BOOKMARK ) && aDataHelper.GetINetBookmark( SOT_FORMATSTR_ID_NETSCAPE_BOOKMARK, aINetBookmark ) ) || @@ -533,13 +533,13 @@ void DrawViewShell::Command(const CommandEvent& rCEvt, ::sd::Window* pWin) // Ist ein Fangobjekt unter dem Mauszeiger? SdrPageView* pPV; - Point aMPos = pWin->PixelToLogic( maMousePos ); - USHORT nHitLog = (USHORT) GetActiveWindow()->PixelToLogic( + Point aMPos = pWin->PixelToLogic( maMousePos ); + USHORT nHitLog = (USHORT) GetActiveWindow()->PixelToLogic( Size(FuPoor::HITPIX, 0 ) ).Width(); - USHORT nHelpLine; + USHORT nHelpLine; // fuer Klebepunkt - SdrObject* pObj = NULL; - USHORT nPickId = 0; + SdrObject* pObj = NULL; + USHORT nPickId = 0; // fuer Feldbefehl OutlinerView* pOLV = mpDrawView->GetTextEditOutlinerView(); const SvxFieldItem* pFldItem = NULL; @@ -615,7 +615,7 @@ void DrawViewShell::Command(const CommandEvent& rCEvt, ::sd::Window* pWin) mpDrawView->GetMarkedObjectList().GetMarkCount() == 1 ) { pObj = mpDrawView->GetMarkedObjectList().GetMark(0)->GetMarkedSdrObj(); - if( HasCurrentFunction(SID_BEZIER_EDIT) && (dynamic_cast< SdrPathObj * >( pObj ) != 0 ) ) + if( HasCurrentFunction(SID_BEZIER_EDIT) && (dynamic_cast< SdrPathObj * >( pObj ) != 0 ) ) { nSdResId = RID_BEZIER_POPUP; } @@ -691,7 +691,7 @@ void DrawViewShell::Command(const CommandEvent& rCEvt, ::sd::Window* pWin) break; case OBJ_FREELINE: - case OBJ_EDGE: // Connector + case OBJ_EDGE: // Connector nSdResId = bGraphicShell ? RID_GRAPHIC_EDGEOBJ_POPUP : RID_DRAW_EDGEOBJ_POPUP; break; @@ -842,11 +842,11 @@ void DrawViewShell::ShowMousePosInfo(const Rectangle& rRect, { if (mbHasRulers && pWin ) { - RulerLine pHLines[2]; - RulerLine pVLines[2]; + RulerLine pHLines[2]; + RulerLine pVLines[2]; long nHOffs = 0L; long nVOffs = 0L; - USHORT nCnt; + USHORT nCnt; if (mpHorizontalRuler.get() != NULL) mpHorizontalRuler->SetLines(); @@ -896,7 +896,7 @@ void DrawViewShell::ShowMousePosInfo(const Rectangle& rRect, SID_ATTR_SIZE, SID_ATTR_SIZE, 0L); -// GetStatusBarState(aSet); nicht performant bei gedrueckter Modifiertaste!! +// GetStatusBarState(aSet); nicht performant bei gedrueckter Modifiertaste!! aSet.Put( SfxStringItem( SID_CONTEXT, mpDrawView->GetStatusText() ) ); diff --git a/sd/source/ui/view/drviews5.cxx b/sd/source/ui/view/drviews5.cxx index 9916f990691d..fd0dd65627f3 100644 --- a/sd/source/ui/view/drviews5.cxx +++ b/sd/source/ui/view/drviews5.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -99,7 +99,7 @@ void DrawViewShell::ModelHasChanged() // jetzt den von der Drawing Engine neu erzeugten TextEditOutliner // initialisieren - ::Outliner* pOutliner = mpDrawView->GetTextEditOutliner(); + ::Outliner* pOutliner = mpDrawView->GetTextEditOutliner(); if (pOutliner) { SfxStyleSheetPool* pSPool = (SfxStyleSheetPool*) GetDocSh()->GetStyleSheetPool(); @@ -134,7 +134,7 @@ void DrawViewShell::ArrangeGUIElements (void) // Retrieve the current size (thickness) of the scroll bars. That is // the width of the vertical and the height of the horizontal scroll // bar. - int nScrollBarSize = + int nScrollBarSize = GetParentWindow()->GetSettings().GetStyleSettings().GetScrollBarSize(); maScrBarWH = Size (nScrollBarSize, nScrollBarSize); @@ -272,8 +272,8 @@ void DrawViewShell::ReadFrameViewData(FrameView* pView) mpDrawView->SetMasterPagePaintCaching( pView->IsMasterPagePaintCaching() ); // Definition: - // grosse Handles: 9 - // kleine Handles: 7 + // grosse Handles: 9 + // kleine Handles: 7 USHORT nTmp = mpDrawView->GetMarkHdlSizePixel(); //DBG_ASSERT(nTmp != 7, "HandleSize != 7 oder 9"); if( nTmp == 9 && !pView->IsBigHandles() ) @@ -467,7 +467,7 @@ void DrawViewShell::Paint(const Rectangle& rRect, ::sd::Window* pWin) aFillColor = Color( aColorConfig.GetColorValue( svtools::DOCCOLOR ).nColor ); } - /* #97517# This is done before each text edit, so why not do it before every paint. + /* #97517# This is done before each text edit, so why not do it before every paint. The default language is only used if the outliner only contains one character in a symbol font */ GetDoc()->GetDrawOutliner( NULL ).SetDefaultLanguage( GetDoc()->GetLanguage( EE_CHAR_LANGUAGE ) ); @@ -475,7 +475,7 @@ void DrawViewShell::Paint(const Rectangle& rRect, ::sd::Window* pWin) // #103834# Set Application Background color for usage in SdrPaintView(s) mpDrawView->SetApplicationBackgroundColor(aFillColor); - /* #97517# This is done before each text edit, so why not do it before every paint. + /* #97517# This is done before each text edit, so why not do it before every paint. The default language is only used if the outliner only contains one character in a symbol font */ GetDoc()->GetDrawOutliner( NULL ).SetDefaultLanguage( Application::GetSettings().GetLanguage() ); @@ -687,7 +687,7 @@ void DrawViewShell::VisAreaChanged(const Rectangle& rRect) int DrawViewShell::GetActiveTabLayerIndex (void) const { - const LayerTabBar* pBar + const LayerTabBar* pBar = const_cast<DrawViewShell*>(this)->GetLayerTabControl (); if (pBar != NULL) return pBar->GetPagePos (pBar->GetCurPageId()); @@ -734,7 +734,7 @@ LayerTabBar* DrawViewShell::GetLayerTabControl (void) int DrawViewShell::GetTabLayerCount (void) const { - const LayerTabBar* pBar + const LayerTabBar* pBar = const_cast<DrawViewShell*>(this)->GetLayerTabControl (); if (pBar != NULL) return pBar->GetPageCount(); diff --git a/sd/source/ui/view/drviews6.cxx b/sd/source/ui/view/drviews6.cxx index 6be0ffe52c90..a29abf742705 100644 --- a/sd/source/ui/view/drviews6.cxx +++ b/sd/source/ui/view/drviews6.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -115,7 +115,7 @@ void DrawViewShell::ExecFormText(SfxRequest& rReq) GetValue()); if(HasCurrentFunction(SID_BEZIER_EDIT)) - { // ggf. die richtige Editfunktion aktivieren + { // ggf. die richtige Editfunktion aktivieren GetViewFrame()->GetDispatcher()->Execute(SID_SWITCH_POINTEDIT, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD); } @@ -149,8 +149,8 @@ void DrawViewShell::GetFormTextState(SfxItemSet& rSet) !((SdrTextObj*) pObj)->HasText() ) { // automatisches Auf/Zuklappen des FontWork-Dialog; erstmal deaktiviert -// if ( pDlg ) -// pDlg->SetActive(FALSE); +// if ( pDlg ) +// pDlg->SetActive(FALSE); rSet.DisableItem(XATTR_FORMTXTSTYLE); rSet.DisableItem(XATTR_FORMTXTADJUST); @@ -169,7 +169,7 @@ void DrawViewShell::GetFormTextState(SfxItemSet& rSet) { if ( pDlg ) { -// pDlg->SetActive(); +// pDlg->SetActive(); pDlg->SetColorTable(GetDoc()->GetColorTable()); } @@ -250,7 +250,7 @@ void DrawViewShell::GetAnimationWinState( SfxItemSet& rSet ) { const SdrObject* pObj = rMarkList.GetMark( 0 )->GetMarkedSdrObj(); UINT32 nInv = pObj->GetObjInventor(); - UINT16 nId = pObj->GetObjIdentifier(); + UINT16 nId = pObj->GetObjIdentifier(); // 1 selektiertes Gruppenobjekt if( nInv == SdrInventor && nId == OBJ_GRUP ) nValue = 3; @@ -362,8 +362,8 @@ void DrawViewShell::ExecBmpMask( SfxRequest& rReq ) if ( pObj && !mpDrawView->IsTextEdit() ) { - SdrGrafObj* pNewObj = (SdrGrafObj*) pObj->Clone(); - BOOL bCont = TRUE; + SdrGrafObj* pNewObj = (SdrGrafObj*) pObj->Clone(); + BOOL bCont = TRUE; if( pNewObj->IsLinkedGraphic() ) { @@ -381,8 +381,8 @@ void DrawViewShell::ExecBmpMask( SfxRequest& rReq ) if( bCont ) { - const Graphic& rOldGraphic = pNewObj->GetGraphic(); - const Graphic aNewGraphic( ( (SvxBmpMask*) GetViewFrame()->GetChildWindow( + const Graphic& rOldGraphic = pNewObj->GetGraphic(); + const Graphic aNewGraphic( ( (SvxBmpMask*) GetViewFrame()->GetChildWindow( SvxBmpMaskChildWindow::GetChildWindowId() )->GetWindow() )-> Mask( rOldGraphic ) ); @@ -391,7 +391,7 @@ void DrawViewShell::ExecBmpMask( SfxRequest& rReq ) SdrPageView* pPV = mpDrawView->GetSdrPageView(); pNewObj->SetEmptyPresObj( FALSE ); - pNewObj->SetGraphic( ( (SvxBmpMask*) GetViewFrame()->GetChildWindow( + pNewObj->SetGraphic( ( (SvxBmpMask*) GetViewFrame()->GetChildWindow( SvxBmpMaskChildWindow::GetChildWindowId() )->GetWindow() )-> Mask( pNewObj->GetGraphic() ) ); @@ -420,11 +420,11 @@ void DrawViewShell::ExecBmpMask( SfxRequest& rReq ) void DrawViewShell::GetBmpMaskState( SfxItemSet& rSet ) { - const SdrMarkList& rMarkList = mpDrawView->GetMarkedObjectList(); - const SdrObject* pObj = NULL; - USHORT nId = SvxBmpMaskChildWindow::GetChildWindowId(); - SvxBmpMask* pDlg = NULL; - BOOL bEnable = FALSE; + const SdrMarkList& rMarkList = mpDrawView->GetMarkedObjectList(); + const SdrObject* pObj = NULL; + USHORT nId = SvxBmpMaskChildWindow::GetChildWindowId(); + SvxBmpMask* pDlg = NULL; + BOOL bEnable = FALSE; if ( GetViewFrame()->HasChildWindow( nId ) ) { @@ -672,7 +672,7 @@ void DrawViewShell::FuTemp04(SfxRequest& rReq) rReq.Ignore (); } break; - + case SID_LAYER_DIALOG_WIN: { if ( rReq.GetArgs() ) diff --git a/sd/source/ui/view/drviews7.cxx b/sd/source/ui/view/drviews7.cxx index b6b151ba0bee..e59525a99222 100644 --- a/sd/source/ui/view/drviews7.cxx +++ b/sd/source/ui/view/drviews7.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -300,7 +300,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) if( pPage && !pPage->IsMasterPage() ) { - rSet.Put( SfxUInt32Item( SID_ASSIGN_LAYOUT, static_cast< sal_uInt32 >(pPage->GetAutoLayout()) ) ); + rSet.Put( SfxUInt32Item( SID_ASSIGN_LAYOUT, static_cast< sal_uInt32 >(pPage->GetAutoLayout()) ) ); bDisable = false; } } @@ -444,7 +444,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) // Vertikale Ausrichtung USHORT nVert = mpDrawView->GetMarkedGluePointsAlign( 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_TOP, nVert == SDRVERTALIGN_TOP ) ); rSet.Put( SfxBoolItem( SID_GLUE_VERTALIGN_BOTTOM, nVert == SDRVERTALIGN_BOTTOM ) ); } @@ -869,9 +869,9 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) || SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_DELETE_MASTER_PAGE ) ) { if (maTabControl.GetPageCount() == 1 || - meEditMode == EM_MASTERPAGE || - mePageKind == PK_NOTES || - mePageKind == PK_HANDOUT || + meEditMode == EM_MASTERPAGE || + mePageKind == PK_NOTES || + mePageKind == PK_HANDOUT || (GetShellType()!=ST_DRAW&&IsLayerModeActive())) { if (rSet.GetItemState(SID_DELETE_PAGE) == SFX_ITEM_AVAILABLE) @@ -884,8 +884,8 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) // darf der aktuelle Layer geloescht werden? if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_DELETE_LAYER ) ) { - USHORT nCurrentLayer = GetLayerTabControl()->GetCurPageId(); - const String& rName = GetLayerTabControl()->GetPageText(nCurrentLayer); + USHORT nCurrentLayer = GetLayerTabControl()->GetCurPageId(); + const String& rName = GetLayerTabControl()->GetPageText(nCurrentLayer); BOOL bDisableIt = !IsLayerModeActive(); bDisableIt |= (rName == String(SdResId(STR_LAYER_LAYOUT))); @@ -967,7 +967,7 @@ 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_INSERTPAGE ); rSet.DisableItem( SID_DUPLICATE_PAGE ); rSet.DisableItem( SID_ZOOM_TOOLBOX ); } @@ -1378,7 +1378,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) BOOL bFoundAny = FALSE; bool bFoundTable = false; -// const int nMarkCount = (int) aMarkList.GetMarkCount(); +// const int nMarkCount = (int) aMarkList.GetMarkCount(); for (ULONG i=0; i < nMarkCount && !bFoundAny; i++) { SdrObject* pObj= aMarkList.GetMark(i)->GetMarkedSdrObj(); @@ -1448,11 +1448,11 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) if( bFoundObjNoLine ) rSet.DisableItem( SID_ATTRIBUTES_LINE ); - if( bFoundBitmap && !bFoundMetafile && !bFoundNoGraphicObj ) // only Bitmaps marked + if( bFoundBitmap && !bFoundMetafile && !bFoundNoGraphicObj ) // only Bitmaps marked rSet.DisableItem( SID_CONVERT_TO_BITMAP ); - else if( !bFoundBitmap && bFoundMetafile && !bFoundNoGraphicObj ) // only Metafiles marked + else if( !bFoundBitmap && bFoundMetafile && !bFoundNoGraphicObj ) // only Metafiles marked rSet.DisableItem( SID_CONVERT_TO_METAFILE ); - else if( !bFoundBitmap && !bFoundMetafile && !bFoundNoGraphicObj ) // nothing to do + else if( !bFoundBitmap && !bFoundMetafile && !bFoundNoGraphicObj ) // nothing to do { rSet.DisableItem( SID_CONVERT_TO_BITMAP ); rSet.DisableItem( SID_CONVERT_TO_METAFILE ); diff --git a/sd/source/ui/view/drviews8.cxx b/sd/source/ui/view/drviews8.cxx index ea63e37bf0c8..1d13671c4198 100644 --- a/sd/source/ui/view/drviews8.cxx +++ b/sd/source/ui/view/drviews8.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -78,7 +78,7 @@ #include "drawview.hxx" #include "zoomlist.hxx" #include <osl/mutex.hxx> -#include <vcl/salbtype.hxx> // FRound +#include <vcl/salbtype.hxx> // FRound #include <vcl/svapp.hxx> namespace sd { @@ -115,7 +115,7 @@ void DrawViewShell::FuTemp01(SfxRequest& rReq) } break; - case SID_CHAR_DLG: // BASIC + case SID_CHAR_DLG: // BASIC { SetCurrentFunction( FuChar::Create( this, GetActiveWindow(), mpDrawView, GetDoc(), rReq ) ); Cancel(); @@ -456,8 +456,8 @@ void DrawViewShell::ScannerEvent( const ::com::sun::star::lang::EventObject& ) { if( mxScannerManager.is() ) { - const ::com::sun::star::scanner::ScannerContext aContext( mxScannerManager->getAvailableScanners().getConstArray()[ 0 ] ); - const ::com::sun::star::scanner::ScanError eError = mxScannerManager->getError( aContext ); + const ::com::sun::star::scanner::ScannerContext aContext( mxScannerManager->getAvailableScanners().getConstArray()[ 0 ] ); + const ::com::sun::star::scanner::ScanError eError = mxScannerManager->getError( aContext ); if( ::com::sun::star::scanner::ScanError_ScanErrorNone == eError ) { diff --git a/sd/source/ui/view/drviews9.cxx b/sd/source/ui/view/drviews9.cxx index bcaac6d8b866..217ef520c53b 100644 --- a/sd/source/ui/view/drviews9.cxx +++ b/sd/source/ui/view/drviews9.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -97,8 +97,8 @@ void DrawViewShell::ExecGallery(SfxRequest& rReq) if ( pArgs ) { - const UINT32 nFormats = ( (SfxUInt32Item&) pArgs->Get( SID_GALLERY_FORMATS ) ).GetValue(); - GalleryExplorer* pGal = SVX_GALLERY(); + const UINT32 nFormats = ( (SfxUInt32Item&) pArgs->Get( SID_GALLERY_FORMATS ) ).GetValue(); + GalleryExplorer* pGal = SVX_GALLERY(); if ( pGal ) { @@ -125,12 +125,12 @@ void DrawViewShell::ExecGallery(SfxRequest& rReq) // Falls Grafik zu gross, wird die Grafik // in die Seite eingepasst - if ( ( ( aSize.Height() > aPageSize.Height() ) || ( aSize.Width() > aPageSize.Width() ) ) && + if ( ( ( aSize.Height() > aPageSize.Height() ) || ( aSize.Width() > aPageSize.Width() ) ) && aSize.Height() && aPageSize.Height() ) { - float fGrfWH = (float)aSize.Width() / + float fGrfWH = (float)aSize.Width() / (float)aSize.Height(); - float fWinWH = (float)aPageSize.Width() / + float fWinWH = (float)aPageSize.Width() / (float)aPageSize.Height(); // Grafik an Pagesize anpassen (skaliert) @@ -148,7 +148,7 @@ void DrawViewShell::ExecGallery(SfxRequest& rReq) // Ausgaberechteck fuer Grafik setzen - Point aPnt ((aPageSize.Width() - aSize.Width()) / 2, + Point aPnt ((aPageSize.Width() - aSize.Width()) / 2, (aPageSize.Height() - aSize.Height()) / 2); aPnt += Point(pPage->GetLftBorder(), pPage->GetUppBorder()); Rectangle aRect (aPnt, aSize); @@ -255,8 +255,8 @@ void DrawViewShell::AttrExec (SfxRequest &rReq) CheckLineTo (rReq); - SfxBindings& rBindings = GetViewFrame()->GetBindings(); - SfxItemSet* pAttr = new SfxItemSet ( GetDoc()->GetPool() ); + SfxBindings& rBindings = GetViewFrame()->GetBindings(); + SfxItemSet* pAttr = new SfxItemSet ( GetDoc()->GetPool() ); GetView()->GetAttributes( *pAttr ); const SfxItemSet* pArgs = rReq.GetArgs(); @@ -372,8 +372,8 @@ void DrawViewShell::AttrExec (SfxRequest &rReq) SFX_REQUEST_ARG (rReq, pBlue, SfxUInt32Item, ID_VAL_BLUE, FALSE); XGradientList *pGradientList = GetDoc()->GetGradientList (); - long nCounts = pGradientList->Count (); - Color aColor ((BYTE) pRed->GetValue (), + long nCounts = pGradientList->Count (); + Color aColor ((BYTE) pRed->GetValue (), (BYTE) pGreen->GetValue (), (BYTE) pBlue->GetValue ()); long i; @@ -432,8 +432,8 @@ void DrawViewShell::AttrExec (SfxRequest &rReq) SFX_REQUEST_ARG (rReq, pBlue, SfxUInt32Item, ID_VAL_BLUE, FALSE); XHatchList *pHatchList = GetDoc()->GetHatchList (); - long nCounts = pHatchList->Count (); - Color aColor ((BYTE) pRed->GetValue (), + long nCounts = pHatchList->Count (); + Color aColor ((BYTE) pRed->GetValue (), (BYTE) pGreen->GetValue (), (BYTE) pBlue->GetValue ()); long i; @@ -497,8 +497,8 @@ void DrawViewShell::AttrExec (SfxRequest &rReq) pAttr->ClearItem (XATTR_LINESTYLE); XDashList *pDashList = GetDoc()->GetDashList (); - long nCounts = pDashList->Count (); - XDashEntry *pEntry = new XDashEntry (aNewDash, pName->GetValue ()); + long nCounts = pDashList->Count (); + XDashEntry *pEntry = new XDashEntry (aNewDash, pName->GetValue ()); long i; for ( i = 0; i < nCounts; i++ ) @@ -549,7 +549,7 @@ void DrawViewShell::AttrExec (SfxRequest &rReq) pAttr->ClearItem (XATTR_FILLSTYLE); XGradientList *pGradientList = GetDoc()->GetGradientList (); - long nCounts = pGradientList->Count (); + long nCounts = pGradientList->Count (); long i; for ( i = 0; i < nCounts; i++ ) @@ -615,7 +615,7 @@ void DrawViewShell::AttrExec (SfxRequest &rReq) pAttr->ClearItem (XATTR_FILLSTYLE); XHatchList *pHatchList = GetDoc()->GetHatchList (); - long nCounts = pHatchList->Count (); + long nCounts = pHatchList->Count (); long i; for ( i = 0; i < nCounts; i++ ) @@ -665,7 +665,7 @@ void DrawViewShell::AttrExec (SfxRequest &rReq) SFX_REQUEST_ARG (rReq, pName, SfxStringItem, ID_VAL_INDEX, FALSE); XGradientList *pGradientList = GetDoc()->GetGradientList (); - long nCounts = pGradientList->Count (); + long nCounts = pGradientList->Count (); for (long i = 0; i < nCounts; @@ -699,7 +699,7 @@ void DrawViewShell::AttrExec (SfxRequest &rReq) SFX_REQUEST_ARG (rReq, pName, SfxStringItem, ID_VAL_INDEX, FALSE); XHatchList *pHatchList = GetDoc()->GetHatchList (); - long nCounts = pHatchList->Count (); + long nCounts = pHatchList->Count (); for (long i = 0; i < nCounts; @@ -740,7 +740,7 @@ void DrawViewShell::AttrExec (SfxRequest &rReq) StarBASIC::FatalError (SbERR_WRONG_ARGS); break; -/* case SID_SETFONTFAMILYNAME : +/* case SID_SETFONTFAMILYNAME : case SID_SETFONTSTYLENAME : case SID_SETFONTFAMILY : case SID_SETFONTPITCH : @@ -776,8 +776,8 @@ void DrawViewShell::AttrExec (SfxRequest &rReq) void DrawViewShell::AttrState (SfxItemSet& rSet) { - SfxWhichIter aIter (rSet); - USHORT nWhich = aIter.FirstWhich (); + SfxWhichIter aIter (rSet); + USHORT nWhich = aIter.FirstWhich (); SfxItemSet aAttr( GetDoc()->GetPool() ); mpDrawView->GetAttributes( aAttr ); @@ -814,7 +814,7 @@ void DrawViewShell::AttrState (SfxItemSet& rSet) case SID_GETBLUE : { const SfxUInt32Item &rWhatKind = (const SfxUInt32Item &) rSet.Get (ID_VAL_WHATKIND); - Color aColor; + Color aColor; switch (rWhatKind.GetValue ()) { @@ -838,7 +838,7 @@ void DrawViewShell::AttrState (SfxItemSet& rSet) case 4 : { const XFillGradientItem &rFillGradientItem = (const XFillGradientItem &) aAttr.Get (XATTR_FILLGRADIENT); - const XGradient &rGradient = rFillGradientItem.GetGradientValue (); + const XGradient &rGradient = rFillGradientItem.GetGradientValue (); aColor = (rWhatKind.GetValue () == 3) ? rGradient.GetStartColor () @@ -849,7 +849,7 @@ void DrawViewShell::AttrState (SfxItemSet& rSet) case 5: { const XFillHatchItem &rFillHatchItem = (const XFillHatchItem &) aAttr.Get (XATTR_FILLHATCH); - const XHatch &rHatch = rFillHatchItem.GetHatchValue (); + const XHatch &rHatch = rFillHatchItem.GetHatchValue (); aColor = rHatch.GetColor (); break; diff --git a/sd/source/ui/view/drviewsa.cxx b/sd/source/ui/view/drviewsa.cxx index b4919c6e9573..d7efb814070a 100644 --- a/sd/source/ui/view/drviewsa.cxx +++ b/sd/source/ui/view/drviewsa.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -103,7 +103,7 @@ class ScannerEventListener : public ::cppu::WeakImplHelper1< ::com::sun::star::l { private: - DrawViewShell* mpParent; + DrawViewShell* mpParent; public: @@ -111,9 +111,9 @@ public: ~ScannerEventListener(); // XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& rEventObject ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& rEventObject ) throw (::com::sun::star::uno::RuntimeException); - void ParentDestroyed() { mpParent = NULL; } + void ParentDestroyed() { mpParent = NULL; } }; // ----------------------------------------------------------------------------- @@ -158,7 +158,7 @@ DrawViewShell::~DrawViewShell() { mpAnnotationManager.reset(); mpViewOverlayManager.reset(); - + OSL_ASSERT (GetViewShell()!=NULL); if( mxScannerListener.is() ) @@ -203,7 +203,7 @@ DrawViewShell::~DrawViewShell() if ( mpClipEvtLstnr ) { mpClipEvtLstnr->AddRemoveListener( GetActiveWindow(), FALSE ); - mpClipEvtLstnr->ClearCallbackLink(); // #103849# prevent callback if another thread is waiting + mpClipEvtLstnr->ClearCallbackLink(); // #103849# prevent callback if another thread is waiting mpClipEvtLstnr->release(); } @@ -272,7 +272,7 @@ void DrawViewShell::Construct(DrawDocShell* pDocSh, PageKind eInitialPageKind) GetDoc()->CreateFirstPages(); mpDrawView = new DrawView(pDocSh, GetActiveWindow(), this); - mpView = mpDrawView; // Pointer der Basisklasse ViewShell + mpView = mpDrawView; // Pointer der Basisklasse ViewShell mpDrawView->SetSwapAsynchron(TRUE); // Asynchrones Laden von Graphiken // We do not read the page kind from the frame view anymore so we have @@ -400,8 +400,8 @@ void DrawViewShell::Construct(DrawDocShell* pDocSh, PageKind eInitialPageKind) ::com::sun::star::uno::UNO_QUERY ); } } - - mpAnnotationManager.reset( new AnnotationManager( GetViewShellBase() ) ); + + mpAnnotationManager.reset( new AnnotationManager( GetViewShellBase() ) ); mpViewOverlayManager.reset( new ViewOverlayManager( GetViewShellBase() ) ); } @@ -472,7 +472,7 @@ bool DrawViewShell::RelocateToParentWindow (::Window* pParentWindow) /* linienzuege werden ueber makros als folge von MoveTo (x, y) - LineTo (x, y) [oder BezierTo (x, y)] + LineTo (x, y) [oder BezierTo (x, y)] LineTo (x, y) : dargestellt. einen endbefehl fuer die linienzuege @@ -843,7 +843,7 @@ void DrawViewShell::Notify (SfxBroadcaster&, const SfxHint& rHint) void DrawViewShell::ExecuteAnnotation (SfxRequest& rRequest) { if( mpAnnotationManager.get() ) - mpAnnotationManager->ExecuteAnnotation( rRequest ); + mpAnnotationManager->ExecuteAnnotation( rRequest ); } // -------------------------------------------------------------------- @@ -851,7 +851,7 @@ void DrawViewShell::ExecuteAnnotation (SfxRequest& rRequest) void DrawViewShell::GetAnnotationState (SfxItemSet& rItemSet ) { if( mpAnnotationManager.get() ) - mpAnnotationManager->GetAnnotationState( rItemSet ); + mpAnnotationManager->GetAnnotationState( rItemSet ); } diff --git a/sd/source/ui/view/drviewsb.cxx b/sd/source/ui/view/drviewsb.cxx index 3ef394bc9995..f89ffac376d2 100644 --- a/sd/source/ui/view/drviewsb.cxx +++ b/sd/source/ui/view/drviewsb.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -75,7 +75,7 @@ #include "SlideSorter.hxx" #include "controller/SlideSorterController.hxx" -#define RET_DELETE 100 +#define RET_DELETE 100 namespace sd { @@ -131,7 +131,7 @@ void DrawViewShell::FuTemp02(SfxRequest& rReq) while( bLoop && pDlg->Execute() == RET_OK ) { pDlg->GetAttr( aNewAttr ); - aLayerName = ((SdAttrLayerName &) aNewAttr.Get (ATTR_LAYER_NAME)).GetValue (); + aLayerName = ((SdAttrLayerName &) aNewAttr.Get (ATTR_LAYER_NAME)).GetValue (); if( rLayerAdmin.GetLayer( aLayerName, FALSE ) || aLayerName.Len()==0 ) @@ -157,11 +157,11 @@ void DrawViewShell::FuTemp02(SfxRequest& rReq) else { //pDlg->GetAttr( aNewAttr ); - //aLayerName = ((SdAttrLayerName &) aNewAttr.Get (ATTR_LAYER_NAME)).GetValue (); + //aLayerName = ((SdAttrLayerName &) aNewAttr.Get (ATTR_LAYER_NAME)).GetValue (); aLayerTitle = ((SdAttrLayerTitle &) aNewAttr.Get (ATTR_LAYER_TITLE)).GetValue (); aLayerDesc = ((SdAttrLayerDesc &) aNewAttr.Get (ATTR_LAYER_DESC)).GetValue (); - bIsVisible = ((SdAttrLayerVisible &) aNewAttr.Get (ATTR_LAYER_VISIBLE)).GetValue (); - bIsLocked = ((SdAttrLayerLocked &) aNewAttr.Get (ATTR_LAYER_LOCKED)).GetValue () ; + bIsVisible = ((SdAttrLayerVisible &) aNewAttr.Get (ATTR_LAYER_VISIBLE)).GetValue (); + bIsLocked = ((SdAttrLayerLocked &) aNewAttr.Get (ATTR_LAYER_LOCKED)).GetValue () ; bIsPrintable = ((SdAttrLayerPrintable &) aNewAttr.Get (ATTR_LAYER_PRINTABLE)).GetValue () ; delete pDlg; @@ -184,7 +184,7 @@ void DrawViewShell::FuTemp02(SfxRequest& rReq) aLayerName = pLayerName->GetValue (); bIsVisible = pIsVisible->GetValue (); - bIsLocked = pIsLocked->GetValue (); + bIsLocked = pIsLocked->GetValue (); bIsPrintable = pIsPrintable->GetValue (); } @@ -293,12 +293,12 @@ void DrawViewShell::FuTemp02(SfxRequest& rReq) pDlg->SetHelpId( SID_MODIFYLAYER ); // Ueberpruefung auf schon vorhandene Namen - BOOL bLoop = TRUE; - USHORT nRet = 0; + BOOL bLoop = TRUE; + USHORT nRet = 0; while( bLoop && ( (nRet = pDlg->Execute()) == RET_OK ) ) { pDlg->GetAttr( aNewAttr ); - aLayerName = ((SdAttrLayerName &) aNewAttr.Get (ATTR_LAYER_NAME)).GetValue (); + aLayerName = ((SdAttrLayerName &) aNewAttr.Get (ATTR_LAYER_NAME)).GetValue (); if( (rLayerAdmin.GetLayer( aLayerName, FALSE ) && aLayerName != aOldLayerName) || aLayerName.Len()==0 ) @@ -318,8 +318,8 @@ void DrawViewShell::FuTemp02(SfxRequest& rReq) case RET_OK : aLayerTitle = ((SdAttrLayerTitle &) aNewAttr.Get (ATTR_LAYER_TITLE)).GetValue (); aLayerDesc = ((SdAttrLayerDesc &) aNewAttr.Get (ATTR_LAYER_DESC)).GetValue (); - bIsVisible = ((const SdAttrLayerVisible &) aNewAttr.Get (ATTR_LAYER_VISIBLE)).GetValue (); - bIsLocked = ((const SdAttrLayerLocked &) aNewAttr.Get (ATTR_LAYER_LOCKED)).GetValue (); + bIsVisible = ((const SdAttrLayerVisible &) aNewAttr.Get (ATTR_LAYER_VISIBLE)).GetValue (); + bIsLocked = ((const SdAttrLayerLocked &) aNewAttr.Get (ATTR_LAYER_LOCKED)).GetValue (); bIsPrintable = ((const SdAttrLayerLocked &) aNewAttr.Get (ATTR_LAYER_PRINTABLE)).GetValue (); delete pDlg; @@ -342,7 +342,7 @@ void DrawViewShell::FuTemp02(SfxRequest& rReq) aLayerName = pLayerName->GetValue (); bIsVisible = pIsVisible->GetValue (); - bIsLocked = pIsLocked->GetValue (); + bIsLocked = pIsLocked->GetValue (); bIsPrintable = pIsPrintable->GetValue (); } else @@ -551,7 +551,7 @@ void DrawViewShell::FuTemp02(SfxRequest& rReq) if( GetDocSh()->HasName() ) aName = GetDocSh()->GetMedium()->GetName(); //else - // aName = GetDocSh()->GetName(); + // aName = GetDocSh()->GetName(); pFieldItem = new SvxFieldItem( SvxExtFileField( aName ), EE_FEATURE_FIELD ); } break; diff --git a/sd/source/ui/view/drviewsc.cxx b/sd/source/ui/view/drviewsc.cxx index 563a153a7ef5..73cc59fd9709 100644 --- a/sd/source/ui/view/drviewsc.cxx +++ b/sd/source/ui/view/drviewsc.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -64,11 +64,11 @@ #include "drawdoc.hxx" #include "DrawDocShell.hxx" #include "drawview.hxx" -#include "sdabstdlg.hxx" -#include "brkdlg.hrc" +#include "sdabstdlg.hxx" +#include "brkdlg.hrc" namespace sd { -#define MIN_ACTIONS_FOR_DIALOG 5000 // bei mehr als 1600 Metaobjekten +#define MIN_ACTIONS_FOR_DIALOG 5000 // bei mehr als 1600 Metaobjekten // wird beim Aufbrechen ein Dialog // angezeigt. /************************************************************************* @@ -121,7 +121,7 @@ void DrawViewShell::FuTemp03(SfxRequest& rReq) OSL_ENSURE(pFact, "Dialogdiet fail!"); AbstractSvxObjectNameDialog* pDlg = pFact->CreateSvxObjectNameDialog(NULL, aName); OSL_ENSURE(pDlg, "Dialogdiet fail!"); - + pDlg->SetCheckNameHdl(LINK(this, DrawViewShell, NameObjectHdl)); if(RET_OK == pDlg->Execute()) @@ -200,7 +200,7 @@ void DrawViewShell::FuTemp03(SfxRequest& rReq) rReq.Done (); } break; - + case SID_COMBINE: // BASIC { // #88224# End text edit to avoid conflicts @@ -421,7 +421,7 @@ void DrawViewShell::FuTemp03(SfxRequest& rReq) } break; - case SID_FRAME_TO_TOP: // BASIC + case SID_FRAME_TO_TOP: // BASIC { mpDrawView->PutMarkedToTop(); Cancel(); @@ -439,7 +439,7 @@ void DrawViewShell::FuTemp03(SfxRequest& rReq) } break; - case SID_MOREBACK: // BASIC + case SID_MOREBACK: // BASIC { mpDrawView->MovMarkedToBtm(); Cancel(); @@ -448,7 +448,7 @@ void DrawViewShell::FuTemp03(SfxRequest& rReq) } break; - case SID_FRAME_TO_BOTTOM: // BASIC + case SID_FRAME_TO_BOTTOM: // BASIC { mpDrawView->PutMarkedToBtm(); Cancel(); @@ -465,7 +465,7 @@ void DrawViewShell::FuTemp03(SfxRequest& rReq) } break; - case SID_VERTICAL: // BASIC + case SID_VERTICAL: // BASIC { mpDrawView->MirrorAllMarkedVertical(); Cancel(); @@ -537,7 +537,7 @@ void DrawViewShell::FuTemp03(SfxRequest& rReq) } break; - case SID_STYLE_NEW: // BASIC ??? + case SID_STYLE_NEW: // BASIC ??? case SID_STYLE_APPLY: case SID_STYLE_EDIT: case SID_STYLE_DELETE: @@ -594,7 +594,7 @@ void DrawViewShell::FuTemp03(SfxRequest& rReq) case SID_IMAP: { SvxIMapDlg* pDlg; - USHORT nId = SvxIMapDlgChildWindow::GetChildWindowId(); + USHORT nId = SvxIMapDlgChildWindow::GetChildWindowId(); GetViewFrame()->ToggleChildWindow( nId ); GetViewFrame()->GetBindings().Invalidate( SID_IMAP ); @@ -602,7 +602,7 @@ void DrawViewShell::FuTemp03(SfxRequest& rReq) if ( GetViewFrame()->HasChildWindow( nId ) && ( ( pDlg = ViewShell::Implementation::GetImageMapDialog() ) != NULL ) ) { - const SdrMarkList& rMarkList = mpDrawView->GetMarkedObjectList(); + const SdrMarkList& rMarkList = mpDrawView->GetMarkedObjectList(); if ( rMarkList.GetMarkCount() == 1 ) UpdateIMapDlg( rMarkList.GetMark( 0 )->GetMarkedSdrObj() ); @@ -940,9 +940,9 @@ void DrawViewShell::UpdateIMapDlg( SdrObject* pObj ) if( ( pObj->ISA( SdrGrafObj ) || pObj->ISA( SdrOle2Obj ) ) && !mpDrawView->IsTextEdit() && GetViewFrame()->HasChildWindow( SvxIMapDlgChildWindow::GetChildWindowId() ) ) { - Graphic aGraphic; - ImageMap* pIMap = NULL; - TargetList* pTargetList = NULL; + Graphic aGraphic; + ImageMap* pIMap = NULL; + TargetList* pTargetList = NULL; SdIMapInfo* pIMapInfo = GetDoc()->GetIMapInfo( pObj ); // get graphic from shape diff --git a/sd/source/ui/view/drviewsd.cxx b/sd/source/ui/view/drviewsd.cxx index 6f446b16937f..9d0f3cd30f6a 100644 --- a/sd/source/ui/view/drviewsd.cxx +++ b/sd/source/ui/view/drviewsd.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/view/drviewse.cxx b/sd/source/ui/view/drviewse.cxx index 3f7a86aa5084..7ffde9252924 100644 --- a/sd/source/ui/view/drviewse.cxx +++ b/sd/source/ui/view/drviewse.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -250,7 +250,7 @@ void DrawViewShell::FuPermanent(SfxRequest& rReq) switch ( nSId ) { - case SID_TEXTEDIT: // BASIC ??? + case SID_TEXTEDIT: // BASIC ??? case SID_ATTR_CHAR: case SID_ATTR_CHAR_VERTICAL: case SID_TEXT_FITTOSIZE: @@ -542,7 +542,7 @@ void DrawViewShell::FuPermanent(SfxRequest& rReq) rBind.Update( nSId ); break; } - + default: break; } @@ -704,7 +704,7 @@ void DrawViewShell::FuSupport(SfxRequest& rReq) if( xPresentation.is() ) { if( ( SID_REHEARSE_TIMINGS != rReq.GetSlot() ) ) - xPresentation->start(); + xPresentation->start(); else xPresentation->rehearseTimings(); } @@ -1168,7 +1168,7 @@ void DrawViewShell::FuSupport(SfxRequest& rReq) // Namensverwirrung: SID_SIZE_OPTIMAL -> Zoom auf selektierte Objekte // --> Wird als Objektzoom im Programm angeboten - case SID_SIZE_OPTIMAL: // BASIC + case SID_SIZE_OPTIMAL: // BASIC { mbZoomOnPage = FALSE; if ( mpDrawView->AreObjectsMarked() ) @@ -1198,7 +1198,7 @@ void DrawViewShell::FuSupport(SfxRequest& rReq) // Namensverwirrung: SID_SIZE_ALL -> Zoom auf alle Objekte // --> Wird als Optimal im Programm angeboten - case SID_SIZE_ALL: // BASIC + case SID_SIZE_ALL: // BASIC { mbZoomOnPage = FALSE; SdrPageView* pPageView = mpDrawView->GetSdrPageView(); @@ -1377,7 +1377,7 @@ void DrawViewShell::FuSupport(SfxRequest& rReq) if( rGraphic.GetType() == GRAPHIC_BITMAP ) { - SdrGrafObj* pNewObj = (SdrGrafObj*) pObj->Clone(); + SdrGrafObj* pNewObj = (SdrGrafObj*) pObj->Clone(); if( rGraphic.IsAnimated() ) { diff --git a/sd/source/ui/view/drviewsf.cxx b/sd/source/ui/view/drviewsf.cxx index e55b5e99ac21..9d1e69fad658 100644 --- a/sd/source/ui/view/drviewsf.cxx +++ b/sd/source/ui/view/drviewsf.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -286,10 +286,10 @@ void DrawViewShell::GetCtrlState(SfxItemSet &rSet) void DrawViewShell::GetAttrState( SfxItemSet& rSet ) { - SfxWhichIter aIter( rSet ); - USHORT nWhich = aIter.FirstWhich(); + SfxWhichIter aIter( rSet ); + USHORT nWhich = aIter.FirstWhich(); - BOOL bAttr = FALSE; + BOOL bAttr = FALSE; SfxAllItemSet aAllSet( *rSet.GetPool() ); while ( nWhich ) @@ -349,9 +349,9 @@ void DrawViewShell::GetAttrState( SfxItemSet& rSet ) { SfxStyleFamily eFamily = pStyleSheet->GetFamily(); - if ((eFamily == SD_STYLE_FAMILY_GRAPHICS && nSlotId == SID_STYLE_FAMILY2) || - (eFamily == SD_STYLE_FAMILY_CELL && nSlotId == SID_STYLE_FAMILY3) || - (eFamily == SD_STYLE_FAMILY_PSEUDO && nSlotId == SID_STYLE_FAMILY5)) + if ((eFamily == SD_STYLE_FAMILY_GRAPHICS && nSlotId == SID_STYLE_FAMILY2) || + (eFamily == SD_STYLE_FAMILY_CELL && nSlotId == SID_STYLE_FAMILY3) || + (eFamily == SD_STYLE_FAMILY_PSEUDO && nSlotId == SID_STYLE_FAMILY5)) { SfxTemplateItem aTmpItem ( nWhich, pStyleSheet->GetName() ); aAllSet.Put( aTmpItem, aTmpItem.Which() ); @@ -365,7 +365,7 @@ void DrawViewShell::GetAttrState( SfxItemSet& rSet ) } } else - { SfxTemplateItem aItem( nWhich, String() ); + { SfxTemplateItem aItem( nWhich, String() ); aAllSet.Put( aItem, aItem.Which() ); // rSet.DisableItem( nWhich ); } diff --git a/sd/source/ui/view/drviewsg.cxx b/sd/source/ui/view/drviewsg.cxx index 2e81a007146c..8629cf0de9d7 100644 --- a/sd/source/ui/view/drviewsg.cxx +++ b/sd/source/ui/view/drviewsg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -75,13 +75,13 @@ void DrawViewShell::ExecIMap( SfxRequest& rReq ) if ( pMark ) { - SdrObject* pSdrObj = pMark->GetMarkedSdrObj(); + SdrObject* pSdrObj = pMark->GetMarkedSdrObj(); SvxIMapDlg* pDlg = ViewShell::Implementation::GetImageMapDialog(); if ( pDlg->GetEditingObject() == (void*) pSdrObj ) { const ImageMap& rImageMap = pDlg->GetImageMap(); - SdIMapInfo* pIMapInfo = GetDoc()->GetIMapInfo( pSdrObj ); + SdIMapInfo* pIMapInfo = GetDoc()->GetIMapInfo( pSdrObj ); if ( !pIMapInfo ) pSdrObj->InsertUserData( new SdIMapInfo( rImageMap ) ); @@ -107,9 +107,9 @@ void DrawViewShell::GetIMapState( SfxItemSet& rSet ) if( GetViewFrame()->HasChildWindow( SvxIMapDlgChildWindow::GetChildWindowId() ) ) { - const SdrMarkList& rMarkList = mpDrawView->GetMarkedObjectList(); - const SdrObject* pObj = NULL; - ULONG nMarkCount = rMarkList.GetMarkCount(); + const SdrMarkList& rMarkList = mpDrawView->GetMarkedObjectList(); + const SdrObject* pObj = NULL; + ULONG nMarkCount = rMarkList.GetMarkCount(); if ( nMarkCount == 1 ) { @@ -130,7 +130,7 @@ void DrawViewShell::GetIMapState( SfxItemSet& rSet ) /************************************************************************* |* -|* Execute-Methode der Optionsleiste +|* Execute-Methode der Optionsleiste |* \************************************************************************/ @@ -263,7 +263,7 @@ void DrawViewShell::ExecOptionsBar( SfxRequest& rReq ) /************************************************************************* |* -|* State-Methode der Optionsleiste +|* State-Methode der Optionsleiste |* \************************************************************************/ diff --git a/sd/source/ui/view/drviewsh.cxx b/sd/source/ui/view/drviewsh.cxx index 3fff3eeb729f..2dc9602cb0e6 100644 --- a/sd/source/ui/view/drviewsh.cxx +++ b/sd/source/ui/view/drviewsh.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -56,7 +56,7 @@ namespace sd { -#define TABCONTROL_INITIAL_SIZE 500 +#define TABCONTROL_INITIAL_SIZE 500 /************************************************************************* |* @@ -148,7 +148,7 @@ void DrawViewShell::MakeVisible(const Rectangle& rRect, ::Window& rWin) while(rRect.Right() > aNewPos.X() + aVisAreaSize.Width()) aNewPos.X() += nFreeSpaceX; - + while(rRect.Left() < aNewPos.X()) aNewPos.X() -= nFreeSpaceX; } @@ -174,7 +174,7 @@ void DrawViewShell::MakeVisible(const Rectangle& rRect, ::Window& rWin) while(rRect.Bottom() > aNewPos.Y() + aVisAreaSize.Height()) aNewPos.Y() += nFreeSpaceY; - + while(rRect.Top() < aNewPos.Y()) aNewPos.Y() -= nFreeSpaceY; } diff --git a/sd/source/ui/view/drviewsi.cxx b/sd/source/ui/view/drviewsi.cxx index bb011c5af2fb..c6b5d4c90396 100644 --- a/sd/source/ui/view/drviewsi.cxx +++ b/sd/source/ui/view/drviewsi.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -68,7 +68,7 @@ namespace sd { #define ATTR_MIXED 1 // Attribut uneindeutig (bei Mehrfachselektion) #define ATTR_SET 2 // Attribut eindeutig -#define ITEMVALUE(ItemSet,Id,Cast) ((const Cast&)(ItemSet).Get(Id)).GetValue() +#define ITEMVALUE(ItemSet,Id,Cast) ((const Cast&)(ItemSet).Get(Id)).GetValue() /************************************************************************* |* @@ -146,7 +146,7 @@ void DrawViewShell::AssignFrom3DWindow() if(!GetView()->IsPresObjSelected()) { SfxItemSet aSet( GetDoc()->GetPool(), - SDRATTR_START, SDRATTR_END, + SDRATTR_START, SDRATTR_END, 0, 0); p3DWin->GetAttr( aSet ); @@ -157,7 +157,7 @@ void DrawViewShell::AssignFrom3DWindow() { // Nur TextAttribute zuweisen SfxItemSet aTextSet( GetDoc()->GetPool(), - EE_ITEMS_START, EE_ITEMS_END, 0 ); + EE_ITEMS_START, EE_ITEMS_END, 0 ); aTextSet.Put( aSet, FALSE ); GetView()->SetAttributes( aTextSet ); diff --git a/sd/source/ui/view/drviewsj.cxx b/sd/source/ui/view/drviewsj.cxx index 0d14f18e9a37..f4fc9d9af640 100644 --- a/sd/source/ui/view/drviewsj.cxx +++ b/sd/source/ui/view/drviewsj.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -98,8 +98,8 @@ void DrawViewShell::GetMenuStateSel( SfxItemSet &rSet ) SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_MEASURE_DLG ) || SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_CONNECTION_DLG ) || SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_CONNECTION_NEW_ROUTING ) || -// SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_CONVERT_TO_3D_LATHE ) || -// SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_CONVERT_TO_3D_LATHE_FAST ) || +// SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_CONVERT_TO_3D_LATHE ) || +// SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_CONVERT_TO_3D_LATHE_FAST ) || SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_OBJECT_SHEAR ) || SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_CONVERT_TO_1BIT_THRESHOLD ) || SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_CONVERT_TO_1BIT_MATRIX ) || @@ -333,21 +333,21 @@ void DrawViewShell::GetMenuStateSel( SfxItemSet &rSet ) rSet.DisableItem( SID_MODIFY_FIELD ); if( 1 ) -// if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_ATTR_FILL_STYLE ) || -// SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_UNGROUP ) || -// SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_MEASURE_DLG ) || -// SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_CONNECTION_DLG ) || -// SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_COMBINE ) || +// if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_ATTR_FILL_STYLE ) || +// SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_UNGROUP ) || +// SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_MEASURE_DLG ) || +// SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_CONNECTION_DLG ) || +// SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_COMBINE ) || // SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_OBJECT_SHEAR ) || -// SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_TEXTATTR_DLG ) || -// SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_CONVERT_TO_3D_LATHE ) || -// SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_CONVERT_TO_3D_LATHE_FAST ) || -// SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_OBJECT_ALIGN_LEFT ) || -// SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_OBJECT_ALIGN_CENTER ) || -// SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_OBJECT_ALIGN_RIGHT ) || -// SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_OBJECT_ALIGN_UP ) || -// SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_OBJECT_ALIGN_MIDDLE ) || -// SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_OBJECT_ALIGN_DOWN ) ) +// SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_TEXTATTR_DLG ) || +// SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_CONVERT_TO_3D_LATHE ) || +// SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_CONVERT_TO_3D_LATHE_FAST ) || +// SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_OBJECT_ALIGN_LEFT ) || +// SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_OBJECT_ALIGN_CENTER ) || +// SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_OBJECT_ALIGN_RIGHT ) || +// SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_OBJECT_ALIGN_UP ) || +// SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_OBJECT_ALIGN_MIDDLE ) || +// SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_OBJECT_ALIGN_DOWN ) ) { BOOL bText = FALSE; BOOL bLine = FALSE; @@ -532,7 +532,7 @@ void DrawViewShell::GetMenuStateSel( SfxItemSet &rSet ) rSet.DisableItem( SID_BEHIND_OBJ ); rSet.DisableItem( SID_CONVERT ); -// rSet.DisableItem( SID_BEZIER_EDIT ); +// rSet.DisableItem( SID_BEZIER_EDIT ); rSet.DisableItem( SID_SIZE_OPTIMAL ); rSet.DisableItem( SID_LINEEND_POLYGON ); rSet.DisableItem( SID_COPYOBJECTS ); diff --git a/sd/source/ui/view/drvwshrg.cxx b/sd/source/ui/view/drvwshrg.cxx index 9313d7a9dfd9..13062853ebd1 100644 --- a/sd/source/ui/view/drvwshrg.cxx +++ b/sd/source/ui/view/drvwshrg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -68,7 +68,7 @@ using namespace sd; namespace sd { -//AF:unused #define TABCONTROL_INITIAL_SIZE 500 +//AF:unused #define TABCONTROL_INITIAL_SIZE 500 /************************************************************************* |* diff --git a/sd/source/ui/view/frmview.cxx b/sd/source/ui/view/frmview.cxx index 1404855bf214..9d11475d93ea 100644 --- a/sd/source/ui/view/frmview.cxx +++ b/sd/source/ui/view/frmview.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -125,7 +125,7 @@ FrameView::FrameView(SdDrawDocument* pDrawDoc, FrameView* pFrameView /* = NULK * { default: // case ViewShell::ST_IMPRESS: -// case ViewShell::ST_NOTES: +// case ViewShell::ST_NOTES: // case ViewShell::ST_HANDOUT: mnPresViewShellId = SID_VIEWSHELL0; break; @@ -182,7 +182,7 @@ FrameView::FrameView(SdDrawDocument* pDrawDoc, FrameView* pFrameView /* = NULK * SetEliminatePolyPointLimitAngle( pFrameView->GetEliminatePolyPointLimitAngle() ); SetEliminatePolyPoints( pFrameView->IsEliminatePolyPoints() ); // #110094#-7 -// SetMasterPagePaintCaching( pFrameView->IsMasterPagePaintCaching() ); +// SetMasterPagePaintCaching( pFrameView->IsMasterPagePaintCaching() ); SetDesignMode( pFrameView->IsDesignMode() ); SetSolidMarkHdl( pFrameView->IsSolidMarkHdl() ); @@ -208,12 +208,12 @@ FrameView::FrameView(SdDrawDocument* pDrawDoc, FrameView* pFrameView /* = NULK * SetViewShEditModeOnLoad(pFrameView->GetViewShEditModeOnLoad()); mbLayerMode = pFrameView->IsLayerMode(); mbQuickEdit = pFrameView->IsQuickEdit(); - + // #i26631# SetMasterPagePaintCaching( pFrameView->IsMasterPagePaintCaching() ); - + SetDragWithCopy( pFrameView->IsDragWithCopy() ); - mbBigHandles = pFrameView->IsBigHandles(); + mbBigHandles = pFrameView->IsBigHandles(); mbDoubleClickTextEdit = pFrameView->IsDoubleClickTextEdit(); mbClickChangeRotation = pFrameView->IsClickChangeRotation(); mnSlidesPerRow = pFrameView->GetSlidesPerRow(); @@ -351,7 +351,7 @@ void FrameView::Update(SdOptions* pOptions) SetOrtho( pOptions->IsOrtho() ); SetEliminatePolyPointLimitAngle( pOptions->GetEliminatePolyPointLimitAngle() ); // #110094#-7 -// SetMasterPagePaintCaching( pOptions->IsMasterPagePaintCaching() ); +// SetMasterPagePaintCaching( pOptions->IsMasterPagePaintCaching() ); GetModel()->SetPickThroughTransparentTextFrames( pOptions->IsPickThrough() ); SetSolidMarkHdl( pOptions->IsSolidMarkHdl() ); @@ -363,10 +363,10 @@ void FrameView::Update(SdOptions* pOptions) Fraction aFractY(pOptions->GetFldDrawY(), pOptions->GetFldDrawY() / ( pOptions->GetFldDivisionY() ? pOptions->GetFldDivisionY() : 1 )); SetSnapGridWidth(aFractX, aFractY); SetQuickEdit(pOptions->IsQuickEdit()); - + // #i26631# SetMasterPagePaintCaching( pOptions->IsMasterPagePaintCaching() ); - + SetDragWithCopy(pOptions->IsDragWithCopy()); SetBigHandles( pOptions->IsBigHandles() ); SetDoubleClickTextEdit( pOptions->IsDoubleClickTextEdit() ); @@ -490,38 +490,38 @@ void FrameView::WriteUserDataSequence ( ::com::sun::star::uno::Sequence < ::com: aUserData.addValue( sUNO_View_IsSnapToObjectFrame, makeAny( (sal_Bool)IsOFrmSnap() ) ); aUserData.addValue( sUNO_View_IsSnapToObjectPoints, makeAny( (sal_Bool)IsOPntSnap() ) ); -// pValue->Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( sUNO_View_IsSnapLinesVisible ) ); -// pValue->Value <<= (sal_Bool)IsHlplVisible(); +// pValue->Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( sUNO_View_IsSnapLinesVisible ) ); +// pValue->Value <<= (sal_Bool)IsHlplVisible(); // pValue++;nIndex++; -// pValue->Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( sUNO_View_IsDragStripes ) ); -// pValue->Value <<= (sal_Bool)IsDragStripes(); +// pValue->Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( sUNO_View_IsDragStripes ) ); +// pValue->Value <<= (sal_Bool)IsDragStripes(); // pValue++;nIndex++; aUserData.addValue( sUNO_View_IsPlusHandlesAlwaysVisible, makeAny( (sal_Bool)IsPlusHandlesAlwaysVisible() ) ); aUserData.addValue( sUNO_View_IsFrameDragSingles, makeAny( (sal_Bool)IsFrameDragSingles() ) ); -// pValue->Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( sUNO_View_IsMarkedHitMovesAlways ) ); -// pValue->Value <<= (sal_Bool)IsMarkedHitMovesAlways(); +// pValue->Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( sUNO_View_IsMarkedHitMovesAlways ) ); +// pValue->Value <<= (sal_Bool)IsMarkedHitMovesAlways(); // pValue++;nIndex++; aUserData.addValue( sUNO_View_EliminatePolyPointLimitAngle, makeAny( (sal_Int32)GetEliminatePolyPointLimitAngle() ) ); aUserData.addValue( sUNO_View_IsEliminatePolyPoints, makeAny( (sal_Bool)IsEliminatePolyPoints() ) ); -// pValue->Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( sUNO_View_IsLineDraft ) ); -// pValue->Value <<= (sal_Bool)IsLineDraft(); +// pValue->Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( sUNO_View_IsLineDraft ) ); +// pValue->Value <<= (sal_Bool)IsLineDraft(); // pValue++;nIndex++; -// pValue->Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( sUNO_View_IsFillDraft ) ); -// pValue->Value <<= (sal_Bool)IsFillDraft(); +// pValue->Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( sUNO_View_IsFillDraft ) ); +// pValue->Value <<= (sal_Bool)IsFillDraft(); // pValue++;nIndex++; -// pValue->Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( sUNO_View_IsTextDraft ) ); -// pValue->Value <<= (sal_Bool)IsTextDraft(); +// pValue->Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( sUNO_View_IsTextDraft ) ); +// pValue->Value <<= (sal_Bool)IsTextDraft(); // pValue++;nIndex++; -// pValue->Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( sUNO_View_IsGrafDraft ) ); -// pValue->Value <<= (sal_Bool)IsGrafDraft(); +// pValue->Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( sUNO_View_IsGrafDraft ) ); +// pValue->Value <<= (sal_Bool)IsGrafDraft(); // pValue++;nIndex++; Any aAny; @@ -551,16 +551,16 @@ void FrameView::WriteUserDataSequence ( ::com::sun::star::uno::Sequence < ::com: aUserData.addValue( sUNO_View_SelectedPage, makeAny( (sal_Int16)GetSelectedPage() ) ); aUserData.addValue( sUNO_View_IsLayerMode, makeAny( (sal_Bool)IsLayerMode() ) ); -// pValue->Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( sUNO_View_IsQuickEdit ) ); -// pValue->Value <<= (sal_Bool)IsQuickEdit(); +// pValue->Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( sUNO_View_IsQuickEdit ) ); +// pValue->Value <<= (sal_Bool)IsQuickEdit(); // pValue++;nIndex++; aUserData.addValue( sUNO_View_IsBigHandles, makeAny( (sal_Bool)IsBigHandles() ) ); aUserData.addValue( sUNO_View_IsDoubleClickTextEdit, makeAny( (sal_Bool)IsDoubleClickTextEdit() ) ); aUserData.addValue( sUNO_View_IsClickChangeRotation, makeAny( (sal_Bool)IsClickChangeRotation() ) ); -// pValue->Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( sUNO_View_IsDragWithCopy ) ); -// pValue->Value <<= (sal_Bool)IsDragWithCopy(); +// pValue->Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( sUNO_View_IsDragWithCopy ) ); +// pValue->Value <<= (sal_Bool)IsDragWithCopy(); // pValue++;nIndex++; aUserData.addValue( sUNO_View_SlidesPerRow, makeAny( (sal_Int16)GetSlidesPerRow() ) ); @@ -760,14 +760,14 @@ void FrameView::ReadUserDataSequence ( const ::com::sun::star::uno::Sequence < : SetLayerMode( bBool ); } } -/* else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_IsQuickEdit ) ) ) +/* else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_IsQuickEdit ) ) ) { if( pValue->Value >>= bBool ) { SetQuickEdit( bBool ); } } -*/ else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_IsBigHandles ) ) ) +*/ else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_IsBigHandles ) ) ) { if( pValue->Value >>= bBool ) { @@ -788,14 +788,14 @@ void FrameView::ReadUserDataSequence ( const ::com::sun::star::uno::Sequence < : SetClickChangeRotation( bBool ); } } -/* else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_IsDragWithCopy ) ) ) +/* else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_IsDragWithCopy ) ) ) { if( pValue->Value >>= bBool ) { SetDragWithCopy( bBool ); } } -*/ else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_SlidesPerRow ) ) ) +*/ else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_SlidesPerRow ) ) ) { if( pValue->Value >>= nInt16 ) { @@ -948,7 +948,7 @@ void FrameView::ReadUserDataSequence ( const ::com::sun::star::uno::Sequence < : SetOPntSnap( bBool ); } } -/* else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_IsSnapLinesVisible ) ) ) +/* else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_IsSnapLinesVisible ) ) ) { if( pValue->Value >>= bBool ) { @@ -962,7 +962,7 @@ void FrameView::ReadUserDataSequence ( const ::com::sun::star::uno::Sequence < : SetDragStripes( bBool ); } } -*/ else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_IsPlusHandlesAlwaysVisible ) ) ) +*/ else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_IsPlusHandlesAlwaysVisible ) ) ) { if( pValue->Value >>= bBool ) { @@ -976,14 +976,14 @@ void FrameView::ReadUserDataSequence ( const ::com::sun::star::uno::Sequence < : SetFrameDragSingles( bBool ); } } -/* else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_IsMarkedHitMovesAlways ) ) ) +/* else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_IsMarkedHitMovesAlways ) ) ) { if( pValue->Value >>= bBool ) { SetMarkedHitMovesAlways( bBool ); } } -*/ else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_EliminatePolyPointLimitAngle ) ) ) +*/ else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_EliminatePolyPointLimitAngle ) ) ) { if( pValue->Value >>= nInt32 ) { @@ -1181,8 +1181,8 @@ ViewShell::ShellType FrameView::GetViewShellTypeOnLoad (void) const void FrameView::SetSelectedPage(USHORT nPage) -{ - mnSelectedPage = nPage; +{ + mnSelectedPage = nPage; } @@ -1190,7 +1190,7 @@ void FrameView::SetSelectedPage(USHORT nPage) USHORT FrameView::GetSelectedPage (void) const { - return mnSelectedPage; + return mnSelectedPage; } diff --git a/sd/source/ui/view/grviewsh.cxx b/sd/source/ui/view/grviewsh.cxx index 94ab18124841..15cccdf1ecd1 100644 --- a/sd/source/ui/view/grviewsh.cxx +++ b/sd/source/ui/view/grviewsh.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -35,7 +35,7 @@ #include <sfx2/objsh.hxx> #include <sfx2/viewfrm.hxx> #include <vcl/scrbar.hxx> -#include <vcl/salbtype.hxx> // FRound +#include <vcl/salbtype.hxx> // FRound namespace sd { diff --git a/sd/source/ui/view/outlnvs2.cxx b/sd/source/ui/view/outlnvs2.cxx index 30d48aeb594f..730a7e2871e7 100644 --- a/sd/source/ui/view/outlnvs2.cxx +++ b/sd/source/ui/view/outlnvs2.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -420,12 +420,12 @@ void OutlineViewShell::FuTemporaryModify(SfxRequest &rReq) case SID_SET_DEFAULT: { // 1. Selektion merken (kriegt die eselige EditEngine nicht selbst - // auf die Reihe!) + // auf die Reihe!) // 2. Update auf False (sonst flackert's noch staerker // an allen selektierten Absaetzen: - // a. deren Vorlage nochmal setzen, um absatzweite harte Attribute - // zu entfernen - // b. harte Zeichenattribute loeschen + // a. deren Vorlage nochmal setzen, um absatzweite harte Attribute + // zu entfernen + // b. harte Zeichenattribute loeschen // 3. Update auf True und Selektion wieder setzen /* ESelection aEsel= pOutlinerView->GetSelection(); @@ -530,7 +530,7 @@ void OutlineViewShell::FuTemporaryModify(SfxRequest &rReq) if( GetDocSh()->HasName() ) aName = GetDocSh()->GetMedium()->GetName(); //else - // aName = GetDocSh()->GetName(); + // aName = GetDocSh()->GetName(); pFieldItem = new SvxFieldItem( SvxExtFileField( aName ), EE_FEATURE_FIELD ); } break; diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx index 43ee0b307fd9..68b7a9954054 100644 --- a/sd/source/ui/view/outlnvsh.cxx +++ b/sd/source/ui/view/outlnvsh.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -107,8 +107,8 @@ using namespace sd; namespace sd { -#define MIN_ZOOM 10 // Minimaler Zoomfaktor -#define MAX_ZOOM 1000 // Maximaler Zoomfaktor +#define MIN_ZOOM 10 // Minimaler Zoomfaktor +#define MAX_ZOOM 1000 // Maximaler Zoomfaktor /************************************************************************/ @@ -158,7 +158,7 @@ void OutlineViewShell::Construct(DrawDocShell* ) GetActiveWindow()->SetMaxZoom( MAX_ZOOM ); InitWindows(aViewOrigin, aSize, aWinPos); pOlView = new OutlineView(GetDocSh(), GetActiveWindow(), this); - mpView = pOlView; // Pointer der Basisklasse ViewShell + mpView = pOlView; // Pointer der Basisklasse ViewShell SetPool( &GetDoc()->GetPool() ); @@ -254,7 +254,7 @@ OutlineViewShell::~OutlineViewShell() if ( pClipEvtLstnr ) { pClipEvtLstnr->AddRemoveListener( GetActiveWindow(), FALSE ); - pClipEvtLstnr->ClearCallbackLink(); // #103849# prevent callback if another thread is waiting + pClipEvtLstnr->ClearCallbackLink(); // #103849# prevent callback if another thread is waiting pClipEvtLstnr->release(); } } @@ -314,7 +314,7 @@ void OutlineViewShell::ArrangeGUIElements () OutlinerView* pOutlinerView = pOlView->GetViewByWindow(pWindow); Rectangle aWin(Point(0,0), pWindow->GetOutputSizePixel()); -// aWin.nLeft = pOlView->GetPageNumberWidthPixel(); +// aWin.nLeft = pOlView->GetPageNumberWidthPixel(); aWin = pWindow->PixelToLogic(aWin); pOutlinerView->SetOutputArea(aWin); @@ -326,7 +326,7 @@ void OutlineViewShell::ArrangeGUIElements () pOlView->GetOutliner()->GetTextHeight())); aText.Bottom() += aWin.GetHeight(); - if (!aWin.IsEmpty()) // nicht beim Oeffnen + if (!aWin.IsEmpty()) // nicht beim Oeffnen { InitWindows(Point(0,0), aText.GetSize(), Point(aVis.TopLeft())); UpdateScrollBars(); @@ -515,7 +515,7 @@ void OutlineViewShell::FuSupport(SfxRequest &rReq) (nSlot == SID_TRANSLITERATE_HIRAGANA) || (nSlot == SID_TRANSLITERATE_KATAGANA) || (nSlot == SID_CUT) || -// (nSlot == SID_COPY) || +// (nSlot == SID_COPY) || (nSlot == SID_PASTE) || (nSlot == SID_DELETE))) { @@ -869,7 +869,7 @@ void OutlineViewShell::GetMenuState( SfxItemSet &rSet ) // zunaechst selektionsabhaengige: COLLAPSE, EXPAND BOOL bDisableCollapse = TRUE; BOOL bDisableExpand = TRUE; - BOOL bUnique = TRUE; + BOOL bUnique = TRUE; OutlinerView* pOutlinerView = pOlView->GetViewByWindow(GetActiveWindow()); List* pList = pOutlinerView->CreateSelectionList(); Paragraph* pPara = (Paragraph*)pList->First(); @@ -916,7 +916,7 @@ void OutlineViewShell::GetMenuState( SfxItemSet &rSet ) // jetzt die selektionsunabhaengigen: COLLAPSE_ALL, EXPAND_ALL BOOL bDisableCollapseAll = TRUE; - BOOL bDisableExpandAll = TRUE; + BOOL bDisableExpandAll = TRUE; // wenn schon die Selektion etwas kollabierbares/expandierbares enthaelt if (!bDisableCollapse) @@ -1131,17 +1131,17 @@ long OutlineViewShell::VirtHScrollHdl(ScrollBar* pHScroll) { long nThumb = pHScroll->GetThumbPos(); long nRange = pHScroll->GetRange().Len(); - double fX = (double) nThumb / nRange; + double fX = (double) nThumb / nRange; - Window* pWin = mpContentWindow.get(); + Window* pWin = mpContentWindow.get(); OutlinerView* pOutlinerView = pOlView->GetViewByWindow(pWin); - long nViewWidth = pWin->PixelToLogic( + long nViewWidth = pWin->PixelToLogic( pWin->GetSizePixel()).Width(); - long nTextWidth = pOlView->GetPaperWidth(); - nViewWidth = Max(nViewWidth, nTextWidth); - long nCurrentPos = pOutlinerView->GetVisArea().Left(); - long nTargetPos = (long)(fX * nViewWidth); - long nDelta = nTargetPos - nCurrentPos; + long nTextWidth = pOlView->GetPaperWidth(); + nViewWidth = Max(nViewWidth, nTextWidth); + long nCurrentPos = pOutlinerView->GetVisArea().Left(); + long nTargetPos = (long)(fX * nViewWidth); + long nDelta = nTargetPos - nCurrentPos; pOutlinerView->HideCursor(); pOutlinerView->Scroll(-nDelta, 0); @@ -1163,15 +1163,15 @@ long OutlineViewShell::VirtVScrollHdl(ScrollBar* pVScroll) long nRange = pVScroll->GetRange().Len(); double fY = (double) nThumb / nRange; - Window* pWin = mpContentWindow.get(); + Window* pWin = mpContentWindow.get(); OutlinerView* pOutlinerView = pOlView->GetViewByWindow(pWin); - long nViewHeight = pWin->PixelToLogic( + long nViewHeight = pWin->PixelToLogic( pWin->GetSizePixel()).Height(); - long nTextHeight = pOlView->GetOutliner()->GetTextHeight(); - nViewHeight += nTextHeight; - long nCurrentPos = pOutlinerView->GetVisArea().Top(); - long nTargetPos = (long)(fY * nViewHeight); - long nDelta = nTargetPos - nCurrentPos; + long nTextHeight = pOlView->GetOutliner()->GetTextHeight(); + nViewHeight += nTextHeight; + long nCurrentPos = pOutlinerView->GetVisArea().Top(); + long nTargetPos = (long)(fY * nViewHeight); + long nDelta = nTargetPos - nCurrentPos; pOutlinerView->HideCursor(); pOutlinerView->Scroll(0, -nDelta); @@ -1410,15 +1410,15 @@ void OutlineViewShell::GetStatusBarState(SfxItemSet& rSet) if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_STATUS_PAGE ) || SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_STATUS_LAYOUT ) ) */ - USHORT nPageCount = GetDoc()->GetSdPageCount( PK_STANDARD ); - String aPageStr, aLayoutStr; + USHORT nPageCount = GetDoc()->GetSdPageCount( PK_STANDARD ); + String aPageStr, aLayoutStr; - ::sd::Window* pWin = GetActiveWindow(); - OutlinerView* pActiveView = pOlView->GetViewByWindow( pWin ); + ::sd::Window* pWin = GetActiveWindow(); + OutlinerView* pActiveView = pOlView->GetViewByWindow( pWin ); ::Outliner* pOutliner = pOlView->GetOutliner(); - List* pSelList = (List*)pActiveView->CreateSelectionList(); - Paragraph* pFirstPara = (Paragraph*)pSelList->First(); - Paragraph* pLastPara = (Paragraph*)pSelList->Last(); + List* pSelList = (List*)pActiveView->CreateSelectionList(); + Paragraph* pFirstPara = (Paragraph*)pSelList->First(); + Paragraph* pLastPara = (Paragraph*)pSelList->Last(); if( !pOutliner->HasParaFlag(pFirstPara,PARAFLAG_ISPAGE) ) pFirstPara = pOlView->GetPrevTitle( pFirstPara ); @@ -1426,7 +1426,7 @@ void OutlineViewShell::GetStatusBarState(SfxItemSet& rSet) if( !pOutliner->HasParaFlag(pLastPara, PARAFLAG_ISPAGE) ) pLastPara = pOlView->GetPrevTitle( pLastPara ); - delete pSelList; // die wurde extra fuer uns erzeugt + delete pSelList; // die wurde extra fuer uns erzeugt // nur eine Seite selektiert? if( pFirstPara == pLastPara ) @@ -1447,7 +1447,7 @@ void OutlineViewShell::GetStatusBarState(SfxItemSet& rSet) 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) ); // ULONG -> sal_Int32 aPageStr.AppendAscii( RTL_CONSTASCII_STRINGPARAM( " / " )); aPageStr += String::CreateFromInt32( nPageCount ); @@ -1567,7 +1567,7 @@ Size OutlineViewShell::GetOptimalSizePixel() const // und jetzt jetzt das Standardgelumpe draufaddieren aResult.Width() += mpVerticalScrollBar->GetSizePixel().Width(); aResult.Height() += mpHorizontalScrollBar->GetSizePixel().Height(); - //!!! + System::GetMenuBarHeightPixel(); // statt Titlebar + //!!! + System::GetMenuBarHeightPixel(); // statt Titlebar return aResult; } @@ -1784,11 +1784,11 @@ SdPage* OutlineViewShell::GetActualPage() String OutlineViewShell::GetPageRangeString() { - ::sd::Window* pWin = GetActiveWindow(); - OutlinerView* pActiveView = pOlView->GetViewByWindow(pWin); + ::sd::Window* pWin = GetActiveWindow(); + OutlinerView* pActiveView = pOlView->GetViewByWindow(pWin); ::Outliner* pOutl = pActiveView->GetOutliner(); - List* pSelList = (List*)pActiveView->CreateSelectionList(); - Paragraph* pPara = (Paragraph*)pSelList->First(); + List* pSelList = (List*)pActiveView->CreateSelectionList(); + Paragraph* pPara = (Paragraph*)pSelList->First(); String aStrPageRange; BOOL bFirstPageNo = TRUE; @@ -1868,7 +1868,7 @@ String OutlineViewShell::GetPageRangeString() if( nPageCount == 0 ) aStrPageRange.Erase(); - delete pSelList; // die wurde extra fuer uns erzeugt + delete pSelList; // die wurde extra fuer uns erzeugt return aStrPageRange; } @@ -1898,13 +1898,13 @@ bool OutlineViewShell::UpdateTitleObject( SdPage* pPage, Paragraph* pPara ) if( !pPage || !pPara ) return false; - ::Outliner* pOutliner = pOlView->GetOutliner(); - SdrTextObj* pTO = pOlView->GetTitleTextObject( pPage ); + ::Outliner* pOutliner = pOlView->GetOutliner(); + SdrTextObj* pTO = pOlView->GetTitleTextObject( pPage ); OutlinerParaObject* pOPO = NULL; - String aTest( pOutliner->GetText( pPara ) ); - bool bText = aTest.Len() > 0; - bool bNewObject = false; + String aTest( pOutliner->GetText( pPara ) ); + bool bText = aTest.Len() > 0; + bool bNewObject = false; if( bText ) { @@ -1985,9 +1985,9 @@ bool OutlineViewShell::UpdateOutlineObject( SdPage* pPage, Paragraph* pPara ) if( !pPage || !pPara ) return false; - ::Outliner* pOutliner = pOlView->GetOutliner(); + ::Outliner* pOutliner = pOlView->GetOutliner(); OutlinerParaObject* pOPO = NULL; - SdrTextObj* pTO = NULL; + SdrTextObj* pTO = NULL; BOOL bNewObject = FALSE; @@ -2000,7 +2000,7 @@ bool OutlineViewShell::UpdateOutlineObject( SdPage* pPage, Paragraph* pPara ) } // wieviele Absaetze in der Gliederung? - ULONG nTitlePara = pOutliner->GetAbsPos( pPara ); + ULONG nTitlePara = pOutliner->GetAbsPos( pPara ); ULONG nPara = nTitlePara + 1; ULONG nParasInLayout = 0L; pPara = pOutliner->GetParagraph( nPara ); diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx index fab725a31d58..626d65bbef81 100644 --- a/sd/source/ui/view/outlview.cxx +++ b/sd/source/ui/view/outlview.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -99,7 +99,7 @@ namespace sd { struct SdParaAndPos { Paragraph* pPara; - USHORT nPos; + USHORT nPos; }; TYPEINIT1( OutlineView, ::sd::View ); @@ -330,7 +330,7 @@ void OutlineView::Paint(const Rectangle& rRect, ::sd::Window* pWin) sal_Int32 nLineHeight = pOlView->GetOutliner()->GetLineHeight( nPara, 0 ); aPos.X() = nNumberOffset; - + Point aPoint( aPos.X() - pWin->GetTextWidth( aStr ), aPos.Y() + ( nLineHeight - maPageNumberFont.GetHeight()) / 2 ); pWin->DrawText( aPoint, aStr ); @@ -342,13 +342,13 @@ void OutlineView::Paint(const Rectangle& rRect, ::sd::Window* pWin) } pWin->SetFont( aOldFont ); -*/ +*/ mbFirstPaint = FALSE; } } void OutlineView::InvalidateSlideNumberArea() -{ +{ /* for( sal_Int16 nView = 0; nView < MAX_OUTLINERVIEWS; ++nView ) { @@ -532,7 +532,7 @@ Paragraph* OutlineView::GetNextTitle(const Paragraph* pPara) IMPL_LINK( OutlineView, ParagraphInsertedHdl, ::Outliner *, pOutliner ) { -// DBG_ASSERT( isRecordingUndo(), "sd::OutlineView::ParagraphInsertedHdl(), model change without undo?!" ); +// DBG_ASSERT( isRecordingUndo(), "sd::OutlineView::ParagraphInsertedHdl(), model change without undo?!" ); // we get calls to this handler during binary insert of drag and drop contents but // we ignore it here and handle it later in OnEndPasteOrDrop() @@ -565,8 +565,8 @@ SdPage* OutlineView::InsertSlideForParagraph( Paragraph* pPara ) mpOutliner->SetParaFlag( pPara, PARAFLAG_ISPAGE ); // wieviele Titel sind vor dem neuen Titelabsatz? - ULONG nExample = 0L; // Position der "Vorbild"seite - ULONG nTarget = 0L; // Einfuegeposition + ULONG nExample = 0L; // Position der "Vorbild"seite + ULONG nTarget = 0L; // Einfuegeposition while(pPara) { pPara = GetPrevTitle(pPara); @@ -762,11 +762,11 @@ IMPL_LINK( OutlineView, DepthChangedHdl, ::Outliner *, pOutliner ) // haben es noch nicht getan? if (mnPagesToProcess == 0) { - Window* pActWin = mpOutlineViewShell->GetActiveWindow(); + Window* pActWin = mpOutlineViewShell->GetActiveWindow(); OutlinerView* pOlView = GetViewByWindow(pActWin); - List* pList = pOlView->CreateSelectionList(); + List* pList = pOlView->CreateSelectionList(); - Paragraph* pParagraph = (Paragraph*)pList->First(); + Paragraph* pParagraph = (Paragraph*)pList->First(); while (pParagraph) { if( !pOutliner->HasParaFlag( pParagraph, PARAFLAG_ISPAGE ) && (pOutliner->GetDepth( (USHORT) pOutliner->GetAbsPos( pParagraph ) ) <= 0) ) @@ -774,7 +774,7 @@ IMPL_LINK( OutlineView, DepthChangedHdl, ::Outliner *, pOutliner ) pParagraph = (Paragraph*)pList->Next(); } - mnPagesToProcess++; // der Absatz, der jetzt schon auf Level 0 + mnPagesToProcess++; // der Absatz, der jetzt schon auf Level 0 // steht, gehoert auch dazu mnPagesProcessed = 0; @@ -968,10 +968,10 @@ IMPL_LINK( OutlineView, DepthChangedHdl, ::Outliner *, pOutliner ) IMPL_LINK( OutlineView, StatusEventHdl, EditStatus *, EMPTYARG ) { ::sd::Window* pWin = mpOutlineViewShell->GetActiveWindow(); - OutlinerView* pOutlinerView = GetViewByWindow(pWin); - Rectangle aVis = pOutlinerView->GetVisArea(); + OutlinerView* pOutlinerView = GetViewByWindow(pWin); + Rectangle aVis = pOutlinerView->GetVisArea(); -// ULONG nWidth = ((SdPage*)mpDoc->GetSdPage(0, PK_STANDARD))->GetSize().Width(); +// ULONG nWidth = ((SdPage*)mpDoc->GetSdPage(0, PK_STANDARD))->GetSize().Width(); ULONG nWidth = OUTLINE_PAPERWIDTH; Rectangle aText = Rectangle(Point(0,0), Size(nWidth, @@ -979,7 +979,7 @@ IMPL_LINK( OutlineView, StatusEventHdl, EditStatus *, EMPTYARG ) Rectangle aWin(Point(0,0), pWin->GetOutputSizePixel()); aWin = pWin->PixelToLogic(aWin); - if (!aVis.IsEmpty()) // nicht beim Oeffnen + if (!aVis.IsEmpty()) // nicht beim Oeffnen { aText.Bottom() += aWin.GetHeight(); @@ -1083,8 +1083,8 @@ IMPL_LINK( OutlineView, EndMovingHdl, ::Outliner *, pOutliner ) // den ersten der selektierten Paragraphen in der neuen Ordnung suchen USHORT nPosNewOrder = 0; ULONG nParaPos = 0; - Paragraph* pPara = pOutliner->GetParagraph( 0 ); - Paragraph* pPrev = NULL; + Paragraph* pPara = pOutliner->GetParagraph( 0 ); + Paragraph* pPrev = NULL; while (pPara && pPara != pSearchIt) { if( pOutliner->HasParaFlag(pPara, PARAFLAG_ISPAGE) ) @@ -1095,10 +1095,10 @@ IMPL_LINK( OutlineView, EndMovingHdl, ::Outliner *, pOutliner ) pPara = pOutliner->GetParagraph( ++nParaPos ); } - USHORT nPos = nPosNewOrder; // nPosNewOrder nicht veraendern + USHORT nPos = nPosNewOrder; // nPosNewOrder nicht veraendern if (nPos == 0) { - nPos = (USHORT)-1; // vor der ersten Seite einfuegen + nPos = (USHORT)-1; // vor der ersten Seite einfuegen } else { @@ -1139,9 +1139,9 @@ IMPL_LINK( OutlineView, EndMovingHdl, ::Outliner *, pOutliner ) SdrTextObj* OutlineView::GetTitleTextObject(SdrPage* pPage) { - ULONG nObjectCount = pPage->GetObjCount(); - SdrObject* pObject = NULL; - SdrTextObj* pResult = NULL; + ULONG nObjectCount = pPage->GetObjCount(); + SdrObject* pObject = NULL; + SdrTextObj* pResult = NULL; for (ULONG nObject = 0; nObject < nObjectCount; nObject++) { @@ -1165,9 +1165,9 @@ SdrTextObj* OutlineView::GetTitleTextObject(SdrPage* pPage) SdrTextObj* OutlineView::GetOutlineTextObject(SdrPage* pPage) { - ULONG nObjectCount = pPage->GetObjCount(); - SdrObject* pObject = NULL; - SdrTextObj* pResult = NULL; + ULONG nObjectCount = pPage->GetObjCount(); + SdrObject* pObject = NULL; + SdrTextObj* pResult = NULL; for (ULONG nObject = 0; nObject < nObjectCount; nObject++) { @@ -1210,13 +1210,13 @@ SdrTextObj* OutlineView::CreateOutlineTextObject(SdPage* pPage) { case AUTOLAYOUT_NONE: case AUTOLAYOUT_ONLY_TITLE: - case AUTOLAYOUT_TITLE: eNewLayout = AUTOLAYOUT_ENUM; break; + case AUTOLAYOUT_TITLE: eNewLayout = AUTOLAYOUT_ENUM; break; - case AUTOLAYOUT_CHART: eNewLayout = AUTOLAYOUT_CHARTTEXT; break; + case AUTOLAYOUT_CHART: eNewLayout = AUTOLAYOUT_CHARTTEXT; break; case AUTOLAYOUT_ORG: case AUTOLAYOUT_TAB: - case AUTOLAYOUT_OBJ: eNewLayout = AUTOLAYOUT_OBJTEXT; break; + case AUTOLAYOUT_OBJ: eNewLayout = AUTOLAYOUT_OBJTEXT; break; default: break; } @@ -1308,7 +1308,7 @@ void OutlineView::FillOutliner() // fill outliner with paragraphs from slides title & (outlines|subtitles) for (USHORT nPage = 0; nPage < nPageCount; nPage++) { - SdPage* pPage = (SdPage*)mpDoc->GetSdPage(nPage, PK_STANDARD); + SdPage* pPage = (SdPage*)mpDoc->GetSdPage(nPage, PK_STANDARD); Paragraph * pPara = NULL; // take text from title shape @@ -1354,7 +1354,7 @@ void OutlineView::FillOutliner() if (!pTO) // if no subtile found, try outline pTO = GetOutlineTextObject(pPage); - + if(pTO && !(pTO->IsEmptyPresObj())) // found some text { OutlinerParaObject* pOPO = pTO->GetOutlinerParaObject(); @@ -1495,7 +1495,7 @@ Paragraph* OutlineView::GetParagraphForPage( ::Outliner* pOutl, SdPage* pPage ) { // see if we already skiped enough pages if( 0 == nPagesToSkip ) - break; // and if so, end the loop + break; // and if so, end the loop // we skiped another page nPagesToSkip--; @@ -1973,13 +1973,13 @@ IMPL_LINK(OutlineView, PaintingFirstLineHdl, PaintFirstLineInfo*, pInfo) long nFontHeight = 0; if ( !rEditEngine.IsFlatMode() ) { -// const SvxFontHeightItem& rFH = (const SvxFontHeightItem&)rEditEngine.GetParaAttrib( pInfo->mnPara, EE_CHAR_FONTHEIGHT ); +// const SvxFontHeightItem& rFH = (const SvxFontHeightItem&)rEditEngine.GetParaAttrib( pInfo->mnPara, EE_CHAR_FONTHEIGHT ); // nBulletHeight = rFH.GetHeight(); nFontHeight = nBulletHeight / 5; } else { -// const SvxFontHeightItem& rFH = (const SvxFontHeightItem&)rEditEngine.GetEmptyItemSet().Get( EE_CHAR_FONTHEIGHT ); +// const SvxFontHeightItem& rFH = (const SvxFontHeightItem&)rEditEngine.GetEmptyItemSet().Get( EE_CHAR_FONTHEIGHT ); // nBulletHeight = rFH.GetHeight(); nFontHeight = (nBulletHeight * 10) / 25; } @@ -2007,7 +2007,7 @@ IMPL_LINK(OutlineView, PaintingFirstLineHdl, PaintFirstLineInfo*, pInfo) Point aTextPos( aImagePos.X() - aOffset.Width(), pInfo->mrStartPos.Y() ); Font aNewFont( OutputDevice::GetDefaultFont( DEFAULTFONT_SANS_UNICODE, eLang, 0 ) ); aNewFont.SetSize( aFontSz ); -// aNewFont.SetAlign( aBulletFont.GetAlign() ); +// aNewFont.SetAlign( aBulletFont.GetAlign() ); aNewFont.SetVertical( bVertical ); aNewFont.SetOrientation( bVertical ? 2700 : 0 ); aNewFont.SetColor( COL_AUTO ); diff --git a/sd/source/ui/view/presvish.cxx b/sd/source/ui/view/presvish.cxx index 7f22f7f06879..797f8f5f396a 100644 --- a/sd/source/ui/view/presvish.cxx +++ b/sd/source/ui/view/presvish.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/view/sdruler.cxx b/sd/source/ui/view/sdruler.cxx index 41ec7e8e154d..b141e8bb7a77 100644 --- a/sd/source/ui/view/sdruler.cxx +++ b/sd/source/ui/view/sdruler.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -100,7 +100,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, USHORT nRulerFlags, SfxBindings& rBindings, WinBits nWinStyle) : SvxRuler(pParent, pWin, nRulerFlags, rBindings, nWinStyle) , pSdWin(pWin) , pDrViewShell(&rViewSh) @@ -188,8 +188,8 @@ void Ruler::SetNullOffset(const Point& rOffset) { long nOffset; - if ( bHorz ) nOffset = rOffset.X(); - else nOffset = rOffset.Y(); + if ( bHorz ) nOffset = rOffset.X(); + else nOffset = rOffset.Y(); SetNullOffsetLogic(nOffset); } diff --git a/sd/source/ui/view/sdview.cxx b/sd/source/ui/view/sdview.cxx index 1b9b60e9aeec..6644d83faa0a 100644 --- a/sd/source/ui/view/sdview.cxx +++ b/sd/source/ui/view/sdview.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -214,7 +214,7 @@ public: // all default implementations just call the same methods at the original. To do something // different, overload the method and at least do what the method does. virtual drawinglayer::primitive2d::Primitive2DSequence createRedirectedPrimitive2DSequence( - const sdr::contact::ViewObjectContact& rOriginal, + const sdr::contact::ViewObjectContact& rOriginal, const sdr::contact::DisplayInfo& rDisplayInfo); }; @@ -227,7 +227,7 @@ ViewRedirector::~ViewRedirector() } drawinglayer::primitive2d::Primitive2DSequence ViewRedirector::createRedirectedPrimitive2DSequence( - const sdr::contact::ViewObjectContact& rOriginal, + const sdr::contact::ViewObjectContact& rOriginal, const sdr::contact::DisplayInfo& rDisplayInfo) { SdrObject* pObject = rOriginal.GetViewContact().TryToGetSdrObject(); @@ -311,7 +311,7 @@ drawinglayer::primitive2d::Primitive2DSequence ViewRedirector::createRedirectedP // create line and stroke attribute ::std::vector< double > aDotDashArray; - + aDotDashArray.push_back(160.0); aDotDashArray.push_back(80.0); @@ -321,8 +321,8 @@ drawinglayer::primitive2d::Primitive2DSequence ViewRedirector::createRedirectedP // create primitive and add const drawinglayer::primitive2d::Primitive2DReference xRef(new drawinglayer::primitive2d::PolygonStrokePrimitive2D( - aPolygon, - aLine, + aPolygon, + aLine, aStroke)); drawinglayer::primitive2d::appendPrimitive2DReferenceToPrimitive2DSequence(xRetval, xRef); } @@ -342,7 +342,7 @@ drawinglayer::primitive2d::Primitive2DSequence ViewRedirector::createRedirectedP static String aTitleAreaStr( SdResId( STR_PLACEHOLDER_DESCRIPTION_TITLE ) ); aObjectString = aTitleAreaStr; } - + break; } case PRESOBJ_OUTLINE: @@ -402,16 +402,16 @@ drawinglayer::primitive2d::Primitive2DSequence ViewRedirector::createRedirectedP basegfx::B2DTuple aTranslate; double fRotate, fShearX; aObjectMatrix.decompose(aScale, aTranslate, fRotate, fShearX); - + // create font SdrTextObj* pTextObj = dynamic_cast< SdrTextObj* >( pObject ); const SdrTextVertAdjust eTVA(pTextObj ? pTextObj->GetTextVerticalAdjust() : SDRTEXTVERTADJUST_CENTER); Font aScaledVclFont; - - // use a text size factor to get more reliable text sizes from the text layouter + + // use a text size factor to get more reliable text sizes from the text layouter // (and from vcl), tipp from HDU static sal_uInt32 nTextSizeFactor(100); - + // use a factor to get more linear text size calculations aScaledVclFont.SetHeight( 500 * nTextSizeFactor ); @@ -419,7 +419,7 @@ drawinglayer::primitive2d::Primitive2DSequence ViewRedirector::createRedirectedP drawinglayer::primitive2d::TextLayouterDevice aTextLayouter; aTextLayouter.setFont(aScaledVclFont); const xub_StrLen nTextLength(aObjectString.Len()); - + // do not forget to use the factor again to get the width for the 500 const double fTextWidth(aTextLayouter.getTextWidth(aObjectString, 0, nTextLength) * (1.0 / nTextSizeFactor)); const double fTextHeight(aTextLayouter.getTextHeight() * (1.0 / nTextSizeFactor)); @@ -442,7 +442,7 @@ drawinglayer::primitive2d::Primitive2DSequence ViewRedirector::createRedirectedP const drawinglayer::attribute::FontAttribute aFontAttribute( drawinglayer::primitive2d::getFontAttributeFromVclFont( - aTextSizeAttribute, + aTextSizeAttribute, aVclFont, false, false)); @@ -450,8 +450,8 @@ drawinglayer::primitive2d::Primitive2DSequence ViewRedirector::createRedirectedP // fill text matrix const basegfx::B2DHomMatrix aTextMatrix(basegfx::tools::createScaleShearXRotateTranslateB2DHomMatrix( aTextSizeAttribute.getX(), aTextSizeAttribute.getY(), - fShearX, - fRotate, + fShearX, + fRotate, fPosX, fPosY)); // create DXTextArray (can be empty one) @@ -463,13 +463,13 @@ drawinglayer::primitive2d::Primitive2DSequence ViewRedirector::createRedirectedP // create primitive and add const drawinglayer::primitive2d::Primitive2DReference xRef( new drawinglayer::primitive2d::TextSimplePortionPrimitive2D( - aTextMatrix, - aObjectString, - 0, - nTextLength, - aDXArray, - aFontAttribute, - aLocale, + aTextMatrix, + aObjectString, + 0, + nTextLength, + aDXArray, + aFontAttribute, + aLocale, aFontColor)); drawinglayer::primitive2d::appendPrimitive2DReferenceToPrimitive2DSequence(xRetval, xRef); } @@ -481,9 +481,9 @@ drawinglayer::primitive2d::Primitive2DSequence ViewRedirector::createRedirectedP if(bDoCreateGeometry) { drawinglayer::primitive2d::appendPrimitive2DSequenceToPrimitive2DSequence( - xRetval, + xRetval, sdr::contact::ViewObjectContactRedirector::createRedirectedPrimitive2DSequence( - rOriginal, + rOriginal, rDisplayInfo)); } } @@ -531,7 +531,7 @@ void View::CompleteRedraw(OutputDevice* pOutDev, const Region& rReg, sdr::contac bScreenDisplay = false; } - // #i75566# Name change GetBackgroundColor -> GetPageBackgroundColor and + // #i75566# Name change GetBackgroundColor -> GetPageBackgroundColor and // hint value if screen display. Only then the AutoColor mechanisms shall be applied rOutl.SetBackgroundColor( pPage->GetPageBackgroundColor(pPgView, bScreenDisplay) ); } @@ -547,7 +547,7 @@ void View::CompleteRedraw(OutputDevice* pOutDev, const Region& rReg, sdr::contac mpLockedRedraws = new List; SdViewRedrawRec* pRec = new SdViewRedrawRec; - pRec->mpOut = pOutDev; + pRec->mpOut = pOutDev; pRec->aRect = rReg.GetBoundRect(); mpLockedRedraws->Insert(pRec, LIST_APPEND); } @@ -997,7 +997,7 @@ void View::DoConnect(SdrOle2Obj* pObj) Fraction aScaleWidth (aDrawSize.Width(), aObjAreaSize.Width() ); Fraction aScaleHeight(aDrawSize.Height(), aObjAreaSize.Height() ); - aScaleWidth.ReduceInaccurate(10); // kompatibel zum SdrOle2Obj + aScaleWidth.ReduceInaccurate(10); // kompatibel zum SdrOle2Obj aScaleHeight.ReduceInaccurate(10); pSdClient->SetSizeScale(aScaleWidth, aScaleHeight); @@ -1019,15 +1019,15 @@ void View::DoConnect(SdrOle2Obj* pObj) BOOL View::IsMorphingAllowed() const { - const SdrMarkList& rMarkList = GetMarkedObjectList(); - BOOL bRet = FALSE; + const SdrMarkList& rMarkList = GetMarkedObjectList(); + BOOL bRet = 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 SdrObject* pObj1 = rMarkList.GetMark( 0 )->GetMarkedSdrObj(); + const SdrObject* pObj2 = rMarkList.GetMark( 1 )->GetMarkedSdrObj(); + const UINT16 nKind1 = pObj1->GetObjIdentifier(); + const UINT16 nKind2 = pObj2->GetObjIdentifier(); if ( ( nKind1 != OBJ_TEXT && nKind2 != OBJ_TEXT ) && ( nKind1 != OBJ_TITLETEXT && nKind2 != OBJ_TITLETEXT ) && @@ -1045,14 +1045,14 @@ BOOL View::IsMorphingAllowed() const ( nKind1 != OBJ_CAPTION && nKind2 != OBJ_CAPTION ) && !pObj1->ISA( E3dObject) && !pObj2->ISA( E3dObject) ) { - SfxItemSet aSet1( mpDoc->GetPool(), XATTR_FILLSTYLE, XATTR_FILLSTYLE ); - SfxItemSet aSet2( mpDoc->GetPool(), XATTR_FILLSTYLE, XATTR_FILLSTYLE ); + SfxItemSet aSet1( mpDoc->GetPool(), XATTR_FILLSTYLE, XATTR_FILLSTYLE ); + SfxItemSet aSet2( mpDoc->GetPool(), XATTR_FILLSTYLE, XATTR_FILLSTYLE ); aSet1.Put(pObj1->GetMergedItemSet()); aSet2.Put(pObj2->GetMergedItemSet()); - const XFillStyle eFillStyle1 = ( (const XFillStyleItem&) aSet1.Get( XATTR_FILLSTYLE ) ).GetValue(); - const XFillStyle eFillStyle2 = ( (const XFillStyleItem&) aSet2.Get( XATTR_FILLSTYLE ) ).GetValue(); + const XFillStyle eFillStyle1 = ( (const XFillStyleItem&) aSet1.Get( XATTR_FILLSTYLE ) ).GetValue(); + const XFillStyle eFillStyle2 = ( (const XFillStyleItem&) aSet2.Get( XATTR_FILLSTYLE ) ).GetValue(); if( ( eFillStyle1 == XFILL_NONE || eFillStyle1 == XFILL_SOLID ) && ( eFillStyle2 == XFILL_NONE || eFillStyle2 == XFILL_SOLID ) ) @@ -1071,8 +1071,8 @@ BOOL View::IsMorphingAllowed() const BOOL View::IsVectorizeAllowed() const { - const SdrMarkList& rMarkList = GetMarkedObjectList(); - BOOL bRet = FALSE; + const SdrMarkList& rMarkList = GetMarkedObjectList(); + BOOL bRet = FALSE; if( rMarkList.GetMarkCount() == 1 ) { @@ -1294,7 +1294,7 @@ void View::OnEndPasteOrDrop( PasteOrDropInfos* pInfos ) pStyle = static_cast<SfxStyleSheet*>( pStylePool->Find( aStyleSheetName, pStyleSheet->GetFamily() ) ); DBG_ASSERT( pStyle, "sd::View::OnEndPasteOrDrop(), Style not found!" ); } - + if( !pStyle ) pStyle = pStyleSheet; diff --git a/sd/source/ui/view/sdview2.cxx b/sd/source/ui/view/sdview2.cxx index 1cfb24535fa9..766d49680ba4 100644 --- a/sd/source/ui/view/sdview2.cxx +++ b/sd/source/ui/view/sdview2.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -103,8 +103,8 @@ struct SdNavigatorDropEvent : public ExecuteDropEvent { DropTargetHelper& mrTargetHelper; ::sd::Window* mpTargetWindow; - USHORT mnPage; - USHORT mnLayer; + USHORT mnPage; + USHORT mnLayer; SdNavigatorDropEvent ( const ExecuteDropEvent& rEvt, @@ -135,13 +135,13 @@ struct SdNavigatorDropEvent : public ExecuteDropEvent pTransferable->SetWorkDocument( (SdDrawDocument*) GetAllMarkedModel() ); mpDoc->CreatingDataObj( NULL ); - const Rectangle aMarkRect( GetAllMarkedRect() ); - TransferableObjectDescriptor aObjDesc; - String aDisplayName; - SdrOle2Obj* pSdrOleObj = NULL; - SdrPageView* pPgView = GetSdrPageView(); - SdPage* pOldPage = pPgView ? ( (SdPage*) pPgView->GetPage() ) : NULL; - SdPage* pNewPage = (SdPage*) pTransferable->GetWorkDocument()->GetPage( 0 ); + const Rectangle aMarkRect( GetAllMarkedRect() ); + TransferableObjectDescriptor aObjDesc; + String aDisplayName; + SdrOle2Obj* pSdrOleObj = NULL; + SdrPageView* pPgView = GetSdrPageView(); + SdPage* pOldPage = pPgView ? ( (SdPage*) pPgView->GetPage() ) : NULL; + SdPage* pNewPage = (SdPage*) pTransferable->GetWorkDocument()->GetPage( 0 ); if( pOldPage ) { @@ -193,9 +193,9 @@ struct SdNavigatorDropEvent : public ExecuteDropEvent SD_MOD()->pTransferDrag = pTransferable; - TransferableObjectDescriptor aObjDesc; - String aDisplayName; - SdrOle2Obj* pSdrOleObj = NULL; + TransferableObjectDescriptor aObjDesc; + String aDisplayName; + SdrOle2Obj* pSdrOleObj = NULL; if( GetMarkedObjectCount() == 1 ) { @@ -241,9 +241,9 @@ struct SdNavigatorDropEvent : public ExecuteDropEvent { SdTransferable* pTransferable = new SdTransferable( mpDoc, pWorkView, TRUE ); ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > xRet( pTransferable ); - TransferableObjectDescriptor aObjDesc; - const Rectangle aMarkRect( GetAllMarkedRect() ); - String aDisplayName; + TransferableObjectDescriptor aObjDesc; + const Rectangle aMarkRect( GetAllMarkedRect() ); + String aDisplayName; SD_MOD()->pTransferSelection = pTransferable; @@ -326,9 +326,9 @@ void View::DoPaste (::Window* pWindow) { const_cast< OutlinerView* >(pOLV)->PasteSpecial(); - SdrObject* pObj = GetTextEditObject(); - SdPage* pPage = (SdPage*)( pObj ? pObj->GetPage() : NULL ); - ::Outliner* pOutliner = pOLV->GetOutliner(); + SdrObject* pObj = GetTextEditObject(); + SdPage* pPage = (SdPage*)( pObj ? pObj->GetPage() : NULL ); + ::Outliner* pOutliner = pOLV->GetOutliner(); if( pOutliner) { @@ -377,7 +377,7 @@ void View::DoPaste (::Window* pWindow) { if( !InsertData( aDataHelper, aPos, nDnDAction, FALSE ) ) { - INetBookmark aINetBookmark( aEmptyStr, aEmptyStr ); + INetBookmark aINetBookmark( aEmptyStr, aEmptyStr ); if( ( aDataHelper.HasFormat( SOT_FORMATSTR_ID_NETSCAPE_BOOKMARK ) && aDataHelper.GetINetBookmark( SOT_FORMATSTR_ID_NETSCAPE_BOOKMARK, aINetBookmark ) ) || @@ -471,7 +471,7 @@ void View::DragFinished( sal_Int8 nDropAction ) if( pObj && pObj->GetPage() ) { #ifdef DBG_UTIL - SdrObject* pChkObj = + SdrObject* pChkObj = #endif pObj->GetPage()->RemoveObject(nOrdNum); DBG_ASSERT(pChkObj==pObj,"pChkObj!=pObj beim RemoveObject()"); @@ -497,10 +497,10 @@ void View::DragFinished( sal_Int8 nDropAction ) sal_Int8 View::AcceptDrop( const AcceptDropEvent& rEvt, DropTargetHelper& rTargetHelper, ::sd::Window*, USHORT, USHORT nLayer ) { - String aLayerName( GetActiveLayer() ); - SdrPageView* pPV = GetSdrPageView(); - sal_Int8 nDropAction = rEvt.mnAction; - sal_Int8 nRet = DND_ACTION_NONE; + String aLayerName( GetActiveLayer() ); + SdrPageView* pPV = GetSdrPageView(); + sal_Int8 nDropAction = rEvt.mnAction; + sal_Int8 nRet = DND_ACTION_NONE; if( nLayer != SDRLAYER_NOTFOUND ) { @@ -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; + BOOL bIsInsideOutlinerView = FALSE; if( pOLV ) { @@ -555,10 +555,10 @@ sal_Int8 View::AcceptDrop( const AcceptDropEvent& rEvt, DropTargetHelper& rTarge { 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 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 ); // check handle insert if( !nRet && ( (bXFillExchange && ( SDRDRAG_GRADIENT == GetDragMode() )) || ( SDRDRAG_TRANSPARENCE == GetDragMode() ) ) ) @@ -587,11 +587,11 @@ sal_Int8 View::AcceptDrop( const AcceptDropEvent& rEvt, DropTargetHelper& rTarge // check object insert if( !nRet && ( bXFillExchange || ( ( bDrawing || bGraphic || bMtf || bBitmap || bBookmark ) && ( nDropAction & DND_ACTION_LINK ) ) ) ) { - SdrObject* pPickObj = NULL; - SdrPageView* pPageView = NULL; + SdrObject* pPickObj = NULL; + SdrPageView* pPageView = NULL; ::sd::Window* pWindow = mpViewSh->GetActiveWindow(); - Point aPos( pWindow->PixelToLogic( rEvt.maPosPixel ) ); - const BOOL bHasPickObj = PickObj( aPos, getHitTolLog(), pPickObj, pPageView ); + Point aPos( pWindow->PixelToLogic( rEvt.maPosPixel ) ); + const BOOL bHasPickObj = PickObj( aPos, getHitTolLog(), pPickObj, pPageView ); BOOL bIsPresTarget = FALSE; if( bHasPickObj && pPickObj && ( pPickObj->IsEmptyPresObj() || pPickObj->GetUserCall() ) ) @@ -609,7 +609,7 @@ sal_Int8 View::AcceptDrop( const AcceptDropEvent& rEvt, DropTargetHelper& rTarge { mpDropMarkerObj = pPickObj; ImplClearDrawDropMarker(); - + if(mpDropMarkerObj) { mpDropMarker = new SdrDropMarkerOverlay(*this, *mpDropMarkerObj); @@ -672,10 +672,10 @@ 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 ) { - SdrPageView* pPV = GetSdrPageView(); - String aActiveLayer = GetActiveLayer(); - sal_Int8 nDropAction = rEvt.mnAction; - sal_Int8 nRet = DND_ACTION_NONE; + SdrPageView* pPV = GetSdrPageView(); + String aActiveLayer = GetActiveLayer(); + sal_Int8 nDropAction = rEvt.mnAction; + sal_Int8 nRet = DND_ACTION_NONE; // destroy drop marker if it is shown if( mpDropMarker ) @@ -687,7 +687,7 @@ sal_Int8 View::ExecuteDrop( const ExecuteDropEvent& rEvt, DropTargetHelper& rTar if( !pPV->IsLayerLocked( aActiveLayer ) ) { const OutlinerView* pOLV = GetTextEditOutlinerView(); - BOOL bIsInsideOutlinerView = FALSE; + BOOL bIsInsideOutlinerView = FALSE; if( pOLV ) { @@ -710,8 +710,8 @@ sal_Int8 View::ExecuteDrop( const ExecuteDropEvent& rEvt, DropTargetHelper& rTar if( !bIsInsideOutlinerView ) { - Point aPos; - TransferableDataHelper aDataHelper( rEvt.maDropEvent.Transferable ); + Point aPos; + TransferableDataHelper aDataHelper( rEvt.maDropEvent.Transferable ); if( pTargetWindow ) aPos = pTargetWindow->PixelToLogic( rEvt.maPosPixel ); @@ -752,8 +752,8 @@ sal_Int8 View::ExecuteDrop( const ExecuteDropEvent& rEvt, DropTargetHelper& rTar // special insert? if( !nRet && mpViewSh ) { - String aTmpString1, aTmpString2; - INetBookmark aINetBookmark( aTmpString1, aTmpString2 ); + String aTmpString1, aTmpString2; + INetBookmark aINetBookmark( aTmpString1, aTmpString2 ); // insert bookmark if( aDataHelper.HasFormat( SOT_FORMATSTR_ID_NETSCAPE_BOOKMARK ) && @@ -773,15 +773,15 @@ sal_Int8 View::ExecuteDrop( const ExecuteDropEvent& rEvt, DropTargetHelper& rTar } else { - SdrObject* pPickObj = NULL; - SdrPageView* pPageView = NULL; + SdrObject* pPickObj = NULL; + SdrPageView* pPageView = NULL; if( PickObj( aPos, getHitTolLog(), pPickObj, pPageView ) ) { // insert as clip action => jump - rtl::OUString aBookmark( aINetBookmark.GetURL() ); - SdAnimationInfo* pInfo = mpDoc->GetAnimationInfo( pPickObj ); - BOOL bCreated = FALSE; + rtl::OUString aBookmark( aINetBookmark.GetURL() ); + SdAnimationInfo* pInfo = mpDoc->GetAnimationInfo( pPickObj ); + BOOL bCreated = FALSE; if( aBookmark.getLength() ) { @@ -821,7 +821,7 @@ sal_Int8 View::ExecuteDrop( const ExecuteDropEvent& rEvt, DropTargetHelper& rTar pAction->SetPathObj(pInfo->mpPathObj, pInfo->mpPathObj); pAction->SetClickAction(pInfo->meClickAction, eClickAction); pAction->SetBookmark(pInfo->GetBookmark(), aBookmark); -// pAction->SetInvisibleInPres(pInfo->mbInvisibleInPresentation, TRUE); +// pAction->SetInvisibleInPres(pInfo->mbInvisibleInPresentation, TRUE); pAction->SetVerb(pInfo->mnVerb, pInfo->mnVerb); pAction->SetSecondEffect(pInfo->meSecondEffect, pInfo->meSecondEffect); pAction->SetSecondSpeed(pInfo->meSecondSpeed, pInfo->meSecondSpeed); @@ -857,17 +857,17 @@ sal_Int8 View::ExecuteDrop( const ExecuteDropEvent& rEvt, DropTargetHelper& rTar IMPL_LINK( View, ExecuteNavigatorDrop, SdNavigatorDropEvent*, pSdNavigatorDropEvent ) { - TransferableDataHelper aDataHelper( pSdNavigatorDropEvent->maDropEvent.Transferable ); + TransferableDataHelper aDataHelper( pSdNavigatorDropEvent->maDropEvent.Transferable ); SdPageObjsTLB::SdPageObjsTransferable* pPageObjsTransferable = SdPageObjsTLB::SdPageObjsTransferable::getImplementation( aDataHelper.GetXTransferable() ); - INetBookmark aINetBookmark; + INetBookmark aINetBookmark; if( pPageObjsTransferable && aDataHelper.GetINetBookmark( SOT_FORMATSTR_ID_NETSCAPE_BOOKMARK, aINetBookmark ) ) { - Point aPos; - List aBookmarkList; - String aBookmark; - SdPage* pPage = (SdPage*) GetSdrPageView()->GetPage(); - USHORT nPgPos = 0xFFFF; + Point aPos; + List aBookmarkList; + String aBookmark; + SdPage* pPage = (SdPage*) GetSdrPageView()->GetPage(); + USHORT nPgPos = 0xFFFF; if( pSdNavigatorDropEvent->mpTargetWindow ) aPos = pSdNavigatorDropEvent->mpTargetWindow->PixelToLogic( pSdNavigatorDropEvent->maPosPixel ); @@ -889,10 +889,10 @@ 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) - List* pExchangeList = NULL; - BOOL bLink = ( NAVIGATOR_DRAGTYPE_LINK == pPageObjsTransferable->GetDragType() ? TRUE : FALSE ); - BOOL bNameOK = GetExchangeList( pExchangeList, &aBookmarkList, 2 ); - BOOL bReplace = FALSE; + List* pExchangeList = NULL; + BOOL bLink = ( NAVIGATOR_DRAGTYPE_LINK == pPageObjsTransferable->GetDragType() ? TRUE : FALSE ); + BOOL bNameOK = GetExchangeList( pExchangeList, &aBookmarkList, 2 ); + BOOL bReplace = 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. @@ -936,7 +936,7 @@ BOOL View::GetExchangeList( List*& rpExchangeList, List* pBookmarkList, USHORT n DBG_ASSERT( !rpExchangeList, "ExchangeList muss NULL sein!"); BOOL bListIdentical = TRUE; // BookmarkList und ExchangeList sind gleich - BOOL bNameOK = TRUE; // Name ist eindeutig + BOOL bNameOK = TRUE; // Name ist eindeutig rpExchangeList = new List(); @@ -951,7 +951,7 @@ BOOL View::GetExchangeList( List*& rpExchangeList, List* pBookmarkList, USHORT n if( nType == 0 || nType == 2 ) bNameOK = mpDocSh->CheckPageName ( mpViewSh->GetActiveWindow(), *pNewName); - + if( bNameOK && ( nType == 1 || nType == 2 ) ) { if( mpDoc->GetObj( *pNewName ) ) diff --git a/sd/source/ui/view/sdview3.cxx b/sd/source/ui/view/sdview3.cxx index 779ef01d1562..2f874a705cbd 100644 --- a/sd/source/ui/view/sdview3.cxx +++ b/sd/source/ui/view/sdview3.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -112,8 +112,8 @@ namespace sd { // #83525# struct ImpRememberOrigAndClone { - SdrObject* pOrig; - SdrObject* pClone; + SdrObject* pOrig; + SdrObject* pClone; }; SdrObject* ImpGetClone(Container& aConnectorContainer, SdrObject* pConnObj) @@ -166,9 +166,9 @@ bool View::InsertMetaFile( TransferableDataHelper& rDataHelper, const Point& rPo return false; /* -SvFileStream aSvOutputStream( String( RTL_CONSTASCII_USTRINGPARAM( "/tmp/test.png" ) ), STREAM_WRITE | STREAM_TRUNC ); -Graphic aMtfGraphic( aMtf ); -Size aPreviewSizePixel( OutputDevice::LogicToLogic( aMtf.GetPrefSize(), aMtf.GetPrefMapMode(), MAP_PIXEL ) ); +SvFileStream aSvOutputStream( String( RTL_CONSTASCII_USTRINGPARAM( "/tmp/test.png" ) ), STREAM_WRITE | STREAM_TRUNC ); +Graphic aMtfGraphic( aMtf ); +Size aPreviewSizePixel( OutputDevice::LogicToLogic( aMtf.GetPrefSize(), aMtf.GetPrefMapMode(), MAP_PIXEL ) ); if( aPreviewSizePixel.Width() && aPreviewSizePixel.Height() ) { @@ -299,14 +299,14 @@ BOOL View::InsertData( const TransferableDataHelper& rDataHelper, mnAction = rDnDAction; mbIsDropAllowed = 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; + 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; if (mpViewSh != NULL) { @@ -398,10 +398,10 @@ BOOL View::InsertData( const TransferableDataHelper& rDataHelper, if( nLayer != SDRLAYER_NOTFOUND ) { // drop on layer tab bar - SdrLayerAdmin& rLayerAdmin = mpDoc->GetLayerAdmin(); - SdrLayer* pLayer = rLayerAdmin.GetLayerPerID( nLayer ); - SdrPageView* pPV = GetSdrPageView(); - String aLayer( pLayer->GetName() ); + SdrLayerAdmin& rLayerAdmin = mpDoc->GetLayerAdmin(); + SdrLayer* pLayer = rLayerAdmin.GetLayerPerID( nLayer ); + SdrPageView* pPV = GetSdrPageView(); + String aLayer( pLayer->GetName() ); if( !pPV->IsLayerLocked( aLayer ) ) { @@ -410,8 +410,8 @@ BOOL View::InsertData( const TransferableDataHelper& rDataHelper, for( ULONG nM = 0; nM < GetMarkedObjectCount(); nM++ ) { - SdrMark* pM = GetSdrMarkByIndex( nM ); - SdrObject* pO = pM->GetMarkedSdrObj(); + SdrMark* pM = GetSdrMarkByIndex( nM ); + SdrObject* pO = pM->GetMarkedSdrObj(); if( pO ) { @@ -432,8 +432,8 @@ BOOL View::InsertData( const TransferableDataHelper& rDataHelper, } else { - SdrPageView* pPV = GetSdrPageView(); - BOOL bDropOnTabBar = TRUE; + SdrPageView* pPV = GetSdrPageView(); + BOOL bDropOnTabBar = TRUE; if( !pPage && pPV->GetPage()->GetPageNum() != mnDragSrcPgNum ) { @@ -465,9 +465,9 @@ BOOL View::InsertData( const TransferableDataHelper& rDataHelper, pMarkList->ForceSort(); // #83525# stuff to remember originals and clones - Container aConnectorContainer(0); - sal_uInt32 a, nConnectorCount(0L); - Point aCurPos; + Container aConnectorContainer(0); + sal_uInt32 a, nConnectorCount(0L); + Point aCurPos; // calculate real position of current // source objects, if necessary (#103207) @@ -650,8 +650,8 @@ BOOL View::InsertData( const TransferableDataHelper& rDataHelper, } else { - SdDrawDocument* pWorkModel = (SdDrawDocument*) pOwnData->GetWorkDocument(); - SdPage* pWorkPage = (SdPage*) pWorkModel->GetSdPage( 0, PK_STANDARD ); + SdDrawDocument* pWorkModel = (SdDrawDocument*) pOwnData->GetWorkDocument(); + SdPage* pWorkPage = (SdPage*) pWorkModel->GetSdPage( 0, PK_STANDARD ); pWorkPage->SetRectsDirty(); @@ -711,20 +711,20 @@ BOOL View::InsertData( const TransferableDataHelper& rDataHelper, if( pModel->GetSdPage( 0, PK_STANDARD )->GetObjCount() == 1 ) { // only one object - SdrObject* pObj = pModel->GetSdPage( 0, PK_STANDARD )->GetObj( 0 ); - SdrObject* pPickObj2 = NULL; - SdrPageView* pPV = NULL; + SdrObject* pObj = pModel->GetSdPage( 0, PK_STANDARD )->GetObj( 0 ); + SdrObject* pPickObj2 = NULL; + SdrPageView* pPV = NULL; PickObj( rPos, getHitTolLog(), pPickObj2, pPV ); if( ( mnAction & DND_ACTION_MOVE ) && pPickObj2 && pObj ) { // replace object - SdrObject* pNewObj = pObj->Clone(); - Rectangle aPickObjRect( pPickObj2->GetCurrentBoundRect() ); - Size aPickObjSize( aPickObjRect.GetSize() ); - Point aVec( aPickObjRect.TopLeft() ); - Rectangle aObjRect( pNewObj->GetCurrentBoundRect() ); - Size aObjSize( aObjRect.GetSize() ); + SdrObject* pNewObj = pObj->Clone(); + Rectangle aPickObjRect( pPickObj2->GetCurrentBoundRect() ); + Size aPickObjSize( aPickObjRect.GetSize() ); + Point aVec( aPickObjRect.TopLeft() ); + Rectangle aObjRect( pNewObj->GetCurrentBoundRect() ); + Size aObjSize( aObjRect.GetSize() ); Fraction aScaleWidth( aPickObjSize.Width(), aObjSize.Width() ); Fraction aScaleHeight( aPickObjSize.Height(), aObjSize.Height() ); @@ -832,8 +832,8 @@ BOOL View::InsertData( const TransferableDataHelper& rDataHelper, if( pObj ) { - Rectangle aRect( pObj->GetLogicRect() ); - Size aSize( aRect.GetSize() ); + Rectangle aRect( pObj->GetLogicRect() ); + Size aSize( aRect.GetSize() ); maDropPos.X() -= ( aSize.Width() >> 1 ); maDropPos.Y() -= ( aSize.Height() >> 1 ); @@ -852,7 +852,7 @@ BOOL View::InsertData( const TransferableDataHelper& rDataHelper, { //TODO/LATER: is it possible that this format is binary?! (from old versions of SO) uno::Reference < io::XInputStream > xStm; - TransferableObjectDescriptor aObjDesc; + TransferableObjectDescriptor aObjDesc; if( aDataHelper.GetTransferableObjectDescriptor( SOT_FORMATSTR_ID_OBJECTDESCRIPTOR, aObjDesc ) && ( aDataHelper.GetInputStream( nFormat ? nFormat : SOT_FORMATSTR_ID_EMBED_SOURCE, xStm ) || @@ -867,8 +867,8 @@ BOOL View::InsertData( const TransferableDataHelper& rDataHelper, SfxMedium *pMedium = new SfxMedium( xStore, String() ); if( xDocShRef->DoLoad( pMedium ) ) { - SdDrawDocument* pModel = (SdDrawDocument*) xDocShRef->GetDoc(); - SdPage* pWorkPage = (SdPage*) pModel->GetSdPage( 0, PK_STANDARD ); + SdDrawDocument* pModel = (SdDrawDocument*) xDocShRef->GetDoc(); + SdPage* pWorkPage = (SdPage*) pModel->GetSdPage( 0, PK_STANDARD ); pWorkPage->SetRectsDirty(); @@ -1021,7 +1021,7 @@ BOOL View::InsertData( const TransferableDataHelper& rDataHelper, if( (nFormat != 0) || !aDataHelper.HasFormat( FORMAT_GDIMETAFILE ) ) { uno::Reference < io::XInputStream > xStm; - TransferableObjectDescriptor aObjDesc; + TransferableObjectDescriptor aObjDesc; if ( aDataHelper.GetTransferableObjectDescriptor( SOT_FORMATSTR_ID_OBJECTDESCRIPTOR_OLE, aObjDesc ) ) { @@ -1182,8 +1182,8 @@ BOOL View::InsertData( const TransferableDataHelper& rDataHelper, if( pOwnData && pOwnData->GetWorkDocument() ) { - const SdDrawDocument* pWorkModel = pOwnData->GetWorkDocument(); - SdrPage* pWorkPage = (SdrPage*) ( ( pWorkModel->GetPageCount() > 1 ) ? + const SdDrawDocument* pWorkModel = pOwnData->GetWorkDocument(); + SdrPage* pWorkPage = (SdrPage*) ( ( pWorkModel->GetPageCount() > 1 ) ? pWorkModel->GetSdPage( 0, PK_STANDARD ) : pWorkModel->GetPage( 0 ) ); @@ -1213,8 +1213,8 @@ BOOL View::InsertData( const TransferableDataHelper& rDataHelper, if( pOwnData && pOwnData->GetWorkDocument() ) { - const SdDrawDocument* pWorkModel = pOwnData->GetWorkDocument(); - SdrPage* pWorkPage = (SdrPage*) ( ( pWorkModel->GetPageCount() > 1 ) ? + const SdDrawDocument* pWorkModel = pOwnData->GetWorkDocument(); + SdrPage* pWorkPage = (SdrPage*) ( ( pWorkModel->GetPageCount() > 1 ) ? pWorkModel->GetSdPage( 0, PK_STANDARD ) : pWorkModel->GetPage( 0 ) ); @@ -1239,8 +1239,8 @@ BOOL View::InsertData( const TransferableDataHelper& rDataHelper, if( pOwnData && pOwnData->GetWorkDocument() ) { - const SdDrawDocument* pWorkModel = pOwnData->GetWorkDocument(); - SdrPage* pWorkPage = (SdrPage*) ( ( pWorkModel->GetPageCount() > 1 ) ? + const SdDrawDocument* pWorkModel = pOwnData->GetWorkDocument(); + SdrPage* pWorkPage = (SdrPage*) ( ( pWorkModel->GetPageCount() > 1 ) ? pWorkModel->GetSdPage( 0, PK_STANDARD ) : pWorkModel->GetPage( 0 ) ); @@ -1278,26 +1278,26 @@ BOOL View::InsertData( const TransferableDataHelper& rDataHelper, EndUndo(); } - XFillAttrSetItem* pSetItem = aFillData.GetXFillAttrSetItem(); - SfxItemSet rSet = pSetItem->GetItemSet(); - XFillStyle eFill= ( (XFillStyleItem&) rSet.Get( XATTR_FILLSTYLE ) ).GetValue(); + XFillAttrSetItem* pSetItem = aFillData.GetXFillAttrSetItem(); + SfxItemSet rSet = pSetItem->GetItemSet(); + XFillStyle eFill= ( (XFillStyleItem&) rSet.Get( XATTR_FILLSTYLE ) ).GetValue(); if( eFill == XFILL_SOLID || eFill == XFILL_NONE ) { - const XFillColorItem& rColItem = (XFillColorItem&) rSet.Get( XATTR_FILLCOLOR ); - Color aColor( rColItem.GetColorValue() ); - String aName( rColItem.GetName() ); - SfxItemSet aSet( mpDoc->GetPool() ); - BOOL bClosed = pPickObj->IsClosedObj(); + const XFillColorItem& rColItem = (XFillColorItem&) rSet.Get( XATTR_FILLCOLOR ); + Color aColor( rColItem.GetColorValue() ); + String aName( rColItem.GetName() ); + SfxItemSet aSet( mpDoc->GetPool() ); + BOOL bClosed = pPickObj->IsClosedObj(); ::sd::Window* pWin = mpViewSh->GetActiveWindow(); USHORT nHitLog = (USHORT) pWin->PixelToLogic( Size(FuPoor::HITPIX, 0 ) ).Width(); - const long n2HitLog = nHitLog << 1; - Point aHitPosR( rPos ); - Point aHitPosL( rPos ); - Point aHitPosT( rPos ); - Point aHitPosB( rPos ); - const SetOfByte* pVisiLayer = &GetSdrPageView()->GetVisibleLayers(); + const long n2HitLog = nHitLog << 1; + Point aHitPosR( rPos ); + Point aHitPosL( rPos ); + Point aHitPosT( rPos ); + Point aHitPosB( rPos ); + const SetOfByte* pVisiLayer = &GetSdrPageView()->GetVisibleLayers(); aHitPosR.X() += n2HitLog; aHitPosL.X() -= n2HitLog; diff --git a/sd/source/ui/view/sdview4.cxx b/sd/source/ui/view/sdview4.cxx index 0ef9417fed4e..86dd2c996422 100644 --- a/sd/source/ui/view/sdview4.cxx +++ b/sd/source/ui/view/sdview4.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -97,9 +97,9 @@ SdrGrafObj* View::InsertGraphic( const Graphic& rGraphic, sal_Int8& rAction, mnAction = rAction; // Liegt ein Objekt an der Position rPos? - SdrGrafObj* pNewGrafObj = NULL; - SdrPageView* pPV = GetSdrPageView(); - SdrObject* pPickObj = pObj; + SdrGrafObj* pNewGrafObj = NULL; + SdrPageView* pPV = GetSdrPageView(); + SdrObject* pPickObj = pObj; const bool bOnMaster = pPV && pPV->GetPage() && pPV->GetPage()->IsMasterPage(); if(pPV && this->ISA(::sd::slidesorter::view::SlideSorterView)) @@ -120,7 +120,7 @@ SdrGrafObj* View::InsertGraphic( const Graphic& rGraphic, sal_Int8& rAction, if( bIsGraphic || (pObj->IsEmptyPresObj() && !bOnMaster) ) { if( IsUndoEnabled() ) - BegUndo(String(SdResId(STR_INSERTGRAPHIC))); + BegUndo(String(SdResId(STR_INSERTGRAPHIC))); SdPage* pPage = (SdPage*) pPickObj->GetPage(); @@ -208,10 +208,10 @@ SdrGrafObj* View::InsertGraphic( const Graphic& rGraphic, sal_Int8& rAction, aPageSize.Width() -= pPage->GetLftBorder() + pPage->GetRgtBorder(); aPageSize.Height() -= pPage->GetUppBorder() + pPage->GetLwrBorder(); pNewGrafObj->AdjustToMaxRect( Rectangle( Point(), aPageSize ), TRUE ); -// pNewGrafObj->AdjustToMaxRect( Rectangle( pPV->GetOffset(), aPageSize ), TRUE ); +// pNewGrafObj->AdjustToMaxRect( Rectangle( pPV->GetOffset(), aPageSize ), TRUE ); - ULONG nOptions = SDRINSERT_SETDEFLAYER; - BOOL bIsPresTarget = FALSE; + ULONG nOptions = SDRINSERT_SETDEFLAYER; + BOOL bIsPresTarget = FALSE; if ((mpViewSh && mpViewSh->GetViewShell()!=NULL @@ -292,9 +292,9 @@ SdrMediaObj* View::InsertMediaURL( const rtl::OUString& rMediaURL, sal_Int8& rAc SdrEndTextEdit(); mnAction = rAction; - SdrMediaObj* pNewMediaObj = NULL; - SdrPageView* pPV = GetSdrPageView(); - SdrObject* pPickObj = GetEmptyPresentationObject( PRESOBJ_MEDIA ); + SdrMediaObj* pNewMediaObj = NULL; + SdrPageView* pPV = GetSdrPageView(); + SdrObject* pPickObj = GetEmptyPresentationObject( PRESOBJ_MEDIA ); if(pPV && this->ISA(::sd::slidesorter::view::SlideSorterView )) { @@ -378,7 +378,7 @@ IMPL_LINK( View, DropInsertFileHdl, Timer*, EMPTYARG ) { String aCurrentDropFile( *aIter ); INetURLObject aURL( aCurrentDropFile ); - BOOL bOK = FALSE; + BOOL bOK = FALSE; if( aURL.GetProtocol() == INET_PROT_NOT_VALID ) { @@ -388,7 +388,7 @@ IMPL_LINK( View, DropInsertFileHdl, Timer*, EMPTYARG ) } GraphicFilter* pGraphicFilter = GraphicFilter::GetGraphicFilter(); - Graphic aGraphic; + Graphic aGraphic; aCurrentDropFile = aURL.GetMainURL( INetURLObject::NO_DECODE ); @@ -408,14 +408,14 @@ IMPL_LINK( View, DropInsertFileHdl, Timer*, EMPTYARG ) if( !bOK ) { const SfxFilter* pFoundFilter = NULL; - SfxMedium aSfxMedium( aCurrentDropFile, STREAM_READ | STREAM_SHARE_DENYNONE, FALSE ); - ErrCode nErr = SFX_APP()->GetFilterMatcher().GuessFilter( aSfxMedium, &pFoundFilter, SFX_FILTER_IMPORT, SFX_FILTER_NOTINSTALLED | SFX_FILTER_EXECUTABLE ); + SfxMedium aSfxMedium( aCurrentDropFile, STREAM_READ | STREAM_SHARE_DENYNONE, FALSE ); + ErrCode nErr = SFX_APP()->GetFilterMatcher().GuessFilter( aSfxMedium, &pFoundFilter, SFX_FILTER_IMPORT, SFX_FILTER_NOTINSTALLED | SFX_FILTER_EXECUTABLE ); if( pFoundFilter && !nErr ) { ::std::vector< String > aFilterVector; - const String aFilterName( pFoundFilter->GetFilterName() ); - String aLowerAsciiFileName( aCurrentDropFile ); + const String aFilterName( pFoundFilter->GetFilterName() ); + String aLowerAsciiFileName( aCurrentDropFile ); aLowerAsciiFileName.ToLowerAscii(); FuInsertFile::GetSupportedFilterVector( aFilterVector ); @@ -488,7 +488,7 @@ IMPL_LINK( View, DropInsertFileHdl, Timer*, EMPTYARG ) { // TODO/LEAN: VisualArea access can switch the object to running state sal_Int64 nAspect = embed::Aspects::MSOLE_CONTENT; - + xPersist->storeOwn(); awt::Size aSz; @@ -500,7 +500,7 @@ IMPL_LINK( View, DropInsertFileHdl, Timer*, EMPTYARG ) { // the default size will be set later } - + Size aSize( aSz.Width, aSz.Height ); Rectangle aRect; diff --git a/sd/source/ui/view/sdview5.cxx b/sd/source/ui/view/sdview5.cxx index c28d2c5658cf..9f348b73f6a4 100644 --- a/sd/source/ui/view/sdview5.cxx +++ b/sd/source/ui/view/sdview5.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,7 +38,7 @@ namespace sd { static bool implIsMultiPresObj( PresObjKind eKind ) { switch( eKind ) - { + { case PRESOBJ_OUTLINE: case PRESOBJ_GRAPHIC: case PRESOBJ_OBJECT: @@ -57,7 +57,7 @@ SdrObject* View::GetEmptyPresentationObject( PresObjKind eKind ) { SdrObject* pEmptyObj = 0; - SdrPageView* pPV = GetSdrPageView(); + SdrPageView* pPV = GetSdrPageView(); if( pPV ) { SdPage* pPage = static_cast< SdPage* >( pPV->GetPage() ); @@ -96,7 +96,7 @@ SdrObject* View::GetEmptyPresentationObject( PresObjKind eKind ) if( !pEmptyObj ) { const std::list< SdrObject* >& rShapes = pPage->GetPresentationShapeList().getList(); - + for( std::list< SdrObject* >::const_iterator iter( rShapes.begin() ); iter != rShapes.end(); iter++ ) { if( (*iter)->IsEmptyPresObj() && implIsMultiPresObj(pPage->GetPresObjKind(*iter)) ) diff --git a/sd/source/ui/view/sdwindow.cxx b/sd/source/ui/view/sdwindow.cxx index 9a80ee38dd60..86d0bc1c7bb1 100644 --- a/sd/source/ui/view/sdwindow.cxx +++ b/sd/source/ui/view/sdwindow.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -56,8 +56,8 @@ namespace sd { #define SCROLL_PAGE_FACT 0.5 // Faktor fuer Seitenscrolling #define SCROLL_SENSITIVE 20 // Sensitiver Bereich (Pixel) #define ZOOM_MULTIPLICATOR 10000 // Multiplikator um Rundungsfehler zu vermeiden -#define MIN_ZOOM 5 // Minimaler Zoomfaktor -#define MAX_ZOOM 3000 // Maximaler Zoomfaktor +#define MIN_ZOOM 5 // Minimaler Zoomfaktor +#define MAX_ZOOM 3000 // Maximaler Zoomfaktor /************************************************************************* @@ -70,9 +70,9 @@ Window::Window(::Window* pParent) : ::Window(pParent, WinBits(WB_CLIPCHILDREN | WB_DIALOGCONTROL)), DropTargetHelper( this ), mpShareWin(NULL), - maWinPos(0, 0), // vorsichtshalber; die Werte sollten aber - maViewOrigin(0, 0), // vom Besitzer des Fensters neu gesetzt - maViewSize(1000, 1000), // werden + maWinPos(0, 0), // vorsichtshalber; die Werte sollten aber + maViewOrigin(0, 0), // vom Besitzer des Fensters neu gesetzt + maViewSize(1000, 1000), // werden maPrevSize(-1,-1), mnMinZoom(MIN_ZOOM), mnMaxZoom(MAX_ZOOM), @@ -554,7 +554,7 @@ long Window::GetZoomForRect( const Rectangle& rZoomRect ) nRetZoom = GetZoom(); } else - { + { // Clip the zoom factor to the valid range marked by nMinZoom as // previously calculated by <member>CalcMinZoom()</member> and the // MAX_ZOOM constant. @@ -640,8 +640,8 @@ long Window::SetZoomRect (const Rectangle& rZoomRect) aWinSize.Height() = (long) ((double) aWinSize.Height() * (double) ZOOM_MULTIPLICATOR / (double) nFact); maWinPos.Y() += (rZoomRect.GetHeight() - aWinSize.Height()) / 2; - if ( maWinPos.X() < 0 ) maWinPos.X() = 0; - if ( maWinPos.Y() < 0 ) maWinPos.Y() = 0; + if ( maWinPos.X() < 0 ) maWinPos.X() = 0; + if ( maWinPos.Y() < 0 ) maWinPos.Y() = 0; // Adapt the window's map mode to the new zoom factor. nNewZoom = SetZoomFactor(nZoom); @@ -672,7 +672,7 @@ void Window::SetMinZoomAutoCalc (bool bAuto) void Window::UpdateMapOrigin(BOOL bInvalidate) { - BOOL bChanged = FALSE; + BOOL bChanged = FALSE; const Size aWinSize = PixelToLogic(GetOutputSizePixel()); if ( mbCenterAllowed ) @@ -735,7 +735,7 @@ void Window::UpdateMapMode (void) { Size aViewSizePixel = LogicToPixel(maViewSize); Size aWinSizePixel = LogicToPixel(aWinSize); - + // Seite soll nicht am Fensterrand "kleben" if (aPix.Width() == 0) { @@ -752,13 +752,13 @@ void Window::UpdateMapMode (void) aPix.Height() -= 8; } } - + aPix = PixelToLogic(aPix); maWinPos.X() = aPix.Width(); maWinPos.Y() = aPix.Height(); Point aNewOrigin (-maWinPos.X(), -maWinPos.Y()); maWinPos += maViewOrigin; - + MapMode aMap(GetMapMode()); aMap.SetOrigin(aNewOrigin); SetMapMode(aMap); @@ -809,8 +809,8 @@ void Window::SetVisibleXY(double fX, double fY) if ( fY >= 0 ) maWinPos.Y() = (long) (fY * maViewSize.Height()); UpdateMapOrigin(FALSE); - // Size sz(nOldX - aWinPos.X(), nOldY - aWinPos.Y()); - // sz = LogicToPixel(sz); + // Size sz(nOldX - aWinPos.X(), nOldY - aWinPos.Y()); + // sz = LogicToPixel(sz); Scroll(nOldX - maWinPos.X(), nOldY - maWinPos.Y(), SCROLL_CHILDREN); Update(); } @@ -913,7 +913,7 @@ void Window::LoseFocus() void Window::GrabFocus() { - mnTicks = 0; + mnTicks = 0; ::Window::GrabFocus (); } @@ -984,7 +984,7 @@ void Window::DataChanged( const DataChangedEvent& rDCEvt ) SetDrawMode( nOutputMode ); mpViewShell->GetFrameView()->SetDrawMode( nOutputMode ); // #110094#-7 -// mpViewShell->GetView()->ReleaseMasterPagePaintCache(); +// mpViewShell->GetView()->ReleaseMasterPagePaintCache(); Invalidate(); } @@ -1166,9 +1166,9 @@ void Window::DropScroll(const Point& rMousePos) if ( (nDx || nDy) && (rMousePos.X()!=0 || rMousePos.Y()!=0 ) ) { - if (mnTicks > 20) + if (mnTicks > 20) mpViewShell->ScrollLines(nDx, nDy); - else + else mnTicks ++; } } diff --git a/sd/source/ui/view/tabcontr.cxx b/sd/source/ui/view/tabcontr.cxx index 24e63ed5c8da..53cd5c8b20c1 100644 --- a/sd/source/ui/view/tabcontr.cxx +++ b/sd/source/ui/view/tabcontr.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -56,7 +56,7 @@ namespace sd { -#define SWITCH_TIMEOUT 20 +#define SWITCH_TIMEOUT 20 // ----------------------------------------- // - SdTabControl::SdPageObjsTransferable - @@ -134,8 +134,8 @@ void TabControl::Select() void TabControl::MouseButtonDown(const MouseEvent& rMEvt) { if (rMEvt.IsLeft() - && !rMEvt.IsMod1() - && !rMEvt.IsMod2() + && !rMEvt.IsMod1() + && !rMEvt.IsMod2() && !rMEvt.IsShift()) { Point aPos = PixelToLogic( rMEvt.GetPosPixel() ); @@ -232,7 +232,7 @@ sal_Int8 TabControl::AcceptDrop( const AcceptDropEvent& rEvt ) if( !pDrViewSh->GetDocSh()->IsReadOnly() ) { SdDrawDocument* pDoc = pDrViewSh->GetDoc(); - Point aPos( rEvt.maPosPixel ); + Point aPos( rEvt.maPosPixel ); if( bInternalMove ) { @@ -270,8 +270,8 @@ sal_Int8 TabControl::AcceptDrop( const AcceptDropEvent& rEvt ) sal_Int8 TabControl::ExecuteDrop( const ExecuteDropEvent& rEvt ) { SdDrawDocument* pDoc = pDrViewSh->GetDoc(); - Point aPos( rEvt.maPosPixel ); - sal_Int8 nRet = DND_ACTION_NONE; + Point aPos( rEvt.maPosPixel ); + sal_Int8 nRet = DND_ACTION_NONE; if( bInternalMove ) { @@ -286,7 +286,7 @@ sal_Int8 TabControl::ExecuteDrop( const ExecuteDropEvent& rEvt ) pDispatcher->Execute(SID_SWITCHPAGE, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD); } break; - + case DND_ACTION_COPY: { // Copying the selected page to the place that rEvt points diff --git a/sd/source/ui/view/unmodpg.cxx b/sd/source/ui/view/unmodpg.cxx index 16315f989f04..f107d0afbd89 100644 --- a/sd/source/ui/view/unmodpg.cxx +++ b/sd/source/ui/view/unmodpg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -61,21 +61,21 @@ ModifyPageUndoAction::ModifyPageUndoAction( SdDrawDocument* pTheDoc, SdPage* pThePage, String aTheNewName, - AutoLayout eTheNewAutoLayout, + AutoLayout eTheNewAutoLayout, BOOL bTheNewBckgrndVisible, BOOL bTheNewBckgrndObjsVisible) -: SdUndoAction(pTheDoc), +: SdUndoAction(pTheDoc), mpManager(pTheManager) { DBG_ASSERT(pThePage, "Undo ohne Seite ???"); - mpPage = pThePage; - maNewName = aTheNewName; - meNewAutoLayout = eTheNewAutoLayout; - mbNewBckgrndVisible = bTheNewBckgrndVisible; - mbNewBckgrndObjsVisible = bTheNewBckgrndObjsVisible; + mpPage = pThePage; + maNewName = aTheNewName; + meNewAutoLayout = eTheNewAutoLayout; + mbNewBckgrndVisible = bTheNewBckgrndVisible; + mbNewBckgrndObjsVisible = bTheNewBckgrndObjsVisible; - meOldAutoLayout = mpPage->GetAutoLayout(); + meOldAutoLayout = mpPage->GetAutoLayout(); if (!mpPage->IsMasterPage()) { @@ -105,7 +105,7 @@ void ModifyPageUndoAction::Undo() // which are no longer allowed to be selected then. SdrViewIter aIter(mpPage); SdrView* pView = aIter.FirstView(); - + while(pView) { if(pView->AreObjectsMarked()) @@ -154,7 +154,7 @@ void ModifyPageUndoAction::Redo() // which are no longer allowed to be selected then. SdrViewIter aIter(mpPage); SdrView* pView = aIter.FirstView(); - + while(pView) { if(pView->AreObjectsMarked()) @@ -245,7 +245,7 @@ void RenameLayoutTemplateUndoAction::Redo() String RenameLayoutTemplateUndoAction::GetComment() const { - return maComment; + return maComment; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/view/viewoverlaymanager.cxx b/sd/source/ui/view/viewoverlaymanager.cxx index 8b4464c64fb4..1a09d86f73fc 100644 --- a/sd/source/ui/view/viewoverlaymanager.cxx +++ b/sd/source/ui/view/viewoverlaymanager.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -410,8 +410,8 @@ BitmapEx ChangePlaceholderTag::createOverlayImage( int nHighlight ) aRet = *(getButtonImage((nHighlight == 0) ? 4 : 0, bLarge)); aRet.Expand( aSize.Width(), aSize.Height(), NULL, 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) ); + 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) ); aRet.CopyPixel( Rectangle( Point( aSize.Width(), aSize.Height() ), aSize ), aRectSrc, getButtonImage((nHighlight == 3) ? 7 : 3, bLarge) ); } @@ -435,7 +435,7 @@ void ChangePlaceholderTag::addCustomHandles( SdrHdlList& rHandlerList ) long nShapeSizePix = std::min(aShapeSizePix.Width(),aShapeSizePix.Height()); if( 50 > nShapeSizePix ) return; - + bool bLarge = nShapeSizePix > 250; Size aButtonSize( pDev->PixelToLogic( getButtonImage(0, bLarge )->GetSizePixel()) ); @@ -453,7 +453,7 @@ void ChangePlaceholderTag::addCustomHandles( SdrHdlList& rHandlerList ) ImageButtonHdl* pHdl = new ImageButtonHdl( xThis, aPoint ); pHdl->SetObjHdlNum( SMART_TAG_HDL_NUM ); pHdl->SetPageView( mrView.GetSdrPageView() ); - + pHdl->SetPos( aPos ); rHandlerList.AddHdl( pHdl ); @@ -494,7 +494,7 @@ ViewOverlayManager::ViewOverlayManager( ViewShellBase& rViewShellBase ) | tools::EventMultiplexerEvent::EID_BEGIN_TEXT_EDIT | tools::EventMultiplexerEvent::EID_END_TEXT_EDIT ); - StartListening( *mrBase.GetDocShell() ); + StartListening( *mrBase.GetDocShell() ); } // -------------------------------------------------------------------- @@ -548,22 +548,22 @@ IMPL_LINK(ViewOverlayManager,UpdateTagsHdl, void *, EMPTYARG) mnUpdateTagsEvent = 0; bool bChanges = DisposeTags(); bChanges |= CreateTags(); - + if( bChanges && mrBase.GetDrawView() ) - static_cast< ::sd::View* >( mrBase.GetDrawView() )->updateHandles(); + static_cast< ::sd::View* >( mrBase.GetDrawView() )->updateHandles(); return 0; } bool ViewOverlayManager::CreateTags() { bool bChanges = false; - + SdPage* pPage = mrBase.GetMainViewShell()->getCurrentPage(); - - if( pPage && !pPage->IsMasterPage() && (pPage->GetPageKind() == PK_STANDARD) ) + + if( pPage && !pPage->IsMasterPage() && (pPage->GetPageKind() == PK_STANDARD) ) { const std::list< SdrObject* >& rShapes = pPage->GetPresentationShapeList().getList(); - + for( std::list< SdrObject* >::const_iterator iter( rShapes.begin() ); iter != rShapes.end(); iter++ ) { if( (*iter)->IsEmptyPresObj() && ((*iter)->GetObjIdentifier() == OBJ_OUTLINETEXT) && (mrBase.GetDrawView()->GetTextEditObject() != (*iter)) ) @@ -574,7 +574,7 @@ bool ViewOverlayManager::CreateTags() } } } - + return bChanges; } @@ -586,7 +586,7 @@ bool ViewOverlayManager::DisposeTags() { ViewTagVector vec; vec.swap( maTagVector ); - + ViewTagVector::iterator iter = vec.begin(); do { @@ -595,7 +595,7 @@ bool ViewOverlayManager::DisposeTags() while( iter != vec.end() ); return true; } - + return false; } diff --git a/sd/source/ui/view/viewshe2.cxx b/sd/source/ui/view/viewshe2.cxx index a76709d52a49..bc42cb93210f 100644 --- a/sd/source/ui/view/viewshe2.cxx +++ b/sd/source/ui/view/viewshe2.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -343,9 +343,9 @@ void ViewShell::Scroll(long nScrollX, long nScrollY) long nNewThumb = mpVerticalScrollBar->GetThumbPos() + nScrollY; mpVerticalScrollBar->SetThumbPos(nNewThumb); } - double fX = (double) mpHorizontalScrollBar->GetThumbPos() / + double fX = (double) mpHorizontalScrollBar->GetThumbPos() / mpHorizontalScrollBar->GetRange().Len(); - double fY = (double) mpVerticalScrollBar->GetThumbPos() / + double fY = (double) mpVerticalScrollBar->GetThumbPos() / mpVerticalScrollBar->GetRange().Len(); GetActiveWindow()->SetVisibleXY(fX, fY); @@ -1091,7 +1091,7 @@ sal_Int8 ViewShell::ExecuteDrop ( USHORT nPage, USHORT nLayer) { - ::sd::View* pView = GetView(); + ::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 29bb1c62dd3a..711239fade96 100644 --- a/sd/source/ui/view/viewshe3.cxx +++ b/sd/source/ui/view/viewshe3.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -226,7 +226,7 @@ SdPage* ViewShell::CreateOrDuplicatePage ( SdPage* pTemplatePage = pPage; if (pTemplatePage == NULL) if (pDocument->GetSdPage(0, ePageKind) > 0) - pTemplatePage = pDocument->GetSdPage(0, ePageKind); + pTemplatePage = pDocument->GetSdPage(0, ePageKind); if (pTemplatePage != NULL && pTemplatePage->TRG_HasMasterPage()) aVisibleLayers = pTemplatePage->TRG_GetMasterPageVisibleLayers(); else @@ -310,12 +310,12 @@ SdPage* ViewShell::CreateOrDuplicatePage ( } bIsPageBack = pIsPageBack->GetValue (); - bIsPageObj = pIsPageObj->GetValue (); + bIsPageObj = pIsPageObj->GetValue (); } else { Cancel(); - + if(HasCurrentFunction( SID_BEZIER_EDIT ) ) GetViewFrame()->GetDispatcher()->Execute(SID_OBJECT_SELECT, SFX_CALLMODE_ASYNCHRON); @@ -403,11 +403,11 @@ SdPage* ViewShell::CreateOrDuplicatePage ( // Duplication makes no sense when pPage is NULL. if (pPage != NULL) nNewPageIndex = pDocument->DuplicatePage ( - pPage, + pPage, ePageKind, - aStandardPageName, + aStandardPageName, aNotesPageName, - eStandardLayout, + eStandardLayout, eNotesLayout, bIsPageBack, bIsPageObj); diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx index ca0592221ee8..0b557d92c3c4 100644 --- a/sd/source/ui/view/viewshel.cxx +++ b/sd/source/ui/view/viewshel.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -159,9 +159,9 @@ TYPEINIT1(ViewShell, SfxShell); ViewShell::ViewShell( SfxViewFrame*, ::Window* pParentWindow, ViewShellBase& rViewShellBase, bool bAllowCenter) -: SfxShell(&rViewShellBase) -, mbCenterAllowed(bAllowCenter) -, mpParentWindow(pParentWindow) +: SfxShell(&rViewShellBase) +, mbCenterAllowed(bAllowCenter) +, mpParentWindow(pParentWindow) { construct(); } @@ -358,7 +358,7 @@ void ViewShell::Activate(BOOL bIsMDIActivate) //HMHif (pView) //HMH{ - //HMH pView->ShowMarkHdl(); + //HMH pView->ShowMarkHdl(); //HMH} } @@ -529,7 +529,7 @@ void ViewShell::MouseButtonDown(const MouseEvent& rMEvt, ::sd::Window* pWin) { pWin->GrabFocus(); SetActiveWindow(pWin); -// GetViewFrame()->GetWindow().GrabFocus(); +// GetViewFrame()->GetWindow().GrabFocus(); } // MouseEvent in E3dView eintragen @@ -654,7 +654,7 @@ void ViewShell::Command(const CommandEvent& rCEvt, ::sd::Window* pWin) { bConsumed = GetView()->getSmartTags().Command(rCEvt); } - + if( !bConsumed && HasCurrentFunction()) { GetCurrentFunction()->Command(rCEvt); @@ -807,7 +807,7 @@ void ViewShell::Resize (void) if (mpParentWindow == NULL) return; - + // Make sure that the new size is not degenerate. const Size aSize (mpParentWindow->GetSizePixel()); if (aSize.Width()==0 || aSize.Height()==0) @@ -833,7 +833,7 @@ void ViewShell::Resize (void) // GetDocSh()->SetVisArea(aVisArea); } - // VisAreaChanged(aVisArea); + // VisAreaChanged(aVisArea); ::sd::View* pView = GetView(); diff --git a/sd/source/ui/view/zoomlist.cxx b/sd/source/ui/view/zoomlist.cxx index 1d5dd0cac84c..7ca7b4839428 100644 --- a/sd/source/ui/view/zoomlist.cxx +++ b/sd/source/ui/view/zoomlist.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,7 +41,7 @@ namespace sd { -#define MAX_ENTRYS 10 +#define MAX_ENTRYS 10 /************************************************************************* |* |