summaryrefslogtreecommitdiff
path: root/sd/source/ui/sidebar
diff options
context:
space:
mode:
authorMarkus Mohrhard <markus.mohrhard@collabora.co.uk>2014-06-25 05:20:00 +0200
committerMarkus Mohrhard <markus.mohrhard@collabora.co.uk>2014-06-25 05:41:09 +0200
commited6b8a100c1aabb342573f252509573bbe124d29 (patch)
tree35874493d9470202b3221aa2a1666b6647494242 /sd/source/ui/sidebar
parent78f6407978aa48c3cbb116bc281940dbf1f2dcbc (diff)
remove whitespaces
Change-Id: I9daea42a433b5032931a722878874917cf37f4d1
Diffstat (limited to 'sd/source/ui/sidebar')
-rw-r--r--sd/source/ui/sidebar/AllMasterPagesSelector.cxx33
-rw-r--r--sd/source/ui/sidebar/AllMasterPagesSelector.hxx1
-rw-r--r--sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx30
-rw-r--r--sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx3
-rw-r--r--sd/source/ui/sidebar/CustomAnimationPanel.cxx11
-rw-r--r--sd/source/ui/sidebar/DocumentHelper.cxx26
-rw-r--r--sd/source/ui/sidebar/DocumentHelper.hxx1
-rw-r--r--sd/source/ui/sidebar/IDisposable.hxx2
-rw-r--r--sd/source/ui/sidebar/ISidebarReceiver.hxx2
-rw-r--r--sd/source/ui/sidebar/LayoutMenu.cxx84
-rw-r--r--sd/source/ui/sidebar/LayoutMenu.hxx3
-rw-r--r--sd/source/ui/sidebar/MasterPageContainer.cxx160
-rw-r--r--sd/source/ui/sidebar/MasterPageContainer.hxx4
-rw-r--r--sd/source/ui/sidebar/MasterPageContainerFiller.cxx18
-rw-r--r--sd/source/ui/sidebar/MasterPageContainerProviders.cxx62
-rw-r--r--sd/source/ui/sidebar/MasterPageContainerProviders.hxx19
-rw-r--r--sd/source/ui/sidebar/MasterPageContainerQueue.cxx34
-rw-r--r--sd/source/ui/sidebar/MasterPageContainerQueue.hxx1
-rw-r--r--sd/source/ui/sidebar/MasterPageDescriptor.cxx47
-rw-r--r--sd/source/ui/sidebar/MasterPageDescriptor.hxx2
-rw-r--r--sd/source/ui/sidebar/MasterPageObserver.cxx40
-rw-r--r--sd/source/ui/sidebar/MasterPagesSelector.cxx116
-rw-r--r--sd/source/ui/sidebar/MasterPagesSelector.hxx1
-rw-r--r--sd/source/ui/sidebar/NavigatorWrapper.cxx18
-rw-r--r--sd/source/ui/sidebar/NavigatorWrapper.hxx2
-rw-r--r--sd/source/ui/sidebar/PanelBase.cxx25
-rw-r--r--sd/source/ui/sidebar/PanelBase.hxx4
-rw-r--r--sd/source/ui/sidebar/PanelFactory.cxx23
-rw-r--r--sd/source/ui/sidebar/PanelFactory.hxx4
-rw-r--r--sd/source/ui/sidebar/PreviewValueSet.cxx35
-rw-r--r--sd/source/ui/sidebar/PreviewValueSet.hxx2
-rw-r--r--sd/source/ui/sidebar/RecentMasterPagesSelector.cxx25
-rw-r--r--sd/source/ui/sidebar/RecentMasterPagesSelector.hxx1
-rw-r--r--sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx50
-rw-r--r--sd/source/ui/sidebar/RecentlyUsedMasterPages.hxx3
-rw-r--r--sd/source/ui/sidebar/SlideTransitionPanel.cxx10
-rw-r--r--sd/source/ui/sidebar/SlideTransitionPanel.hxx1
-rw-r--r--sd/source/ui/sidebar/TableDesignPanel.cxx10
38 files changed, 0 insertions, 913 deletions
diff --git a/sd/source/ui/sidebar/AllMasterPagesSelector.cxx b/sd/source/ui/sidebar/AllMasterPagesSelector.cxx
index 1b74b8f16c66..19f825822e3e 100644
--- a/sd/source/ui/sidebar/AllMasterPagesSelector.cxx
+++ b/sd/source/ui/sidebar/AllMasterPagesSelector.cxx
@@ -48,7 +48,6 @@ int GetURLPriority (const SharedMasterPageDescriptor& rpDescriptor)
return nPriority;
}
-
class MasterPageDescriptorOrder
{
public:
@@ -69,8 +68,6 @@ public:
} // end of anonymous namespace
-
-
namespace sd { namespace sidebar {
class AllMasterPagesSelector::SortedMasterPageDescriptorList
@@ -80,9 +77,6 @@ public:
SortedMasterPageDescriptorList (void) {}
};
-
-
-
MasterPagesSelector* AllMasterPagesSelector::Create (
::Window* pParent,
ViewShellBase& rViewShellBase,
@@ -107,9 +101,6 @@ MasterPagesSelector* AllMasterPagesSelector::Create (
return pSelector;
}
-
-
-
AllMasterPagesSelector::AllMasterPagesSelector (
::Window* pParent,
SdDrawDocument& rDocument,
@@ -122,16 +113,10 @@ AllMasterPagesSelector::AllMasterPagesSelector (
MasterPagesSelector::Fill();
}
-
-
-
AllMasterPagesSelector::~AllMasterPagesSelector (void)
{
}
-
-
-
void AllMasterPagesSelector::Fill (ItemList& rItemList)
{
if (mpSortedMasterPages->empty())
@@ -139,9 +124,6 @@ void AllMasterPagesSelector::Fill (ItemList& rItemList)
UpdatePageSet(rItemList);
}
-
-
-
void AllMasterPagesSelector::NotifyContainerChangeEvent (
const MasterPageContainerChangeEvent& rEvent)
{
@@ -164,9 +146,6 @@ void AllMasterPagesSelector::NotifyContainerChangeEvent (
}
}
-
-
-
void AllMasterPagesSelector::UpdateMasterPageList (void)
{
mpSortedMasterPages->clear();
@@ -175,9 +154,6 @@ void AllMasterPagesSelector::UpdateMasterPageList (void)
AddItem(mpContainer->GetTokenForIndex(i));
}
-
-
-
void AllMasterPagesSelector::AddItem (MasterPageContainer::Token aToken)
{
switch (mpContainer->GetOriginForToken(aToken))
@@ -198,9 +174,6 @@ void AllMasterPagesSelector::AddItem (MasterPageContainer::Token aToken)
}
}
-
-
-
void AllMasterPagesSelector::UpdatePageSet (ItemList& rItemList)
{
SortedMasterPageDescriptorList::const_iterator iDescriptor;
@@ -209,9 +182,6 @@ void AllMasterPagesSelector::UpdatePageSet (ItemList& rItemList)
rItemList.push_back((*iDescriptor)->maToken);
}
-
-
-
void AllMasterPagesSelector::GetState (SfxItemSet& rItemSet)
{
// MasterPagesSelector::GetState(rItemSet);
@@ -220,9 +190,6 @@ void AllMasterPagesSelector::GetState (SfxItemSet& rItemSet)
rItemSet.DisableItem(SID_TP_EDIT_MASTER);
}
-
-
-
} } // end of namespace sd::sidebar
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/sidebar/AllMasterPagesSelector.hxx b/sd/source/ui/sidebar/AllMasterPagesSelector.hxx
index 00c19f2e5307..56cef88ffdd3 100644
--- a/sd/source/ui/sidebar/AllMasterPagesSelector.hxx
+++ b/sd/source/ui/sidebar/AllMasterPagesSelector.hxx
@@ -30,7 +30,6 @@ class TemplateEntry;
namespace sd { namespace sidebar {
-
/** Show a list of all available master pages so that the user can assign
them to the document.
*/
diff --git a/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx b/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx
index dc793a14615a..1b5807150e41 100644
--- a/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx
+++ b/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx
@@ -38,7 +38,6 @@
#include <set>
-
using namespace ::com::sun::star;
namespace sd { namespace sidebar {
@@ -67,9 +66,6 @@ MasterPagesSelector* CurrentMasterPagesSelector::Create (
return pSelector;
}
-
-
-
CurrentMasterPagesSelector::CurrentMasterPagesSelector (
::Window* pParent,
SdDrawDocument& rDocument,
@@ -93,9 +89,6 @@ CurrentMasterPagesSelector::CurrentMasterPagesSelector (
| sd::tools::EventMultiplexerEvent::EID_SHAPE_REMOVED);
}
-
-
-
CurrentMasterPagesSelector::~CurrentMasterPagesSelector (void)
{
if (mrDocument.GetDocSh() != NULL)
@@ -111,9 +104,6 @@ CurrentMasterPagesSelector::~CurrentMasterPagesSelector (void)
mrBase.GetEventMultiplexer()->RemoveEventListener(aLink);
}
-
-
-
void CurrentMasterPagesSelector::LateInit (void)
{
MasterPagesSelector::LateInit();
@@ -128,9 +118,6 @@ void CurrentMasterPagesSelector::LateInit (void)
}
}
-
-
-
void CurrentMasterPagesSelector::Fill (ItemList& rItemList)
{
sal_uInt16 nPageCount = mrDocument.GetMasterSdPageCount(PK_STANDARD);
@@ -171,17 +158,11 @@ void CurrentMasterPagesSelector::Fill (ItemList& rItemList)
}
}
-
-
-
ResId CurrentMasterPagesSelector::GetContextMenuResId (void) const
{
return SdResId(RID_TASKPANE_CURRENT_MASTERPAGESSELECTOR_POPUP);
}
-
-
-
void CurrentMasterPagesSelector::UpdateSelection (void)
{
// Iterate over all pages and for the selected ones put the name of
@@ -228,9 +209,6 @@ void CurrentMasterPagesSelector::UpdateSelection (void)
}
}
-
-
-
void CurrentMasterPagesSelector::ExecuteCommand (const sal_Int32 nCommandId)
{
if (nCommandId == SID_DELETE_MASTER_PAGE)
@@ -251,9 +229,6 @@ void CurrentMasterPagesSelector::ExecuteCommand (const sal_Int32 nCommandId)
MasterPagesSelector::ExecuteCommand(nCommandId);
}
-
-
-
void CurrentMasterPagesSelector::ProcessPopupMenu (Menu& rMenu)
{
// Disable the SID_DELTE_MASTER slot when there is only one master page.
@@ -275,11 +250,6 @@ void CurrentMasterPagesSelector::ProcessPopupMenu (Menu& rMenu)
MasterPagesSelector::ProcessPopupMenu(rMenu);
}
-
-
-
-
-
IMPL_LINK(CurrentMasterPagesSelector,EventMultiplexerListener,
sd::tools::EventMultiplexerEvent*,pEvent)
{
diff --git a/sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx b/sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx
index 8ff1455a5432..d233980ab0a6 100644
--- a/sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx
+++ b/sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx
@@ -25,13 +25,10 @@
namespace cssu = ::com::sun::star::uno;
-
namespace sd { namespace tools { class EventMultiplexerEvent; } }
-
namespace sd { namespace sidebar {
-
/** Show the master pages currently used by a SdDrawDocument.
*/
class CurrentMasterPagesSelector
diff --git a/sd/source/ui/sidebar/CustomAnimationPanel.cxx b/sd/source/ui/sidebar/CustomAnimationPanel.cxx
index 56a425e782ed..c0ed23cc4bcf 100644
--- a/sd/source/ui/sidebar/CustomAnimationPanel.cxx
+++ b/sd/source/ui/sidebar/CustomAnimationPanel.cxx
@@ -24,7 +24,6 @@
namespace sd { namespace sidebar {
-
CustomAnimationPanel::CustomAnimationPanel (
::Window* pParentWindow,
ViewShellBase& rViewShellBase,
@@ -40,16 +39,10 @@ CustomAnimationPanel::CustomAnimationPanel (
#endif
}
-
-
-
CustomAnimationPanel::~CustomAnimationPanel (void)
{
}
-
-
-
::Window* CustomAnimationPanel::CreateWrappedControl (
::Window* pParentWindow,
ViewShellBase& rViewShellBase)
@@ -57,9 +50,6 @@ CustomAnimationPanel::~CustomAnimationPanel (void)
return createCustomAnimationPanel(pParentWindow, rViewShellBase, mxFrame);
}
-
-
-
css::ui::LayoutSize CustomAnimationPanel::GetHeightForWidth (const sal_Int32 /*nWidth*/)
{
Window *pControl = mpWrappedControl.get();
@@ -67,7 +57,6 @@ css::ui::LayoutSize CustomAnimationPanel::GetHeightForWidth (const sal_Int32 /*n
return css::ui::LayoutSize(nMinimumHeight,-1, nMinimumHeight);
}
-
} } // end of namespace sd::sidebar
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/sidebar/DocumentHelper.cxx b/sd/source/ui/sidebar/DocumentHelper.cxx
index a96b55c49c2d..0b59b8330edf 100644
--- a/sd/source/ui/sidebar/DocumentHelper.cxx
+++ b/sd/source/ui/sidebar/DocumentHelper.cxx
@@ -87,7 +87,6 @@ SdPage* DocumentHelper::CopyMasterPageToLocalDocument (
if (pNotesMasterPage == NULL)
break;
-
// Check if a master page with the same name as that of the given
// master page already exists.
bool bPageExists (false);
@@ -155,9 +154,6 @@ SdPage* DocumentHelper::CopyMasterPageToLocalDocument (
return pNewMasterPage;
}
-
-
-
SdPage* DocumentHelper::GetSlideForMasterPage (SdPage* pMasterPage)
{
SdPage* pCandidate = NULL;
@@ -204,9 +200,6 @@ SdPage* DocumentHelper::GetSlideForMasterPage (SdPage* pMasterPage)
return pCandidate;
}
-
-
-
SdPage* DocumentHelper::AddMasterPage (
SdDrawDocument& rTargetDocument,
SdPage* pMasterPage)
@@ -253,9 +246,6 @@ SdPage* DocumentHelper::AddMasterPage (
return pClonedMasterPage;
}
-
-
-
void DocumentHelper::ProvideStyles (
SdDrawDocument& rSourceDocument,
SdDrawDocument& rTargetDocument,
@@ -294,9 +284,6 @@ void DocumentHelper::ProvideStyles (
}
}
-
-
-
void DocumentHelper::AssignMasterPageToPageList (
SdDrawDocument& rTargetDocument,
SdPage* pMasterPage,
@@ -354,9 +341,6 @@ void DocumentHelper::AssignMasterPageToPageList (
pUndoMgr->LeaveListAction();
}
-
-
-
SdPage* DocumentHelper::AddMasterPage (
SdDrawDocument& rTargetDocument,
SdPage* pMasterPage,
@@ -400,9 +384,6 @@ SdPage* DocumentHelper::AddMasterPage (
return pClonedMasterPage;
}
-
-
-
/** In here we have to handle three cases:
1. pPage is a normal slide. We can use SetMasterPage to assign the
master pages to it.
@@ -483,9 +464,6 @@ void DocumentHelper::AssignMasterPageToPage (
}
}
-
-
-
SdPage* DocumentHelper::ProvideMasterPage (
SdDrawDocument& rTargetDocument,
SdPage* pMasterPage,
@@ -565,10 +543,6 @@ SdPage* DocumentHelper::ProvideMasterPage (
return pMasterPageInDocument;
}
-
-
-
-
} } // end of namespace sd::sidebar
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/sidebar/DocumentHelper.hxx b/sd/source/ui/sidebar/DocumentHelper.hxx
index c243127595fd..0c457b209dc6 100644
--- a/sd/source/ui/sidebar/DocumentHelper.hxx
+++ b/sd/source/ui/sidebar/DocumentHelper.hxx
@@ -101,7 +101,6 @@ private:
SdPage* pPage);
};
-
} } // end of namespace sd::sidebar
#endif
diff --git a/sd/source/ui/sidebar/IDisposable.hxx b/sd/source/ui/sidebar/IDisposable.hxx
index a03533e3719a..ef68ac282788 100644
--- a/sd/source/ui/sidebar/IDisposable.hxx
+++ b/sd/source/ui/sidebar/IDisposable.hxx
@@ -26,7 +26,6 @@ class Window;
namespace sd { namespace sidebar {
-
class IDisposable
{
public:
@@ -34,7 +33,6 @@ public:
virtual ~IDisposable();
};
-
} } // end of namespace ::sd::sidebar
#endif
diff --git a/sd/source/ui/sidebar/ISidebarReceiver.hxx b/sd/source/ui/sidebar/ISidebarReceiver.hxx
index aa15c6d93a84..2c5867391981 100644
--- a/sd/source/ui/sidebar/ISidebarReceiver.hxx
+++ b/sd/source/ui/sidebar/ISidebarReceiver.hxx
@@ -23,7 +23,6 @@
namespace sd { namespace sidebar {
-
class ISidebarReceiver
{
public:
@@ -32,7 +31,6 @@ public:
virtual ~ISidebarReceiver();
};
-
} } // end of namespace ::sd::sidebar
#endif
diff --git a/sd/source/ui/sidebar/LayoutMenu.cxx b/sd/source/ui/sidebar/LayoutMenu.cxx
index 7bd90a03ccaa..a6fa641cbd0f 100644
--- a/sd/source/ui/sidebar/LayoutMenu.cxx
+++ b/sd/source/ui/sidebar/LayoutMenu.cxx
@@ -65,8 +65,6 @@ using ::sd::framework::FrameworkHelper;
namespace sd { namespace sidebar {
-
-
struct snewfoil_value_info
{
sal_uInt16 mnBmpResId;
@@ -122,9 +120,6 @@ static const snewfoil_value_info standard[] =
{0, 0, WritingMode_LR_TB, AUTOLAYOUT_NONE}
};
-
-
-
LayoutMenu::LayoutMenu (
::Window* pParent,
ViewShellBase& rViewShellBase,
@@ -154,9 +149,6 @@ LayoutMenu::LayoutMenu (
#endif
}
-
-
-
void LayoutMenu::implConstruct( DrawDocShell& rDocumentShell )
{
OSL_ENSURE( mrBase.GetDocument()->GetDocSh() == &rDocumentShell,
@@ -200,18 +192,12 @@ void LayoutMenu::implConstruct( DrawDocShell& rDocumentShell )
GetParent()->AddEventListener(aWindowEventHandlerLink);
}
-
-
-
LayoutMenu::~LayoutMenu (void)
{
OSL_TRACE("destroying LayoutMenu at %x", this);
Dispose();
}
-
-
-
void LayoutMenu::Dispose (void)
{
if (mbIsDisposed)
@@ -233,9 +219,6 @@ void LayoutMenu::Dispose (void)
GetParent()->RemoveEventListener(aWindowEventHandlerLink);
}
-
-
-
AutoLayout LayoutMenu::GetSelectedAutoLayout (void)
{
AutoLayout aResult = AUTOLAYOUT_NONE;
@@ -273,9 +256,6 @@ ui::LayoutSize LayoutMenu::GetHeightForWidth (const sal_Int32 nWidth)
return ui::LayoutSize(nPreferredHeight,nPreferredHeight,nPreferredHeight);
}
-
-
-
void LayoutMenu::Paint (const Rectangle& rRect)
{
if (mbSelectionUpdatePending)
@@ -286,9 +266,6 @@ void LayoutMenu::Paint (const Rectangle& rRect)
ValueSet::Paint (rRect);
}
-
-
-
void LayoutMenu::Resize (void)
{
Size aWindowSize = GetOutputSizePixel();
@@ -318,9 +295,6 @@ void LayoutMenu::Resize (void)
ValueSet::Resize ();
}
-
-
-
void LayoutMenu::MouseButtonDown (const MouseEvent& rEvent)
{
// As a preparation for the context menu the item under the mouse is
@@ -336,9 +310,6 @@ void LayoutMenu::MouseButtonDown (const MouseEvent& rEvent)
ValueSet::MouseButtonDown (rEvent);
}
-
-
-
void LayoutMenu::InsertPageWithLayout (AutoLayout aLayout)
{
ViewShell* pViewShell = mrBase.GetMainViewShell().get();
@@ -366,9 +337,6 @@ void LayoutMenu::InsertPageWithLayout (AutoLayout aLayout)
UpdateSelection();
}
-
-
-
void LayoutMenu::InvalidateContent (void)
{
// Throw away the current set and fill the menu anew according to the
@@ -379,9 +347,6 @@ void LayoutMenu::InvalidateContent (void)
mxSidebar->requestLayout();
}
-
-
-
int LayoutMenu::CalculateRowCount (const Size&, int nColumnCount)
{
int nRowCount = 0;
@@ -397,18 +362,12 @@ int LayoutMenu::CalculateRowCount (const Size&, int nColumnCount)
return nRowCount;
}
-
-
-
IMPL_LINK_NOARG(LayoutMenu, ClickHandler)
{
AssignLayoutToSelectedSlides (GetSelectedAutoLayout());
return 0;
}
-
-
-
/** The specified layout is assigned to the current page of the view shell
in the center pane.
*/
@@ -478,7 +437,6 @@ void LayoutMenu::AssignLayoutToSelectedSlides (AutoLayout aLayout)
pPageSelection->push_back(pMainViewShell->GetActualPage());
}
-
if (pPageSelection->empty())
break;
@@ -498,9 +456,6 @@ void LayoutMenu::AssignLayoutToSelectedSlides (AutoLayout aLayout)
while(false);
}
-
-
-
SfxRequest LayoutMenu::CreateRequest (
sal_uInt16 nSlotId,
AutoLayout aLayout)
@@ -538,9 +493,6 @@ SfxRequest LayoutMenu::CreateRequest (
return aRequest;
}
-
-
-
void LayoutMenu::Fill (void)
{
SvtLanguageOptions aLanguageOptions;
@@ -607,9 +559,6 @@ void LayoutMenu::Fill (void)
mbSelectionUpdatePending = true;
}
-
-
-
void LayoutMenu::Clear (void)
{
for (sal_uInt16 nId=1; nId<=GetItemCount(); nId++)
@@ -617,31 +566,20 @@ void LayoutMenu::Clear (void)
ValueSet::Clear();
}
-
-
void LayoutMenu::StartDrag (sal_Int8 , const Point& )
{
}
-
-
-
sal_Int8 LayoutMenu::AcceptDrop (const AcceptDropEvent& )
{
return 0;
}
-
-
-
sal_Int8 LayoutMenu::ExecuteDrop (const ExecuteDropEvent& )
{
return 0;
}
-
-
-
void LayoutMenu::Command (const CommandEvent& rEvent)
{
switch (rEvent.GetCommand())
@@ -692,18 +630,12 @@ void LayoutMenu::Command (const CommandEvent& rEvent)
}
}
-
-
-
IMPL_LINK_NOARG(LayoutMenu, StateChangeHandler)
{
InvalidateContent();
return 0;
}
-
-
-
IMPL_LINK(LayoutMenu, OnMenuItemSelected, Menu*, pMenu)
{
if (pMenu == NULL)
@@ -729,9 +661,6 @@ IMPL_LINK(LayoutMenu, OnMenuItemSelected, Menu*, pMenu)
return 0;
}
-
-
-
void LayoutMenu::UpdateSelection (void)
{
bool bItemSelected = false;
@@ -771,9 +700,6 @@ void LayoutMenu::UpdateSelection (void)
SetNoSelection();
}
-
-
-
IMPL_LINK(LayoutMenu, EventMultiplexerListener, ::sd::tools::EventMultiplexerEvent*, pEvent)
{
switch (pEvent->meEventId)
@@ -808,9 +734,6 @@ IMPL_LINK(LayoutMenu, EventMultiplexerListener, ::sd::tools::EventMultiplexerEve
return 0;
}
-
-
-
IMPL_LINK(LayoutMenu, WindowEventHandler, VclWindowEvent*, pEvent)
{
if (pEvent != NULL)
@@ -830,9 +753,6 @@ IMPL_LINK(LayoutMenu, WindowEventHandler, VclWindowEvent*, pEvent)
return sal_False;
}
-
-
-
void LayoutMenu::DataChanged (const DataChangedEvent& rEvent)
{
Fill();
@@ -841,10 +761,6 @@ void LayoutMenu::DataChanged (const DataChangedEvent& rEvent)
SetColor(sfx2::sidebar::Theme::GetColor(sfx2::sidebar::Theme::Paint_PanelBackground));
}
-
-
-
-
} } // end of namespace ::sd::sidebar
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/sidebar/LayoutMenu.hxx b/sd/source/ui/sidebar/LayoutMenu.hxx
index cdbb0221c99a..d6b61a26b098 100644
--- a/sd/source/ui/sidebar/LayoutMenu.hxx
+++ b/sd/source/ui/sidebar/LayoutMenu.hxx
@@ -45,18 +45,15 @@ class DrawDocShell;
class ViewShellBase;
}
-
namespace sd { namespace tools {
class EventMultiplexerEvent;
} }
-
namespace sd { namespace sidebar {
class ControlFactory;
class SidebarViewShell;
-
class LayoutMenu
: public ValueSet,
public DragSourceHelper,
diff --git a/sd/source/ui/sidebar/MasterPageContainer.cxx b/sd/source/ui/sidebar/MasterPageContainer.cxx
index 8dfc1b807dc3..657e0217b6d1 100644
--- a/sd/source/ui/sidebar/MasterPageContainer.cxx
+++ b/sd/source/ui/sidebar/MasterPageContainer.cxx
@@ -64,10 +64,8 @@ typedef ::std::vector<sd::sidebar::SharedMasterPageDescriptor> MasterPageContain
} // end of anonymous namespace
-
namespace sd { namespace sidebar {
-
/** Inner implementation class of the MasterPageContainer.
*/
class MasterPageContainer::Implementation
@@ -178,9 +176,6 @@ private:
void CleanContainer (void);
};
-
-
-
//===== MasterPageContainer ===================================================
::boost::weak_ptr<MasterPageContainer::Implementation>
@@ -220,9 +215,6 @@ private:
return pInstance;
}
-
-
-
MasterPageContainer::MasterPageContainer (void)
: mpImpl(Implementation::Instance()),
mePreviewSize(SMALL)
@@ -230,32 +222,20 @@ MasterPageContainer::MasterPageContainer (void)
mpImpl->LateInit();
}
-
-
-
MasterPageContainer::~MasterPageContainer (void)
{
}
-
-
-
void MasterPageContainer::AddChangeListener (const Link& rLink)
{
mpImpl->AddChangeListener(rLink);
}
-
-
-
void MasterPageContainer::RemoveChangeListener (const Link& rLink)
{
mpImpl->RemoveChangeListener(rLink);
}
-
-
-
void MasterPageContainer::SetPreviewSize (PreviewSize eSize)
{
mePreviewSize = eSize;
@@ -264,30 +244,17 @@ void MasterPageContainer::SetPreviewSize (PreviewSize eSize)
NIL_TOKEN);
}
-
-
-
-
-
-
-
Size MasterPageContainer::GetPreviewSizePixel (void) const
{
return mpImpl->GetPreviewSizePixel(mePreviewSize);
}
-
-
-
MasterPageContainer::Token MasterPageContainer::PutMasterPage (
const SharedMasterPageDescriptor& rDescriptor)
{
return mpImpl->PutMasterPage(rDescriptor);
}
-
-
-
void MasterPageContainer::AcquireToken (Token aToken)
{
SharedMasterPageDescriptor pDescriptor = mpImpl->GetDescriptor(aToken);
@@ -297,9 +264,6 @@ void MasterPageContainer::AcquireToken (Token aToken)
}
}
-
-
-
void MasterPageContainer::ReleaseToken (Token aToken)
{
SharedMasterPageDescriptor pDescriptor = mpImpl->GetDescriptor(aToken);
@@ -324,9 +288,6 @@ void MasterPageContainer::ReleaseToken (Token aToken)
}
}
-
-
-
int MasterPageContainer::GetTokenCount (void) const
{
const ::osl::MutexGuard aGuard (mpImpl->maMutex);
@@ -334,9 +295,6 @@ int MasterPageContainer::GetTokenCount (void) const
return mpImpl->maContainer.size();
}
-
-
-
bool MasterPageContainer::HasToken (Token aToken) const
{
const ::osl::MutexGuard aGuard (mpImpl->maMutex);
@@ -344,9 +302,6 @@ bool MasterPageContainer::HasToken (Token aToken) const
return mpImpl->HasToken(aToken);
}
-
-
-
MasterPageContainer::Token MasterPageContainer::GetTokenForIndex (int nIndex)
{
const ::osl::MutexGuard aGuard (mpImpl->maMutex);
@@ -357,9 +312,6 @@ MasterPageContainer::Token MasterPageContainer::GetTokenForIndex (int nIndex)
return aResult;
}
-
-
-
MasterPageContainer::Token MasterPageContainer::GetTokenForURL (
const OUString& sURL)
{
@@ -379,9 +331,6 @@ MasterPageContainer::Token MasterPageContainer::GetTokenForURL (
return aResult;
}
-
-
-
MasterPageContainer::Token MasterPageContainer::GetTokenForStyleName (const OUString& sStyleName)
{
const ::osl::MutexGuard aGuard (mpImpl->maMutex);
@@ -400,9 +349,6 @@ MasterPageContainer::Token MasterPageContainer::GetTokenForStyleName (const OUSt
return aResult;
}
-
-
-
MasterPageContainer::Token MasterPageContainer::GetTokenForPageObject (
const SdPage* pPage)
{
@@ -422,9 +368,6 @@ MasterPageContainer::Token MasterPageContainer::GetTokenForPageObject (
return aResult;
}
-
-
-
OUString MasterPageContainer::GetURLForToken (
MasterPageContainer::Token aToken)
{
@@ -437,9 +380,6 @@ OUString MasterPageContainer::GetURLForToken (
return OUString();
}
-
-
-
OUString MasterPageContainer::GetPageNameForToken (
MasterPageContainer::Token aToken)
{
@@ -452,9 +392,6 @@ OUString MasterPageContainer::GetPageNameForToken (
return OUString();
}
-
-
-
OUString MasterPageContainer::GetStyleNameForToken (
MasterPageContainer::Token aToken)
{
@@ -467,9 +404,6 @@ OUString MasterPageContainer::GetStyleNameForToken (
return OUString();
}
-
-
-
SdPage* MasterPageContainer::GetPageObjectForToken (
MasterPageContainer::Token aToken,
bool bLoad)
@@ -495,9 +429,6 @@ SdPage* MasterPageContainer::GetPageObjectForToken (
return pPageObject;
}
-
-
-
MasterPageContainer::Origin MasterPageContainer::GetOriginForToken (Token aToken)
{
const ::osl::MutexGuard aGuard (mpImpl->maMutex);
@@ -509,9 +440,6 @@ MasterPageContainer::Origin MasterPageContainer::GetOriginForToken (Token aToken
return UNKNOWN;
}
-
-
-
sal_Int32 MasterPageContainer::GetTemplateIndexForToken (Token aToken)
{
const ::osl::MutexGuard aGuard (mpImpl->maMutex);
@@ -523,9 +451,6 @@ sal_Int32 MasterPageContainer::GetTemplateIndexForToken (Token aToken)
return -1;
}
-
-
-
SharedMasterPageDescriptor MasterPageContainer::GetDescriptorForToken (
MasterPageContainer::Token aToken)
{
@@ -534,40 +459,26 @@ SharedMasterPageDescriptor MasterPageContainer::GetDescriptorForToken (
return mpImpl->GetDescriptor(aToken);
}
-
-
void MasterPageContainer::InvalidatePreview (MasterPageContainer::Token aToken)
{
mpImpl->InvalidatePreview(aToken);
}
-
-
-
Image MasterPageContainer::GetPreviewForToken (MasterPageContainer::Token aToken)
{
return mpImpl->GetPreviewForToken(aToken,mePreviewSize);
}
-
-
-
MasterPageContainer::PreviewState MasterPageContainer::GetPreviewState (Token aToken)
{
return mpImpl->GetPreviewState(aToken);
}
-
-
-
bool MasterPageContainer::RequestPreview (Token aToken)
{
return mpImpl->RequestPreview(aToken);
}
-
-
-
//==== Implementation ================================================
MasterPageContainer::Implementation::Implementation (void)
@@ -592,9 +503,6 @@ MasterPageContainer::Implementation::Implementation (void)
UpdatePreviewSizePixel();
}
-
-
-
MasterPageContainer::Implementation::~Implementation (void)
{
// When the initializer or filler tasks are still running then we have
@@ -617,9 +525,6 @@ MasterPageContainer::Implementation::~Implementation (void)
mxModel = NULL;
}
-
-
-
void MasterPageContainer::Implementation::LateInit (void)
{
const ::osl::MutexGuard aGuard (maMutex);
@@ -641,9 +546,6 @@ void MasterPageContainer::Implementation::LateInit (void)
}
}
-
-
-
void MasterPageContainer::Implementation::AddChangeListener (const Link& rLink)
{
const ::osl::MutexGuard aGuard (maMutex);
@@ -655,9 +557,6 @@ void MasterPageContainer::Implementation::AddChangeListener (const Link& rLink)
}
-
-
-
void MasterPageContainer::Implementation::RemoveChangeListener (const Link& rLink)
{
const ::osl::MutexGuard aGuard (maMutex);
@@ -668,9 +567,6 @@ void MasterPageContainer::Implementation::RemoveChangeListener (const Link& rLin
maChangeListeners.erase(iListener);
}
-
-
-
void MasterPageContainer::Implementation::UpdatePreviewSizePixel (void)
{
const ::osl::MutexGuard aGuard (maMutex);
@@ -712,9 +608,6 @@ void MasterPageContainer::Implementation::UpdatePreviewSizePixel (void)
}
}
-
-
-
Size MasterPageContainer::Implementation::GetPreviewSizePixel (PreviewSize eSize) const
{
if (eSize == SMALL)
@@ -723,9 +616,6 @@ Size MasterPageContainer::Implementation::GetPreviewSizePixel (PreviewSize eSize
return maLargePreviewSizePixel;
}
-
-
-
IMPL_LINK(MasterPageContainer::Implementation,AsynchronousNotifyCallback, EventData*, pData)
{
const ::osl::MutexGuard aGuard (maMutex);
@@ -739,9 +629,6 @@ IMPL_LINK(MasterPageContainer::Implementation,AsynchronousNotifyCallback, EventD
return 0;
}
-
-
-
MasterPageContainer::Token MasterPageContainer::Implementation::PutMasterPage (
const SharedMasterPageDescriptor& rpDescriptor)
{
@@ -819,9 +706,6 @@ MasterPageContainer::Token MasterPageContainer::Implementation::PutMasterPage (
return aResult;
}
-
-
-
bool MasterPageContainer::Implementation::HasToken (Token aToken) const
{
return aToken>=0
@@ -829,9 +713,6 @@ bool MasterPageContainer::Implementation::HasToken (Token aToken) const
&& maContainer[aToken].get()!=NULL;
}
-
-
-
const SharedMasterPageDescriptor MasterPageContainer::Implementation::GetDescriptor (
Token aToken) const
{
@@ -841,9 +722,6 @@ const SharedMasterPageDescriptor MasterPageContainer::Implementation::GetDescrip
return SharedMasterPageDescriptor();
}
-
-
-
SharedMasterPageDescriptor MasterPageContainer::Implementation::GetDescriptor (Token aToken)
{
if (aToken>=0 && (unsigned)aToken<maContainer.size())
@@ -852,9 +730,6 @@ SharedMasterPageDescriptor MasterPageContainer::Implementation::GetDescriptor (T
return SharedMasterPageDescriptor();
}
-
-
-
void MasterPageContainer::Implementation::InvalidatePreview (Token aToken)
{
const ::osl::MutexGuard aGuard (maMutex);
@@ -868,9 +743,6 @@ void MasterPageContainer::Implementation::InvalidatePreview (Token aToken)
}
}
-
-
-
Image MasterPageContainer::Implementation::GetPreviewForToken (
MasterPageContainer::Token aToken,
PreviewSize ePreviewSize)
@@ -924,9 +796,6 @@ Image MasterPageContainer::Implementation::GetPreviewForToken (
return aPreview;
}
-
-
-
MasterPageContainer::PreviewState MasterPageContainer::Implementation::GetPreviewState (
Token aToken) const
{
@@ -955,9 +824,6 @@ MasterPageContainer::PreviewState MasterPageContainer::Implementation::GetPrevie
return eState;
}
-
-
-
bool MasterPageContainer::Implementation::RequestPreview (Token aToken)
{
SharedMasterPageDescriptor pDescriptor = GetDescriptor(aToken);
@@ -967,9 +833,6 @@ bool MasterPageContainer::Implementation::RequestPreview (Token aToken)
return false;
}
-
-
-
Reference<frame::XModel> MasterPageContainer::Implementation::GetModel (void)
{
const ::osl::MutexGuard aGuard (maMutex);
@@ -1022,18 +885,12 @@ Reference<frame::XModel> MasterPageContainer::Implementation::GetModel (void)
return mxModel;
}
-
-
-
SdDrawDocument* MasterPageContainer::Implementation::GetDocument (void)
{
GetModel();
return mpDocument;
}
-
-
-
Image MasterPageContainer::Implementation::GetPreviewSubstitution (
sal_uInt16 nId,
PreviewSize ePreviewSize)
@@ -1078,9 +935,6 @@ Image MasterPageContainer::Implementation::GetPreviewSubstitution (
return aPreview;
}
-
-
-
void MasterPageContainer::Implementation::CleanContainer (void)
{
// Remove the empty elements at the end of the container. The empty
@@ -1092,9 +946,6 @@ void MasterPageContainer::Implementation::CleanContainer (void)
maContainer.resize(++nIndex);
}
-
-
-
void MasterPageContainer::Implementation::FireContainerChange (
MasterPageContainerChangeEvent::EventType eType,
Token aToken,
@@ -1118,9 +969,6 @@ void MasterPageContainer::Implementation::FireContainerChange (
}
}
-
-
-
bool MasterPageContainer::Implementation::UpdateDescriptor (
const SharedMasterPageDescriptor& rpDescriptor,
bool bForcePageObject,
@@ -1172,9 +1020,6 @@ bool MasterPageContainer::Implementation::UpdateDescriptor (
return nPageObjectModified || bPreviewModified;
}
-
-
-
void MasterPageContainer::Implementation::ReleaseDescriptor (Token aToken)
{
if (aToken>=0 && (unsigned)aToken<maContainer.size())
@@ -1184,16 +1029,11 @@ void MasterPageContainer::Implementation::ReleaseDescriptor (Token aToken)
}
}
-
-
-
void MasterPageContainer::Implementation::FillingDone (void)
{
mpRequestQueue->ProcessAllRequests();
}
-
-
} } // end of namespace sd::sidebar
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/sidebar/MasterPageContainer.hxx b/sd/source/ui/sidebar/MasterPageContainer.hxx
index 692815a0b4ba..4ed2d90bb6d9 100644
--- a/sd/source/ui/sidebar/MasterPageContainer.hxx
+++ b/sd/source/ui/sidebar/MasterPageContainer.hxx
@@ -164,9 +164,6 @@ private:
static BitmapEx LoadPreviewFromURL (const OUString& aURL);
};
-
-
-
/** For some changes to the set of master pages in a MasterPageContainer or
to the data stored for each master page one or more events are sent to
registered listeners.
@@ -198,7 +195,6 @@ public:
MasterPageContainer::Token maChildToken;
};
-
} } // end of namespace sd::sidebar
#endif
diff --git a/sd/source/ui/sidebar/MasterPageContainerFiller.cxx b/sd/source/ui/sidebar/MasterPageContainerFiller.cxx
index a33c86d86195..49fba6dbfc06 100644
--- a/sd/source/ui/sidebar/MasterPageContainerFiller.cxx
+++ b/sd/source/ui/sidebar/MasterPageContainerFiller.cxx
@@ -26,7 +26,6 @@
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
-
namespace sd { namespace sidebar {
MasterPageContainerFiller::MasterPageContainerFiller (ContainerAdapter& rpAdapter)
@@ -52,16 +51,10 @@ MasterPageContainerFiller::MasterPageContainerFiller (ContainerAdapter& rpAdapte
mrContainerAdapter.PutMasterPage(pDescriptor);
}
-
-
-
MasterPageContainerFiller::~MasterPageContainerFiller (void)
{
}
-
-
-
void MasterPageContainerFiller::RunNextStep (void)
{
switch (meState)
@@ -102,9 +95,6 @@ void MasterPageContainerFiller::RunNextStep (void)
}
}
-
-
-
bool MasterPageContainerFiller::HasNextStep (void)
{
switch (meState)
@@ -118,9 +108,6 @@ bool MasterPageContainerFiller::HasNextStep (void)
}
}
-
-
-
MasterPageContainerFiller::State MasterPageContainerFiller::ScanTemplate (void)
{
State eState (ERROR);
@@ -148,9 +135,6 @@ MasterPageContainerFiller::State MasterPageContainerFiller::ScanTemplate (void)
return eState;
}
-
-
-
MasterPageContainerFiller::State MasterPageContainerFiller::AddTemplate (void)
{
if (mpLastAddedEntry != NULL)
@@ -182,8 +166,6 @@ MasterPageContainerFiller::State MasterPageContainerFiller::AddTemplate (void)
return SCAN_TEMPLATE;
}
-
-
} } // end of namespace sd::sidebar
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/sidebar/MasterPageContainerProviders.cxx b/sd/source/ui/sidebar/MasterPageContainerProviders.cxx
index a4abeaeca3b4..c81f74aaeca7 100644
--- a/sd/source/ui/sidebar/MasterPageContainerProviders.cxx
+++ b/sd/source/ui/sidebar/MasterPageContainerProviders.cxx
@@ -38,16 +38,12 @@ using namespace ::com::sun::star::uno;
namespace sd { namespace sidebar {
-
//===== PagePreviewProvider ===================================================
PagePreviewProvider::PagePreviewProvider (void)
{
}
-
-
-
Image PagePreviewProvider::operator () (
int nWidth,
SdPage* pPage,
@@ -69,25 +65,16 @@ Image PagePreviewProvider::operator () (
return aPreview;
}
-
-
-
int PagePreviewProvider::GetCostIndex (void)
{
return 5;
}
-
-
-
bool PagePreviewProvider::NeedsPageObject (void)
{
return true;
}
-
-
-
//===== TemplatePreviewProvider ===============================================
TemplatePreviewProvider::TemplatePreviewProvider (const OUString& rsURL)
@@ -95,9 +82,6 @@ TemplatePreviewProvider::TemplatePreviewProvider (const OUString& rsURL)
{
}
-
-
-
Image TemplatePreviewProvider::operator() (
int nWidth,
SdPage* pPage,
@@ -111,25 +95,16 @@ Image TemplatePreviewProvider::operator() (
return Image(ThumbnailView::readThumbnail(msURL));
}
-
-
-
int TemplatePreviewProvider::GetCostIndex (void)
{
return 10;
}
-
-
-
bool TemplatePreviewProvider::NeedsPageObject (void)
{
return false;
}
-
-
-
//===== TemplatePageObjectProvider =============================================
TemplatePageObjectProvider::TemplatePageObjectProvider (const OUString& rsURL)
@@ -138,9 +113,6 @@ TemplatePageObjectProvider::TemplatePageObjectProvider (const OUString& rsURL)
{
}
-
-
-
SdPage* TemplatePageObjectProvider::operator() (SdDrawDocument* pContainerDocument)
{
// Unused parameters.
@@ -177,9 +149,6 @@ SdPage* TemplatePageObjectProvider::operator() (SdDrawDocument* pContainerDocume
return pPage;
}
-
-
-
::sd::DrawDocShell* TemplatePageObjectProvider::LoadDocument (const OUString& sFileName)
{
SfxApplication* pSfxApp = SFX_APP();
@@ -194,17 +163,11 @@ SdPage* TemplatePageObjectProvider::operator() (SdDrawDocument* pContainerDocume
return PTR_CAST(::sd::DrawDocShell,pShell);
}
-
-
-
int TemplatePageObjectProvider::GetCostIndex (void)
{
return 20;
}
-
-
-
bool TemplatePageObjectProvider::operator== (const PageObjectProvider& rProvider)
{
const TemplatePageObjectProvider* pTemplatePageObjectProvider
@@ -215,18 +178,12 @@ bool TemplatePageObjectProvider::operator== (const PageObjectProvider& rProvider
return false;
}
-
-
-
//===== DefaultPageObjectProvider ==============================================
DefaultPageObjectProvider::DefaultPageObjectProvider (void)
{
}
-
-
-
SdPage* DefaultPageObjectProvider::operator () (SdDrawDocument* pContainerDocument)
{
SdPage* pLocalMasterPage = NULL;
@@ -246,25 +203,16 @@ SdPage* DefaultPageObjectProvider::operator () (SdDrawDocument* pContainerDocume
return pLocalMasterPage;
}
-
-
-
int DefaultPageObjectProvider::GetCostIndex (void)
{
return 15;
}
-
-
-
bool DefaultPageObjectProvider::operator== (const PageObjectProvider& rProvider)
{
return (dynamic_cast<const DefaultPageObjectProvider*>(&rProvider) != NULL);
}
-
-
-
//===== ExistingPageProvider ==================================================
ExistingPageProvider::ExistingPageProvider (SdPage* pPage)
@@ -272,9 +220,6 @@ ExistingPageProvider::ExistingPageProvider (SdPage* pPage)
{
}
-
-
-
SdPage* ExistingPageProvider::operator() (SdDrawDocument* pDocument)
{
(void)pDocument; // Unused parameter.
@@ -282,17 +227,11 @@ SdPage* ExistingPageProvider::operator() (SdDrawDocument* pDocument)
return mpPage;
}
-
-
-
int ExistingPageProvider::GetCostIndex (void)
{
return 0;
}
-
-
-
bool ExistingPageProvider::operator== (const PageObjectProvider& rProvider)
{
const ExistingPageProvider* pExistingPageProvider
@@ -303,7 +242,6 @@ bool ExistingPageProvider::operator== (const PageObjectProvider& rProvider)
return false;
}
-
} } // end of namespace sd::sidebar
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/sidebar/MasterPageContainerProviders.hxx b/sd/source/ui/sidebar/MasterPageContainerProviders.hxx
index aa4b91160ec4..7fc367ebe30b 100644
--- a/sd/source/ui/sidebar/MasterPageContainerProviders.hxx
+++ b/sd/source/ui/sidebar/MasterPageContainerProviders.hxx
@@ -29,10 +29,8 @@ class SdPage;
namespace sd { class PreviewRenderer; }
namespace sd { class DrawDocShell; }
-
namespace sd { namespace sidebar {
-
/** Interface for a provider of page objects. It is used by the
MasterPageDescriptor to create master page objects on demand.
*/
@@ -62,9 +60,6 @@ protected:
~PageObjectProvider() {}
};
-
-
-
class PreviewProvider
{
public:
@@ -99,9 +94,6 @@ protected:
~PreviewProvider() {}
};
-
-
-
/** Provide previews of existing page objects by rendering them.
*/
class PagePreviewProvider : public PreviewProvider
@@ -115,9 +107,6 @@ public:
private:
};
-
-
-
/** Provide master page objects for template documents for which only the
URL is given.
*/
@@ -135,9 +124,6 @@ private:
::sd::DrawDocShell* LoadDocument (const OUString& sFileName);
};
-
-
-
/** Provide previews for template documents by loading the thumbnails from
the documents.
*/
@@ -153,9 +139,6 @@ private:
OUString msURL;
};
-
-
-
/** Create an empty default master page.
*/
class DefaultPageObjectProvider : public PageObjectProvider
@@ -168,8 +151,6 @@ public:
virtual bool operator== (const PageObjectProvider& rProvider) SAL_OVERRIDE;
};
-
-
/** This implementation of the PageObjectProvider simply returns an already
existing master page object.
*/
diff --git a/sd/source/ui/sidebar/MasterPageContainerQueue.cxx b/sd/source/ui/sidebar/MasterPageContainerQueue.cxx
index 36015378092f..6841211049b2 100644
--- a/sd/source/ui/sidebar/MasterPageContainerQueue.cxx
+++ b/sd/source/ui/sidebar/MasterPageContainerQueue.cxx
@@ -70,9 +70,6 @@ public:
};
};
-
-
-
//===== MasterPageContainerQueue::RequestQueue ================================
class MasterPageContainerQueue::RequestQueue
@@ -82,9 +79,6 @@ public:
RequestQueue (void) {}
};
-
-
-
//===== MasterPageContainerQueue ==============================================
MasterPageContainerQueue* MasterPageContainerQueue::Create (
@@ -95,9 +89,6 @@ MasterPageContainerQueue* MasterPageContainerQueue::Create (
return pQueue;
}
-
-
-
MasterPageContainerQueue::MasterPageContainerQueue (
const ::boost::weak_ptr<ContainerAdapter>& rpContainer)
: mpWeakContainer(rpContainer),
@@ -107,9 +98,6 @@ MasterPageContainerQueue::MasterPageContainerQueue (
{
}
-
-
-
MasterPageContainerQueue::~MasterPageContainerQueue (void)
{
maDelayedPreviewCreationTimer.Stop();
@@ -117,9 +105,6 @@ MasterPageContainerQueue::~MasterPageContainerQueue (void)
mpRequestQueue->erase(mpRequestQueue->begin());
}
-
-
-
void MasterPageContainerQueue::LateInit (void)
{
// Set up the timer for the delayed creation of preview bitmaps.
@@ -128,9 +113,6 @@ void MasterPageContainerQueue::LateInit (void)
maDelayedPreviewCreationTimer.SetTimeoutHdl(aLink);
}
-
-
-
bool MasterPageContainerQueue::RequestPreview (const SharedMasterPageDescriptor& rpDescriptor)
{
bool bSuccess (false);
@@ -164,9 +146,6 @@ bool MasterPageContainerQueue::RequestPreview (const SharedMasterPageDescriptor&
return bSuccess;
}
-
-
-
sal_Int32 MasterPageContainerQueue::CalculatePriority (
const SharedMasterPageDescriptor& rpDescriptor) const
{
@@ -197,9 +176,6 @@ sal_Int32 MasterPageContainerQueue::CalculatePriority (
return nPriority;
}
-
-
-
IMPL_LINK(MasterPageContainerQueue, DelayedPreviewCreation, Timer*, pTimer)
{
bool bIsShowingFullScreenShow (false);
@@ -263,9 +239,6 @@ IMPL_LINK(MasterPageContainerQueue, DelayedPreviewCreation, Timer*, pTimer)
return 0;
}
-
-
-
bool MasterPageContainerQueue::HasRequest (MasterPageContainer::Token aToken) const
{
RequestQueue::iterator iRequest (::std::find_if(
@@ -275,17 +248,11 @@ bool MasterPageContainerQueue::HasRequest (MasterPageContainer::Token aToken) co
return (iRequest != mpRequestQueue->end());
}
-
-
-
bool MasterPageContainerQueue::IsEmpty (void) const
{
return mpRequestQueue->empty();
}
-
-
-
void MasterPageContainerQueue::ProcessAllRequests (void)
{
snWaitForMoreRequestsCount = 0;
@@ -293,7 +260,6 @@ void MasterPageContainerQueue::ProcessAllRequests (void)
maDelayedPreviewCreationTimer.Start();
}
-
} } // end of namespace sd::sidebar
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/sidebar/MasterPageContainerQueue.hxx b/sd/source/ui/sidebar/MasterPageContainerQueue.hxx
index 5e3afbf208e0..f013acc7da9a 100644
--- a/sd/source/ui/sidebar/MasterPageContainerQueue.hxx
+++ b/sd/source/ui/sidebar/MasterPageContainerQueue.hxx
@@ -28,7 +28,6 @@
namespace sd { namespace sidebar {
-
/** The queue stores and processes all requests from a MasterPageContainer
for the creation of previews.
The order of request processing and its timing is controlled by a
diff --git a/sd/source/ui/sidebar/MasterPageDescriptor.cxx b/sd/source/ui/sidebar/MasterPageDescriptor.cxx
index 973e86485535..d4a18755d5b7 100644
--- a/sd/source/ui/sidebar/MasterPageDescriptor.cxx
+++ b/sd/source/ui/sidebar/MasterPageDescriptor.cxx
@@ -25,7 +25,6 @@
namespace sd { namespace sidebar {
-
//===== MasterPageDescriptor ==================================================
MasterPageDescriptor::MasterPageDescriptor (
@@ -55,9 +54,6 @@ MasterPageDescriptor::MasterPageDescriptor (
{
}
-
-
-
MasterPageDescriptor::MasterPageDescriptor (const MasterPageDescriptor& rDescriptor)
: maToken(rDescriptor.maToken),
meOrigin(rDescriptor.meOrigin),
@@ -77,24 +73,15 @@ MasterPageDescriptor::MasterPageDescriptor (const MasterPageDescriptor& rDescrip
{
}
-
-
-
MasterPageDescriptor::~MasterPageDescriptor (void)
{
}
-
-
-
void MasterPageDescriptor::SetToken (MasterPageContainer::Token aToken)
{
maToken = aToken;
}
-
-
-
Image MasterPageDescriptor::GetPreview (MasterPageContainer::PreviewSize eSize) const
{
if (eSize == MasterPageContainer::SMALL)
@@ -103,8 +90,6 @@ Image MasterPageDescriptor::GetPreview (MasterPageContainer::PreviewSize eSize)
return maLargePreview;
}
-
-
SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<std::vector<MasterPageContainerChangeEvent::EventType> >
MasterPageDescriptor::Update (
@@ -174,8 +159,6 @@ SAL_WNODEPRECATED_DECLARATIONS_PUSH
}
SAL_WNODEPRECATED_DECLARATIONS_POP
-
-
int MasterPageDescriptor::UpdatePageObject (
sal_Int32 nCostThreshold,
SdDrawDocument* pDocument)
@@ -229,9 +212,6 @@ int MasterPageDescriptor::UpdatePageObject (
return nModified;
}
-
-
-
bool MasterPageDescriptor::UpdatePreview (
sal_Int32 nCostThreshold,
const Size& rSmallSize,
@@ -273,9 +253,6 @@ bool MasterPageDescriptor::UpdatePreview (
return bModified;
}
-
-
-
MasterPageDescriptor::URLClassification MasterPageDescriptor::GetURLClassification (void)
{
if (meURLClassification == URLCLASS_UNDETERMINED)
@@ -303,8 +280,6 @@ MasterPageDescriptor::URLClassification MasterPageDescriptor::GetURLClassificati
return meURLClassification;
}
-
-
//===== URLComparator =========================================================
MasterPageDescriptor::URLComparator::URLComparator (const OUString& sURL)
@@ -312,9 +287,6 @@ MasterPageDescriptor::URLComparator::URLComparator (const OUString& sURL)
{
}
-
-
-
bool MasterPageDescriptor::URLComparator::operator() (
const SharedMasterPageDescriptor& rDescriptor)
{
@@ -324,9 +296,6 @@ bool MasterPageDescriptor::URLComparator::operator() (
return rDescriptor->msURL.equals(msURL);
}
-
-
-
// ===== StyleNameComparator ==================================================
MasterPageDescriptor::StyleNameComparator::StyleNameComparator (const OUString& sStyleName)
@@ -334,9 +303,6 @@ MasterPageDescriptor::StyleNameComparator::StyleNameComparator (const OUString&
{
}
-
-
-
bool MasterPageDescriptor::StyleNameComparator::operator() (
const SharedMasterPageDescriptor& rDescriptor)
{
@@ -346,9 +312,6 @@ bool MasterPageDescriptor::StyleNameComparator::operator() (
return rDescriptor->msStyleName.equals(msStyleName);
}
-
-
-
//===== PageObjectComparator ==================================================
MasterPageDescriptor::PageObjectComparator::PageObjectComparator (const SdPage* pPageObject)
@@ -356,9 +319,6 @@ MasterPageDescriptor::PageObjectComparator::PageObjectComparator (const SdPage*
{
}
-
-
-
bool MasterPageDescriptor::PageObjectComparator::operator() (
const SharedMasterPageDescriptor& rDescriptor)
{
@@ -368,9 +328,6 @@ bool MasterPageDescriptor::PageObjectComparator::operator() (
return rDescriptor->mpMasterPage==mpMasterPage;
}
-
-
-
//===== AllComparator =========================================================
MasterPageDescriptor::AllComparator::AllComparator(const SharedMasterPageDescriptor& rDescriptor)
@@ -378,9 +335,6 @@ MasterPageDescriptor::AllComparator::AllComparator(const SharedMasterPageDescrip
{
}
-
-
-
bool MasterPageDescriptor::AllComparator::operator() (const SharedMasterPageDescriptor&rDescriptor)
{
if (rDescriptor.get() == NULL)
@@ -409,7 +363,6 @@ bool MasterPageDescriptor::AllComparator::operator() (const SharedMasterPageDesc
}
}
-
} } // end of namespace sd::sidebar
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/sidebar/MasterPageDescriptor.hxx b/sd/source/ui/sidebar/MasterPageDescriptor.hxx
index 14468b1c990d..28a52ec7a54c 100644
--- a/sd/source/ui/sidebar/MasterPageDescriptor.hxx
+++ b/sd/source/ui/sidebar/MasterPageDescriptor.hxx
@@ -224,10 +224,8 @@ public:
SharedMasterPageDescriptor mpDescriptor;
};
-
};
-
} } // end of namespace sd::sidebar
#endif
diff --git a/sd/source/ui/sidebar/MasterPageObserver.cxx b/sd/source/ui/sidebar/MasterPageObserver.cxx
index 65853925625b..38df5dd28fda 100644
--- a/sd/source/ui/sidebar/MasterPageObserver.cxx
+++ b/sd/source/ui/sidebar/MasterPageObserver.cxx
@@ -29,7 +29,6 @@
#include <osl/doublecheckedlocking.h>
#include <osl/getglobalmutex.hxx>
-
namespace sd {
class MasterPageObserver::Implementation
@@ -91,8 +90,6 @@ private:
MasterPageObserver* MasterPageObserver::Implementation::mpInstance = NULL;
-
-
//===== MasterPageObserver ====================================================
MasterPageObserver& MasterPageObserver::Instance (void)
@@ -120,55 +117,34 @@ MasterPageObserver& MasterPageObserver::Instance (void)
return *Implementation::mpInstance;
}
-
-
-
void MasterPageObserver::RegisterDocument (SdDrawDocument& rDocument)
{
mpImpl->RegisterDocument (rDocument);
}
-
-
-
void MasterPageObserver::UnregisterDocument (SdDrawDocument& rDocument)
{
mpImpl->UnregisterDocument (rDocument);
}
-
-
-
void MasterPageObserver::AddEventListener (const Link& rEventListener)
{
mpImpl->AddEventListener (rEventListener);
}
-
-
-
void MasterPageObserver::RemoveEventListener (const Link& rEventListener)
{
mpImpl->RemoveEventListener (rEventListener);
}
-
-
-
MasterPageObserver::MasterPageObserver (void)
: mpImpl (new Implementation())
{}
-
-
-
MasterPageObserver::~MasterPageObserver (void)
{}
-
-
-
//===== MasterPageObserver::Implementation ====================================
void MasterPageObserver::Implementation::RegisterDocument (
@@ -189,9 +165,6 @@ void MasterPageObserver::Implementation::RegisterDocument (
StartListening (rDocument);
}
-
-
-
void MasterPageObserver::Implementation::UnregisterDocument (
SdDrawDocument& rDocument)
{
@@ -202,9 +175,6 @@ void MasterPageObserver::Implementation::UnregisterDocument (
maUsedMasterPages.erase(aMasterPageDescriptor);
}
-
-
-
void MasterPageObserver::Implementation::AddEventListener (
const Link& rEventListener)
{
@@ -237,9 +207,6 @@ void MasterPageObserver::Implementation::AddEventListener (
}
}
-
-
-
void MasterPageObserver::Implementation::RemoveEventListener (
const Link& rEventListener)
{
@@ -283,9 +250,6 @@ void MasterPageObserver::Implementation::Notify(
}
}
-
-
-
void MasterPageObserver::Implementation::AnalyzeUsedMasterPages (
SdDrawDocument& rDocument)
{
@@ -367,9 +331,6 @@ void MasterPageObserver::Implementation::AnalyzeUsedMasterPages (
}
}
-
-
-
void MasterPageObserver::Implementation::SendEvent (
MasterPageObserverEvent& rEvent)
{
@@ -382,7 +343,6 @@ void MasterPageObserver::Implementation::SendEvent (
}
}
-
} // end of namespace sd
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/sidebar/MasterPagesSelector.cxx b/sd/source/ui/sidebar/MasterPagesSelector.cxx
index ded2f3a028a8..dbff168eca62 100644
--- a/sd/source/ui/sidebar/MasterPagesSelector.cxx
+++ b/sd/source/ui/sidebar/MasterPagesSelector.cxx
@@ -56,14 +56,10 @@
#include <svl/itempool.hxx>
#include <sfx2/sidebar/Theme.hxx>
-
using namespace ::com::sun::star::text;
-
-
namespace sd { namespace sidebar {
-
MasterPagesSelector::MasterPagesSelector (
::Window* pParent,
SdDrawDocument& rDocument,
@@ -102,9 +98,6 @@ MasterPagesSelector::MasterPagesSelector (
mpContainer->AddChangeListener(aChangeListener);
}
-
-
-
MasterPagesSelector::~MasterPagesSelector (void)
{
Clear();
@@ -114,16 +107,10 @@ MasterPagesSelector::~MasterPagesSelector (void)
mpContainer->RemoveChangeListener(aChangeListener);
}
-
-
-
void MasterPagesSelector::LateInit (void)
{
}
-
-
-
sal_Int32 MasterPagesSelector::GetPreferredWidth (sal_Int32 nHeight)
{
const ::osl::MutexGuard aGuard (maMutex);
@@ -131,9 +118,6 @@ sal_Int32 MasterPagesSelector::GetPreferredWidth (sal_Int32 nHeight)
return PreviewValueSet::GetPreferredWidth (nHeight);
}
-
-
-
sal_Int32 MasterPagesSelector::GetPreferredHeight (sal_Int32 nWidth)
{
const ::osl::MutexGuard aGuard (maMutex);
@@ -141,9 +125,6 @@ sal_Int32 MasterPagesSelector::GetPreferredHeight (sal_Int32 nWidth)
return PreviewValueSet::GetPreferredHeight (nWidth);
}
-
-
-
Size MasterPagesSelector::GetPreferredSize (void)
{
int nPreferredWidth = GetPreferredWidth(
@@ -153,9 +134,6 @@ Size MasterPagesSelector::GetPreferredSize (void)
}
-
-
-
void MasterPagesSelector::UpdateLocks (const ItemList& rItemList)
{
ItemList aNewLockList;
@@ -183,9 +161,6 @@ void MasterPagesSelector::UpdateLocks (const ItemList& rItemList)
maLockedMasterPages.swap(aNewLockList);
}
-
-
-
void MasterPagesSelector::Fill (void)
{
::std::auto_ptr<ItemList> pItemList (new ItemList());
@@ -196,17 +171,11 @@ void MasterPagesSelector::Fill (void)
UpdateItemList(pItemList);
}
-
-
-
ResId MasterPagesSelector::GetContextMenuResId (void) const
{
return SdResId(RID_TASKPANE_MASTERPAGESSELECTOR_POPUP);
}
-
-
-
IMPL_LINK_NOARG(MasterPagesSelector, ClickHandler)
{
// We use the framework to assign the clicked-on master page because we
@@ -217,9 +186,6 @@ IMPL_LINK_NOARG(MasterPagesSelector, ClickHandler)
return 0;
}
-
-
-
IMPL_LINK(MasterPagesSelector, RightClickHandler, MouseEvent*, pEvent)
{
// Here we only prepare the display of the context menu: the item under
@@ -242,9 +208,6 @@ IMPL_LINK(MasterPagesSelector, RightClickHandler, MouseEvent*, pEvent)
return 0;
}
-
-
-
void MasterPagesSelector::Command (const CommandEvent& rEvent)
{
switch (rEvent.GetCommand())
@@ -285,9 +248,6 @@ void MasterPagesSelector::Command (const CommandEvent& rEvent)
}
}
-
-
-
void MasterPagesSelector::ProcessPopupMenu (Menu& rMenu)
{
// Disable some entries.
@@ -297,9 +257,6 @@ void MasterPagesSelector::ProcessPopupMenu (Menu& rMenu)
rMenu.EnableItem(SID_TP_SHOW_LARGE_PREVIEW, false);
}
-
-
-
IMPL_LINK(MasterPagesSelector, OnMenuItemSelected, Menu*, pMenu)
{
if (pMenu == NULL)
@@ -313,9 +270,6 @@ IMPL_LINK(MasterPagesSelector, OnMenuItemSelected, Menu*, pMenu)
return 0;
}
-
-
-
void MasterPagesSelector::ExecuteCommand (const sal_Int32 nCommandId)
{
switch (nCommandId)
@@ -383,9 +337,6 @@ void MasterPagesSelector::ExecuteCommand (const sal_Int32 nCommandId)
}
}
-
-
-
IMPL_LINK(MasterPagesSelector, ContainerChangeListener, MasterPageContainerChangeEvent*, pEvent)
{
if (pEvent)
@@ -393,9 +344,6 @@ IMPL_LINK(MasterPagesSelector, ContainerChangeListener, MasterPageContainerChang
return 0;
}
-
-
-
SdPage* MasterPagesSelector::GetSelectedMasterPage (void)
{
const ::osl::MutexGuard aGuard (maMutex);
@@ -410,9 +358,6 @@ SdPage* MasterPagesSelector::GetSelectedMasterPage (void)
return pMasterPage;
}
-
-
-
/** Assemble a list of all slides of the document and pass it to
AssignMasterPageToPageList().
*/
@@ -443,9 +388,6 @@ void MasterPagesSelector::AssignMasterPageToAllSlides (SdPage* pMasterPage)
AssignMasterPageToPageList(pMasterPage, pPageList);
}
-
-
-
/** Assemble a list of the currently selected slides (selected in a visible
slide sorter) and pass it to AssignMasterPageToPageList().
*/
@@ -474,9 +416,6 @@ void MasterPagesSelector::AssignMasterPageToSelectedSlides (
pSlideSorter->SetPageSelection(pPageSelection);
}
-
-
-
void MasterPagesSelector::AssignMasterPageToPageList (
SdPage* pMasterPage,
const ::sd::slidesorter::SharedPageSelection& rPageList)
@@ -484,9 +423,6 @@ void MasterPagesSelector::AssignMasterPageToPageList (
DocumentHelper::AssignMasterPageToPageList(mrDocument, pMasterPage, rPageList);
}
-
-
-
void MasterPagesSelector::NotifyContainerChangeEvent (const MasterPageContainerChangeEvent& rEvent)
{
const ::osl::MutexGuard aGuard (maMutex);
@@ -529,9 +465,6 @@ void MasterPagesSelector::NotifyContainerChangeEvent (const MasterPageContainerC
}
}
-
-
-
MasterPagesSelector::UserData* MasterPagesSelector::CreateUserData (
int nIndex,
MasterPageContainer::Token aToken) const
@@ -539,9 +472,6 @@ MasterPagesSelector::UserData* MasterPagesSelector::CreateUserData (
return new UserData(nIndex,aToken);
}
-
-
-
MasterPagesSelector::UserData* MasterPagesSelector::GetUserData (int nIndex) const
{
const ::osl::MutexGuard aGuard (maMutex);
@@ -552,9 +482,6 @@ MasterPagesSelector::UserData* MasterPagesSelector::GetUserData (int nIndex) con
return NULL;
}
-
-
-
void MasterPagesSelector::SetUserData (int nIndex, UserData* pData)
{
const ::osl::MutexGuard aGuard (maMutex);
@@ -568,40 +495,25 @@ void MasterPagesSelector::SetUserData (int nIndex, UserData* pData)
}
}
-
-
-
bool MasterPagesSelector::IsResizable (void)
{
return false;
}
-
-
-
::Window* MasterPagesSelector::GetWindow (void)
{
return this;
}
-
-
-
sal_Int32 MasterPagesSelector::GetMinimumWidth (void)
{
return mpContainer->GetPreviewSizePixel().Width() + 2*3;
}
-
-
-
void MasterPagesSelector::UpdateSelection (void)
{
}
-
-
-
void MasterPagesSelector::SetItem (
sal_uInt16 nIndex,
MasterPageContainer::Token aToken)
@@ -648,9 +560,6 @@ void MasterPagesSelector::SetItem (
}
-
-
-
void MasterPagesSelector::AddTokenToIndexEntry (
sal_uInt16 nIndex,
MasterPageContainer::Token aToken)
@@ -660,9 +569,6 @@ void MasterPagesSelector::AddTokenToIndexEntry (
maTokenToValueSetIndex[aToken] = nIndex;
}
-
-
-
void MasterPagesSelector::RemoveTokenToIndexEntry (
sal_uInt16 nIndex,
MasterPageContainer::Token aNewToken)
@@ -683,9 +589,6 @@ void MasterPagesSelector::RemoveTokenToIndexEntry (
}
}
-
-
-
void MasterPagesSelector::InvalidatePreview (const SdPage* pPage)
{
const ::osl::MutexGuard aGuard (maMutex);
@@ -726,9 +629,6 @@ void MasterPagesSelector::UpdateAllPreviews (void)
PreviewValueSet::Rearrange(true);
}
-
-
-
void MasterPagesSelector::ClearPageSet (void)
{
const ::osl::MutexGuard aGuard (maMutex);
@@ -742,9 +642,6 @@ void MasterPagesSelector::ClearPageSet (void)
PreviewValueSet::Clear();
}
-
-
-
void MasterPagesSelector::SetHelpId( const OString& aId )
{
const ::osl::MutexGuard aGuard (maMutex);
@@ -752,9 +649,6 @@ void MasterPagesSelector::SetHelpId( const OString& aId )
PreviewValueSet::SetHelpId( aId );
}
-
-
-
sal_Int32 MasterPagesSelector::GetIndexForToken (MasterPageContainer::Token aToken) const
{
const ::osl::MutexGuard aGuard (maMutex);
@@ -766,9 +660,6 @@ sal_Int32 MasterPagesSelector::GetIndexForToken (MasterPageContainer::Token aTok
return -1;
}
-
-
-
void MasterPagesSelector::Clear (void)
{
const ::osl::MutexGuard aGuard (maMutex);
@@ -776,9 +667,6 @@ void MasterPagesSelector::Clear (void)
ClearPageSet();
}
-
-
-
void MasterPagesSelector::InvalidateItem (MasterPageContainer::Token aToken)
{
const ::osl::MutexGuard aGuard (maMutex);
@@ -794,8 +682,6 @@ void MasterPagesSelector::InvalidateItem (MasterPageContainer::Token aToken)
}
}
-
-
SAL_WNODEPRECATED_DECLARATIONS_PUSH
void MasterPagesSelector::UpdateItemList (::std::auto_ptr<ItemList> pNewItemList)
{
@@ -836,8 +722,6 @@ void MasterPagesSelector::UpdateItemList (::std::auto_ptr<ItemList> pNewItemList
}
SAL_WNODEPRECATED_DECLARATIONS_POP
-
-
css::ui::LayoutSize MasterPagesSelector::GetHeightForWidth (const sal_Int32 nWidth)
{
const sal_Int32 nHeight (GetPreferredHeight(nWidth));
diff --git a/sd/source/ui/sidebar/MasterPagesSelector.hxx b/sd/source/ui/sidebar/MasterPagesSelector.hxx
index c65b400e6154..04380bc070e5 100644
--- a/sd/source/ui/sidebar/MasterPagesSelector.hxx
+++ b/sd/source/ui/sidebar/MasterPagesSelector.hxx
@@ -49,7 +49,6 @@ namespace sd { namespace sidebar {
class PreviewValueSet;
-
/** Base class of a menu that lets the user select from a list of
templates or designs that are loaded from files.
*/
diff --git a/sd/source/ui/sidebar/NavigatorWrapper.cxx b/sd/source/ui/sidebar/NavigatorWrapper.cxx
index 53689f467665..3df03cc05f88 100644
--- a/sd/source/ui/sidebar/NavigatorWrapper.cxx
+++ b/sd/source/ui/sidebar/NavigatorWrapper.cxx
@@ -25,7 +25,6 @@
#include <boost/bind.hpp>
-
namespace sd { namespace sidebar {
NavigatorWrapper::NavigatorWrapper (
@@ -48,24 +47,15 @@ NavigatorWrapper::NavigatorWrapper (
maNavigator.Show();
}
-
-
-
NavigatorWrapper::~NavigatorWrapper (void)
{
}
-
-
-
void NavigatorWrapper::Resize (void)
{
maNavigator.SetSizePixel(GetSizePixel());
}
-
-
-
css::ui::LayoutSize NavigatorWrapper::GetHeightForWidth (const sal_Int32 nWidth)
{
(void)nWidth;
@@ -73,24 +63,16 @@ css::ui::LayoutSize NavigatorWrapper::GetHeightForWidth (const sal_Int32 nWidth)
return css::ui::LayoutSize(-1,-1,-1);
}
-
-
-
void NavigatorWrapper::UpdateNavigator (void)
{
maNavigator.InitTreeLB(mrViewShellBase.GetDocument());
}
-
-
-
void NavigatorWrapper::GetFocus (void)
{
maNavigator.GrabFocus();
}
-
-
} } // end of namespace sd::sidebar
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/sidebar/NavigatorWrapper.hxx b/sd/source/ui/sidebar/NavigatorWrapper.hxx
index d9bb14d33dd0..61445b1b984a 100644
--- a/sd/source/ui/sidebar/NavigatorWrapper.hxx
+++ b/sd/source/ui/sidebar/NavigatorWrapper.hxx
@@ -23,7 +23,6 @@
#include <vcl/ctrl.hxx>
#include "navigatr.hxx"
-
class SfxBindings;
namespace sd { class ViewShellBase; }
@@ -62,7 +61,6 @@ private:
void UpdateNavigator (void);
};
-
} } // end of namespace sd::sidebar
#endif
diff --git a/sd/source/ui/sidebar/PanelBase.cxx b/sd/source/ui/sidebar/PanelBase.cxx
index fd6a7c1d413d..e1e368e31470 100644
--- a/sd/source/ui/sidebar/PanelBase.cxx
+++ b/sd/source/ui/sidebar/PanelBase.cxx
@@ -19,11 +19,8 @@
#include "TableDesignPanel.hxx"
-
-
namespace sd { namespace sidebar {
-
PanelBase::PanelBase (
::Window* pParentWindow,
ViewShellBase& rViewShellBase)
@@ -39,9 +36,6 @@ PanelBase::PanelBase (
#endif
}
-
-
-
PanelBase::~PanelBase (void)
{
OSL_TRACE("deleting wrapped control at %p", mpWrappedControl.get());
@@ -49,19 +43,12 @@ PanelBase::~PanelBase (void)
OSL_TRACE("deleting PanelBase at %p from parent %p", this, GetParent());
}
-
-
-
-
void PanelBase::Dispose (void)
{
OSL_TRACE("PanelBase::DisposeL: deleting wrapped control at %p", mpWrappedControl.get());
mpWrappedControl.reset();
}
-
-
-
css::ui::LayoutSize PanelBase::GetHeightForWidth (const sal_Int32 /*nWidth*/)
{
sal_Int32 nHeight (0);
@@ -70,9 +57,6 @@ css::ui::LayoutSize PanelBase::GetHeightForWidth (const sal_Int32 /*nWidth*/)
return css::ui::LayoutSize(nHeight,nHeight,nHeight);
}
-
-
-
void PanelBase::Resize (void)
{
if (ProvideWrappedControl())
@@ -82,9 +66,6 @@ void PanelBase::Resize (void)
}
}
-
-
-
::com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessible> PanelBase::CreateAccessibleObject (
const ::com::sun::star::uno::Reference<
@@ -96,9 +77,6 @@ void PanelBase::Resize (void)
return NULL;
}
-
-
-
void PanelBase::SetSidebar (const cssu::Reference<css::ui::XSidebar>& rxSidebar)
{
mxSidebar = rxSidebar;
@@ -106,9 +84,6 @@ void PanelBase::SetSidebar (const cssu::Reference<css::ui::XSidebar>& rxSidebar)
mxSidebar->requestLayout();
}
-
-
-
bool PanelBase::ProvideWrappedControl (void)
{
if ( ! mpWrappedControl)
diff --git a/sd/source/ui/sidebar/PanelBase.hxx b/sd/source/ui/sidebar/PanelBase.hxx
index e3ea04032d37..b41f58110eab 100644
--- a/sd/source/ui/sidebar/PanelBase.hxx
+++ b/sd/source/ui/sidebar/PanelBase.hxx
@@ -33,12 +33,8 @@ namespace sd {
class ViewShellBase;
}
-
-
-
namespace sd { namespace sidebar {
-
class PanelBase
: public Control,
public sfx2::sidebar::ILayoutableWindow,
diff --git a/sd/source/ui/sidebar/PanelFactory.cxx b/sd/source/ui/sidebar/PanelFactory.cxx
index ec1f3d4929a4..678efe441e11 100644
--- a/sd/source/ui/sidebar/PanelFactory.cxx
+++ b/sd/source/ui/sidebar/PanelFactory.cxx
@@ -61,8 +61,6 @@ namespace {
Reference<lang::XEventListener> mxControllerDisposeListener;
-
-
// ----- Service functions ----------------------------------------------------
Reference<XInterface> SAL_CALL PanelFactory_createInstance (
@@ -71,17 +69,11 @@ Reference<XInterface> SAL_CALL PanelFactory_createInstance (
return Reference<XInterface>(static_cast<XWeak*>(new PanelFactory(rxContext)));
}
-
-
-
::rtl::OUString PanelFactory_getImplementationName (void) throw(RuntimeException)
{
return OUString("org.openoffice.comp.Draw.framework.PanelFactory");
}
-
-
-
Sequence<rtl::OUString> SAL_CALL PanelFactory_getSupportedServiceNames (void)
throw (RuntimeException)
{
@@ -89,9 +81,6 @@ Sequence<rtl::OUString> SAL_CALL PanelFactory_getSupportedServiceNames (void)
return Sequence<rtl::OUString>(&sServiceName, 1);
}
-
-
-
//----- PanelFactory --------------------------------------------------------
PanelFactory::PanelFactory(
@@ -100,23 +89,14 @@ PanelFactory::PanelFactory(
{
}
-
-
-
PanelFactory::~PanelFactory (void)
{
}
-
-
-
void SAL_CALL PanelFactory::disposing (void)
{
}
-
-
-
// XUIElementFactory
Reference<ui::XUIElement> SAL_CALL PanelFactory::createUIElement (
@@ -194,9 +174,6 @@ Reference<ui::XUIElement> SAL_CALL PanelFactory::createUIElement (
aLayoutSize);
}
-
-
-
} } // end of namespace sd::sidebar
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/sidebar/PanelFactory.hxx b/sd/source/ui/sidebar/PanelFactory.hxx
index 6d16b43f2af0..ae4f307b81b4 100644
--- a/sd/source/ui/sidebar/PanelFactory.hxx
+++ b/sd/source/ui/sidebar/PanelFactory.hxx
@@ -34,7 +34,6 @@
namespace cssu = ::com::sun::star::uno;
-
namespace sd {
class ViewShellBase;
}
@@ -48,7 +47,6 @@ namespace
> PanelFactoryInterfaceBase;
}
-
class PanelFactory
: private ::boost::noncopyable,
private ::cppu::BaseMutex,
@@ -65,7 +63,6 @@ public:
virtual void SAL_CALL disposing (void) SAL_OVERRIDE;
-
// XUIElementFactory
cssu::Reference<css::ui::XUIElement> SAL_CALL createUIElement (
@@ -77,7 +74,6 @@ public:
cssu::RuntimeException, std::exception) SAL_OVERRIDE;
};
-
} } // end of namespace sd::sidebar
#endif
diff --git a/sd/source/ui/sidebar/PreviewValueSet.cxx b/sd/source/ui/sidebar/PreviewValueSet.cxx
index ae3d7fbfbd5f..e532d7ace50f 100644
--- a/sd/source/ui/sidebar/PreviewValueSet.cxx
+++ b/sd/source/ui/sidebar/PreviewValueSet.cxx
@@ -20,10 +20,8 @@
#include "PreviewValueSet.hxx"
#include <vcl/image.hxx>
-
namespace sd { namespace sidebar {
-
PreviewValueSet::PreviewValueSet (::Window* pParent)
: ValueSet (pParent, WB_TABSTOP),
maPreviewSize(10,10),
@@ -40,32 +38,20 @@ PreviewValueSet::PreviewValueSet (::Window* pParent)
SetExtraSpacing (2);
}
-
-
-
PreviewValueSet::~PreviewValueSet (void)
{
}
-
-
-
void PreviewValueSet::SetPreviewSize (const Size& rSize)
{
maPreviewSize = rSize;
}
-
-
-
void PreviewValueSet::SetRightMouseClickHandler (const Link& rLink)
{
maRightMouseClickHandler = rLink;
}
-
-
-
void PreviewValueSet::MouseButtonDown (const MouseEvent& rEvent)
{
if (rEvent.IsRight())
@@ -76,9 +62,6 @@ void PreviewValueSet::MouseButtonDown (const MouseEvent& rEvent)
}
-
-
-
void PreviewValueSet::Resize (void)
{
ValueSet::Resize ();
@@ -90,9 +73,6 @@ void PreviewValueSet::Resize (void)
}
}
-
-
-
void PreviewValueSet::Rearrange (bool /*bForceRequestResize*/)
{
sal_uInt16 nNewColumnCount (CalculateColumnCount (
@@ -103,9 +83,6 @@ void PreviewValueSet::Rearrange (bool /*bForceRequestResize*/)
SetLineCount(nNewRowCount);
}
-
-
-
sal_uInt16 PreviewValueSet::CalculateColumnCount (int nWidth) const
{
int nColumnCount = 0;
@@ -120,9 +97,6 @@ sal_uInt16 PreviewValueSet::CalculateColumnCount (int nWidth) const
return (sal_uInt16)nColumnCount;
}
-
-
-
sal_uInt16 PreviewValueSet::CalculateRowCount (sal_uInt16 nColumnCount) const
{
int nRowCount = 0;
@@ -137,9 +111,6 @@ sal_uInt16 PreviewValueSet::CalculateRowCount (sal_uInt16 nColumnCount) const
return (sal_uInt16)nRowCount;
}
-
-
-
sal_Int32 PreviewValueSet::GetPreferredWidth (sal_Int32 nHeight)
{
int nPreferredWidth (maPreviewSize.Width() + 2*mnBorderWidth);
@@ -161,9 +132,6 @@ sal_Int32 PreviewValueSet::GetPreferredWidth (sal_Int32 nHeight)
return nPreferredWidth;
}
-
-
-
sal_Int32 PreviewValueSet::GetPreferredHeight (sal_Int32 nWidth)
{
int nRowCount (CalculateRowCount(CalculateColumnCount(nWidth)));
@@ -172,9 +140,6 @@ sal_Int32 PreviewValueSet::GetPreferredHeight (sal_Int32 nWidth)
return nRowCount * (nItemHeight + 2*mnBorderHeight);
}
-
-
-
} } // end of namespace sd::sidebar
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/sidebar/PreviewValueSet.hxx b/sd/source/ui/sidebar/PreviewValueSet.hxx
index bbaf21cb3e22..9bd390f7c18f 100644
--- a/sd/source/ui/sidebar/PreviewValueSet.hxx
+++ b/sd/source/ui/sidebar/PreviewValueSet.hxx
@@ -22,10 +22,8 @@
#include <svtools/valueset.hxx>
-
namespace sd { namespace sidebar {
-
/** Adapt the svtools valueset to the needs of the master page controls.
*/
class PreviewValueSet
diff --git a/sd/source/ui/sidebar/RecentMasterPagesSelector.cxx b/sd/source/ui/sidebar/RecentMasterPagesSelector.cxx
index 0e1a423ea17f..0ebcff4c640e 100644
--- a/sd/source/ui/sidebar/RecentMasterPagesSelector.cxx
+++ b/sd/source/ui/sidebar/RecentMasterPagesSelector.cxx
@@ -32,7 +32,6 @@
namespace sd { namespace sidebar {
-
MasterPagesSelector* RecentMasterPagesSelector::Create (
::Window* pParent,
ViewShellBase& rViewShellBase,
@@ -57,9 +56,6 @@ MasterPagesSelector* RecentMasterPagesSelector::Create (
return pSelector;
}
-
-
-
RecentMasterPagesSelector::RecentMasterPagesSelector (
::Window* pParent,
SdDrawDocument& rDocument,
@@ -70,18 +66,12 @@ RecentMasterPagesSelector::RecentMasterPagesSelector (
{
}
-
-
-
RecentMasterPagesSelector::~RecentMasterPagesSelector (void)
{
RecentlyUsedMasterPages::Instance().RemoveEventListener (
LINK(this,RecentMasterPagesSelector,MasterPageListListener));
}
-
-
-
void RecentMasterPagesSelector::LateInit (void)
{
MasterPagesSelector::LateInit();
@@ -91,18 +81,12 @@ void RecentMasterPagesSelector::LateInit (void)
LINK(this,RecentMasterPagesSelector,MasterPageListListener));
}
-
-
-
IMPL_LINK_NOARG(RecentMasterPagesSelector, MasterPageListListener)
{
MasterPagesSelector::Fill();
return 0;
}
-
-
-
void RecentMasterPagesSelector::Fill (ItemList& rItemList)
{
// Create a set of names of the master pages used by the document.
@@ -138,9 +122,6 @@ void RecentMasterPagesSelector::Fill (ItemList& rItemList)
}
}
-
-
-
void RecentMasterPagesSelector::AssignMasterPageToPageList (
SdPage* pMasterPage,
const ::boost::shared_ptr<std::vector<SdPage*> >& rpPageList)
@@ -159,18 +140,12 @@ void RecentMasterPagesSelector::AssignMasterPageToPageList (
}
}
-
-
-
void RecentMasterPagesSelector::ProcessPopupMenu (Menu& rMenu)
{
if (rMenu.GetItemPos(SID_TP_EDIT_MASTER) != MENU_ITEM_NOTFOUND)
rMenu.EnableItem(SID_TP_EDIT_MASTER, false);
}
-
-
-
} } // end of namespace sd::sidebar
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/sidebar/RecentMasterPagesSelector.hxx b/sd/source/ui/sidebar/RecentMasterPagesSelector.hxx
index e751b2b8ed71..931663966f1d 100644
--- a/sd/source/ui/sidebar/RecentMasterPagesSelector.hxx
+++ b/sd/source/ui/sidebar/RecentMasterPagesSelector.hxx
@@ -24,7 +24,6 @@
namespace sd { namespace sidebar {
-
/** Show the recently used master pages (that are not currently used).
*/
class RecentMasterPagesSelector
diff --git a/sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx b/sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx
index 315c5f1fd024..1ce37806298f 100644
--- a/sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx
+++ b/sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx
@@ -46,7 +46,6 @@ using namespace ::std;
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
-
namespace {
static const OUString& GetPathToImpressConfigurationRoot (void)
@@ -60,7 +59,6 @@ static const OUString& GetPathToSetNode (void)
return sPathToSetNode;
}
-
class Descriptor
{
public:
@@ -85,9 +83,6 @@ public:
} // end of anonymous namespace
-
-
-
namespace sd { namespace sidebar {
class RecentlyUsedMasterPages::MasterPageList : public ::std::vector<Descriptor>
@@ -96,10 +91,8 @@ public:
MasterPageList (void) {}
};
-
RecentlyUsedMasterPages* RecentlyUsedMasterPages::mpInstance = NULL;
-
RecentlyUsedMasterPages& RecentlyUsedMasterPages::Instance (void)
{
if (mpInstance == NULL)
@@ -123,9 +116,6 @@ RecentlyUsedMasterPages& RecentlyUsedMasterPages::Instance (void)
return *mpInstance;
}
-
-
-
RecentlyUsedMasterPages::RecentlyUsedMasterPages (void)
: maListeners(),
mpMasterPages(new MasterPageList()),
@@ -134,9 +124,6 @@ RecentlyUsedMasterPages::RecentlyUsedMasterPages (void)
{
}
-
-
-
RecentlyUsedMasterPages::~RecentlyUsedMasterPages (void)
{
Link aLink (LINK(this,RecentlyUsedMasterPages,MasterPageContainerChangeListener));
@@ -146,9 +133,6 @@ RecentlyUsedMasterPages::~RecentlyUsedMasterPages (void)
LINK(this,RecentlyUsedMasterPages,MasterPageChangeListener));
}
-
-
-
void RecentlyUsedMasterPages::LateInit (void)
{
Link aLink (LINK(this,RecentlyUsedMasterPages,MasterPageContainerChangeListener));
@@ -159,9 +143,6 @@ void RecentlyUsedMasterPages::LateInit (void)
LINK(this,RecentlyUsedMasterPages,MasterPageChangeListener));
}
-
-
-
void RecentlyUsedMasterPages::LoadPersistentValues (void)
{
try
@@ -227,9 +208,6 @@ void RecentlyUsedMasterPages::LoadPersistentValues (void)
}
}
-
-
-
void RecentlyUsedMasterPages::SavePersistentValues (void)
{
try
@@ -289,9 +267,6 @@ void RecentlyUsedMasterPages::SavePersistentValues (void)
}
}
-
-
-
void RecentlyUsedMasterPages::AddEventListener (const Link& rEventListener)
{
if (::std::find (
@@ -303,9 +278,6 @@ void RecentlyUsedMasterPages::AddEventListener (const Link& rEventListener)
}
}
-
-
-
void RecentlyUsedMasterPages::RemoveEventListener (const Link& rEventListener)
{
maListeners.erase (
@@ -315,17 +287,11 @@ void RecentlyUsedMasterPages::RemoveEventListener (const Link& rEventListener)
rEventListener));
}
-
-
-
int RecentlyUsedMasterPages::GetMasterPageCount (void) const
{
return mpMasterPages->size();
}
-
-
-
MasterPageContainer::Token RecentlyUsedMasterPages::GetTokenForIndex (sal_uInt32 nIndex) const
{
if(nIndex<mpMasterPages->size())
@@ -334,9 +300,6 @@ MasterPageContainer::Token RecentlyUsedMasterPages::GetTokenForIndex (sal_uInt32
return MasterPageContainer::NIL_TOKEN;
}
-
-
-
void RecentlyUsedMasterPages::SendEvent (void)
{
::std::vector<Link>::iterator aLink (maListeners.begin());
@@ -348,9 +311,6 @@ void RecentlyUsedMasterPages::SendEvent (void)
}
}
-
-
-
IMPL_LINK(RecentlyUsedMasterPages, MasterPageChangeListener,
MasterPageObserverEvent*, pEvent)
{
@@ -372,9 +332,6 @@ IMPL_LINK(RecentlyUsedMasterPages, MasterPageChangeListener,
return 0;
}
-
-
-
IMPL_LINK(RecentlyUsedMasterPages, MasterPageContainerChangeListener,
MasterPageContainerChangeEvent*, pEvent)
{
@@ -395,9 +352,6 @@ IMPL_LINK(RecentlyUsedMasterPages, MasterPageContainerChangeListener,
return 0;
}
-
-
-
void RecentlyUsedMasterPages::AddMasterPage (
MasterPageContainer::Token aToken,
bool bMakePersistent)
@@ -437,9 +391,6 @@ void RecentlyUsedMasterPages::AddMasterPage (
}
}
-
-
-
void RecentlyUsedMasterPages::ResolveList (void)
{
bool bNotify (false);
@@ -468,7 +419,6 @@ void RecentlyUsedMasterPages::ResolveList (void)
SendEvent();
}
-
} } // end of namespace sd::sidebar
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/sidebar/RecentlyUsedMasterPages.hxx b/sd/source/ui/sidebar/RecentlyUsedMasterPages.hxx
index 1de71bfc5f50..8be36cb1239f 100644
--- a/sd/source/ui/sidebar/RecentlyUsedMasterPages.hxx
+++ b/sd/source/ui/sidebar/RecentlyUsedMasterPages.hxx
@@ -34,7 +34,6 @@ namespace sd {
class MasterPageObserverEvent;
}
-
namespace sd { namespace sidebar {
/** This singleton holds a list of the most recently used master pages.
@@ -110,8 +109,6 @@ private:
void ResolveList (void);
};
-
-
} } // end of namespace sd::sidebar
#endif
diff --git a/sd/source/ui/sidebar/SlideTransitionPanel.cxx b/sd/source/ui/sidebar/SlideTransitionPanel.cxx
index 30cbe1392207..04d47524f862 100644
--- a/sd/source/ui/sidebar/SlideTransitionPanel.cxx
+++ b/sd/source/ui/sidebar/SlideTransitionPanel.cxx
@@ -24,7 +24,6 @@
namespace sd { namespace sidebar {
-
SlideTransitionPanel::SlideTransitionPanel (
::Window* pParentWindow,
ViewShellBase& rViewShellBase,
@@ -38,16 +37,10 @@ SlideTransitionPanel::SlideTransitionPanel (
#endif
}
-
-
-
SlideTransitionPanel::~SlideTransitionPanel (void)
{
}
-
-
-
::Window* SlideTransitionPanel::CreateWrappedControl (
::Window* pParentWindow,
ViewShellBase& rViewShellBase)
@@ -55,9 +48,6 @@ SlideTransitionPanel::~SlideTransitionPanel (void)
return createSlideTransitionPanel(pParentWindow, rViewShellBase, mxFrame);
}
-
-
-
css::ui::LayoutSize SlideTransitionPanel::GetHeightForWidth (const sal_Int32 /*nWidth*/)
{
Window *pControl = mpWrappedControl.get();
diff --git a/sd/source/ui/sidebar/SlideTransitionPanel.hxx b/sd/source/ui/sidebar/SlideTransitionPanel.hxx
index d2990b62e6de..251976ba7c63 100644
--- a/sd/source/ui/sidebar/SlideTransitionPanel.hxx
+++ b/sd/source/ui/sidebar/SlideTransitionPanel.hxx
@@ -48,7 +48,6 @@ private:
} } // end of namespace sd::sidebar
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/sidebar/TableDesignPanel.cxx b/sd/source/ui/sidebar/TableDesignPanel.cxx
index dd9a1333a514..61212dd7db17 100644
--- a/sd/source/ui/sidebar/TableDesignPanel.cxx
+++ b/sd/source/ui/sidebar/TableDesignPanel.cxx
@@ -24,7 +24,6 @@
namespace sd { namespace sidebar {
-
TableDesignPanel::TableDesignPanel (
::Window* pParentWindow,
ViewShellBase& rViewShellBase)
@@ -35,16 +34,10 @@ TableDesignPanel::TableDesignPanel (
#endif
}
-
-
-
TableDesignPanel::~TableDesignPanel (void)
{
}
-
-
-
::Window* TableDesignPanel::CreateWrappedControl (
::Window* pParentWindow,
ViewShellBase& rViewShellBase)
@@ -52,9 +45,6 @@ TableDesignPanel::~TableDesignPanel (void)
return createTableDesignPanel(pParentWindow, rViewShellBase);
}
-
-
-
css::ui::LayoutSize TableDesignPanel::GetHeightForWidth (const sal_Int32 /*nWidth*/)
{
Window *pControl = mpWrappedControl.get();