diff options
| author | Frank Schoenheit [fs] <frank.schoenheit@sun.com> | 2010-04-28 09:41:55 +0200 |
|---|---|---|
| committer | Frank Schoenheit [fs] <frank.schoenheit@sun.com> | 2010-04-28 09:41:55 +0200 |
| commit | d41b771550edf1d920f2ecba4d3c846b4a0d4373 (patch) | |
| tree | 945463a474e80e6fd2834b3fdd81a545c519483d /sd | |
| parent | b7c38dbce15f379554b955f0f3a27ae316626147 (diff) | |
slidecopy: make compile on unxsol[i|s]4.pro and unxmacxi[.pro]
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/toolpanel/LayoutMenu.cxx | 6 | ||||
| -rw-r--r-- | sd/source/ui/toolpanel/LayoutMenu.hxx | 2 | ||||
| -rwxr-xr-x | sd/source/ui/toolpanel/ToolPanelViewShell.cxx | 1 |
3 files changed, 5 insertions, 4 deletions
diff --git a/sd/source/ui/toolpanel/LayoutMenu.cxx b/sd/source/ui/toolpanel/LayoutMenu.cxx index 67efc0e59d50..0e445ddb57bd 100644 --- a/sd/source/ui/toolpanel/LayoutMenu.cxx +++ b/sd/source/ui/toolpanel/LayoutMenu.cxx @@ -228,14 +228,14 @@ LayoutMenu::LayoutMenu( TreeNode* pParent, ToolPanelViewShell& i_rPanelViewShell mbSelectionUpdatePending(true), mbIsMainViewChangePending(false) { - ImplConstruct( *mrBase.GetDocument()->GetDocSh() ); + implConstruct( *mrBase.GetDocument()->GetDocSh() ); } -void LayoutMenu::ImplConstruct( DrawDocShell& rDocumentShell ) +void LayoutMenu::implConstruct( DrawDocShell& rDocumentShell ) { OSL_ENSURE( mrBase.GetDocument()->GetDocSh() == &rDocumentShell, - "LayoutMenu::ImplConstruct: hmm?" ); + "LayoutMenu::implConstruct: hmm?" ); // if this fires, then my assumption that the rDocumentShell parameter to our first ctor is superfluous ... SetStyle ( diff --git a/sd/source/ui/toolpanel/LayoutMenu.hxx b/sd/source/ui/toolpanel/LayoutMenu.hxx index 86606ef0b69c..86e01e9f803b 100644 --- a/sd/source/ui/toolpanel/LayoutMenu.hxx +++ b/sd/source/ui/toolpanel/LayoutMenu.hxx @@ -228,7 +228,7 @@ private: void UpdateSelection (void); // internal ctor - void ImplConstruct( DrawDocShell& rDocumentShell ); + void implConstruct( DrawDocShell& rDocumentShell ); /** When clicked then set the current page of the view in the center pane. */ diff --git a/sd/source/ui/toolpanel/ToolPanelViewShell.cxx b/sd/source/ui/toolpanel/ToolPanelViewShell.cxx index 4c51d92142e9..b0539b14f41a 100755 --- a/sd/source/ui/toolpanel/ToolPanelViewShell.cxx +++ b/sd/source/ui/toolpanel/ToolPanelViewShell.cxx @@ -159,6 +159,7 @@ PanelId GetStandardPanelId( const ::rtl::OUString& i_rTaskPanelResourceURL, cons else { OSL_ENSURE( i_bIgnoreUnknown, "GetStandardPanelId: cannot translate the given resource URL!" ); + (void)i_bIgnoreUnknown; } return ePanelId; |