summaryrefslogtreecommitdiff
path: root/svx/source/gallery2/galbrws2.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'svx/source/gallery2/galbrws2.cxx')
-rw-r--r--svx/source/gallery2/galbrws2.cxx16
1 files changed, 8 insertions, 8 deletions
diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx
index 5c8cbc6d3b27..4fadfb888cce 100644
--- a/svx/source/gallery2/galbrws2.cxx
+++ b/svx/source/gallery2/galbrws2.cxx
@@ -118,7 +118,7 @@ private:
typedef std::map< int, CommandInfo > CommandInfoMap;
CommandInfoMap m_aCommandInfo;
- void Execute( const CommandInfo &rCmdInfo,
+ static void Execute( const CommandInfo &rCmdInfo,
const css::uno::Sequence< css::beans::PropertyValue > &rArguments );
DECL_LINK( MenuSelectHdl, Menu* pMenu );
@@ -295,7 +295,7 @@ void GalleryThemePopup::ExecutePopup( vcl::Window *pWindow, const ::Point &aPos
// update status
css::uno::Reference< css::frame::XDispatchProvider> xDispatchProvider(
- mpBrowser->GetFrame(), css::uno::UNO_QUERY );
+ GalleryBrowser2::GetFrame(), css::uno::UNO_QUERY );
css::uno::Reference< css::util::XURLTransformer > xTransformer(
mpBrowser->GetURLTransformer() );
for ( CommandInfoMap::iterator it = m_aCommandInfo.begin();
@@ -793,7 +793,7 @@ void GalleryBrowser2::SetMode( GalleryBrowserMode eMode )
mpPreview->Hide();
mpPreview->SetGraphic( Graphic() );
- mpPreview->PreviewMedia( INetURLObject() );
+ GalleryPreview::PreviewMedia( INetURLObject() );
mpIconView->Show();
@@ -811,7 +811,7 @@ void GalleryBrowser2::SetMode( GalleryBrowserMode eMode )
mpPreview->Hide();
mpPreview->SetGraphic( Graphic() );
- mpPreview->PreviewMedia( INetURLObject() );
+ GalleryPreview::PreviewMedia( INetURLObject() );
mpListView->Show();
@@ -843,7 +843,7 @@ void GalleryBrowser2::SetMode( GalleryBrowserMode eMode )
mpPreview->Show();
if( mpCurTheme && mpCurTheme->GetObjectKind( nPos ) == SGA_OBJ_SOUND )
- mpPreview->PreviewMedia( mpCurTheme->GetObjectURL( nPos ) );
+ GalleryPreview::PreviewMedia( mpCurTheme->GetObjectURL( nPos ) );
maViewBox->EnableItem( TBX_ID_ICON, false );
maViewBox->EnableItem( TBX_ID_LIST, false );
@@ -916,7 +916,7 @@ void GalleryBrowser2::Travel( GalleryBrowserTravel eTravel )
mpPreview->SetGraphic( aGraphic );
if( SGA_OBJ_SOUND == mpCurTheme->GetObjectKind( nPos ) )
- mpPreview->PreviewMedia( mpCurTheme->GetObjectURL( nPos ) );
+ GalleryPreview::PreviewMedia( mpCurTheme->GetObjectURL( nPos ) );
mpPreview->Invalidate();
}
@@ -1027,7 +1027,7 @@ void GalleryBrowser2::ImplSelectItemId( sal_uIntPtr nItemId )
}
css::uno::Reference< css::frame::XFrame >
-GalleryBrowser2::GetFrame() const
+GalleryBrowser2::GetFrame()
{
css::uno::Reference< css::frame::XFrame > xFrame;
SfxViewFrame* pCurrentViewFrame = SfxViewFrame::Current();
@@ -1195,7 +1195,7 @@ void GalleryBrowser2::Execute( sal_uInt16 nId )
}
}
- mpCurTheme->ReleaseObject( pObj );
+ GalleryTheme::ReleaseObject( pObj );
}
}
}