[Libreoffice-commits] core.git: 3 commits - avmedia/source basctl/source basic/source
avmedia/source/gstreamer/gstplayer.cxx |2 +- avmedia/source/gstreamer/gstwindow.cxx |3 +-- avmedia/source/gstreamer/gstwindow.hxx |4 +--- basctl/source/basicide/basicbox.cxx|7 +++ basctl/source/basicide/basicbox.hxx|4 +--- basctl/source/basicide/baside2.hxx |2 -- basctl/source/basicide/bastypes.cxx|4 +--- basctl/source/inc/bastypes.hxx |3 +-- basic/source/classes/sbunoobj.cxx |7 ++- basic/source/inc/dlgcont.hxx |2 -- basic/source/inc/namecont.hxx |3 --- basic/source/inc/sbunoobj.hxx |5 + basic/source/inc/scriptcont.hxx|2 -- basic/source/uno/dlgcont.cxx | 10 -- basic/source/uno/namecont.cxx |6 ++ basic/source/uno/scriptcont.cxx| 10 -- 16 files changed, 22 insertions(+), 52 deletions(-) New commits: commit 2351fd5d489fde281e8d1ef97af747149a29c247 Author: Noel GrandinDate: Wed Dec 23 09:53:35 2015 +0200 loplugin:unusedfields in avmedia Change-Id: I725a80cf7b6f2b728e650d0f365d063931b17ea7 diff --git a/avmedia/source/gstreamer/gstplayer.cxx b/avmedia/source/gstreamer/gstplayer.cxx index d59f591..afd 100644 --- a/avmedia/source/gstreamer/gstplayer.cxx +++ b/avmedia/source/gstreamer/gstplayer.cxx @@ -871,7 +871,7 @@ uno::Reference< ::media::XPlayerWindow > SAL_CALL Player::createPlayerWindow( co if( aSize.Width > 0 && aSize.Height > 0 ) { -::avmedia::gstreamer::Window* pWindow = new ::avmedia::gstreamer::Window( mxMgr ); +::avmedia::gstreamer::Window* pWindow = new ::avmedia::gstreamer::Window; xRet = pWindow; diff --git a/avmedia/source/gstreamer/gstwindow.cxx b/avmedia/source/gstreamer/gstwindow.cxx index fc2a8ee..765343d 100644 --- a/avmedia/source/gstreamer/gstwindow.cxx +++ b/avmedia/source/gstreamer/gstwindow.cxx @@ -52,8 +52,7 @@ static ::osl::Mutex& ImplGetOwnStaticMutex() // Window -Window::Window( const uno::Reference< lang::XMultiServiceFactory >& rxMgr ) : -mxMgr( rxMgr ), +Window::Window() : meZoomLevel( media::ZoomLevel_NOT_AVAILABLE ), mnPointerType( awt::SystemPointer::ARROW ) { diff --git a/avmedia/source/gstreamer/gstwindow.hxx b/avmedia/source/gstreamer/gstwindow.hxx index 73bfb30..2c9af23 100644 --- a/avmedia/source/gstreamer/gstwindow.hxx +++ b/avmedia/source/gstreamer/gstwindow.hxx @@ -39,7 +39,7 @@ class Window : public ::cppu::WeakImplHelper< css::media::XPlayerWindow, { public: -explicit Window( const css::uno::Reference< css::lang::XMultiServiceFactory >& rxMgr ); +explicit Window(); virtual ~Window(); // XPlayerWindow @@ -79,8 +79,6 @@ public: private: -css::uno::Reference< css::lang::XMultiServiceFactory > mxMgr; - css::media::ZoomLevel meZoomLevel; int mnPointerType; }; commit 472388fda8afc28d7b9f61056f45a741abfb732e Author: Noel Grandin Date: Wed Dec 23 09:51:38 2015 +0200 loplugin:unusedfields in basctl Change-Id: I565bd86167c93ece1d65ce8a3b148144f5a7107a diff --git a/basctl/source/basicide/basicbox.cxx b/basctl/source/basicide/basicbox.cxx index 78518d1..c515c23 100644 --- a/basctl/source/basicide/basicbox.cxx +++ b/basctl/source/basicide/basicbox.cxx @@ -67,7 +67,7 @@ void LibBoxControl::StateChanged( sal_uInt16, SfxItemState eState, const SfxPool VclPtr LibBoxControl::CreateItemWindow( vcl::Window *pParent ) { -return VclPtr::Create( pParent, m_xFrame ); +return VclPtr::Create( pParent ); } @@ -133,9 +133,8 @@ void DocListenerBox::onDocumentModeChanged( const ScriptDocument& /*_rDocument*/ // not interested in } -LibBox::LibBox( vcl::Window* pParent, const uno::Reference< frame::XFrame >& rFrame ) : -DocListenerBox( pParent ), -m_xFrame( rFrame ) +LibBox::LibBox( vcl::Window* pParent ) : +DocListenerBox( pParent ) { FillBox(); bIgnoreSelect = true; // do not yet transfer select of 0 diff --git a/basctl/source/basicide/basicbox.hxx b/basctl/source/basicide/basicbox.hxx index 9102741..77f8642 100644 --- a/basctl/source/basicide/basicbox.hxx +++ b/basctl/source/basicide/basicbox.hxx @@ -77,7 +77,6 @@ private: OUStringaCurText; boolbIgnoreSelect; boolbFillBox; -css::uno::Reference< css::frame::XFrame > m_xFrame; static void ReleaseFocus(); voidInsertEntries( const ScriptDocument& rDocument, LibraryLocation eLocation ); @@ -93,8 +92,7 @@ protected: virtual boolPreNotify( NotifyEvent& rNEvt ) override; public: -LibBox( vcl::Window* pParent, -const css::uno::Reference< css::frame::XFrame >& rFrame ); +LibBox( vcl::Window* pParent ); virtual ~LibBox(); virtual voiddispose() override; diff --git
[Libreoffice-commits] core.git: 3 commits - avmedia/source basctl/source chart2/source cui/source dbaccess/source editeng/source extensions/source framework/source include/svtools include/svx include/
avmedia/source/framework/mediacontrol.cxx |2 basctl/source/dlged/dlged.cxx |2 chart2/source/controller/main/ChartWindow.cxx |6 chart2/source/controller/main/ChartWindow.hxx |6 cui/source/dialogs/cuihyperdlg.cxx|2 cui/source/factory/dlgfact.cxx|2 cui/source/factory/dlgfact.hxx|2 cui/source/options/connpooloptions.cxx|4 dbaccess/source/ui/querydesign/JoinTableView.cxx | 10 - dbaccess/source/ui/querydesign/QuerySizeTabWinUndoAct.hxx |4 dbaccess/source/ui/querydesign/QueryTableView.cxx |4 dbaccess/source/ui/querydesign/TableConnection.cxx|4 dbaccess/source/ui/querydesign/TableWindow.cxx|4 dbaccess/source/ui/querydesign/TableWindowListBox.cxx |4 dbaccess/source/ui/querydesign/TableWindowTitle.cxx |2 dbaccess/source/ui/relationdesign/RelationController.cxx |4 dbaccess/source/ui/relationdesign/RelationTableView.cxx |2 editeng/source/editeng/impedit.cxx|2 extensions/source/propctrlr/browserlistbox.cxx|6 extensions/source/propctrlr/standardcontrol.cxx |2 framework/source/helper/vclstatusindicator.cxx|2 include/svtools/scrwin.hxx|2 include/svtools/treelistbox.hxx |6 include/svx/svxdlg.hxx|2 include/vcl/window.hxx| 83 ++--- offapi/com/sun/star/awt/XWindowPeer.idl |4 reportdesign/source/core/sdr/RptObject.cxx|2 reportdesign/source/ui/misc/ColorListener.cxx |4 reportdesign/source/ui/report/ReportSection.cxx |4 reportdesign/source/ui/report/ReportWindow.cxx|7 reportdesign/source/ui/report/ScrollHelper.cxx|2 reportdesign/source/ui/report/SectionView.cxx |2 reportdesign/source/ui/report/SectionWindow.cxx | 10 - reportdesign/source/ui/report/StartMarker.cxx |2 reportdesign/source/ui/report/ViewsWindow.cxx | 16 - reportdesign/source/ui/report/dlgedfunc.cxx |2 sc/source/ui/app/inputwin.cxx |4 sc/source/ui/view/gridwin.cxx |2 sd/source/ui/view/sdwindow.cxx|2 sd/source/ui/view/viewshe2.cxx|8 sfx2/source/doc/templatedlg.cxx |4 sfx2/source/sidebar/SidebarController.cxx |2 svtools/source/brwbox/brwbox1.cxx | 18 +- svtools/source/brwbox/datwin.cxx |4 svtools/source/brwbox/datwin.hxx |6 svtools/source/contnr/imivctl1.cxx| 10 - svtools/source/contnr/ivctrl.cxx |4 svtools/source/contnr/svimpbox.cxx| 10 - svtools/source/contnr/treelistbox.cxx |6 svtools/source/control/scrwin.cxx |2 svtools/source/table/tablecontrol_impl.cxx| 18 +- svx/source/accessibility/AccessibleTextHelper.cxx |2 svx/source/dialog/frmsel.cxx |2 svx/source/sdr/overlay/overlaymanager.cxx |4 svx/source/svdraw/sdrpagewindow.cxx |2 svx/source/svdraw/sdrpaintwindow.cxx |2 svx/source/svdraw/svdglue.cxx |2 svx/source/svdraw/svdpntv.cxx |4 sw/source/core/layout/paintfrm.cxx|2 sw/source/core/view/viewsh.cxx| 12 - sw/source/ui/dbui/addresslistdialog.cxx |2 sw/source/uibase/docvw/srcedtw.cxx|3 sw/source/uibase/inc/pview.hxx|2 sw/source/uibase/inc/srcedtw.hxx |2 sw/source/uibase/uiview/pview.cxx |2 toolkit/source/awt/scrollabledialog.cxx |2 toolkit/source/awt/vclxwindow.cxx |4 vcl/source/control/button.cxx |2 vcl/source/control/edit.cxx |2 vcl/source/control/ilstbox.cxx|2 vcl/source/control/lstbox.cxx |2 vcl/source/control/slider.cxx |2 vcl/source/control/tabctrl.cxx|4 vcl/source/window/brdwin.cxx |4
[Libreoffice-commits] core.git: 3 commits - avmedia/source basctl/source cui/source editeng/source forms/source include/svl reportdesign/source sc/source sd/source sfx2/source starmath/source svl/sour
avmedia/source/framework/mediatoolbox.cxx |2 basctl/source/basicide/basicbox.cxx |4 cui/source/dialogs/cuihyperdlg.cxx|2 cui/source/dialogs/postdlg.cxx|6 cui/source/options/treeopt.cxx| 10 cui/source/tabpages/backgrnd.cxx | 20 - cui/source/tabpages/border.cxx|2 cui/source/tabpages/page.cxx | 12 - cui/source/tabpages/paragrph.cxx | 34 +-- editeng/source/editeng/editdbg.cxx|6 editeng/source/editeng/editdoc.cxx| 56 ++--- editeng/source/editeng/editobj.cxx| 10 editeng/source/editeng/impedit4.cxx |6 editeng/source/editeng/impedit5.cxx | 18 - editeng/source/outliner/outliner.cxx |4 editeng/source/uno/unofored.cxx |2 forms/source/richtext/rtattributehandler.cxx |2 include/svl/poolitem.hxx |5 reportdesign/source/ui/misc/statusbarcontroller.cxx |4 reportdesign/source/ui/misc/toolboxcontroller.cxx |2 sc/source/core/data/patattr.cxx |2 sc/source/filter/html/htmlexp.cxx |2 sc/source/ui/cctrl/tbinsert.cxx |2 sc/source/ui/cctrl/tbzoomsliderctrl.cxx |2 sc/source/ui/drawfunc/drawsh2.cxx |2 sc/source/ui/drawfunc/drtxtob.cxx |4 sc/source/ui/optdlg/tpview.cxx|2 sc/source/ui/pagedlg/tptable.cxx |6 sc/source/ui/sidebar/AlignmentPropertyPanel.cxx |4 sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx|4 sc/source/ui/view/formatsh.cxx|2 sd/source/core/sdpage.cxx | 10 sd/source/filter/html/htmlex.cxx | 14 - sd/source/ui/annotations/annotationmanager.cxx|8 sd/source/ui/app/sdmod1.cxx | 10 sd/source/ui/app/tbxww.cxx|2 sd/source/ui/app/tmplctrl.cxx |2 sd/source/ui/dlg/animobjs.cxx |2 sd/source/ui/dlg/diactrl.cxx |2 sd/source/ui/dlg/dlgolbul.cxx |4 sd/source/ui/dlg/gluectrl.cxx |2 sd/source/ui/dlg/navigatr.cxx |4 sd/source/ui/dlg/paragr.cxx |4 sd/source/ui/dlg/tpoption.cxx |6 sd/source/ui/func/fubullet.cxx| 16 - sd/source/ui/func/fuolbull.cxx|2 sd/source/ui/func/futempl.cxx |2 sd/source/ui/sidebar/AllMasterPagesSelector.cxx |2 sd/source/ui/slidesorter/controller/SlideSorterController.cxx | 10 sd/source/ui/slidesorter/controller/SlsSlotManager.cxx| 52 ++-- sd/source/ui/view/drawview.cxx|8 sd/source/ui/view/drtxtob1.cxx|4 sd/source/ui/view/drviews2.cxx|4 sd/source/ui/view/drviews3.cxx|8 sd/source/ui/view/drviews6.cxx| 16 - sd/source/ui/view/drviews7.cxx| 112 +- sd/source/ui/view/drviewsa.cxx|8 sd/source/ui/view/drviewsf.cxx| 16 - sd/source/ui/view/drviewsj.cxx| 98 sd/source/ui/view/outlnvsh.cxx| 34 +-- sd/source/ui/view/outlview.cxx|2 sd/source/ui/view/viewshe3.cxx| 10 sd/source/ui/view/viewshel.cxx|2 sfx2/source/control/bindings.cxx | 18 - sfx2/source/control/ctrlitem.cxx |4 sfx2/source/control/dispatch.cxx |4 sfx2/source/control/querystatus.cxx |2 sfx2/source/control/request.cxx |2 sfx2/source/control/sfxstatuslistener.cxx |2 sfx2/source/control/shell.cxx
[Libreoffice-commits] core.git: 3 commits - avmedia/source basctl/source
avmedia/source/vlc/wrapper/SymbolLoader.hxx |4 ++-- basctl/source/basicide/baside2.cxx |5 + basctl/source/basicide/baside3.cxx |6 +++--- 3 files changed, 10 insertions(+), 5 deletions(-) New commits: commit 81f94edc6341b4c898d8109ed50260de9ed06504 Author: Tor Lillqvist t...@collabora.com Date: Sat Oct 12 09:34:51 2013 +0300 What (who?) are OW and MTF? Change-Id: I47b9b91d72e423c0ef37eaa9f081e755adfc36d6 diff --git a/basctl/source/basicide/baside2.cxx b/basctl/source/basicide/baside2.cxx index 667bae5..7080371 100644 --- a/basctl/source/basicide/baside2.cxx +++ b/basctl/source/basicide/baside2.cxx @@ -72,6 +72,11 @@ namespace Print short const ValidWindow = 0x1234; +// What (who) are OW and MTF? Compare to baside3.cxx where an +// identically named variable, used in the same way, has the value +// *.* on Windows, * otherwise. Is that what should be done here, +// too? + #if defined(OW) || defined(MTF) char const FilterMask_All[] = *; #else commit 5705102c02fefa715426424f0536d675c3faee68 Author: Tor Lillqvist t...@collabora.com Date: Sat Oct 12 09:30:34 2013 +0300 Test WNT instead of the vague UNX Change-Id: I99aa82d29d056afde92d258fd5cdf13359f9b74c diff --git a/basctl/source/basicide/baside3.cxx b/basctl/source/basicide/baside3.cxx index a6c73d1..b22db95 100644 --- a/basctl/source/basicide/baside3.cxx +++ b/basctl/source/basicide/baside3.cxx @@ -64,10 +64,10 @@ using namespace ::com::sun::star::io; using namespace ::com::sun::star::resource; using namespace ::com::sun::star::ui::dialogs; -#if defined(UNX) -char const FilterMask_All[] = *; -#else +#ifdef WNT char const FilterMask_All[] = *.*; +#else +char const FilterMask_All[] = *; #endif DBG_NAME( DialogWindow ) commit f1b956f5aaa83b53b1217d85be24d71d6379e97e Author: Tor Lillqvist t...@collabora.com Date: Sat Oct 12 09:26:17 2013 +0300 s/UNX/LINUX/, as that is what is meant here Change-Id: I6b58f6f62bc304b29c336fc46f87bce8d2ce22fe diff --git a/avmedia/source/vlc/wrapper/SymbolLoader.hxx b/avmedia/source/vlc/wrapper/SymbolLoader.hxx index 7061faf..e7db7a7 100644 --- a/avmedia/source/vlc/wrapper/SymbolLoader.hxx +++ b/avmedia/source/vlc/wrapper/SymbolLoader.hxx @@ -34,7 +34,7 @@ struct ApiMap namespace { -#if defined( UNX ) +#if defined( LINUX ) const char LibName[] = libvlc.so.5; #elif defined( MACOSX ) const char LibName[] = /Applications/VLC.app/Contents/MacOS/lib/libvlc.dylib; @@ -92,7 +92,7 @@ namespace templatesize_t N bool InitApiMap( const ApiMap ( pMap )[N] ) { -#if defined( UNX ) || defined( MACOSX ) +#if defined( LINUX ) || defined( MACOSX ) const OUString fullPath = OUString::createFromAscii(LibName); #elif defined( WNT ) const OUString fullPath = GetVLCPath() + OUString::createFromAscii(LibName); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits