diff options
Diffstat (limited to 'sd/source/ui/toolpanel/controls')
35 files changed, 179 insertions, 179 deletions
diff --git a/sd/source/ui/toolpanel/controls/AllMasterPagesSelector.cxx b/sd/source/ui/toolpanel/controls/AllMasterPagesSelector.cxx index 3ac8c9866880..99a13e145eed 100644 --- a/sd/source/ui/toolpanel/controls/AllMasterPagesSelector.cxx +++ b/sd/source/ui/toolpanel/controls/AllMasterPagesSelector.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 @@ -134,7 +134,7 @@ void AllMasterPagesSelector::NotifyContainerChangeEvent ( AddItem(rEvent.maChildToken); MasterPagesSelector::Fill(); break; - + case MasterPageContainerChangeEvent::INDEX_CHANGED: case MasterPageContainerChangeEvent::INDEXES_CHANGED: mpSortedMasterPages->clear(); diff --git a/sd/source/ui/toolpanel/controls/AllMasterPagesSelector.hxx b/sd/source/ui/toolpanel/controls/AllMasterPagesSelector.hxx index 4f1df32fc695..7e6c8460268b 100644 --- a/sd/source/ui/toolpanel/controls/AllMasterPagesSelector.hxx +++ b/sd/source/ui/toolpanel/controls/AllMasterPagesSelector.hxx @@ -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 @@ -44,7 +44,7 @@ class AllMasterPagesSelector { public: AllMasterPagesSelector ( - TreeNode* pParent, + TreeNode* pParent, SdDrawDocument& rDocument, ViewShellBase& rBase, DrawViewShell& rViewShell, diff --git a/sd/source/ui/toolpanel/controls/AnimationSchemesPanel.cxx b/sd/source/ui/toolpanel/controls/AnimationSchemesPanel.cxx index 80d047cba829..1bd04f200c98 100644 --- a/sd/source/ui/toolpanel/controls/AnimationSchemesPanel.cxx +++ b/sd/source/ui/toolpanel/controls/AnimationSchemesPanel.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 @@ -28,7 +28,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 diff --git a/sd/source/ui/toolpanel/controls/AnimationSchemesPanel.hxx b/sd/source/ui/toolpanel/controls/AnimationSchemesPanel.hxx index 30ab4e191634..e257f26b73f0 100644 --- a/sd/source/ui/toolpanel/controls/AnimationSchemesPanel.hxx +++ b/sd/source/ui/toolpanel/controls/AnimationSchemesPanel.hxx @@ -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 @@ -28,7 +28,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 diff --git a/sd/source/ui/toolpanel/controls/CurrentMasterPagesSelector.cxx b/sd/source/ui/toolpanel/controls/CurrentMasterPagesSelector.cxx index 322649b9a408..1d2bf8b4be9f 100644 --- a/sd/source/ui/toolpanel/controls/CurrentMasterPagesSelector.cxx +++ b/sd/source/ui/toolpanel/controls/CurrentMasterPagesSelector.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 @@ -93,7 +93,7 @@ CurrentMasterPagesSelector::~CurrentMasterPagesSelector (void) { OSL_ASSERT(mrDocument.GetDocSh() != NULL); } - + Link aLink (LINK(this,CurrentMasterPagesSelector,EventMultiplexerListener)); mrBase.GetEventMultiplexer()->RemoveEventListener(aLink); } @@ -237,7 +237,7 @@ void CurrentMasterPagesSelector::Execute (SfxRequest& rRequest) } } break; - + default: MasterPagesSelector::Execute(rRequest); break; @@ -306,7 +306,7 @@ IMPL_LINK(CurrentMasterPagesSelector,EventMultiplexerListener, break; } } - + return 0; } diff --git a/sd/source/ui/toolpanel/controls/CurrentMasterPagesSelector.hxx b/sd/source/ui/toolpanel/controls/CurrentMasterPagesSelector.hxx index 1490bda2cab0..393e8b0e7168 100644 --- a/sd/source/ui/toolpanel/controls/CurrentMasterPagesSelector.hxx +++ b/sd/source/ui/toolpanel/controls/CurrentMasterPagesSelector.hxx @@ -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 @@ -46,7 +46,7 @@ class CurrentMasterPagesSelector { public: CurrentMasterPagesSelector ( - TreeNode* pParent, + TreeNode* pParent, SdDrawDocument& rDocument, ViewShellBase& rBase, const ::boost::shared_ptr<MasterPageContainer>& rpContainer); @@ -70,7 +70,7 @@ protected: virtual ResId GetContextMenuResId (void) const; virtual void Execute (SfxRequest& rRequest); virtual void GetState (SfxItemSet& rItemSet); - + private: ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent> mxListener; diff --git a/sd/source/ui/toolpanel/controls/CustomAnimationPanel.cxx b/sd/source/ui/toolpanel/controls/CustomAnimationPanel.cxx index 67972234eefe..470dd63eac99 100644 --- a/sd/source/ui/toolpanel/controls/CustomAnimationPanel.cxx +++ b/sd/source/ui/toolpanel/controls/CustomAnimationPanel.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,11 +38,11 @@ #include "sdresid.hxx" namespace sd -{ - +{ + class ViewShellBase; extern ::Window * createCustomAnimationPanel( ::Window* pParent, ViewShellBase& rBase ); - + namespace toolpanel { namespace controls { diff --git a/sd/source/ui/toolpanel/controls/CustomAnimationPanel.hxx b/sd/source/ui/toolpanel/controls/CustomAnimationPanel.hxx index 41195d308a60..d9ee13dab18e 100644 --- a/sd/source/ui/toolpanel/controls/CustomAnimationPanel.hxx +++ b/sd/source/ui/toolpanel/controls/CustomAnimationPanel.hxx @@ -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 @@ -48,7 +48,7 @@ class CustomAnimationPanel { public: CustomAnimationPanel ( - Window& i_rParentWindow, + Window& i_rParentWindow, ToolPanelViewShell& i_rPanelViewShell); virtual ~CustomAnimationPanel (void); diff --git a/sd/source/ui/toolpanel/controls/DocumentHelper.cxx b/sd/source/ui/toolpanel/controls/DocumentHelper.cxx index c8f3cde1253f..c315dacf9a9c 100644 --- a/sd/source/ui/toolpanel/controls/DocumentHelper.cxx +++ b/sd/source/ui/toolpanel/controls/DocumentHelper.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 @@ -118,7 +118,7 @@ SdPage* DocumentHelper::CopyMasterPageToLocalDocument ( } if (bPageExists) break; - + // Create a new slide (and its notes page.) uno::Reference<drawing::XDrawPagesSupplier> xSlideSupplier ( rTargetDocument.getUnoModel(), uno::UNO_QUERY); @@ -143,7 +143,7 @@ SdPage* DocumentHelper::CopyMasterPageToLocalDocument ( pNewMasterPage = AddMasterPage(rTargetDocument, pMasterPage); if (pNewMasterPage==NULL) break; - SdPage* pNewNotesMasterPage + SdPage* pNewNotesMasterPage = AddMasterPage(rTargetDocument, pNotesMasterPage); if (pNewNotesMasterPage==NULL) break; @@ -240,7 +240,7 @@ SdPage* DocumentHelper::AddMasterPage ( // Copy the precious flag. pClonedMasterPage->SetPrecious(pMasterPage->IsPrecious()); - + // Now that the styles are available we can insert the cloned // master page. rTargetDocument.InsertMasterPage (pClonedMasterPage); @@ -284,8 +284,8 @@ void DocumentHelper::ProvideStyles ( static_cast<SdStyleSheetPool*>(rTargetDocument.GetStyleSheetPool()); SdStyleSheetVector aCreatedStyles; pTargetStyleSheetPool->CopyLayoutSheets ( - sLayoutName, - *pSourceStyleSheetPool, + sLayoutName, + *pSourceStyleSheetPool, aCreatedStyles); // Add an undo action for the copied style sheets. @@ -296,8 +296,8 @@ void DocumentHelper::ProvideStyles ( { SdMoveStyleSheetsUndoAction* pMovStyles = new SdMoveStyleSheetsUndoAction ( - &rTargetDocument, - aCreatedStyles, + &rTargetDocument, + aCreatedStyles, TRUE); pUndoManager->AddUndoAction (pMovStyles); } @@ -380,7 +380,7 @@ SdPage* DocumentHelper::AddMasterPage ( // Copy the precious flag. pClonedMasterPage->SetPrecious(pMasterPage->IsPrecious()); - + // Copy the necessary styles. SdDrawDocument* pSourceDocument = static_cast<SdDrawDocument*>(pMasterPage->GetModel()); @@ -436,7 +436,7 @@ void DocumentHelper::AssignMasterPageToPage ( SdDrawDocument* pDocument = dynamic_cast<SdDrawDocument*>(pPage->GetModel()); if (pDocument == NULL) return; - + if ( ! pPage->IsMasterPage()) { // 1. Remove the background object (so that that, if it exists, does @@ -447,7 +447,7 @@ void DocumentHelper::AssignMasterPageToPage ( *pDocument, *pPage, pPage->getSdrPageProperties().GetItemSet()), TRUE); pPage->getSdrPageProperties().PutItem(XFillStyleItem(XFILL_NONE)); - + pDocument->SetMasterPage ( (pPage->GetPageNum()-1)/2, rsBaseLayoutName, @@ -529,7 +529,7 @@ SdPage* DocumentHelper::ProvideMasterPage ( for (USHORT nIndex=0,nCount=rTargetDocument.GetMasterPageCount(); nIndex<nCount; ++nIndex) { SdPage* pCandidate = static_cast<SdPage*>(rTargetDocument.GetMasterPage(nIndex)); - if (pCandidate!=NULL + if (pCandidate!=NULL && sMasterPageLayoutName==pCandidate->GetLayoutName()) { // The requested master page does already exist in the @@ -537,7 +537,7 @@ SdPage* DocumentHelper::ProvideMasterPage ( return pCandidate; } } - + // The given master page does not already belong to the target // document so we have to create copies and insert them into the // targer document. @@ -565,7 +565,7 @@ SdPage* DocumentHelper::ProvideMasterPage ( // Clone the notes master. if (pNotesMasterPage->GetModel() != &rTargetDocument) { - SdPage* pClonedNotesMasterPage + SdPage* pClonedNotesMasterPage = AddMasterPage (rTargetDocument, pNotesMasterPage, nInsertionIndex+1); if( rTargetDocument.IsUndoEnabled() ) rTargetDocument.AddUndo( diff --git a/sd/source/ui/toolpanel/controls/DocumentHelper.hxx b/sd/source/ui/toolpanel/controls/DocumentHelper.hxx index c699819885f1..4624612c1cb3 100644 --- a/sd/source/ui/toolpanel/controls/DocumentHelper.hxx +++ b/sd/source/ui/toolpanel/controls/DocumentHelper.hxx @@ -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 @@ -90,7 +90,7 @@ private: SdDrawDocument& rTargetDocument, SdPage* pMasterPage, const ::boost::shared_ptr<std::vector<SdPage*> >& rpPageList); - + /** Assign the given master page to the given page. @param pMasterPage In contrast to AssignMasterPageToPageList() this page is assumed diff --git a/sd/source/ui/toolpanel/controls/MasterPageContainer.cxx b/sd/source/ui/toolpanel/controls/MasterPageContainer.cxx index 6362fb5d90b2..b46dc325ebbe 100644 --- a/sd/source/ui/toolpanel/controls/MasterPageContainer.cxx +++ b/sd/source/ui/toolpanel/controls/MasterPageContainer.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 @@ -152,7 +152,7 @@ private: determine the correct size ratio. */ bool mbFirstPageObjectSeen; - + // The widths for the previews contain two pixels for the border that is // painted arround the preview. static const int SMALL_PREVIEW_WIDTH = 72 + 2; @@ -210,7 +210,7 @@ static const MasterPageContainer::Token NIL_TOKEN (-1); MasterPageContainer::Implementation::Instance (void) { ::boost::shared_ptr<MasterPageContainer::Implementation> pInstance; - + if (Implementation::mpInstance.expired()) { ::osl::GetGlobalMutex aMutexFunctor; @@ -703,7 +703,7 @@ void MasterPageContainer::Implementation::UpdatePreviewSizePixel (void) // The default aspect ratio is 4:3 int nWidth (4); int nHeight (3); - + // Search for the first entry with an existing master page. MasterPageContainerType::const_iterator iDescriptor; MasterPageContainerType::const_iterator iContainerEnd(maContainer.end()); @@ -791,7 +791,7 @@ MasterPageContainer::Token MasterPageContainer::Implementation::PutMasterPage ( { if (mbContainerCleaningPending) CleanContainer(); - + aResult = maContainer.size(); rpDescriptor->SetToken(aResult); @@ -808,10 +808,10 @@ MasterPageContainer::Token MasterPageContainer::Implementation::PutMasterPage ( default: break; } - + maContainer.push_back(rpDescriptor); aEntry = maContainer.end()-1; - + FireContainerChange(MasterPageContainerChangeEvent::CHILD_ADDED,aResult); } } @@ -826,7 +826,7 @@ MasterPageContainer::Token MasterPageContainer::Implementation::PutMasterPage ( // One or more aspects of the descriptor have changed. Send // appropriate events to the listeners. UpdateDescriptor(*aEntry,false,false, true); - + std::vector<MasterPageContainerChangeEvent::EventType>::const_iterator iEventType; for (iEventType=pEventTypes->begin(); iEventType!=pEventTypes->end(); ++iEventType) { @@ -903,7 +903,7 @@ Image MasterPageContainer::Implementation::GetPreviewForToken ( PreviewState ePreviewState (GetPreviewState(aToken)); SharedMasterPageDescriptor pDescriptor = GetDescriptor(aToken); - + // When the preview is missing but inexpensively creatable then do that // now. if (pDescriptor.get()!=NULL) @@ -942,7 +942,7 @@ Image MasterPageContainer::Implementation::GetPreviewForToken ( break; } } - + return aPreview; } @@ -1003,7 +1003,7 @@ Reference<frame::XModel> MasterPageContainer::Implementation::GetModel (void) RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Desktop")); uno::Reference<frame::XComponentLoader> xDesktop ( ::comphelper::getProcessServiceFactory()->createInstance( - sDesktopServiceName), + sDesktopServiceName), uno::UNO_QUERY); // Create a new model. @@ -1069,7 +1069,7 @@ Image MasterPageContainer::Implementation::GetPreviewSubstitution ( const ::osl::MutexGuard aGuard (maMutex); Image aPreview; - + switch (nId) { case STR_TASKPANEL_PREPARING_PREVIEW_SUBSTITUTION: diff --git a/sd/source/ui/toolpanel/controls/MasterPageContainer.hxx b/sd/source/ui/toolpanel/controls/MasterPageContainer.hxx index 6a10764dbe20..6a7d5ecafb34 100644 --- a/sd/source/ui/toolpanel/controls/MasterPageContainer.hxx +++ b/sd/source/ui/toolpanel/controls/MasterPageContainer.hxx @@ -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 @@ -60,12 +60,12 @@ class MasterPageDescriptor; master pages. Each MasterPageContainer, however, has its own PreviewSize value and thus can independantly switch between large and small previews. - + The container maintains its own document to store master page objects. - + For each master page container stores its URL, preview bitmap, page name, and, if available, the page object. - + Entries are accessed via a Token, which is mostly a numerical index but whose values do not neccessarily have to be consecutive. */ @@ -110,7 +110,7 @@ public: bool RequestPreview (Token aToken); /** Each entry of the container is either the first page of a template - document or is a master page of an Impress document. + document or is a master page of an Impress document. */ enum Origin { MASTERPAGE, // Master page of a document. @@ -137,8 +137,8 @@ public: /** Determine whether the container has a member for the given token. */ bool HasToken (Token aToken) const; - - /** Return a token for an index in the range + + /** Return a token for an index in the range 0 <= index < GetTokenCount(). */ Token GetTokenForIndex (int nIndex); @@ -154,7 +154,7 @@ public: Origin GetOriginForToken (Token aToken); sal_Int32 GetTemplateIndexForToken (Token aToken); ::boost::shared_ptr<MasterPageDescriptor> GetDescriptorForToken (Token aToken); - + void InvalidatePreview (Token aToken); /** Return a preview for the specified token. When the preview is not diff --git a/sd/source/ui/toolpanel/controls/MasterPageContainerFiller.cxx b/sd/source/ui/toolpanel/controls/MasterPageContainerFiller.cxx index 79b3185d256c..164c39e4196e 100644 --- a/sd/source/ui/toolpanel/controls/MasterPageContainerFiller.cxx +++ b/sd/source/ui/toolpanel/controls/MasterPageContainerFiller.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 @@ -87,11 +87,11 @@ void MasterPageContainerFiller::RunNextStep (void) case SCAN_TEMPLATE: meState = ScanTemplate(); break; - + case ADD_TEMPLATE: meState = AddTemplate(); break; - + case DONE: case ERROR: default: @@ -125,7 +125,7 @@ bool MasterPageContainerFiller::HasNextStep (void) case DONE: case ERROR: return false; - + default: return true; } diff --git a/sd/source/ui/toolpanel/controls/MasterPageContainerFiller.hxx b/sd/source/ui/toolpanel/controls/MasterPageContainerFiller.hxx index 661a26bd68b8..f83db4b59077 100644 --- a/sd/source/ui/toolpanel/controls/MasterPageContainerFiller.hxx +++ b/sd/source/ui/toolpanel/controls/MasterPageContainerFiller.hxx @@ -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 @@ -58,10 +58,10 @@ public: */ virtual void FillingDone (void) = 0; }; - + MasterPageContainerFiller (ContainerAdapter& rContainerAdapter); virtual ~MasterPageContainerFiller (void); - + /** Run the next step of the task. After HasNextStep() returns false this method should ignore further calls. */ @@ -86,7 +86,7 @@ private: ::std::auto_ptr<TemplateScanner> mpScannerTask; const TemplateEntry* mpLastAddedEntry; int mnIndex; - + State ScanTemplate (void); State AddTemplate (void); }; diff --git a/sd/source/ui/toolpanel/controls/MasterPageContainerProviders.cxx b/sd/source/ui/toolpanel/controls/MasterPageContainerProviders.cxx index 94c4e9bcc1d4..f5e8658e0896 100644 --- a/sd/source/ui/toolpanel/controls/MasterPageContainerProviders.cxx +++ b/sd/source/ui/toolpanel/controls/MasterPageContainerProviders.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 @@ -66,7 +66,7 @@ Image PagePreviewProvider::operator () ( ::sd::PreviewRenderer& rRenderer) { Image aPreview; - + if (pPage != NULL) { // Use the given renderer to create a preview of the given page @@ -117,9 +117,9 @@ Image TemplatePreviewProvider::operator() ( { // Unused parameters. (void)nWidth; - (void)pPage; + (void)pPage; (void)rRenderer; - + // Load the thumbnail from a template document. uno::Reference<io::XInputStream> xIStream; @@ -130,11 +130,11 @@ Image TemplatePreviewProvider::operator() ( try { uno::Reference<lang::XSingleServiceFactory> xStorageFactory( - xServiceManager->createInstance( + xServiceManager->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.embed.StorageFactory")), uno::UNO_QUERY); - + if (xStorageFactory.is()) { uno::Sequence<uno::Any> aArgs (2); @@ -268,9 +268,9 @@ SdPage* TemplatePageObjectProvider::operator() (SdDrawDocument* pContainerDocume { // Unused parameters. (void)pContainerDocument; - + SdPage* pPage = NULL; - + mxDocumentShell = NULL; ::sd::DrawDocShell* pDocumentShell = NULL; try @@ -401,7 +401,7 @@ ExistingPageProvider::ExistingPageProvider (SdPage* pPage) SdPage* ExistingPageProvider::operator() (SdDrawDocument* pDocument) { (void)pDocument; // Unused parameter. - + return mpPage; } diff --git a/sd/source/ui/toolpanel/controls/MasterPageContainerProviders.hxx b/sd/source/ui/toolpanel/controls/MasterPageContainerProviders.hxx index 573448bbf1ca..e07879693d9e 100644 --- a/sd/source/ui/toolpanel/controls/MasterPageContainerProviders.hxx +++ b/sd/source/ui/toolpanel/controls/MasterPageContainerProviders.hxx @@ -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/toolpanel/controls/MasterPageContainerQueue.cxx b/sd/source/ui/toolpanel/controls/MasterPageContainerQueue.cxx index 9fceb3270687..275f3b11d61a 100644 --- a/sd/source/ui/toolpanel/controls/MasterPageContainerQueue.cxx +++ b/sd/source/ui/toolpanel/controls/MasterPageContainerQueue.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 @@ -146,7 +146,7 @@ bool MasterPageContainerQueue::RequestPreview (const SharedMasterPageDescriptor& && rpDescriptor->maLargePreview.GetSizePixel().Width() == 0) { sal_Int32 nPriority (CalculatePriority(rpDescriptor)); - + // Add a new or replace an existing request. RequestQueue::iterator iRequest (::std::find_if( mpRequestQueue->begin(), @@ -197,7 +197,7 @@ sal_Int32 MasterPageContainerQueue::CalculatePriority ( // Add a term that introduces an order based on the appearance in the // AllMasterPagesSelector. nPriority -= rpDescriptor->maToken / 3; - + // Process requests for the CurrentMasterPagesSelector first. if (rpDescriptor->meOrigin == MasterPageContainer::MASTERPAGE) nPriority += snMasterPagePriorityBoost; @@ -245,7 +245,7 @@ IMPL_LINK(MasterPageContainerQueue, DelayedPreviewCreation, Timer*, pTimer) } mpRequestQueue->erase(mpRequestQueue->begin()); - + if (aRequest.mpDescriptor.get() != NULL) { mnRequestsServedCount += 1; @@ -258,7 +258,7 @@ IMPL_LINK(MasterPageContainerQueue, DelayedPreviewCreation, Timer*, pTimer) } } while (false); - + if (mpRequestQueue->size() > 0 && ! bWaitForMoreRequests) { int nTimeout (snDelayedCreationTimeout); diff --git a/sd/source/ui/toolpanel/controls/MasterPageContainerQueue.hxx b/sd/source/ui/toolpanel/controls/MasterPageContainerQueue.hxx index 2cab5d31edc5..e4251e48df79 100644 --- a/sd/source/ui/toolpanel/controls/MasterPageContainerQueue.hxx +++ b/sd/source/ui/toolpanel/controls/MasterPageContainerQueue.hxx @@ -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 @@ -82,7 +82,7 @@ public: templates are inserted into the MasterPageContainer. */ void ProcessAllRequests (void); - + private: ::boost::weak_ptr<ContainerAdapter> mpWeakContainer; class PreviewCreationRequest; @@ -94,7 +94,7 @@ private: // There are a couple of values that define various aspects of the // heuristic that defines the order and timing in which requests for // preview creation are processed. - + /** The time to wait (in milliseconds) between the creation of previews. */ static const sal_Int32 snDelayedCreationTimeout; @@ -102,7 +102,7 @@ private: /** The time to wait when the system is not idle. */ static const sal_Int32 snDelayedCreationTimeoutWhenNotIdle; - + /** Requests for previews of master pages in a document have their priority increased by this value. */ @@ -120,7 +120,7 @@ private: present. */ static sal_uInt32 snWaitForMoreRequestsCount; - + MasterPageContainerQueue (const ::boost::weak_ptr<ContainerAdapter>& rpContainer); void LateInit (void); @@ -128,7 +128,7 @@ private: are processed. */ sal_Int32 CalculatePriority (const SharedMasterPageDescriptor& rDescriptor) const; - + DECL_LINK(DelayedPreviewCreation, Timer *); }; diff --git a/sd/source/ui/toolpanel/controls/MasterPageDescriptor.cxx b/sd/source/ui/toolpanel/controls/MasterPageDescriptor.cxx index c9b87b425a9d..9ee7a55a6dc7 100644 --- a/sd/source/ui/toolpanel/controls/MasterPageDescriptor.cxx +++ b/sd/source/ui/toolpanel/controls/MasterPageDescriptor.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 @@ -66,7 +66,7 @@ MasterPageDescriptor::MasterPageDescriptor ( mnUseCount(0) { } - + @@ -132,31 +132,31 @@ Image MasterPageDescriptor::GetPreview (MasterPageContainer::PreviewSize eSize) meOrigin = rDescriptor.meOrigin; bIndexChanged = true; } - + if (msURL.getLength()==0 && rDescriptor.msURL.getLength()!=0) { msURL = rDescriptor.msURL; bDataChanged = true; } - + if (msPageName.getLength()==0 && rDescriptor.msPageName.getLength()!=0) { msPageName = rDescriptor.msPageName; bDataChanged = true; } - + if (msStyleName.getLength()==0 && rDescriptor.msStyleName.getLength()!=0) { msStyleName = rDescriptor.msStyleName; bDataChanged = true; } - + if (mpPageObjectProvider.get()==NULL && rDescriptor.mpPageObjectProvider.get()!=NULL) { mpPageObjectProvider = rDescriptor.mpPageObjectProvider; bDataChanged = true; } - + if (mpPreviewProvider.get()==NULL && rDescriptor.mpPreviewProvider.get()!=NULL) { mpPreviewProvider = rDescriptor.mpPreviewProvider; @@ -181,7 +181,7 @@ Image MasterPageDescriptor::GetPreview (MasterPageContainer::PreviewSize eSize) if (bPreviewChanged) pResult->push_back(MasterPageContainerChangeEvent::PREVIEW_CHANGED); } - + return pResult; } @@ -193,14 +193,14 @@ bool MasterPageDescriptor::UpdatePageObject ( SdDrawDocument* pDocument) { bool bModified (false); - + // Update the page object when that is not yet known. if (mpMasterPage == NULL && mpPageObjectProvider.get()!=NULL && (nCostThreshold<0 || mpPageObjectProvider->GetCostIndex()<=nCostThreshold)) { // Note that pDocument may be NULL. - + SdPage* pPage = (*mpPageObjectProvider)(pDocument); if (meOrigin == MasterPageContainer::MASTERPAGE) { @@ -250,7 +250,7 @@ bool MasterPageDescriptor::UpdatePreview ( ::sd::PreviewRenderer& rRenderer) { bool bModified (false); - + // Update the preview when that is not yet known. if (maLargePreview.GetSizePixel().Width()==0 && mpPreviewProvider.get()!=NULL @@ -310,7 +310,7 @@ MasterPageDescriptor::URLClassification MasterPageDescriptor::GetURLClassificati meURLClassification = URLCLASS_USER; } } - + return meURLClassification; } @@ -362,7 +362,7 @@ bool MasterPageDescriptor::StyleNameComparator::operator() ( //===== PageObjectComparator ================================================== -MasterPageDescriptor::PageObjectComparator::PageObjectComparator (const SdPage* pPageObject) +MasterPageDescriptor::PageObjectComparator::PageObjectComparator (const SdPage* pPageObject) : mpMasterPage(pPageObject) { } diff --git a/sd/source/ui/toolpanel/controls/MasterPageDescriptor.hxx b/sd/source/ui/toolpanel/controls/MasterPageDescriptor.hxx index 0bbd4cc3773b..f89cc9612be4 100644 --- a/sd/source/ui/toolpanel/controls/MasterPageDescriptor.hxx +++ b/sd/source/ui/toolpanel/controls/MasterPageDescriptor.hxx @@ -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 @@ -71,7 +71,7 @@ public: ::std::auto_ptr<std::vector<MasterPageContainerChangeEvent::EventType> > Update ( const MasterPageDescriptor& rDescriptor); - + /** This convenience method returns either a small or a large preview, depending on the given size specifier. Note that the previews are not created when they are not present. @@ -82,18 +82,18 @@ public: /** Use the PreviewProvider to get access to a preview of the master page. - + Note that this is only done, when either bForce is <TRUE/> or the PreviewProvider::GetCostIndex() returns 0. - + The small preview is created by scaling the large one, not by calling PreviewProvider::operator() a second time. - + It is the responsibility of the caller to call UpdatePageObject() before calling this method when the PreviewProvider can only work when the master page object is present, i.e. its NeedsPageObject() method returns <TRUE/>. - + @param nCostThreshold When this is zero or positive then the preview is created only when the preview provider has a cost equal to or smaller than @@ -116,7 +116,7 @@ public: ::sd::PreviewRenderer& rRenderer); /** Use the PageObjectProvider to get access to the master page object. - + Note that this is only done, when either bForce is <TRUE/> or the PreviewProvider::GetCostIndex() returns 0. @@ -146,7 +146,7 @@ public: }; URLClassification GetURLClassification (void); - + /** The Token under which the MasterPageContainer gives access to the object. */ @@ -155,16 +155,16 @@ public: /** A rough specification of the origin of the master page. */ MasterPageContainer::Origin meOrigin; - + /** The URL is not empty for master pages loaded from a template document. */ ::rtl::OUString msURL; - + /** Taken from the title of the template file. */ ::rtl::OUString msPageName; - + /** Taken from the master page object. */ ::rtl::OUString msStyleName; @@ -174,17 +174,17 @@ public: /** The actual master page. */ SdPage* mpMasterPage; - + /** A slide that uses the master page. */ SdPage* mpSlide; - + /** A small (the default size) preview of the master page. May be empty. When this smaller preview is not empty then the larger one is not empty, too. */ Image maSmallPreview; - + /** A large preview of the master page. May be empty. When this larger preview is not empty then the smaller one is not empty, too. */ @@ -199,7 +199,7 @@ public: the lifetime of a MasterPageDescriptor object. */ ::boost::shared_ptr<PageObjectProvider> mpPageObjectProvider; - + /** This index represents the order in which templates are provided via the TemplateScanner. It defines the order in which the entries in the AllMasterPagesSelector are displayed. The default value is -1. diff --git a/sd/source/ui/toolpanel/controls/MasterPageObserver.cxx b/sd/source/ui/toolpanel/controls/MasterPageObserver.cxx index 2d11b9e6f7a5..b7e51a8b81eb 100644 --- a/sd/source/ui/toolpanel/controls/MasterPageObserver.cxx +++ b/sd/source/ui/toolpanel/controls/MasterPageObserver.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 @@ -62,7 +62,7 @@ public: document. */ void UnregisterDocument (SdDrawDocument& rDocument); - + /** Add a listener that is informed of master pages that are newly assigned to slides or become unassigned. @param rEventListener @@ -90,7 +90,7 @@ private: ::std::vector<Link> maListeners; struct DrawDocHash { - size_t operator()(SdDrawDocument* argument) const + size_t operator()(SdDrawDocument* argument) const { return reinterpret_cast<unsigned long>(argument); } }; typedef ::std::hash_map<SdDrawDocument*, @@ -133,7 +133,7 @@ MasterPageObserver& MasterPageObserver::Instance (void) { OSL_DOUBLE_CHECKED_LOCKING_MEMORY_BARRIER(); } - + DBG_ASSERT(Implementation::mpInstance!=NULL, "MasterPageObserver::Instance(): instance is NULL"); return *Implementation::mpInstance; @@ -157,7 +157,7 @@ void MasterPageObserver::UnregisterDocument (SdDrawDocument& rDocument) - + void MasterPageObserver::AddEventListener (const Link& rEventListener) { @@ -223,7 +223,7 @@ void MasterPageObserver::Implementation::UnregisterDocument ( - + void MasterPageObserver::Implementation::AddEventListener ( const Link& rEventListener) { @@ -233,7 +233,7 @@ void MasterPageObserver::Implementation::AddEventListener ( rEventListener) == maListeners.end()) { maListeners.push_back (rEventListener); - + // Tell the new listener about all the master pages that are // currently in use. typedef ::std::vector<String> StringList; @@ -275,7 +275,7 @@ void MasterPageObserver::Implementation::RemoveEventListener ( -MasterPageObserver::MasterPageNameSet +MasterPageObserver::MasterPageNameSet MasterPageObserver::Implementation::GetMasterPageNames ( SdDrawDocument& rDocument) { @@ -355,8 +355,8 @@ void MasterPageObserver::Implementation::AnalyzeUsedMasterPages ( ::std::set<String>::iterator J; int i=0; - for (J=aOldMasterPagesDescriptor->second.begin(); - J!=aOldMasterPagesDescriptor->second.end(); + for (J=aOldMasterPagesDescriptor->second.begin(); + J!=aOldMasterPagesDescriptor->second.end(); ++J) OSL_TRACE("old used master page %d is %s", i++, @@ -377,8 +377,8 @@ void MasterPageObserver::Implementation::AnalyzeUsedMasterPages ( RTL_TEXTENCODING_UTF8).getStr()); MasterPageObserverEvent aEvent ( - MasterPageObserverEvent::ET_MASTER_PAGE_ADDED, - rDocument, + MasterPageObserverEvent::ET_MASTER_PAGE_ADDED, + rDocument, *I); SendEvent (aEvent); } @@ -398,7 +398,7 @@ void MasterPageObserver::Implementation::AnalyzeUsedMasterPages ( MasterPageObserverEvent aEvent ( MasterPageObserverEvent::ET_MASTER_PAGE_REMOVED, - rDocument, + rDocument, *I); SendEvent (aEvent); } diff --git a/sd/source/ui/toolpanel/controls/MasterPagesPanel.cxx b/sd/source/ui/toolpanel/controls/MasterPagesPanel.cxx index ed28b54f6f5b..b5eae0e840c5 100644 --- a/sd/source/ui/toolpanel/controls/MasterPagesPanel.cxx +++ b/sd/source/ui/toolpanel/controls/MasterPagesPanel.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,12 +64,12 @@ void MasterPagesPanel::impl_construct( ViewShellBase& rBase ) TitledControl* pTitledControl; ::boost::shared_ptr<MasterPageContainer> pContainer (new MasterPageContainer()); - + // Create a panel with the master pages that are in use by the currently // edited document. DrawViewShell* pDrawViewShell = dynamic_cast<DrawViewShell*>(rBase.GetMainViewShell().get()); pSelector.reset(new controls::CurrentMasterPagesSelector ( - this, + this, *pDocument, rBase, pContainer)); @@ -83,10 +83,10 @@ void MasterPagesPanel::impl_construct( ViewShellBase& rBase ) ::std::auto_ptr<TreeNode>(pSelector.release()), SdResId(STR_TASKPANEL_CURRENT_MASTER_PAGES_TITLE), HID_SD_CURRENT_MASTERS); - + // Create a panel with the most recently used master pages. pSelector.reset(new controls::RecentMasterPagesSelector ( - this, + this, *pDocument, rBase, pContainer)); @@ -103,7 +103,7 @@ void MasterPagesPanel::impl_construct( ViewShellBase& rBase ) // Create a panel with all available master pages. pSelector.reset(new controls::AllMasterPagesSelector ( - this, + this, *pDocument, rBase, *pDrawViewShell, diff --git a/sd/source/ui/toolpanel/controls/MasterPagesPanel.hxx b/sd/source/ui/toolpanel/controls/MasterPagesPanel.hxx index c756b383b4ee..8c886d00750c 100644 --- a/sd/source/ui/toolpanel/controls/MasterPagesPanel.hxx +++ b/sd/source/ui/toolpanel/controls/MasterPagesPanel.hxx @@ -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 @@ -52,7 +52,7 @@ class MasterPagesPanel { public: MasterPagesPanel ( - ::Window& i_rParentWindow, + ::Window& i_rParentWindow, ToolPanelViewShell& i_rPanelViewShell); virtual ~MasterPagesPanel (void); diff --git a/sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx b/sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx index d178ffb06760..10db80a6778f 100644 --- a/sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx +++ b/sd/source/ui/toolpanel/controls/MasterPagesSelector.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 @@ -84,7 +84,7 @@ using namespace ::com::sun::star::text; namespace sd { namespace toolpanel { namespace controls { -SFX_IMPL_INTERFACE(MasterPagesSelector, SfxShell, +SFX_IMPL_INTERFACE(MasterPagesSelector, SfxShell, SdResId(STR_MASTERPAGESSELECTOR)) { SFX_POPUPMENU_REGISTRATION( SdResId(RID_TASKPANE_MASTERPAGESSELECTOR_POPUP) ); @@ -189,7 +189,7 @@ Size MasterPagesSelector::GetPreferredSize (void) void MasterPagesSelector::UpdateLocks (const ItemList& rItemList) { ItemList aNewLockList; - + // In here we first lock the master pages in the given list and then // release the locks acquired in a previous call to this method. When // this were done the other way round the lock count of some master @@ -219,7 +219,7 @@ void MasterPagesSelector::UpdateLocks (const ItemList& rItemList) void MasterPagesSelector::Fill (void) { ::std::auto_ptr<ItemList> pItemList (new ItemList()); - + Fill(*pItemList); UpdateLocks(*pItemList); @@ -305,7 +305,7 @@ IMPL_LINK(MasterPagesSelector, ContextMenuCallback, CommandEvent*, pEvent) mpPageSet.get(), &aPosition); } - + return 0; } @@ -540,7 +540,7 @@ void MasterPagesSelector::Execute (SfxRequest& rRequest) break; case SID_TP_USE_FOR_NEW_PRESENTATIONS: - DBG_ASSERT (false, + DBG_ASSERT (false, "Using slides as default for new presentations" " is not yet implemented"); break; @@ -647,7 +647,7 @@ void MasterPagesSelector::SetItem ( mpPageSet->RemoveItem(nIndex); } } - + } @@ -711,7 +711,7 @@ void MasterPagesSelector::InvalidatePreview (const SdPage* pPage) void MasterPagesSelector::UpdateAllPreviews (void) { const ::osl::MutexGuard aGuard (maMutex); - + for (USHORT nIndex=1; nIndex<=mpPageSet->GetItemCount(); nIndex++) { UserData* pData = GetUserData(nIndex); @@ -817,13 +817,13 @@ void MasterPagesSelector::UpdateItemList (::std::auto_ptr<ItemList> pNewItemList SetItem(nIndex,*iNewItem); } } - + // Append new items. for ( ; iNewItem!=iNewEnd; ++iNewItem,++nIndex) { SetItem(nIndex,*iNewItem); } - + // Remove trailing items. for ( ; iCurrentItem!=iCurrentEnd; ++iCurrentItem,++nIndex) { @@ -831,7 +831,7 @@ void MasterPagesSelector::UpdateItemList (::std::auto_ptr<ItemList> pNewItemList } maCurrentItemList.swap(*pNewItemList); - + mpPageSet->Rearrange(); if (GetParentNode() != NULL) GetParentNode()->RequestResize(); diff --git a/sd/source/ui/toolpanel/controls/MasterPagesSelector.hxx b/sd/source/ui/toolpanel/controls/MasterPagesSelector.hxx index 3e3eb9b9fe99..89410a24ce0c 100644 --- a/sd/source/ui/toolpanel/controls/MasterPagesSelector.hxx +++ b/sd/source/ui/toolpanel/controls/MasterPagesSelector.hxx @@ -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 @@ -46,7 +46,7 @@ class SdDrawDocument; class SdPage; class SfxModule; -namespace sd { +namespace sd { class DrawViewShell; class TemplateEntry; class TemplateDir; @@ -150,7 +150,7 @@ protected: sal_uInt16 mnDefaultClickAction; /** Pages with pointers in this queue have their previews updated eventually. Filled by InvalidatePreview() and operated upon by - UpdatePreviews(). + UpdatePreviews(). */ ::std::queue<USHORT> maPreviewUpdateQueue; @@ -219,7 +219,7 @@ private: DECL_LINK(RightClickHandler, MouseEvent*); DECL_LINK(ContextMenuCallback, CommandEvent*); DECL_LINK(ContainerChangeListener, MasterPageContainerChangeEvent*); - + void SetItem ( USHORT nIndex, MasterPageContainer::Token aToken); diff --git a/sd/source/ui/toolpanel/controls/PreviewValueSet.cxx b/sd/source/ui/toolpanel/controls/PreviewValueSet.cxx index b1c6350ecf4a..74a83784ac44 100644 --- a/sd/source/ui/toolpanel/controls/PreviewValueSet.cxx +++ b/sd/source/ui/toolpanel/controls/PreviewValueSet.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 @@ -45,13 +45,13 @@ PreviewValueSet::PreviewValueSet (TreeNode* pParent) mnMaxColumnCount(-1) { SetStyle ( - GetStyle() + GetStyle() & ~(WB_ITEMBORDER)// | WB_MENUSTYLEVALUESET) // | WB_FLATVALUESET); ); SetColCount(2); - // SetLineCount(1); + // SetLineCount(1); SetExtraSpacing (2); } @@ -130,7 +130,7 @@ void PreviewValueSet::Command (const CommandEvent& rEvent) maContextMenuCallback.Call(&aNonConstEventCopy); } break; - + default: ValueSet::Command(rEvent); break; @@ -217,7 +217,7 @@ sal_Int32 PreviewValueSet::GetPreferredWidth (sal_Int32 nHeight) { int nColumnCount = (GetItemCount()+nRowCount-1) / nRowCount; if (nColumnCount > 0) - nPreferredWidth = (maPreviewSize.Width() + 2*mnBorderWidth) + nPreferredWidth = (maPreviewSize.Width() + 2*mnBorderWidth) * nColumnCount; } @@ -231,7 +231,7 @@ sal_Int32 PreviewValueSet::GetPreferredHeight (sal_Int32 nWidth) { int nRowCount (CalculateRowCount(CalculateColumnCount(nWidth))); int nItemHeight (maPreviewSize.Height()); - + return nRowCount * (nItemHeight + 2*mnBorderHeight); } diff --git a/sd/source/ui/toolpanel/controls/PreviewValueSet.hxx b/sd/source/ui/toolpanel/controls/PreviewValueSet.hxx index 2c693f20866f..ab9d789d8d75 100644 --- a/sd/source/ui/toolpanel/controls/PreviewValueSet.hxx +++ b/sd/source/ui/toolpanel/controls/PreviewValueSet.hxx @@ -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 @@ -51,7 +51,7 @@ public: void SetRightMouseClickHandler (const Link& rLink); virtual void Paint (const Rectangle& rRect); virtual void Resize (void); - + /** When a request for the display of a context menu is made to this method then that request is forwarded via the ContextMenuCallback. This way the owning class can handle the context menu without having @@ -87,7 +87,7 @@ private: const int mnBorderWidth; const int mnBorderHeight; const int mnMaxColumnCount; - + USHORT CalculateColumnCount (int nWidth) const; USHORT CalculateRowCount (USHORT nColumnCount) const; }; diff --git a/sd/source/ui/toolpanel/controls/RecentMasterPagesSelector.cxx b/sd/source/ui/toolpanel/controls/RecentMasterPagesSelector.cxx index 83bc417def0b..01fae398aff1 100644 --- a/sd/source/ui/toolpanel/controls/RecentMasterPagesSelector.cxx +++ b/sd/source/ui/toolpanel/controls/RecentMasterPagesSelector.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 @@ -114,7 +114,7 @@ void RecentMasterPagesSelector::Fill (ItemList& rItemList) if (aToken != MasterPageContainer::NIL_TOKEN) { String sStyleName (mpContainer->GetStyleNameForToken(aToken)); - if (sStyleName.Len()==0 + if (sStyleName.Len()==0 || aCurrentNames.find(sStyleName) == aCurrentNames.end()) { rItemList.push_back(aToken); @@ -131,7 +131,7 @@ void RecentMasterPagesSelector::AssignMasterPageToPageList ( const ::boost::shared_ptr<std::vector<SdPage*> >& rpPageList) { USHORT nSelectedItemId = mpPageSet->GetSelectItemId(); - + MasterPagesSelector::AssignMasterPageToPageList(pMasterPage, rpPageList); // Restore the selection. diff --git a/sd/source/ui/toolpanel/controls/RecentMasterPagesSelector.hxx b/sd/source/ui/toolpanel/controls/RecentMasterPagesSelector.hxx index 051da6ad7f71..108aa24b2ea5 100644 --- a/sd/source/ui/toolpanel/controls/RecentMasterPagesSelector.hxx +++ b/sd/source/ui/toolpanel/controls/RecentMasterPagesSelector.hxx @@ -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 @@ class RecentMasterPagesSelector { public: RecentMasterPagesSelector ( - TreeNode* pParent, + TreeNode* pParent, SdDrawDocument& rDocument, ViewShellBase& rBase, const ::boost::shared_ptr<MasterPageContainer>& rpContainer); diff --git a/sd/source/ui/toolpanel/controls/RecentlyUsedMasterPages.cxx b/sd/source/ui/toolpanel/controls/RecentlyUsedMasterPages.cxx index 7a685ca76cd7..1dd5109c1eb0 100644 --- a/sd/source/ui/toolpanel/controls/RecentlyUsedMasterPages.cxx +++ b/sd/source/ui/toolpanel/controls/RecentlyUsedMasterPages.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 @@ -141,7 +141,7 @@ RecentlyUsedMasterPages& RecentlyUsedMasterPages::Instance (void) else { OSL_DOUBLE_CHECKED_LOCKING_MEMORY_BARRIER(); } - + return *mpInstance; } @@ -163,7 +163,7 @@ RecentlyUsedMasterPages::~RecentlyUsedMasterPages (void) { Link aLink (LINK(this,RecentlyUsedMasterPages,MasterPageContainerChangeListener)); mpContainer->RemoveChangeListener(aLink); - + MasterPageObserver::Instance().RemoveEventListener( LINK(this,RecentlyUsedMasterPages,MasterPageChangeListener)); } @@ -175,7 +175,7 @@ void RecentlyUsedMasterPages::LateInit (void) { Link aLink (LINK(this,RecentlyUsedMasterPages,MasterPageContainerChangeListener)); mpContainer->AddChangeListener(aLink); - + LoadPersistentValues (); MasterPageObserver::Instance().AddEventListener( LINK(this,RecentlyUsedMasterPages,MasterPageChangeListener)); diff --git a/sd/source/ui/toolpanel/controls/RecentlyUsedMasterPages.hxx b/sd/source/ui/toolpanel/controls/RecentlyUsedMasterPages.hxx index 592cfd0cf914..1e153625992e 100644 --- a/sd/source/ui/toolpanel/controls/RecentlyUsedMasterPages.hxx +++ b/sd/source/ui/toolpanel/controls/RecentlyUsedMasterPages.hxx @@ -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,7 +61,7 @@ public: void AddEventListener (const Link& rEventListener); void RemoveEventListener (const Link& rEventListener); - + int GetMasterPageCount (void) const; MasterPageContainer::Token GetTokenForIndex (sal_uInt32 nIndex) const; @@ -77,7 +77,7 @@ private: ::std::auto_ptr<MasterPageList> mpMasterPages; unsigned long int mnMaxListSize; ::boost::shared_ptr<MasterPageContainer> mpContainer; - + RecentlyUsedMasterPages (void); virtual ~RecentlyUsedMasterPages (void); diff --git a/sd/source/ui/toolpanel/controls/SlideTransitionPanel.cxx b/sd/source/ui/toolpanel/controls/SlideTransitionPanel.cxx index ac51ec1dc163..d0d5ef0cdb71 100644 --- a/sd/source/ui/toolpanel/controls/SlideTransitionPanel.cxx +++ b/sd/source/ui/toolpanel/controls/SlideTransitionPanel.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/toolpanel/controls/SlideTransitionPanel.hxx b/sd/source/ui/toolpanel/controls/SlideTransitionPanel.hxx index b4e2005225ad..48e29ebbd011 100644 --- a/sd/source/ui/toolpanel/controls/SlideTransitionPanel.hxx +++ b/sd/source/ui/toolpanel/controls/SlideTransitionPanel.hxx @@ -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/toolpanel/controls/TableDesignPanel.cxx b/sd/source/ui/toolpanel/controls/TableDesignPanel.cxx index ac5c97ecf3e8..61b35ae9b97c 100644 --- a/sd/source/ui/toolpanel/controls/TableDesignPanel.cxx +++ b/sd/source/ui/toolpanel/controls/TableDesignPanel.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,11 +38,11 @@ #include "sdresid.hxx" namespace sd -{ - +{ + class ViewShellBase; extern ::Window * createTableDesignPanel( ::Window* pParent, ViewShellBase& rBase ); - + namespace toolpanel { namespace controls { diff --git a/sd/source/ui/toolpanel/controls/TableDesignPanel.hxx b/sd/source/ui/toolpanel/controls/TableDesignPanel.hxx index 551d6b9b7a08..6ed358bd4b8b 100644 --- a/sd/source/ui/toolpanel/controls/TableDesignPanel.hxx +++ b/sd/source/ui/toolpanel/controls/TableDesignPanel.hxx @@ -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 @@ -48,7 +48,7 @@ class TableDesignPanel { public: TableDesignPanel ( - ::Window& i_rParentWindow, + ::Window& i_rParentWindow, ToolPanelViewShell& i_rPanelViewShell); virtual ~TableDesignPanel (void); |