[Libreoffice-commits] core.git: avmedia/inc avmedia/source bridges/source connectivity/source cui/source dbaccess/source editeng/source extensions/source filter/source forms/source hwpfilter/source idlc/source include/avmedia include/helpcompiler include/i18nutil include/sfx2 include/svl include/svtools include/svx include/test include/unotest include/unotools include/vcl include/xmloff odk/examples onlineupdate/source oox/source reportdesign/source scaddins/source sc/qa sc/source sdext/source sd/source sfx2/source svl/source svtools/source svx/inc svx/source sw/inc sw/source tubes/source vcl/inc vcl/osx vcl/qa vcl/source vcl/unx vcl/win xmloff/source
Chris Sherlock
chris.sherlock79 at gmail.com
Tue Feb 9 08:11:58 UTC 2016
avmedia/inc/mediacontrol.hxx | 8
avmedia/source/framework/mediacontrol.cxx | 22
avmedia/source/framework/mediaitem.cxx | 38
avmedia/source/framework/mediamisc.cxx | 2
avmedia/source/framework/mediaplayer.cxx | 17
avmedia/source/framework/mediatoolbox.cxx | 21
avmedia/source/framework/modeltools.cxx | 8
avmedia/source/gstreamer/gstframegrabber.hxx | 5
avmedia/source/gstreamer/gstmanager.hxx | 4
avmedia/source/gstreamer/gstplayer.cxx | 43
avmedia/source/gstreamer/gstplayer.hxx | 3
avmedia/source/gstreamer/gstwindow.hxx | 4
avmedia/source/macavf/framegrabber.hxx | 4
avmedia/source/macavf/framegrabber.mm | 11
avmedia/source/macavf/manager.hxx | 3
avmedia/source/macavf/manager.mm | 9
avmedia/source/macavf/player.hxx | 6
avmedia/source/macavf/player.mm | 27
avmedia/source/macavf/window.hxx | 7
avmedia/source/macavf/window.mm | 33
avmedia/source/quicktime/framegrabber.hxx | 4
avmedia/source/quicktime/framegrabber.mm | 9
avmedia/source/quicktime/manager.hxx | 3
avmedia/source/quicktime/manager.mm | 8
avmedia/source/quicktime/player.hxx | 6
avmedia/source/quicktime/player.mm | 26
avmedia/source/quicktime/window.hxx | 4
avmedia/source/viewer/mediaevent_impl.cxx | 29
avmedia/source/viewer/mediawindow.cxx | 58 -
avmedia/source/win/framegrabber.cxx | 10
avmedia/source/win/framegrabber.hxx | 4
avmedia/source/win/manager.cxx | 8
avmedia/source/win/manager.hxx | 3
avmedia/source/win/player.cxx | 27
avmedia/source/win/player.hxx | 5
avmedia/source/win/window.hxx | 5
bridges/source/cpp_uno/gcc3_ios_arm/rtti.h | 274 ++---
connectivity/source/drivers/postgresql/pq_tools.cxx | 2
connectivity/source/drivers/postgresql/pq_tools.hxx | 2
connectivity/source/parse/sqlflex.l | 3
cui/source/dialogs/cuigaldlg.cxx | 84 -
cui/source/dialogs/cuigrfflt.cxx | 64 -
dbaccess/source/filter/xml/xmlExport.hxx | 8
dbaccess/source/filter/xml/xmlfilter.cxx | 31
dbaccess/source/filter/xml/xmlfilter.hxx | 6
editeng/source/items/frmitems.cxx | 190 +--
editeng/source/rtf/svxrtf.cxx | 14
extensions/source/macosx/spotlight/main.m | 20
extensions/source/scanner/sane.hxx | 10
extensions/source/scanner/scanner.cxx | 11
extensions/source/scanner/scanunx.cxx | 24
filter/source/flash/impswfdialog.cxx | 9
filter/source/flash/impswfdialog.hxx | 4
filter/source/flash/swfdialog.cxx | 26
filter/source/flash/swfdialog.hxx | 7
filter/source/graphicfilter/egif/egif.cxx | 27
filter/source/graphicfilter/egif/giflzwc.cxx | 29
filter/source/graphicfilter/egif/giflzwc.hxx | 4
filter/source/graphicfilter/etiff/etiff.cxx | 31
filter/source/pdf/impdialog.cxx | 156 +--
filter/source/pdf/impdialog.hxx | 518 ++++------
filter/source/pdf/pdfdialog.cxx | 8
filter/source/pdf/pdfdialog.hxx | 17
filter/source/pdf/pdfexport.cxx | 233 ++--
filter/source/pdf/pdfexport.hxx | 76 -
filter/source/pdf/pdffilter.cxx | 34
filter/source/pdf/pdffilter.hxx | 16
filter/source/pdf/pdfinteract.cxx | 11
filter/source/pdf/pdfinteract.hxx | 15
filter/source/svg/impsvgdialog.cxx | 10
filter/source/svg/impsvgdialog.hxx | 12
filter/source/svg/svgdialog.cxx | 21
filter/source/svg/svgdialog.hxx | 9
filter/source/svg/svgexport.cxx | 147 --
filter/source/svg/svgfontexport.cxx | 13
filter/source/svg/svgfontexport.hxx | 16
filter/source/svg/svgwriter.cxx | 136 +-
filter/source/svg/svgwriter.hxx | 20
forms/source/component/imgprod.cxx | 28
forms/source/component/imgprod.hxx | 13
hwpfilter/source/hwpfile.cxx | 60 -
idlc/source/idlccompile.cxx | 8
include/avmedia/modeltools.hxx | 2
include/helpcompiler/HelpIndexer.hxx | 60 -
include/helpcompiler/HelpSearch.hxx | 24
include/i18nutil/paper.hxx | 3
include/sfx2/printopt.hxx | 3
include/svl/svdde.hxx | 46
include/svtools/brwbox.hxx | 30
include/svtools/calendar.hxx | 17
include/svtools/colrdlg.hxx | 4
include/svtools/headbar.hxx | 18
include/svtools/printoptions.hxx | 12
include/svtools/prnsetup.hxx | 6
include/svtools/ruler.hxx | 13
include/svtools/scrwin.hxx | 12
include/svtools/tabbar.hxx | 16
include/svtools/valueset.hxx | 3
include/svtools/wizdlg.hxx | 7
include/svx/gallery1.hxx | 10
include/svx/galtheme.hxx | 12
include/svx/grafctrl.hxx | 34
include/svx/msdffdef.hxx | 205 ++-
include/svx/svdomedia.hxx | 3
include/svx/xmleohlp.hxx | 19
include/test/util/xreplaceable.hxx | 4
include/unotest/bootstrapfixturebase.hxx | 4
include/unotools/fontcvt.hxx | 23
include/unotools/fontdefs.hxx | 9
include/vcl/bitmapaccess.hxx | 36
include/vcl/button.hxx | 30
include/vcl/commandevent.hxx | 51
include/vcl/ctrl.hxx | 1
include/vcl/cvtgrf.hxx | 1
include/vcl/dialog.hxx | 3
include/vcl/dockwin.hxx | 1
include/vcl/edit.hxx | 2
include/vcl/event.hxx | 6
include/vcl/field.hxx | 19
include/vcl/fixed.hxx | 4
include/vcl/floatwin.hxx | 2
include/vcl/gdimtf.hxx | 2
include/vcl/gfxlink.hxx | 5
include/vcl/gradient.hxx | 2
include/vcl/graphicfilter.hxx | 1
include/vcl/group.hxx | 1
include/vcl/hatch.hxx | 2
include/vcl/help.hxx | 2
include/vcl/imgctrl.hxx | 1
include/vcl/inputctx.hxx | 2
include/vcl/lineinfo.hxx | 2
include/vcl/longcurr.hxx | 3
include/vcl/mapmod.hxx | 1
include/vcl/mnemonic.hxx | 2
include/vcl/morebtn.hxx | 1
include/vcl/prgsbar.hxx | 2
include/vcl/prntypes.hxx | 4
include/vcl/salbtype.hxx | 8
include/vcl/scrbar.hxx | 3
include/vcl/seleng.hxx | 2
include/vcl/settings.hxx | 5
include/vcl/sound.hxx | 1
include/vcl/spin.hxx | 1
include/vcl/status.hxx | 5
include/vcl/syswin.hxx | 4
include/vcl/tabpage.hxx | 1
include/vcl/window.hxx | 2
include/vcl/wrkwin.hxx | 2
include/xmloff/settingsstore.hxx | 4
include/xmloff/unointerfacetouniqueidentifiermapper.hxx | 2
include/xmloff/xmltypes.hxx | 2
include/xmloff/xmluconv.hxx | 2
odk/examples/cpp/complextoolbarcontrols/MyJob.cxx | 2
odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.cxx | 16
onlineupdate/source/update/inc/nsWindowsHelpers.h | 2
oox/source/drawingml/diagram/diagramfragmenthandler.hxx | 4
reportdesign/source/filter/xml/xmlExport.hxx | 1
reportdesign/source/filter/xml/xmlfilter.cxx | 1
reportdesign/source/filter/xml/xmlfilter.hxx | 1
sc/qa/unit/ucalc_formula.cxx | 1
sc/source/filter/inc/lotfntbf.hxx | 4
sc/source/filter/inc/tokstack.hxx | 12
sc/source/filter/lotus/filter.cxx | 2
sc/source/filter/lotus/lotattr.cxx | 4
sc/source/filter/lotus/lotread.cxx | 2
sc/source/filter/oox/worksheetfragment.cxx | 2
sc/source/ui/condformat/condformatdlg.cxx | 7
sc/source/ui/condformat/condformatmgr.cxx | 1
sc/source/ui/docshell/docsh6.cxx | 8
sc/source/ui/undo/undoblk3.cxx | 4
sc/source/ui/unoobj/appluno.cxx | 4
sc/source/ui/vba/vbarange.cxx | 28
sc/source/ui/vba/vbaworkbook.cxx | 2
scaddins/source/analysis/analysishelper.cxx | 26
sd/source/filter/grf/sdgrffilter.cxx | 1
sd/source/filter/html/HtmlOptionsDialog.cxx | 1
sd/source/filter/html/sdhtmlfilter.cxx | 1
sd/source/filter/ppt/pptanimations.hxx | 2
sd/source/filter/sdfilter.cxx | 2
sd/source/filter/sdpptwrp.cxx | 2
sd/source/filter/xml/sdxmlwrp.cxx | 1
sd/source/ui/app/optsitem.cxx | 2
sd/source/ui/dlg/sdpreslt.cxx | 2
sd/source/ui/dlg/sdtreelb.cxx | 1
sd/source/ui/docshell/sdclient.cxx | 2
sd/source/ui/framework/factories/BasicPaneFactory.cxx | 2
sd/source/ui/table/tableobjectbar.cxx | 1
sd/source/ui/view/GraphicObjectBar.cxx | 1
sd/source/ui/view/MediaObjectBar.cxx | 1
sd/source/ui/view/drviewsa.cxx | 1
sd/source/ui/view/outlview.cxx | 2
sd/source/ui/view/sdview2.cxx | 1
sd/source/ui/view/sdview3.cxx | 1
sd/source/ui/view/tabcontr.cxx | 1
sdext/source/minimizer/graphiccollector.hxx | 1
sdext/source/minimizer/impoptimizer.cxx | 1
sdext/source/minimizer/impoptimizer.hxx | 1
sdext/source/minimizer/informationdialog.cxx | 1
sdext/source/minimizer/informationdialog.hxx | 1
sdext/source/minimizer/optimizerdialog.cxx | 1
sdext/source/minimizer/optimizerdialog.hxx | 1
sdext/source/minimizer/optimizerdialogcontrols.cxx | 1
sdext/source/minimizer/pppoptimizer.cxx | 1
sdext/source/minimizer/pppoptimizer.hxx | 1
sdext/source/minimizer/pppoptimizerdialog.hxx | 1
sdext/source/minimizer/unodialog.cxx | 1
sdext/source/minimizer/unodialog.hxx | 1
sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx | 2
sfx2/source/dialog/bluthsnd.cxx | 2
svl/source/svdde/ddeimp.hxx | 4
svtools/source/control/toolbarmenuacc.cxx | 2
svtools/source/control/toolbarmenuimp.hxx | 3
svtools/source/control/valueacc.cxx | 3
svtools/source/dialogs/colrdlg.cxx | 1
svtools/source/graphic/descriptor.cxx | 1
svtools/source/graphic/grfattr.cxx | 1
svtools/source/graphic/grfcache.hxx | 1
svtools/source/graphic/grfmgr2.cxx | 2
svtools/source/graphic/transformer.cxx | 1
svtools/source/graphic/transformer.hxx | 1
svtools/source/misc/transfer.cxx | 7
svtools/source/misc/transfer2.cxx | 5
svx/inc/galbrws2.hxx | 5
svx/source/accessibility/charmapacc.cxx | 4
svx/source/dialog/grfflt.cxx | 1
svx/source/dialog/imapimp.hxx | 1
svx/source/gallery2/codec.cxx | 1
svx/source/gallery2/galbrws1.cxx | 4
svx/source/gallery2/galbrws1.hxx | 3
svx/source/gallery2/galexpl.cxx | 1
svx/source/gallery2/gallery1.cxx | 4
svx/source/gallery2/galtheme.cxx | 1
svx/source/sdr/contact/sdrmediawindow.cxx | 1
svx/source/sdr/contact/sdrmediawindow.hxx | 1
svx/source/svdraw/svdibrow.cxx | 3
svx/source/svdraw/svdomedia.cxx | 1
svx/source/tbxctrls/colrctrl.cxx | 1
svx/source/unodraw/unoshap4.cxx | 6
svx/source/unodraw/unoshape.cxx | 2
svx/source/unogallery/unogalitem.cxx | 2
svx/source/unogallery/unogalitem.hxx | 2
svx/source/unogallery/unogaltheme.cxx | 1
svx/source/unogallery/unogaltheme.hxx | 1
sw/inc/modcfg.hxx | 4
sw/source/core/doc/doccomp.cxx | 2
sw/source/uibase/config/modcfg.cxx | 6
tubes/source/manager.cxx | 4
vcl/inc/PhysicalFontCollection.hxx | 1
vcl/inc/PhysicalFontFace.hxx | 1
vcl/inc/osx/a11yfocustracker.hxx | 1
vcl/inc/osx/a11ylistener.hxx | 1
vcl/inc/osx/keyboardfocuslistener.hxx | 1
vcl/inc/osx/salframe.h | 1
vcl/inc/osx/salobj.h | 1
vcl/inc/osx/salprn.h | 2
vcl/inc/osx/salsys.h | 1
vcl/inc/quartz/salbmp.h | 1
vcl/inc/quartz/salgdi.h | 2
vcl/inc/unx/salbmp.h | 3
vcl/inc/win/salbmp.h | 1
vcl/inc/win/salframe.h | 1
vcl/inc/win/salobj.h | 1
vcl/inc/win/salprn.h | 3
vcl/inc/win/salvd.h | 1
vcl/inc/win/wincomp.hxx | 3
vcl/osx/documentfocuslistener.hxx | 1
vcl/qa/cppunit/timer.cxx | 5
vcl/source/filter/ixpm/xpmread.cxx | 1
vcl/source/gdi/dibtools.cxx | 1
vcl/source/gdi/impvect.hxx | 1
vcl/source/gdi/lineinfo.cxx | 2
vcl/source/gdi/mapmod.cxx | 1
vcl/source/gdi/pdfwriter_impl.cxx | 1
vcl/source/window/brdwin.cxx | 4
vcl/source/window/menu.cxx | 1
vcl/unx/generic/app/gendisp.cxx | 6
vcl/unx/generic/gdi/salbmp.cxx | 3
vcl/win/gdi/salbmp.cxx | 2
vcl/win/gdi/salfont.cxx | 1
vcl/win/gdi/salprn.cxx | 5
xmloff/source/core/DocumentSettingsContext.cxx | 10
xmloff/source/core/SettingsExportHelper.cxx | 8
xmloff/source/core/XMLBase64Export.cxx | 2
xmloff/source/core/XMLBase64ImportContext.cxx | 4
xmloff/source/draw/animexp.cxx | 2
xmloff/source/text/txtprmap.cxx | 8
286 files changed, 1594 insertions(+), 2547 deletions(-)
New commits:
commit 538f276ae0414ea34ede6090b5f56e8fecd6fc65
Author: Chris Sherlock <chris.sherlock79 at gmail.com>
Date: Tue Feb 9 09:21:53 2016 +1100
Formatting changes across all modules
+ Removed comment cruft
+ Tab formatting in number of files
+ Some commented out code removed
+ Tab characters replaced with spaces
+ Newline cleanup in quite a few files
+ Tweak header guard #endifs
Change-Id: I3208ff2f047da890edcc49b73389aca22442f5fc
Reviewed-on: https://gerrit.libreoffice.org/22221
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Chris Sherlock <chris.sherlock79 at gmail.com>
diff --git a/avmedia/inc/mediacontrol.hxx b/avmedia/inc/mediacontrol.hxx
index da17bc8..1139f98 100644
--- a/avmedia/inc/mediacontrol.hxx
+++ b/avmedia/inc/mediacontrol.hxx
@@ -37,9 +37,6 @@ namespace avmedia
{
-// - MediaControlStyle -
-
-
enum MediaControlStyle
{
MEDIACONTROLSTYLE_SINGLELINE = 0,
@@ -47,9 +44,6 @@ enum MediaControlStyle
};
-// - MediaControl -
-
-
class MediaItem;
class MediaControl : public Control
@@ -103,6 +97,6 @@ private:
}
-#endif
+#endif // INCLUDED_AVMEDIA_INC_MEDIACONTROL_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/framework/mediacontrol.cxx b/avmedia/source/framework/mediacontrol.cxx
index 8d54229..8728fdf 100644
--- a/avmedia/source/framework/mediacontrol.cxx
+++ b/avmedia/source/framework/mediacontrol.cxx
@@ -57,10 +57,6 @@
namespace avmedia
{
-
-// - MediaControl -
-
-
MediaControl::MediaControl( vcl::Window* pParent, MediaControlStyle eControlStyle ) :
Control( pParent ),
maImageList( SvtMiscOptions().AreCurrentSymbolsLarge() ? AVMEDIA_RESID( AVMEDIA_IMGLST_L ) : AVMEDIA_RESID( AVMEDIA_IMGLST ) ),
@@ -192,12 +188,12 @@ MediaControl::MediaControl( vcl::Window* pParent, MediaControlStyle eControlStyl
}
-
MediaControl::~MediaControl()
{
disposeOnce();
}
+
void MediaControl::dispose()
{
maZoomToolBox->SetItemWindow( AVMEDIA_TOOLBOXITEM_ZOOM, nullptr );
@@ -212,14 +208,12 @@ void MediaControl::dispose()
}
-
const Size& MediaControl::getMinSizePixel() const
{
return maMinSize;
}
-
void MediaControl::Resize()
{
Point aPos( 0, 0 );
@@ -277,7 +271,6 @@ void MediaControl::Resize()
}
-
void MediaControl::setState( const MediaItem& rItem )
{
if( !mbLocked )
@@ -292,7 +285,6 @@ void MediaControl::setState( const MediaItem& rItem )
}
-
void MediaControl::implUpdateToolboxes()
{
const bool bValidURL = !maItem.getURL().isEmpty();
@@ -367,7 +359,6 @@ void MediaControl::implUpdateToolboxes()
}
-
void MediaControl::implUpdateTimeSlider()
{
if( maItem.getURL().isEmpty() || !IsEnabled() )
@@ -394,7 +385,6 @@ void MediaControl::implUpdateTimeSlider()
}
-
void MediaControl::implUpdateVolumeSlider()
{
if( maItem.getURL().isEmpty() || !IsEnabled() )
@@ -411,7 +401,6 @@ void MediaControl::implUpdateVolumeSlider()
}
-
void MediaControl::implUpdateTimeField( double fCurTime )
{
if( !maItem.getURL().isEmpty() )
@@ -431,14 +420,12 @@ void MediaControl::implUpdateTimeField( double fCurTime )
}
-
Image MediaControl::implGetImage( sal_Int32 nImageId ) const
{
return maImageList.GetImage( static_cast< sal_uInt16 >( nImageId ) );
}
-
IMPL_LINK_TYPED( MediaControl, implTimeHdl, Slider*, p, void )
{
mbLocked = true;
@@ -447,7 +434,6 @@ IMPL_LINK_TYPED( MediaControl, implTimeHdl, Slider*, p, void )
}
-
IMPL_LINK_TYPED( MediaControl, implTimeEndHdl, Slider*, p, void )
{
MediaItem aExecItem;
@@ -460,7 +446,6 @@ IMPL_LINK_TYPED( MediaControl, implTimeEndHdl, Slider*, p, void )
}
-
IMPL_LINK_TYPED( MediaControl, implVolumeHdl, Slider*, p, void )
{
MediaItem aExecItem;
@@ -471,7 +456,6 @@ IMPL_LINK_TYPED( MediaControl, implVolumeHdl, Slider*, p, void )
}
-
IMPL_LINK_TYPED( MediaControl, implSelectHdl, ToolBox*, p, void )
{
if( p )
@@ -559,7 +543,6 @@ IMPL_LINK_TYPED( MediaControl, implSelectHdl, ToolBox*, p, void )
}
-
IMPL_LINK_TYPED( MediaControl, implZoomSelectHdl, ListBox&, p, void )
{
MediaItem aExecItem;
@@ -582,12 +565,11 @@ IMPL_LINK_TYPED( MediaControl, implZoomSelectHdl, ListBox&, p, void )
}
-
IMPL_LINK_NOARG_TYPED(MediaControl, implTimeoutHdl, Idle *, void)
{
update();
}
-}
+} // namespace avmedia
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/framework/mediaitem.cxx b/avmedia/source/framework/mediaitem.cxx
index 7a8b9a6..ed413f2 100644
--- a/avmedia/source/framework/mediaitem.cxx
+++ b/avmedia/source/framework/mediaitem.cxx
@@ -43,7 +43,6 @@ using namespace ::com::sun::star;
namespace avmedia
{
-// - MediaItem -
SfxPoolItem* MediaItem::CreateDefault() { return new MediaItem; }
struct MediaItem::Impl
@@ -89,22 +88,26 @@ struct MediaItem::Impl
}
};
+
MediaItem::MediaItem( sal_uInt16 i_nWhich, AVMediaSetMask nMaskSet )
: SfxPoolItem( i_nWhich )
, m_pImpl( new Impl(nMaskSet) )
{
}
+
MediaItem::MediaItem( const MediaItem& rItem )
: SfxPoolItem( rItem )
, m_pImpl( new Impl(*rItem.m_pImpl) )
{
}
+
MediaItem::~MediaItem()
{
}
+
bool MediaItem::operator==( const SfxPoolItem& rItem ) const
{
assert( SfxPoolItem::operator==(rItem));
@@ -122,11 +125,13 @@ bool MediaItem::operator==( const SfxPoolItem& rItem ) const
&& m_pImpl->m_eZoom == rOther.m_pImpl->m_eZoom;
}
+
SfxPoolItem* MediaItem::Clone( SfxItemPool* ) const
{
return new MediaItem( *this );
}
+
bool MediaItem::GetPresentation( SfxItemPresentation,
SfxMapUnit,
SfxMapUnit,
@@ -137,6 +142,7 @@ bool MediaItem::GetPresentation( SfxItemPresentation,
return false;
}
+
bool MediaItem::QueryValue( css::uno::Any& rVal, sal_uInt8 ) const
{
uno::Sequence< uno::Any > aSeq( 10 );
@@ -157,6 +163,7 @@ bool MediaItem::QueryValue( css::uno::Any& rVal, sal_uInt8 ) const
return true;
}
+
bool MediaItem::PutValue( const css::uno::Any& rVal, sal_uInt8 )
{
uno::Sequence< uno::Any > aSeq;
@@ -185,6 +192,7 @@ bool MediaItem::PutValue( const css::uno::Any& rVal, sal_uInt8 )
return bRet;
}
+
void MediaItem::merge( const MediaItem& rMediaItem )
{
const AVMediaSetMask nMaskSet = rMediaItem.getMaskSet();
@@ -217,11 +225,13 @@ void MediaItem::merge( const MediaItem& rMediaItem )
setZoom( rMediaItem.getZoom() );
}
+
AVMediaSetMask MediaItem::getMaskSet() const
{
return m_pImpl->m_nMaskSet;
}
+
void MediaItem::setURL( const OUString& rURL, const OUString& rTempURL, const OUString& rReferer )
{
m_pImpl->m_nMaskSet |= AVMediaSetMask::URL;
@@ -230,109 +240,129 @@ void MediaItem::setURL( const OUString& rURL, const OUString& rTempURL, const OU
m_pImpl->m_Referer = rReferer;
}
+
const OUString& MediaItem::getURL() const
{
return m_pImpl->m_URL;
}
+
const OUString& MediaItem::getTempURL() const
{
return m_pImpl->m_TempFileURL;
}
+
const OUString& MediaItem::getReferer() const
{
return m_pImpl->m_Referer;
}
+
void MediaItem::setMimeType( const OUString& rMimeType )
{
m_pImpl->m_nMaskSet |= AVMediaSetMask::MIME_TYPE;
m_pImpl->m_sMimeType = rMimeType;
}
+
OUString MediaItem::getMimeType() const
{
return !m_pImpl->m_sMimeType.isEmpty() ? m_pImpl->m_sMimeType : AVMEDIA_MIMETYPE_COMMON;
}
+
void MediaItem::setState( MediaState eState )
{
m_pImpl->m_eState = eState;
m_pImpl->m_nMaskSet |= AVMediaSetMask::STATE;
}
+
MediaState MediaItem::getState() const
{
return m_pImpl->m_eState;
}
+
void MediaItem::setDuration( double fDuration )
{
m_pImpl->m_fDuration = fDuration;
m_pImpl->m_nMaskSet |= AVMediaSetMask::DURATION;
}
+
double MediaItem::getDuration() const
{
return m_pImpl->m_fDuration;
}
+
void MediaItem::setTime( double fTime )
{
m_pImpl->m_fTime = fTime;
m_pImpl->m_nMaskSet |= AVMediaSetMask::TIME;
}
+
double MediaItem::getTime() const
{
return m_pImpl->m_fTime;
}
+
void MediaItem::setLoop( bool bLoop )
{
m_pImpl->m_bLoop = bLoop;
m_pImpl->m_nMaskSet |= AVMediaSetMask::LOOP;
}
+
bool MediaItem::isLoop() const
{
return m_pImpl->m_bLoop;
}
+
void MediaItem::setMute( bool bMute )
{
m_pImpl->m_bMute = bMute;
m_pImpl->m_nMaskSet |= AVMediaSetMask::MUTE;
}
+
bool MediaItem::isMute() const
{
return m_pImpl->m_bMute;
}
+
void MediaItem::setVolumeDB( sal_Int16 nDB )
{
m_pImpl->m_nVolumeDB = nDB;
m_pImpl->m_nMaskSet |= AVMediaSetMask::VOLUMEDB;
}
+
sal_Int16 MediaItem::getVolumeDB() const
{
return m_pImpl->m_nVolumeDB;
}
+
void MediaItem::setZoom( css::media::ZoomLevel eZoom )
{
m_pImpl->m_eZoom = eZoom;
m_pImpl->m_nMaskSet |= AVMediaSetMask::ZOOM;
}
+
css::media::ZoomLevel MediaItem::getZoom() const
{
return m_pImpl->m_eZoom;
}
+
OUString GetFilename(OUString const& rSourceURL)
{
uno::Reference<uri::XUriReferenceFactory> const xUriFactory(
@@ -357,6 +387,7 @@ OUString GetFilename(OUString const& rSourceURL)
return filename;
}
+
uno::Reference<io::XStream>
CreateStream(uno::Reference<embed::XStorage> const& xStorage,
OUString const& rFilename)
@@ -399,6 +430,7 @@ CreateStream(uno::Reference<embed::XStorage> const& xStorage,
return xStream;
}
+
bool EmbedMedia(uno::Reference<frame::XModel> const& xModel,
OUString const& rSourceURL, OUString & o_rEmbeddedURL)
{
@@ -451,6 +483,8 @@ bool EmbedMedia(uno::Reference<frame::XModel> const& xModel,
}
return false;
}
-}
+
+
+} // namespace avmedia
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/framework/mediamisc.cxx b/avmedia/source/framework/mediamisc.cxx
index 6733313..af9ce1b 100644
--- a/avmedia/source/framework/mediamisc.cxx
+++ b/avmedia/source/framework/mediamisc.cxx
@@ -38,6 +38,6 @@ ResMgr* GetResMgr()
return pResMgr;
}
-} // namespace avemdia
+} // namespace avmedia
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/framework/mediaplayer.cxx b/avmedia/source/framework/mediaplayer.cxx
index c39af42..489ff5e 100644
--- a/avmedia/source/framework/mediaplayer.cxx
+++ b/avmedia/source/framework/mediaplayer.cxx
@@ -33,10 +33,6 @@
namespace avmedia
{
-
-// - MediaPlayer -
-
-
MediaPlayer::MediaPlayer( vcl::Window* _pParent, sal_uInt16 nId, SfxBindings* _pBindings, SfxChildWinInfo* pInfo ) :
SfxChildWindow( _pParent, nId )
{
@@ -45,19 +41,14 @@ MediaPlayer::MediaPlayer( vcl::Window* _pParent, sal_uInt16 nId, SfxBindings* _p
};
-
MediaPlayer::~MediaPlayer()
{
}
-
SFX_IMPL_DOCKINGWINDOW_WITHID( MediaPlayer, SID_AVMEDIA_PLAYER )
-// - MediaFloater -
-
-
MediaFloater::MediaFloater( SfxBindings* _pBindings, SfxChildWindow* pCW, vcl::Window* pParent ) :
SfxDockingWindow( _pBindings, pCW, pParent, WB_CLOSEABLE | WB_MOVEABLE | WB_SIZEABLE | WB_DOCKABLE ),
mpMediaWindow( new MediaWindow( this, true ) )
@@ -71,12 +62,12 @@ MediaFloater::MediaFloater( SfxBindings* _pBindings, SfxChildWindow* pCW, vcl::W
}
-
MediaFloater::~MediaFloater()
{
disposeOnce();
}
+
void MediaFloater::dispose()
{
delete mpMediaWindow;
@@ -85,7 +76,6 @@ void MediaFloater::dispose()
}
-
void MediaFloater::Resize()
{
SfxDockingWindow::Resize();
@@ -95,7 +85,6 @@ void MediaFloater::Resize()
}
-
void MediaFloater::ToggleFloatingMode()
{
::avmedia::MediaItem aRestoreItem;
@@ -124,7 +113,6 @@ void MediaFloater::ToggleFloatingMode()
}
-
void MediaFloater::setURL( const OUString& rURL, const OUString& rReferer, bool bPlayImmediately )
{
if( mpMediaWindow )
@@ -137,7 +125,6 @@ void MediaFloater::setURL( const OUString& rURL, const OUString& rReferer, bool
}
-
void MediaFloater::dispatchCurrentURL()
{
SfxDispatcher* pDispatcher = GetBindings().GetDispatcher();
@@ -153,6 +140,6 @@ void MediaFloater::dispatchCurrentURL()
}
}
-}
+} // namespace avmedia
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/framework/mediatoolbox.cxx b/avmedia/source/framework/mediatoolbox.cxx
index 14d6bef..08d1f9f 100644
--- a/avmedia/source/framework/mediatoolbox.cxx
+++ b/avmedia/source/framework/mediatoolbox.cxx
@@ -33,10 +33,6 @@ using namespace ::com::sun::star;
namespace avmedia
{
-
-// - MediaToolboxControl -
-
-
class MediaToolBoxControl_Impl : public MediaControl
{
public:
@@ -52,7 +48,6 @@ private:
};
-
MediaToolBoxControl_Impl::MediaToolBoxControl_Impl( vcl::Window& rParent, MediaToolBoxControl& rControl ) :
MediaControl( &rParent, MEDIACONTROLSTYLE_SINGLELINE ),
mpToolBoxControl( &rControl )
@@ -61,27 +56,21 @@ MediaToolBoxControl_Impl::MediaToolBoxControl_Impl( vcl::Window& rParent, MediaT
}
-
void MediaToolBoxControl_Impl::update()
{
mpToolBoxControl->implUpdateMediaControl();
}
-
void MediaToolBoxControl_Impl::execute( const MediaItem& rItem )
{
mpToolBoxControl->implExecuteMediaControl( rItem );
}
-// - MediaToolBoxControl -
-
-
SFX_IMPL_TOOLBOX_CONTROL( ::avmedia::MediaToolBoxControl, ::avmedia::MediaItem );
-
MediaToolBoxControl::MediaToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) :
SfxToolBoxControl( nSlotId, nId, rTbx )
{
@@ -89,15 +78,12 @@ MediaToolBoxControl::MediaToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, To
}
-
MediaToolBoxControl::~MediaToolBoxControl()
{
}
-
-void MediaToolBoxControl::StateChanged( sal_uInt16 /* nSID */, SfxItemState eState, const SfxPoolItem* pState )
-
+void MediaToolBoxControl::StateChanged( sal_uInt16, SfxItemState eState, const SfxPoolItem* pState )
{
MediaToolBoxControl_Impl* pCtrl = static_cast< MediaToolBoxControl_Impl* >( GetToolBox().GetItemWindow( GetId() ) );
@@ -123,21 +109,18 @@ void MediaToolBoxControl::StateChanged( sal_uInt16 /* nSID */, SfxItemState eSta
}
-
VclPtr<vcl::Window> MediaToolBoxControl::CreateItemWindow( vcl::Window *pParent )
{
return ( pParent ? VclPtr<MediaToolBoxControl_Impl>::Create( *pParent, *this ) : nullptr );
}
-
void MediaToolBoxControl::implUpdateMediaControl()
{
updateStatus( ".uno:AVMediaToolBox" );
}
-
void MediaToolBoxControl::implExecuteMediaControl( const MediaItem& rItem )
{
MediaItem aExecItem( SID_AVMEDIA_TOOLBOX );
@@ -152,6 +135,6 @@ void MediaToolBoxControl::implExecuteMediaControl( const MediaItem& rItem )
Dispatch( ".uno:AVMediaToolBox" , aArgs );
}
-}
+} // namespace avmedia
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/framework/modeltools.cxx b/avmedia/source/framework/modeltools.cxx
index 4d348c3..74669af 100644
--- a/avmedia/source/framework/modeltools.cxx
+++ b/avmedia/source/framework/modeltools.cxx
@@ -66,6 +66,7 @@ static void lcl_UnzipKmz(const OUString& rSourceURL, const OUString& rOutputFold
}
}
+
bool KmzDae2Gltf(const OUString& rSourceURL, OUString& o_rOutput)
{
o_rOutput.clear();
@@ -133,7 +134,8 @@ bool KmzDae2Gltf(const OUString& rSourceURL, OUString& o_rOutput)
o_rOutput = sOutput + "/" + GetFilename(sOutput) + ".json";
return true;
}
-#endif
+#endif // HAVE_FEATURE_COLLADA
+
static void lcl_EmbedExternals(const OUString& rSourceURL, uno::Reference<embed::XStorage> xSubStorage, ::ucbhelper::Content& rContent)
{
@@ -237,6 +239,7 @@ static void lcl_EmbedExternals(const OUString& rSourceURL, uno::Reference<embed:
}
}
+
bool Embed3DModel( const uno::Reference<frame::XModel>& xModel,
const OUString& rSourceURL, OUString& o_rEmbeddedURL)
{
@@ -311,11 +314,12 @@ bool Embed3DModel( const uno::Reference<frame::XModel>& xModel,
return false;
}
+
bool IsModel(const OUString& rMimeType)
{
return rMimeType == AVMEDIA_MIMETYPE_JSON;
}
-} // namespace avemdia
+} // namespace avmedia
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/gstreamer/gstframegrabber.hxx b/avmedia/source/gstreamer/gstframegrabber.hxx
index 4939d4e..af18138 100644
--- a/avmedia/source/gstreamer/gstframegrabber.hxx
+++ b/avmedia/source/gstreamer/gstframegrabber.hxx
@@ -27,13 +27,10 @@
namespace avmedia { namespace gstreamer {
-
-// - FrameGrabber -
-
-
typedef ::cppu::WeakImplHelper< css::media::XFrameGrabber,
css::lang::XServiceInfo > FrameGrabber_BASE;
+
class FrameGrabber : public FrameGrabber_BASE, private boost::noncopyable
{
GstElement *mpPipeline;
diff --git a/avmedia/source/gstreamer/gstmanager.hxx b/avmedia/source/gstreamer/gstmanager.hxx
index 8dc1a95..48a07f6 100644
--- a/avmedia/source/gstreamer/gstmanager.hxx
+++ b/avmedia/source/gstreamer/gstmanager.hxx
@@ -24,10 +24,6 @@
#include <cppuhelper/implbase.hxx>
#include "com/sun/star/media/XManager.hpp"
-
-// - Manager -
-
-
namespace avmedia { namespace gstreamer {
class Manager : public ::cppu::WeakImplHelper< css::media::XManager,
diff --git a/avmedia/source/gstreamer/gstplayer.cxx b/avmedia/source/gstreamer/gstplayer.cxx
index fef123fd..d77944e 100644
--- a/avmedia/source/gstreamer/gstplayer.cxx
+++ b/avmedia/source/gstreamer/gstplayer.cxx
@@ -83,6 +83,7 @@ private:
void execute() override;
};
+
class MissingPluginInstaller {
friend class MissingPluginInstallerThread;
@@ -113,12 +114,14 @@ private:
bool inCleanUp_;
};
+
MissingPluginInstaller::~MissingPluginInstaller() {
osl::MutexGuard g(mutex_);
SAL_WARN_IF(currentThread_.is(), "avmedia.gstreamer", "unjoined thread");
inCleanUp_ = true;
}
+
void MissingPluginInstaller::report(
rtl::Reference<Player> const & source, GstMessage * message)
{
@@ -169,6 +172,7 @@ void MissingPluginInstaller::report(
LINK(this, MissingPluginInstaller, launchUi), launch.get());
}
+
void eraseSource(std::set<rtl::Reference<Player>> & set, Player const * source)
{
auto i = std::find_if(
@@ -181,6 +185,7 @@ void eraseSource(std::set<rtl::Reference<Player>> & set, Player const * source)
}
}
+
void MissingPluginInstaller::detach(Player const * source) {
rtl::Reference<MissingPluginInstallerThread> join;
{
@@ -217,6 +222,7 @@ void MissingPluginInstaller::detach(Player const * source) {
}
}
+
void MissingPluginInstaller::processQueue() {
assert(!queued_.empty());
assert(currentDetails_.empty());
@@ -228,6 +234,7 @@ void MissingPluginInstaller::processQueue() {
queued_.clear();
}
+
IMPL_STATIC_LINK_TYPED(MissingPluginInstaller, launchUi, void *, p, void)
{
MissingPluginInstallerThread* thread = static_cast<MissingPluginInstallerThread*>(p);
@@ -243,10 +250,12 @@ IMPL_STATIC_LINK_TYPED(MissingPluginInstaller, launchUi, void *, p, void)
ref->launch();
}
+
struct TheMissingPluginInstaller:
public rtl::Static<MissingPluginInstaller, TheMissingPluginInstaller>
{};
+
void MissingPluginInstallerThread::execute() {
MissingPluginInstaller & inst = TheMissingPluginInstaller::get();
for (;;) {
@@ -273,9 +282,7 @@ void MissingPluginInstallerThread::execute() {
}
}
-}
-
-// - Player -
+} // end anonymous namespace
Player::Player() :
@@ -315,7 +322,6 @@ Player::Player() :
}
-
Player::~Player()
{
SAL_INFO( "avmedia.gstreamer", AVVERSION << this << " Player::~Player" );
@@ -323,6 +329,7 @@ Player::~Player()
disposing();
}
+
void SAL_CALL Player::disposing()
{
TheMissingPluginInstaller::get().detach(this);
@@ -357,6 +364,7 @@ void SAL_CALL Player::disposing()
}
}
+
static gboolean pipeline_bus_callback( GstBus *, GstMessage *message, gpointer data )
{
Player* pPlayer = static_cast<Player*>(data);
@@ -366,6 +374,7 @@ static gboolean pipeline_bus_callback( GstBus *, GstMessage *message, gpointer d
return TRUE;
}
+
static GstBusSyncReply pipeline_bus_sync_handler( GstBus *, GstMessage * message, gpointer data )
{
Player* pPlayer = static_cast<Player*>(data);
@@ -373,6 +382,7 @@ static GstBusSyncReply pipeline_bus_sync_handler( GstBus *, GstMessage * message
return pPlayer->processSyncMessage( message );
}
+
void Player::processMessage( GstMessage *message )
{
switch( GST_MESSAGE_TYPE( message ) ) {
@@ -401,6 +411,7 @@ void Player::processMessage( GstMessage *message )
}
}
+
static gboolean wrap_element_query_position (GstElement *element, GstFormat format, gint64 *cur)
{
#ifdef AVMEDIA_GST_0_10
@@ -411,6 +422,7 @@ static gboolean wrap_element_query_position (GstElement *element, GstFormat form
#endif
}
+
static gboolean wrap_element_query_duration (GstElement *element, GstFormat format, gint64 *duration)
{
#ifdef AVMEDIA_GST_0_10
@@ -421,6 +433,7 @@ static gboolean wrap_element_query_duration (GstElement *element, GstFormat form
#endif
}
+
GstBusSyncReply Player::processSyncMessage( GstMessage *message )
{
#if OSL_DEBUG_LEVEL > 0
@@ -543,7 +556,7 @@ GstBusSyncReply Player::processSyncMessage( GstMessage *message )
g_object_unref( pad );
}
}
-#endif
+#endif // AVMEDIA_GST_0_10
} else if (gst_is_missing_plugin_message(message)) {
TheMissingPluginInstaller::get().report(this, message);
if( mnWidth == 0 ) {
@@ -560,6 +573,7 @@ GstBusSyncReply Player::processSyncMessage( GstMessage *message )
return GST_BUS_PASS;
}
+
void Player::preparePlaybin( const OUString& rURL, GstElement *pSink )
{
GstBus *pBus;
@@ -599,6 +613,7 @@ void Player::preparePlaybin( const OUString& rURL, GstElement *pSink )
g_object_unref( pBus );
}
+
bool Player::create( const OUString& rURL )
{
bool bRet = false;
@@ -627,7 +642,6 @@ bool Player::create( const OUString& rURL )
}
-
void SAL_CALL Player::start()
throw (uno::RuntimeException, std::exception)
{
@@ -642,7 +656,6 @@ void SAL_CALL Player::start()
}
-
void SAL_CALL Player::stop()
throw (uno::RuntimeException, std::exception)
{
@@ -657,7 +670,6 @@ void SAL_CALL Player::stop()
}
-
sal_Bool SAL_CALL Player::isPlaying()
throw (uno::RuntimeException, std::exception)
{
@@ -677,7 +689,6 @@ sal_Bool SAL_CALL Player::isPlaying()
}
-
double SAL_CALL Player::getDuration()
throw (uno::RuntimeException, std::exception)
{
@@ -694,7 +705,6 @@ double SAL_CALL Player::getDuration()
}
-
void SAL_CALL Player::setMediaTime( double fTime )
throw (uno::RuntimeException, std::exception)
{
@@ -716,7 +726,6 @@ void SAL_CALL Player::setMediaTime( double fTime )
}
-
double SAL_CALL Player::getMediaTime()
throw (uno::RuntimeException, std::exception)
{
@@ -734,6 +743,7 @@ double SAL_CALL Player::getMediaTime()
return position;
}
+
void SAL_CALL Player::setPlaybackLoop( sal_Bool bSet )
throw (uno::RuntimeException, std::exception)
{
@@ -743,7 +753,6 @@ void SAL_CALL Player::setPlaybackLoop( sal_Bool bSet )
}
-
sal_Bool SAL_CALL Player::isPlaybackLoop()
throw (uno::RuntimeException, std::exception)
{
@@ -753,7 +762,6 @@ sal_Bool SAL_CALL Player::isPlaybackLoop()
}
-
void SAL_CALL Player::setMute( sal_Bool bSet )
throw (uno::RuntimeException, std::exception)
{
@@ -777,7 +785,6 @@ void SAL_CALL Player::setMute( sal_Bool bSet )
}
-
sal_Bool SAL_CALL Player::isMute()
throw (uno::RuntimeException, std::exception)
{
@@ -787,7 +794,6 @@ sal_Bool SAL_CALL Player::isMute()
}
-
void SAL_CALL Player::setVolumeDB( sal_Int16 nVolumeDB )
throw (uno::RuntimeException, std::exception)
{
@@ -805,7 +811,6 @@ void SAL_CALL Player::setVolumeDB( sal_Int16 nVolumeDB )
}
-
sal_Int16 SAL_CALL Player::getVolumeDB()
throw (uno::RuntimeException, std::exception)
{
@@ -825,7 +830,6 @@ sal_Int16 SAL_CALL Player::getVolumeDB()
}
-
awt::Size SAL_CALL Player::getPreferredPlayerWindowSize()
throw (uno::RuntimeException, std::exception)
{
@@ -854,7 +858,6 @@ awt::Size SAL_CALL Player::getPreferredPlayerWindowSize()
}
-
uno::Reference< ::media::XPlayerWindow > SAL_CALL Player::createPlayerWindow( const uno::Sequence< uno::Any >& rArguments )
throw (uno::RuntimeException, std::exception)
{
@@ -896,7 +899,6 @@ uno::Reference< ::media::XPlayerWindow > SAL_CALL Player::createPlayerWindow( co
}
-
uno::Reference< media::XFrameGrabber > SAL_CALL Player::createFrameGrabber()
throw (uno::RuntimeException, std::exception)
{
@@ -912,7 +914,6 @@ uno::Reference< media::XFrameGrabber > SAL_CALL Player::createFrameGrabber()
}
-
OUString SAL_CALL Player::getImplementationName()
throw (uno::RuntimeException, std::exception)
{
@@ -920,7 +921,6 @@ OUString SAL_CALL Player::getImplementationName()
}
-
sal_Bool SAL_CALL Player::supportsService( const OUString& ServiceName )
throw (uno::RuntimeException, std::exception)
{
@@ -928,7 +928,6 @@ sal_Bool SAL_CALL Player::supportsService( const OUString& ServiceName )
}
-
uno::Sequence< OUString > SAL_CALL Player::getSupportedServiceNames()
throw (uno::RuntimeException, std::exception)
{
diff --git a/avmedia/source/gstreamer/gstplayer.hxx b/avmedia/source/gstreamer/gstplayer.hxx
index 3f95a88..b6c51fa 100644
--- a/avmedia/source/gstreamer/gstplayer.hxx
+++ b/avmedia/source/gstreamer/gstplayer.hxx
@@ -32,9 +32,6 @@ typedef struct _GstVideoOverlay GstVideoOverlay;
namespace avmedia { namespace gstreamer {
-// - Player -
-
-
typedef ::cppu::WeakComponentImplHelper< css::media::XPlayer,
css::lang::XServiceInfo > GstPlayer_BASE;
diff --git a/avmedia/source/gstreamer/gstwindow.hxx b/avmedia/source/gstreamer/gstwindow.hxx
index 2c9af23..9246a44 100644
--- a/avmedia/source/gstreamer/gstwindow.hxx
+++ b/avmedia/source/gstreamer/gstwindow.hxx
@@ -28,10 +28,6 @@
namespace avmedia { namespace gstreamer {
-
-// - Window -
-
-
class Player;
class Window : public ::cppu::WeakImplHelper< css::media::XPlayerWindow,
diff --git a/avmedia/source/macavf/framegrabber.hxx b/avmedia/source/macavf/framegrabber.hxx
index cb67176..f8ce9d6 100644
--- a/avmedia/source/macavf/framegrabber.hxx
+++ b/avmedia/source/macavf/framegrabber.hxx
@@ -27,10 +27,6 @@
namespace avmedia { namespace macavf {
-// ----------------
-// - FrameGrabber -
-// ----------------
-
class FrameGrabber : public ::cppu::WeakImplHelper< css::media::XFrameGrabber,
css::lang::XServiceInfo >
{
diff --git a/avmedia/source/macavf/framegrabber.mm b/avmedia/source/macavf/framegrabber.mm
index bf54b01..2cbe8cb 100644
--- a/avmedia/source/macavf/framegrabber.mm
+++ b/avmedia/source/macavf/framegrabber.mm
@@ -29,15 +29,10 @@ using namespace ::com::sun::star;
namespace avmedia { namespace macavf {
-// ----------------
-// - FrameGrabber -
-// ----------------
-
FrameGrabber::FrameGrabber( const uno::Reference< lang::XMultiServiceFactory >& /*rxMgr*/ )
: mpImageGen( nullptr )
{}
-// ------------------------------------------------------------------------------
FrameGrabber::~FrameGrabber()
{
@@ -45,7 +40,6 @@ FrameGrabber::~FrameGrabber()
CFRelease( mpImageGen );
}
-// ------------------------------------------------------------------------------
bool FrameGrabber::create( const ::rtl::OUString& rURL )
{
@@ -64,7 +58,6 @@ bool FrameGrabber::create( const ::rtl::OUString& rURL )
return create( pMovie );
}
-// ------------------------------------------------------------------------------
bool FrameGrabber::create( AVAsset* pMovie )
{
@@ -79,7 +72,6 @@ bool FrameGrabber::create( AVAsset* pMovie )
return true;
}
-// ------------------------------------------------------------------------------
uno::Reference< graphic::XGraphic > SAL_CALL FrameGrabber::grabFrame( double fMediaTime )
throw (uno::RuntimeException)
@@ -112,7 +104,6 @@ uno::Reference< graphic::XGraphic > SAL_CALL FrameGrabber::grabFrame( double fMe
return xRet;
}
-// ------------------------------------------------------------------------------
::rtl::OUString SAL_CALL FrameGrabber::getImplementationName( )
throw (uno::RuntimeException)
@@ -120,7 +111,6 @@ uno::Reference< graphic::XGraphic > SAL_CALL FrameGrabber::grabFrame( double fMe
return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( AVMEDIA_MACAVF_FRAMEGRABBER_IMPLEMENTATIONNAME ) );
}
-// ------------------------------------------------------------------------------
sal_Bool SAL_CALL FrameGrabber::supportsService( const ::rtl::OUString& ServiceName )
throw (uno::RuntimeException)
@@ -128,7 +118,6 @@ sal_Bool SAL_CALL FrameGrabber::supportsService( const ::rtl::OUString& ServiceN
return ServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( AVMEDIA_MACAVF_FRAMEGRABBER_SERVICENAME ) );
}
-// ------------------------------------------------------------------------------
uno::Sequence< ::rtl::OUString > SAL_CALL FrameGrabber::getSupportedServiceNames( )
throw (uno::RuntimeException)
diff --git a/avmedia/source/macavf/manager.hxx b/avmedia/source/macavf/manager.hxx
index 87db731..6e93d7e 100644
--- a/avmedia/source/macavf/manager.hxx
+++ b/avmedia/source/macavf/manager.hxx
@@ -25,9 +25,6 @@
#include "com/sun/star/media/XManager.hdl"
-// -----------
-// - Manager -
-// -----------
namespace avmedia { namespace macavf {
diff --git a/avmedia/source/macavf/manager.mm b/avmedia/source/macavf/manager.mm
index 0bc5abd..3e413a3 100644
--- a/avmedia/source/macavf/manager.mm
+++ b/avmedia/source/macavf/manager.mm
@@ -26,22 +26,16 @@ using namespace ::com::sun::star;
namespace avmedia { namespace macavf {
-// ----------------
-// - Manager -
-// ----------------
-
Manager::Manager( const uno::Reference< lang::XMultiServiceFactory >& rxMgr ) :
mxMgr( rxMgr )
{
OSL_TRACE( "Constructing avmedia::macavf::Manager" );
}
-// ------------------------------------------------------------------------------
Manager::~Manager()
{}
-// ------------------------------------------------------------------------------
uno::Reference< media::XPlayer > SAL_CALL Manager::createPlayer( const ::rtl::OUString& rURL )
throw (uno::RuntimeException)
@@ -58,7 +52,6 @@ uno::Reference< media::XPlayer > SAL_CALL Manager::createPlayer( const ::rtl::OU
return xRet;
}
-// ------------------------------------------------------------------------------
::rtl::OUString SAL_CALL Manager::getImplementationName( )
throw (uno::RuntimeException)
@@ -66,7 +59,6 @@ uno::Reference< media::XPlayer > SAL_CALL Manager::createPlayer( const ::rtl::OU
return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( AVMEDIA_MACAVF_MANAGER_IMPLEMENTATIONNAME ) );
}
-// ------------------------------------------------------------------------------
sal_Bool SAL_CALL Manager::supportsService( const ::rtl::OUString& ServiceName )
throw (uno::RuntimeException)
@@ -74,7 +66,6 @@ sal_Bool SAL_CALL Manager::supportsService( const ::rtl::OUString& ServiceName )
return ServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( AVMEDIA_MACAVF_MANAGER_SERVICENAME ) );
}
-// ------------------------------------------------------------------------------
uno::Sequence< ::rtl::OUString > SAL_CALL Manager::getSupportedServiceNames( )
throw (uno::RuntimeException)
diff --git a/avmedia/source/macavf/player.hxx b/avmedia/source/macavf/player.hxx
index 9f26b47..e1c644b 100644
--- a/avmedia/source/macavf/player.hxx
+++ b/avmedia/source/macavf/player.hxx
@@ -28,12 +28,6 @@
namespace avmedia { namespace macavf {
-/*
-// ----------
-// - Player -
-// ----------
-*/
-
class Player
: public MacAVObserverHandler
, public ::cppu::WeakImplHelper< css::media::XPlayer,
diff --git a/avmedia/source/macavf/player.mm b/avmedia/source/macavf/player.mm
index cb366c0..4f753c3 100644
--- a/avmedia/source/macavf/player.mm
+++ b/avmedia/source/macavf/player.mm
@@ -73,10 +73,6 @@ MacAVObserverObject* MacAVObserverHandler::getObserver()
}
-// ----------------
-// - Player -
-// ----------------
-
Player::Player( const uno::Reference< lang::XMultiServiceFactory >& rxMgr )
: mxMgr( rxMgr )
, mpPlayer( nullptr )
@@ -86,7 +82,6 @@ Player::Player( const uno::Reference< lang::XMultiServiceFactory >& rxMgr )
, mbLooping( false )
{}
-// ------------------------------------------------------------------------------
Player::~Player()
{
@@ -103,7 +98,6 @@ Player::~Player()
CFRelease( mpPlayer );
}
-// ------------------------------------------------------------------------------
bool Player::handleObservation( NSString* pKeyPath )
{
@@ -117,7 +111,6 @@ bool Player::handleObservation( NSString* pKeyPath )
return true;
}
-// ------------------------------------------------------------------------------
bool Player::create( const ::rtl::OUString& rURL )
{
@@ -163,7 +156,6 @@ bool Player::create( const ::rtl::OUString& rURL )
return true;
}
-// ------------------------------------------------------------------------------
void SAL_CALL Player::start()
throw (uno::RuntimeException)
@@ -181,7 +173,6 @@ void SAL_CALL Player::start()
// else // TODO: delay until it becomes ready
}
-// ------------------------------------------------------------------------------
void SAL_CALL Player::stop()
throw (uno::RuntimeException)
@@ -194,7 +185,6 @@ void SAL_CALL Player::stop()
[mpPlayer pause];
}
-// ------------------------------------------------------------------------------
sal_Bool SAL_CALL Player::isPlaying()
throw (uno::RuntimeException)
@@ -205,7 +195,6 @@ sal_Bool SAL_CALL Player::isPlaying()
return (fRate != 0.0);
}
-// ------------------------------------------------------------------------------
double SAL_CALL Player::getDuration()
throw (uno::RuntimeException)
@@ -225,7 +214,6 @@ double SAL_CALL Player::getDuration()
return duration;
}
-// ------------------------------------------------------------------------------
void SAL_CALL Player::setMediaTime( double fTime )
throw (uno::RuntimeException)
@@ -235,7 +223,6 @@ void SAL_CALL Player::setMediaTime( double fTime )
[mpPlayer seekToTime: CMTimeMakeWithSeconds(fTime,1000) ];
}
-// ------------------------------------------------------------------------------
double SAL_CALL Player::getMediaTime()
throw (uno::RuntimeException)
@@ -252,7 +239,6 @@ double SAL_CALL Player::getMediaTime()
return position;
}
-// ------------------------------------------------------------------------------
void SAL_CALL Player::setStopTime( double fTime )
throw (uno::RuntimeException)
@@ -261,7 +247,6 @@ void SAL_CALL Player::setStopTime( double fTime )
mfStopTime = fTime;
}
-// ------------------------------------------------------------------------------
double SAL_CALL Player::getStopTime()
throw (uno::RuntimeException)
@@ -269,7 +254,6 @@ double SAL_CALL Player::getStopTime()
return mfStopTime;
}
-// ------------------------------------------------------------------------------
void SAL_CALL Player::setPlaybackLoop( sal_Bool bSet )
throw (uno::RuntimeException)
@@ -278,7 +262,6 @@ void SAL_CALL Player::setPlaybackLoop( sal_Bool bSet )
mbLooping = bSet;
}
-// ------------------------------------------------------------------------------
sal_Bool SAL_CALL Player::isPlaybackLoop()
throw (uno::RuntimeException)
@@ -288,7 +271,6 @@ sal_Bool SAL_CALL Player::isPlaybackLoop()
return bRet;
}
-// ------------------------------------------------------------------------------
void SAL_CALL Player::setMute( sal_Bool bSet )
throw (uno::RuntimeException)
@@ -302,7 +284,6 @@ void SAL_CALL Player::setMute( sal_Bool bSet )
[mpPlayer setMuted:mbMuted];
}
-// ------------------------------------------------------------------------------
sal_Bool SAL_CALL Player::isMute()
throw (uno::RuntimeException)
@@ -311,7 +292,6 @@ sal_Bool SAL_CALL Player::isMute()
return mbMuted;
}
-// ------------------------------------------------------------------------------
void SAL_CALL Player::setVolumeDB( sal_Int16 nVolumeDB )
throw (uno::RuntimeException)
@@ -326,7 +306,6 @@ void SAL_CALL Player::setVolumeDB( sal_Int16 nVolumeDB )
[mpPlayer setVolume:mfUnmutedVolume];
}
-// ------------------------------------------------------------------------------
sal_Int16 SAL_CALL Player::getVolumeDB()
throw (uno::RuntimeException)
@@ -345,7 +324,6 @@ sal_Int16 SAL_CALL Player::getVolumeDB()
return (sal_Int16)nVolumeDB;
}
-// ------------------------------------------------------------------------------
awt::Size SAL_CALL Player::getPreferredPlayerWindowSize()
throw (uno::RuntimeException)
@@ -364,7 +342,6 @@ awt::Size SAL_CALL Player::getPreferredPlayerWindowSize()
return aSize;
}
-// ------------------------------------------------------------------------------
uno::Reference< ::media::XPlayerWindow > SAL_CALL Player::createPlayerWindow( const uno::Sequence< uno::Any >& aArguments )
throw (uno::RuntimeException)
@@ -389,7 +366,6 @@ uno::Reference< ::media::XPlayerWindow > SAL_CALL Player::createPlayerWindow( co
return xRet;
}
-// ------------------------------------------------------------------------------
uno::Reference< media::XFrameGrabber > SAL_CALL Player::createFrameGrabber()
throw (uno::RuntimeException)
@@ -405,7 +381,6 @@ uno::Reference< media::XFrameGrabber > SAL_CALL Player::createFrameGrabber()
return xRet;
}
-// ------------------------------------------------------------------------------
::rtl::OUString SAL_CALL Player::getImplementationName( )
throw (uno::RuntimeException)
@@ -413,7 +388,6 @@ uno::Reference< media::XFrameGrabber > SAL_CALL Player::createFrameGrabber()
return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( AVMEDIA_MACAVF_PLAYER_IMPLEMENTATIONNAME ) );
}
-// ------------------------------------------------------------------------------
sal_Bool SAL_CALL Player::supportsService( const ::rtl::OUString& ServiceName )
throw (uno::RuntimeException)
@@ -421,7 +395,6 @@ sal_Bool SAL_CALL Player::supportsService( const ::rtl::OUString& ServiceName )
return ServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( AVMEDIA_MACAVF_PLAYER_SERVICENAME ) );
}
-// ------------------------------------------------------------------------------
uno::Sequence< ::rtl::OUString > SAL_CALL Player::getSupportedServiceNames( )
throw (uno::RuntimeException)
diff --git a/avmedia/source/macavf/window.hxx b/avmedia/source/macavf/window.hxx
index 63f77ab..396f75a 100644
--- a/avmedia/source/macavf/window.hxx
+++ b/avmedia/source/macavf/window.hxx
@@ -26,9 +26,6 @@
#include "com/sun/star/media/XPlayerWindow.hdl"
-// ---------------
-// - MyMediaView -
-// ---------------
@interface MyMediaView : NSView
@property (nonatomic, readonly, strong) AVPlayer* player;
@@ -39,10 +36,6 @@
namespace avmedia { namespace macavf {
-// ---------------
-// - Window -
-// ---------------
-
class Player;
class Window
diff --git a/avmedia/source/macavf/window.mm b/avmedia/source/macavf/window.mm
index a546501..0ddee7f 100644
--- a/avmedia/source/macavf/window.mm
+++ b/avmedia/source/macavf/window.mm
@@ -28,10 +28,6 @@ using namespace ::com::sun::star;
namespace avmedia { namespace macavf {
-// ---------------
-// - Window -
-// ---------------
-
Window::Window( const uno::Reference< lang::XMultiServiceFactory >& i_rxMgr, Player& i_rPlayer, NSView* i_pParentView )
: mxMgr( i_rxMgr )
, maListeners( maMutex )
@@ -71,7 +67,6 @@ Window::Window( const uno::Reference< lang::XMultiServiceFactory >& i_rxMgr, Pla
[mpView.layer addSublayer:mpPlayerLayer];
}
-// ------------------------------------------------------------------------------
Window::~Window()
{
@@ -79,7 +74,6 @@ Window::~Window()
[mpPlayerLayer release];
}
-// ------------------------------------------------------------------------------
bool Window::handleObservation( NSString* pKeyPath )
{
@@ -90,13 +84,11 @@ bool Window::handleObservation( NSString* pKeyPath )
}
// XPlayerWindow
-// ------------------------------------------------------------------------------
void SAL_CALL Window::update()
throw (uno::RuntimeException)
{}
-// ------------------------------------------------------------------------------
sal_Bool SAL_CALL Window::setZoomLevel( media::ZoomLevel /* eZoomLevel */ )
throw (uno::RuntimeException)
@@ -104,7 +96,6 @@ sal_Bool SAL_CALL Window::setZoomLevel( media::ZoomLevel /* eZoomLevel */ )
return false;
}
-// ------------------------------------------------------------------------------
media::ZoomLevel SAL_CALL Window::getZoomLevel( )
throw (uno::RuntimeException)
@@ -112,7 +103,6 @@ media::ZoomLevel SAL_CALL Window::getZoomLevel( )
return meZoomLevel;
}
-// ------------------------------------------------------------------------------
void SAL_CALL Window::setPointerType( sal_Int32 nPointerType )
throw (uno::RuntimeException)
@@ -121,7 +111,6 @@ void SAL_CALL Window::setPointerType( sal_Int32 nPointerType )
}
// XWindow
-// ------------------------------------------------------------------------------
void SAL_CALL Window::setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height, sal_Int16 /* Flags */ )
throw (uno::RuntimeException)
@@ -140,7 +129,6 @@ void SAL_CALL Window::setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal
[mpPlayerLayer setFrame:CGRectMake(viewFrame.origin.x, viewFrame.origin.y, viewFrame.size.width, viewFrame.size.height)];
}
-// ------------------------------------------------------------------------------
awt::Rectangle SAL_CALL Window::getPosSize()
throw (uno::RuntimeException)
@@ -155,7 +143,6 @@ awt::Rectangle SAL_CALL Window::getPosSize()
return aRet;
}
-// ------------------------------------------------------------------------------
void SAL_CALL Window::setVisible( sal_Bool bVisible )
throw (uno::RuntimeException)
@@ -163,7 +150,6 @@ void SAL_CALL Window::setVisible( sal_Bool bVisible )
OSL_TRACE ("Window::setVisible(%d)", bVisible);
}
-// ------------------------------------------------------------------------------
void SAL_CALL Window::setEnable( sal_Bool bEnable )
throw (uno::RuntimeException)
@@ -171,7 +157,6 @@ void SAL_CALL Window::setEnable( sal_Bool bEnable )
OSL_TRACE ("Window::setEnable(%d)", bEnable);
}
-// ------------------------------------------------------------------------------
void SAL_CALL Window::setFocus()
throw (uno::RuntimeException)
@@ -179,7 +164,6 @@ void SAL_CALL Window::setFocus()
OSL_TRACE ("Window::setFocus");
}
-// ------------------------------------------------------------------------------
void SAL_CALL Window::addWindowListener( const uno::Reference< awt::XWindowListener >& xListener )
throw (uno::RuntimeException)
@@ -187,7 +171,6 @@ void SAL_CALL Window::addWindowListener( const uno::Reference< awt::XWindowListe
maListeners.addInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
}
-// ------------------------------------------------------------------------------
void SAL_CALL Window::removeWindowListener( const uno::Reference< awt::XWindowListener >& xListener )
throw (uno::RuntimeException)
@@ -195,7 +178,6 @@ void SAL_CALL Window::removeWindowListener( const uno::Reference< awt::XWindowLi
maListeners.removeInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
}
-// ------------------------------------------------------------------------------
void SAL_CALL Window::addFocusListener( const uno::Reference< awt::XFocusListener >& xListener )
throw (uno::RuntimeException)
@@ -203,7 +185,6 @@ void SAL_CALL Window::addFocusListener( const uno::Reference< awt::XFocusListene
maListeners.addInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
}
-// ------------------------------------------------------------------------------
void SAL_CALL Window::removeFocusListener( const uno::Reference< awt::XFocusListener >& xListener )
throw (uno::RuntimeException)
@@ -211,7 +192,6 @@ void SAL_CALL Window::removeFocusListener( const uno::Reference< awt::XFocusList
maListeners.removeInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
}
-// ------------------------------------------------------------------------------
void SAL_CALL Window::addKeyListener( const uno::Reference< awt::XKeyListener >& xListener )
throw (uno::RuntimeException)
@@ -219,7 +199,6 @@ void SAL_CALL Window::addKeyListener( const uno::Reference< awt::XKeyListener >&
maListeners.addInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
}
-// ------------------------------------------------------------------------------
void SAL_CALL Window::removeKeyListener( const uno::Reference< awt::XKeyListener >& xListener )
throw (uno::RuntimeException)
@@ -227,7 +206,6 @@ void SAL_CALL Window::removeKeyListener( const uno::Reference< awt::XKeyListener
maListeners.removeInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
}
-// ------------------------------------------------------------------------------
void SAL_CALL Window::addMouseListener( const uno::Reference< awt::XMouseListener >& xListener )
throw (uno::RuntimeException)
@@ -235,7 +213,6 @@ void SAL_CALL Window::addMouseListener( const uno::Reference< awt::XMouseListene
maListeners.addInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
}
-// ------------------------------------------------------------------------------
void SAL_CALL Window::removeMouseListener( const uno::Reference< awt::XMouseListener >& xListener )
throw (uno::RuntimeException)
@@ -243,7 +220,6 @@ void SAL_CALL Window::removeMouseListener( const uno::Reference< awt::XMouseList
maListeners.removeInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
}
-// ------------------------------------------------------------------------------
void SAL_CALL Window::addMouseMotionListener( const uno::Reference< awt::XMouseMotionListener >& xListener )
throw (uno::RuntimeException)
@@ -251,7 +227,6 @@ void SAL_CALL Window::addMouseMotionListener( const uno::Reference< awt::XMouseM
maListeners.addInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
}
-// ------------------------------------------------------------------------------
void SAL_CALL Window::removeMouseMotionListener( const uno::Reference< awt::XMouseMotionListener >& xListener )
throw (uno::RuntimeException)
@@ -259,7 +234,6 @@ void SAL_CALL Window::removeMouseMotionListener( const uno::Reference< awt::XMou
maListeners.removeInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
}
-// ------------------------------------------------------------------------------
void SAL_CALL Window::addPaintListener( const uno::Reference< awt::XPaintListener >& xListener )
throw (uno::RuntimeException)
@@ -267,7 +241,6 @@ void SAL_CALL Window::addPaintListener( const uno::Reference< awt::XPaintListene
maListeners.addInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
}
-// ------------------------------------------------------------------------------
void SAL_CALL Window::removePaintListener( const uno::Reference< awt::XPaintListener >& xListener )
throw (uno::RuntimeException)
@@ -277,14 +250,12 @@ void SAL_CALL Window::removePaintListener( const uno::Reference< awt::XPaintList
// XComponent
-// ------------------------------------------------------------------------------
void SAL_CALL Window::dispose( )
throw (uno::RuntimeException)
{
}
-// ------------------------------------------------------------------------------
void SAL_CALL Window::addEventListener( const uno::Reference< lang::XEventListener >& xListener )
throw (uno::RuntimeException)
@@ -292,7 +263,6 @@ void SAL_CALL Window::addEventListener( const uno::Reference< lang::XEventListen
maListeners.addInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
}
-// ------------------------------------------------------------------------------
void SAL_CALL Window::removeEventListener( const uno::Reference< lang::XEventListener >& xListener )
throw (uno::RuntimeException)
@@ -301,7 +271,6 @@ void SAL_CALL Window::removeEventListener( const uno::Reference< lang::XEventLis
}
// XServiceInfo
-// ------------------------------------------------------------------------------
::rtl::OUString SAL_CALL Window::getImplementationName( )
throw (uno::RuntimeException)
@@ -309,7 +278,6 @@ void SAL_CALL Window::removeEventListener( const uno::Reference< lang::XEventLis
return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( AVMEDIA_MACAVF_WINDOW_IMPLEMENTATIONNAME ) );
}
-// ------------------------------------------------------------------------------
sal_Bool SAL_CALL Window::supportsService( const ::rtl::OUString& ServiceName )
throw (uno::RuntimeException)
@@ -317,7 +285,6 @@ sal_Bool SAL_CALL Window::supportsService( const ::rtl::OUString& ServiceName )
return ServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( AVMEDIA_MACAVF_WINDOW_SERVICENAME ) );
}
-// ------------------------------------------------------------------------------
uno::Sequence< ::rtl::OUString > SAL_CALL Window::getSupportedServiceNames( )
throw (uno::RuntimeException)
diff --git a/avmedia/source/quicktime/framegrabber.hxx b/avmedia/source/quicktime/framegrabber.hxx
index 0a697c1..7d2a8df 100644
--- a/avmedia/source/quicktime/framegrabber.hxx
+++ b/avmedia/source/quicktime/framegrabber.hxx
@@ -27,10 +27,6 @@
namespace avmedia { namespace quicktime {
-
-// - FrameGrabber -
-
-
class FrameGrabber : public ::cppu::WeakImplHelper< css::media::XFrameGrabber,
css::lang::XServiceInfo >
{
diff --git a/avmedia/source/quicktime/framegrabber.mm b/avmedia/source/quicktime/framegrabber.mm
index e3cc480..2fd457b 100644
--- a/avmedia/source/quicktime/framegrabber.mm
+++ b/avmedia/source/quicktime/framegrabber.mm
@@ -35,9 +35,6 @@ SAL_WNODEPRECATED_DECLARATIONS_PUSH //TODO: 10.9
namespace avmedia { namespace quicktime {
-// - FrameGrabber -
-
-
FrameGrabber::FrameGrabber( const uno::Reference< lang::XMultiServiceFactory >& rxMgr ) :
mxMgr( rxMgr )
{
@@ -49,7 +46,6 @@ FrameGrabber::FrameGrabber( const uno::Reference< lang::XMultiServiceFactory >&
}
-
FrameGrabber::~FrameGrabber()
{
if( mbInitialized )
@@ -63,7 +59,6 @@ FrameGrabber::~FrameGrabber()
}
-
bool FrameGrabber::create( const ::rtl::OUString& rURL )
{
bool bRet = false;
@@ -87,7 +82,6 @@ bool FrameGrabber::create( const ::rtl::OUString& rURL )
}
-
uno::Reference< graphic::XGraphic > SAL_CALL FrameGrabber::grabFrame( double fMediaTime )
throw (uno::RuntimeException)
{
@@ -108,7 +102,6 @@ uno::Reference< graphic::XGraphic > SAL_CALL FrameGrabber::grabFrame( double fMe
}
-
::rtl::OUString SAL_CALL FrameGrabber::getImplementationName( )
throw (uno::RuntimeException)
{
@@ -116,7 +109,6 @@ uno::Reference< graphic::XGraphic > SAL_CALL FrameGrabber::grabFrame( double fMe
}
-
sal_Bool SAL_CALL FrameGrabber::supportsService( const ::rtl::OUString& ServiceName )
throw (uno::RuntimeException)
{
@@ -124,7 +116,6 @@ sal_Bool SAL_CALL FrameGrabber::supportsService( const ::rtl::OUString& ServiceN
}
-
uno::Sequence< ::rtl::OUString > SAL_CALL FrameGrabber::getSupportedServiceNames( )
throw (uno::RuntimeException)
{
diff --git a/avmedia/source/quicktime/manager.hxx b/avmedia/source/quicktime/manager.hxx
index 0ab910c..215e14c 100644
--- a/avmedia/source/quicktime/manager.hxx
+++ b/avmedia/source/quicktime/manager.hxx
@@ -26,9 +26,6 @@
#include "com/sun/star/media/XManager.hpp"
-// - Manager -
-
-
namespace avmedia { namespace quicktime {
class Manager : public ::cppu::WeakImplHelper< css::media::XManager,
diff --git a/avmedia/source/quicktime/manager.mm b/avmedia/source/quicktime/manager.mm
index b708184..1426020 100644
--- a/avmedia/source/quicktime/manager.mm
+++ b/avmedia/source/quicktime/manager.mm
@@ -26,9 +26,6 @@ using namespace ::com::sun::star;
namespace avmedia { namespace quicktime {
-// - Manager -
-
-
Manager::Manager( const uno::Reference< lang::XMultiServiceFactory >& rxMgr ) :
mxMgr( rxMgr )
{
@@ -36,13 +33,11 @@ Manager::Manager( const uno::Reference< lang::XMultiServiceFactory >& rxMgr ) :
}
-
Manager::~Manager()
{
}
-
uno::Reference< media::XPlayer > SAL_CALL Manager::createPlayer( const ::rtl::OUString& rURL )
throw (uno::RuntimeException)
{
@@ -59,7 +54,6 @@ uno::Reference< media::XPlayer > SAL_CALL Manager::createPlayer( const ::rtl::OU
}
-
::rtl::OUString SAL_CALL Manager::getImplementationName( )
throw (uno::RuntimeException)
{
@@ -67,7 +61,6 @@ uno::Reference< media::XPlayer > SAL_CALL Manager::createPlayer( const ::rtl::OU
}
-
sal_Bool SAL_CALL Manager::supportsService( const ::rtl::OUString& ServiceName )
throw (uno::RuntimeException)
{
@@ -75,7 +68,6 @@ sal_Bool SAL_CALL Manager::supportsService( const ::rtl::OUString& ServiceName )
}
-
uno::Sequence< ::rtl::OUString > SAL_CALL Manager::getSupportedServiceNames( )
throw (uno::RuntimeException)
{
diff --git a/avmedia/source/quicktime/player.hxx b/avmedia/source/quicktime/player.hxx
index 11e12fa..636efb0 100644
--- a/avmedia/source/quicktime/player.hxx
+++ b/avmedia/source/quicktime/player.hxx
@@ -26,12 +26,6 @@
namespace avmedia { namespace quicktime {
-/*
-
-// - Player -
-
-*/
-
class Player : public ::cppu::WeakImplHelper< css::media::XPlayer,
css::lang::XServiceInfo >
{
diff --git a/avmedia/source/quicktime/player.mm b/avmedia/source/quicktime/player.mm
index b5cd5f1..0c32df1 100644
--- a/avmedia/source/quicktime/player.mm
+++ b/avmedia/source/quicktime/player.mm
@@ -29,16 +29,9 @@ SAL_WNODEPRECATED_DECLARATIONS_PUSH //TODO: 10.9
namespace avmedia { namespace quicktime {
-
-// - Player -
-
-
Player::Player( const uno::Reference< lang::XMultiServiceFactory >& rxMgr ) :
mxMgr( rxMgr ),
mpMovie( nil ),
- /* GST
- mbFakeVideo (false ),
- */
mnUnmutedVolume( 0 ),
mnStopTime( DBL_MAX ), //max double
mbMuted( false ),
@@ -51,7 +44,6 @@ Player::Player( const uno::Reference< lang::XMultiServiceFactory >& rxMgr ) :
}
-
Player::~Player()
{
if( mpMovie )
@@ -69,7 +61,6 @@ QTMovie* Player::getMovie()
}
-
bool Player::create( const ::rtl::OUString& rURL )
{
bool bRet = false;
@@ -109,7 +100,6 @@ bool Player::create( const ::rtl::OUString& rURL )
}
-
void SAL_CALL Player::start( )
throw (uno::RuntimeException)
{
@@ -122,7 +112,6 @@ void SAL_CALL Player::start( )
}
-
void SAL_CALL Player::stop( )
throw (uno::RuntimeException)
{
@@ -134,7 +123,6 @@ void SAL_CALL Player::stop( )
}
-
sal_Bool SAL_CALL Player::isPlaying()
throw (uno::RuntimeException)
{
@@ -152,7 +140,6 @@ sal_Bool SAL_CALL Player::isPlaying()
}
-
double SAL_CALL Player::getDuration( )
throw (uno::RuntimeException)
{
@@ -169,7 +156,6 @@ double SAL_CALL Player::getDuration( )
}
-
void SAL_CALL Player::setMediaTime( double fTime )
throw (uno::RuntimeException)
{
@@ -182,7 +168,6 @@ void SAL_CALL Player::setMediaTime( double fTime )
}
-
double SAL_CALL Player::getMediaTime( )
throw (uno::RuntimeException)
{
@@ -219,7 +204,6 @@ void SAL_CALL Player::setPlaybackLoop( sal_Bool bSet )
}
-
sal_Bool SAL_CALL Player::isPlaybackLoop( )
throw (uno::RuntimeException)
{
@@ -232,7 +216,6 @@ sal_Bool SAL_CALL Player::isPlaybackLoop( )
}
-
void SAL_CALL Player::setMute( sal_Bool bSet )
throw (uno::RuntimeException)
{
@@ -251,7 +234,6 @@ void SAL_CALL Player::setMute( sal_Bool bSet )
}
-
sal_Bool SAL_CALL Player::isMute( )
throw (uno::RuntimeException)
{
@@ -261,7 +243,6 @@ sal_Bool SAL_CALL Player::isMute( )
}
-
void SAL_CALL Player::setVolumeDB( sal_Int16 nVolumeDB )
throw (uno::RuntimeException)
{
@@ -288,7 +269,6 @@ void SAL_CALL Player::setVolumeDB( sal_Int16 nVolumeDB )
}
-
sal_Int16 SAL_CALL Player::getVolumeDB( )
throw (uno::RuntimeException)
{
@@ -313,7 +293,6 @@ sal_Int16 SAL_CALL Player::getVolumeDB( )
}
-
awt::Size SAL_CALL Player::getPreferredPlayerWindowSize( )
throw (uno::RuntimeException)
{
@@ -323,7 +302,6 @@ awt::Size SAL_CALL Player::getPreferredPlayerWindowSize( )
}
-
uno::Reference< ::media::XPlayerWindow > SAL_CALL Player::createPlayerWindow( const uno::Sequence< uno::Any >& aArguments )
throw (uno::RuntimeException)
{
@@ -348,7 +326,6 @@ uno::Reference< ::media::XPlayerWindow > SAL_CALL Player::createPlayerWindow( co
}
-
uno::Reference< media::XFrameGrabber > SAL_CALL Player::createFrameGrabber( )
throw (css::uno::RuntimeException)
{
@@ -371,7 +348,6 @@ uno::Reference< media::XFrameGrabber > SAL_CALL Player::createFrameGrabber( )
}
-
::rtl::OUString SAL_CALL Player::getImplementationName( )
throw (uno::RuntimeException)
{
@@ -379,7 +355,6 @@ uno::Reference< media::XFrameGrabber > SAL_CALL Player::createFrameGrabber( )
}
-
sal_Bool SAL_CALL Player::supportsService( const ::rtl::OUString& ServiceName )
throw (uno::RuntimeException)
{
@@ -387,7 +362,6 @@ sal_Bool SAL_CALL Player::supportsService( const ::rtl::OUString& ServiceName )
}
-
uno::Sequence< ::rtl::OUString > SAL_CALL Player::getSupportedServiceNames( )
throw (uno::RuntimeException)
{
diff --git a/avmedia/source/quicktime/window.hxx b/avmedia/source/quicktime/window.hxx
index 4268b35..cbcb9ee 100644
--- a/avmedia/source/quicktime/window.hxx
+++ b/avmedia/source/quicktime/window.hxx
@@ -28,10 +28,6 @@
namespace avmedia { namespace quicktime {
-
-// - Window -
-
-
class Player;
class Window : public ::cppu::WeakImplHelper< css::media::XPlayerWindow,
diff --git a/avmedia/source/viewer/mediaevent_impl.cxx b/avmedia/source/viewer/mediaevent_impl.cxx
index 415af55..61634bc 100644
--- a/avmedia/source/viewer/mediaevent_impl.cxx
+++ b/avmedia/source/viewer/mediaevent_impl.cxx
@@ -27,22 +27,17 @@ using namespace ::com::sun::star;
namespace avmedia { namespace priv {
-// - MediaEventListenersImpl -
-
-
MediaEventListenersImpl::MediaEventListenersImpl( vcl::Window& rEventWindow ) :
mpNotifyWindow( &rEventWindow )
{
}
-
MediaEventListenersImpl::~MediaEventListenersImpl()
{
}
-
void MediaEventListenersImpl::cleanUp()
{
Application::RemoveMouseAndKeyEvents( reinterpret_cast< vcl::Window* >( mpNotifyWindow.get() ) );
@@ -50,14 +45,12 @@ void MediaEventListenersImpl::cleanUp()
}
-
-void SAL_CALL MediaEventListenersImpl::disposing( const css::lang::EventObject& /* Source */ )
+void SAL_CALL MediaEventListenersImpl::disposing( const css::lang::EventObject& )
throw (css::uno::RuntimeException, std::exception)
{
}
-
void SAL_CALL MediaEventListenersImpl::keyPressed( const css::awt::KeyEvent& e )
throw (css::uno::RuntimeException, std::exception)
{
@@ -77,7 +70,6 @@ void SAL_CALL MediaEventListenersImpl::keyPressed( const css::awt::KeyEvent& e )
}
-
void SAL_CALL MediaEventListenersImpl::keyReleased( const css::awt::KeyEvent& e )
throw (css::uno::RuntimeException, std::exception)
{
@@ -96,7 +88,6 @@ void SAL_CALL MediaEventListenersImpl::keyReleased( const css::awt::KeyEvent& e
}
-
void SAL_CALL MediaEventListenersImpl::mousePressed( const css::awt::MouseEvent& e )
throw (css::uno::RuntimeException, std::exception)
{
@@ -116,7 +107,6 @@ void SAL_CALL MediaEventListenersImpl::mousePressed( const css::awt::MouseEvent&
}
}
-// ----------------------------------------------gvd-----------------------
void SAL_CALL MediaEventListenersImpl::mouseReleased( const css::awt::MouseEvent& e )
throw (css::uno::RuntimeException, std::exception)
@@ -138,8 +128,7 @@ void SAL_CALL MediaEventListenersImpl::mouseReleased( const css::awt::MouseEvent
}
-
-void SAL_CALL MediaEventListenersImpl::mouseEntered( const css::awt::MouseEvent& /* e */ )
+void SAL_CALL MediaEventListenersImpl::mouseEntered( const css::awt::MouseEvent& )
throw (css::uno::RuntimeException, std::exception)
{
const ::osl::MutexGuard aGuard( maMutex );
@@ -151,8 +140,7 @@ void SAL_CALL MediaEventListenersImpl::mouseEntered( const css::awt::MouseEvent&
}
-
-void SAL_CALL MediaEventListenersImpl::mouseExited( const css::awt::MouseEvent& /* e */ )
+void SAL_CALL MediaEventListenersImpl::mouseExited( const css::awt::MouseEvent& )
throw (css::uno::RuntimeException, std::exception)
{
const ::osl::MutexGuard aGuard( maMutex );
@@ -164,7 +152,6 @@ void SAL_CALL MediaEventListenersImpl::mouseExited( const css::awt::MouseEvent&
}
-
void SAL_CALL MediaEventListenersImpl::mouseDragged( const css::awt::MouseEvent& e )
throw (css::uno::RuntimeException, std::exception)
{
@@ -179,7 +166,6 @@ void SAL_CALL MediaEventListenersImpl::mouseDragged( const css::awt::MouseEvent&
}
-
void SAL_CALL MediaEventListenersImpl::mouseMoved( const css::awt::MouseEvent& e )
throw (css::uno::RuntimeException, std::exception)
{
@@ -194,20 +180,19 @@ void SAL_CALL MediaEventListenersImpl::mouseMoved( const css::awt::MouseEvent& e
}
-
-void SAL_CALL MediaEventListenersImpl::focusGained( const css::awt::FocusEvent& /* e */ )
+void SAL_CALL MediaEventListenersImpl::focusGained( const css::awt::FocusEvent& )
throw (css::uno::RuntimeException, std::exception)
{
}
-
-void SAL_CALL MediaEventListenersImpl::focusLost( const css::awt::FocusEvent& /* e */ )
+void SAL_CALL MediaEventListenersImpl::focusLost( const css::awt::FocusEvent& )
throw (css::uno::RuntimeException, std::exception)
{
}
+
} // namespace priv
-} // namespace avemdia
+} // namespace avmedia
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/viewer/mediawindow.cxx b/avmedia/source/viewer/mediawindow.cxx
index f7c6fe8..5fd94ee 100644
--- a/avmedia/source/viewer/mediawindow.cxx
+++ b/avmedia/source/viewer/mediawindow.cxx
@@ -39,10 +39,6 @@ using namespace ::com::sun::star;
namespace avmedia {
-
-// - MediaWindow -
-
-
MediaWindow::MediaWindow( vcl::Window* parent, bool bInternalMediaControl ) :
mpImpl( VclPtr<priv::MediaWindowImpl>::Create( parent, this, bInternalMediaControl ) )
{
@@ -50,154 +46,130 @@ MediaWindow::MediaWindow( vcl::Window* parent, bool bInternalMediaControl ) :
}
-
MediaWindow::~MediaWindow()
{
mpImpl.disposeAndClear();
}
-
void MediaWindow::setURL( const OUString& rURL, const OUString& rReferer )
{
mpImpl->setURL( rURL, OUString(), rReferer );
}
-
const OUString& MediaWindow::getURL() const
{
return mpImpl->getURL();
}
-
bool MediaWindow::isValid() const
{
return mpImpl->isValid();
}
-
-void MediaWindow::MouseMove( const MouseEvent& /* rMEvt */ )
+void MediaWindow::MouseMove( const MouseEvent& )
{
}
-
-void MediaWindow::MouseButtonDown( const MouseEvent& /* rMEvt */ )
+void MediaWindow::MouseButtonDown( const MouseEvent& )
{
}
-
-void MediaWindow::MouseButtonUp( const MouseEvent& /* rMEvt */ )
+void MediaWindow::MouseButtonUp( const MouseEvent& )
{
}
-
-void MediaWindow::KeyInput( const KeyEvent& /* rKEvt */ )
+void MediaWindow::KeyInput( const KeyEvent& )
{
}
-
-void MediaWindow::KeyUp( const KeyEvent& /* rKEvt */ )
+void MediaWindow::KeyUp( const KeyEvent& )
{
}
-
-
-void MediaWindow::Command( const CommandEvent& /* rCEvt */ )
+void MediaWindow::Command( const CommandEvent& )
{
}
-
-sal_Int8 MediaWindow::AcceptDrop( const AcceptDropEvent& /* rEvt */ )
+sal_Int8 MediaWindow::AcceptDrop( const AcceptDropEvent& )
{
return 0;
}
-
-sal_Int8 MediaWindow::ExecuteDrop( const ExecuteDropEvent& /* rEvt */ )
+sal_Int8 MediaWindow::ExecuteDrop( const ExecuteDropEvent& )
{
return 0;
}
-
-void MediaWindow::StartDrag( sal_Int8 /* nAction */, const Point& /* rPosPixel */ )
+void MediaWindow::StartDrag( sal_Int8, const Point& )
{
}
-
Size MediaWindow::getPreferredSize() const
{
return mpImpl->getPreferredSize();
}
-
void MediaWindow::setPosSize( const Rectangle& rNewRect )
{
mpImpl->setPosSize( rNewRect );
}
-
void MediaWindow::setPointer( const Pointer& rPointer )
{
mpImpl->setPointer( rPointer );
}
-
bool MediaWindow::start()
{
return mpImpl->start();
}
-
void MediaWindow::updateMediaItem( MediaItem& rItem ) const
{
mpImpl->updateMediaItem( rItem );
}
-
void MediaWindow::executeMediaItem( const MediaItem& rItem )
{
mpImpl->executeMediaItem( rItem );
}
-
void MediaWindow::show()
{
mpImpl->Show();
}
-
void MediaWindow::hide()
{
mpImpl->Hide();
}
-
vcl::Window* MediaWindow::getWindow() const
{
return mpImpl.get();
}
-
void MediaWindow::getMediaFilters( FilterNameVector& rFilterNameVector )
{
static const char* pFilters[] = { "Advanced Audio Coding", "aac",
@@ -236,8 +208,7 @@ void MediaWindow::getMediaFilters( FilterNameVector& rFilterNameVector )
}
-
-bool MediaWindow::executeMediaURLDialog(vcl::Window* /* pParent */,
+bool MediaWindow::executeMediaURLDialog(vcl::Window*,
OUString& rURL, bool *const o_pbLink)
{
::sfx2::FileDialogHelper aDlg( (o_pbLink)
@@ -325,7 +296,6 @@ bool MediaWindow::executeMediaURLDialog(vcl::Window* /* pParent */,
}
-
void MediaWindow::executeFormatErrorBox( vcl::Window* pParent )
{
ScopedVclPtrInstance< MessageDialog > aErrBox( pParent, AVMEDIA_RESID( AVMEDIA_STR_ERR_URL ) );
@@ -335,7 +305,6 @@ void MediaWindow::executeFormatErrorBox( vcl::Window* pParent )
}
-
bool MediaWindow::isMediaURL( const OUString& rURL, const OUString& rReferer, bool bDeep, Size* pPreferredSizePixel )
{
const INetURLObject aURL( rURL );
@@ -391,14 +360,12 @@ bool MediaWindow::isMediaURL( const OUString& rURL, const OUString& rReferer, bo
}
-
uno::Reference< media::XPlayer > MediaWindow::createPlayer( const OUString& rURL, const OUString& rReferer, const OUString* pMimeType )
{
return priv::MediaWindowImpl::createPlayer( rURL, rReferer, pMimeType );
}
-
uno::Reference< graphic::XGraphic > MediaWindow::grabFrame( const OUString& rURL,
const OUString& rReferer,
const OUString& sMimeType,
@@ -447,17 +414,18 @@ uno::Reference< graphic::XGraphic > MediaWindow::grabFrame( const OUString& rURL
return xRet;
}
+
BitmapEx MediaWindow::getAudioLogo()
{
return BitmapEx(AVMEDIA_RESID(AVMEDIA_BMP_AUDIOLOGO));
}
+
BitmapEx MediaWindow::getEmptyLogo()
{
return BitmapEx(AVMEDIA_RESID(AVMEDIA_BMP_EMPTYLOGO));
}
-
-} // namespace avemdia
+} // namespace avmedia
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/win/framegrabber.cxx b/avmedia/source/win/framegrabber.cxx
index 4d6305c..6530040 100644
--- a/avmedia/source/win/framegrabber.cxx
+++ b/avmedia/source/win/framegrabber.cxx
@@ -49,20 +49,19 @@ using namespace ::com::sun::star;
namespace avmedia { namespace win {
-// - FrameGrabber -
-
-
FrameGrabber::FrameGrabber( const uno::Reference< lang::XMultiServiceFactory >& rxMgr ) :
mxMgr( rxMgr )
{
::CoInitialize( NULL );
}
+
FrameGrabber::~FrameGrabber()
{
::CoUninitialize();
}
+
IMediaDet* FrameGrabber::implCreateMediaDet( const OUString& rURL ) const
{
IMediaDet* pDet = NULL;
@@ -85,6 +84,7 @@ IMediaDet* FrameGrabber::implCreateMediaDet( const OUString& rURL ) const
return pDet;
}
+
bool FrameGrabber::create( const OUString& rURL )
{
// just check if a MediaDet interface can be created with the given URL
@@ -102,6 +102,7 @@ bool FrameGrabber::create( const OUString& rURL )
return !maURL.isEmpty();
}
+
uno::Reference< graphic::XGraphic > SAL_CALL FrameGrabber::grabFrame( double fMediaTime )
throw (uno::RuntimeException)
{
@@ -198,18 +199,21 @@ uno::Reference< graphic::XGraphic > SAL_CALL FrameGrabber::grabFrame( double fMe
return xRet;
}
+
OUString SAL_CALL FrameGrabber::getImplementationName( )
throw (uno::RuntimeException)
{
return OUString( AVMEDIA_WIN_FRAMEGRABBER_IMPLEMENTATIONNAME );
}
+
sal_Bool SAL_CALL FrameGrabber::supportsService( const OUString& ServiceName )
throw (uno::RuntimeException)
{
return cppu::supportsService(this, ServiceName);
}
+
uno::Sequence< OUString > SAL_CALL FrameGrabber::getSupportedServiceNames( )
throw (uno::RuntimeException)
{
diff --git a/avmedia/source/win/framegrabber.hxx b/avmedia/source/win/framegrabber.hxx
index 98dc0cc..d9845c0 100644
--- a/avmedia/source/win/framegrabber.hxx
+++ b/avmedia/source/win/framegrabber.hxx
@@ -28,10 +28,6 @@ struct IMediaDet;
namespace avmedia { namespace win {
-
-// - FrameGrabber -
-
-
class FrameGrabber : public ::cppu::WeakImplHelper< css::media::XFrameGrabber,
css::lang::XServiceInfo >
{
diff --git a/avmedia/source/win/manager.cxx b/avmedia/source/win/manager.cxx
index d33c9c8..a5042d4 100644
--- a/avmedia/source/win/manager.cxx
+++ b/avmedia/source/win/manager.cxx
@@ -30,18 +30,17 @@ using namespace ::com::sun::star;
namespace avmedia { namespace win {
-// - Manager -
-
-
Manager::Manager( const uno::Reference< lang::XMultiServiceFactory >& rxMgr ) :
mxMgr( rxMgr )
{
}
+
Manager::~Manager()
{
}
+
uno::Reference< media::XPlayer > SAL_CALL Manager::createPlayer( const OUString& rURL )
throw (uno::RuntimeException)
{
@@ -55,18 +54,21 @@ uno::Reference< media::XPlayer > SAL_CALL Manager::createPlayer( const OUString&
return xRet;
}
+
OUString SAL_CALL Manager::getImplementationName( )
throw (uno::RuntimeException)
{
return OUString( AVMEDIA_WIN_MANAGER_IMPLEMENTATIONNAME );
}
+
sal_Bool SAL_CALL Manager::supportsService( const OUString& ServiceName )
throw (uno::RuntimeException)
{
return cppu::supportsService(this, ServiceName);
}
+
uno::Sequence< OUString > SAL_CALL Manager::getSupportedServiceNames( )
throw (uno::RuntimeException)
{
diff --git a/avmedia/source/win/manager.hxx b/avmedia/source/win/manager.hxx
index 9f309c7..a70861e 100644
--- a/avmedia/source/win/manager.hxx
+++ b/avmedia/source/win/manager.hxx
@@ -25,9 +25,6 @@
#include "com/sun/star/media/XManager.hpp"
-// - Manager -
-
-
namespace avmedia { namespace win {
class Manager : public ::cppu::WeakImplHelper< css::media::XManager,
diff --git a/avmedia/source/win/player.cxx b/avmedia/source/win/player.cxx
index 8bf50f2..5bb45e0 100644
--- a/avmedia/source/win/player.cxx
+++ b/avmedia/source/win/player.cxx
@@ -85,9 +85,6 @@ bool isWindowsVistaOrHigher()
}
-// - Player -
-
-
Player::Player( const uno::Reference< lang::XMultiServiceFactory >& rxMgr ) :
Player_BASE(m_aMutex),
mxMgr( rxMgr ),
@@ -110,6 +107,7 @@ Player::Player( const uno::Reference< lang::XMultiServiceFactory >& rxMgr ) :
::CoInitialize( NULL );
}
+
Player::~Player()
{
if( mnFrameWnd )
@@ -118,6 +116,7 @@ Player::~Player()
::CoUninitialize();
}
+
void SAL_CALL Player::disposing()
{
::osl::MutexGuard aGuard(m_aMutex);
@@ -156,6 +155,7 @@ void SAL_CALL Player::disposing()
mpGB->Release();
}
+
bool Player::create( const OUString& rURL )
{
HRESULT hR;
@@ -202,11 +202,13 @@ bool Player::create( const OUString& rURL )
return bRet;
}
+
const IVideoWindow* Player::getVideoWindow() const
{
return mpVW;
}
+
void Player::setNotifyWnd( HWND nNotifyWnd )
{
mbAddWindow = false;
@@ -214,6 +216,7 @@ void Player::setNotifyWnd( HWND nNotifyWnd )
mpME->SetNotifyWindow( (OAHWND) nNotifyWnd, WM_GRAPHNOTIFY, reinterpret_cast< LONG_PTR>( this ) );
}
+
long Player::processEvent()
{
long nCode;
@@ -241,6 +244,7 @@ long Player::processEvent()
return 0;
}
+
void SAL_CALL Player::start( )
throw (uno::RuntimeException)
{
@@ -284,6 +288,7 @@ void SAL_CALL Player::start( )
}
}
+
void SAL_CALL Player::stop( )
throw (uno::RuntimeException)
{
@@ -292,6 +297,7 @@ void SAL_CALL Player::stop( )
mpMC->Stop();
}
+
sal_Bool SAL_CALL Player::isPlaying()
throw (uno::RuntimeException)
{
@@ -306,6 +312,7 @@ sal_Bool SAL_CALL Player::isPlaying()
return bRet;
}
+
double SAL_CALL Player::getDuration( )
throw (uno::RuntimeException)
{
@@ -319,6 +326,7 @@ double SAL_CALL Player::getDuration( )
return aRefTime;
}
+
void SAL_CALL Player::setMediaTime( double fTime )
throw (uno::RuntimeException)
{
@@ -335,6 +343,7 @@ void SAL_CALL Player::setMediaTime( double fTime )
}
}
+
double SAL_CALL Player::getMediaTime( )
throw (uno::RuntimeException)
{
@@ -348,6 +357,7 @@ double SAL_CALL Player::getMediaTime( )
return aRefTime;
}
+
void SAL_CALL Player::setPlaybackLoop( sal_Bool bSet )
throw (uno::RuntimeException)
{
@@ -356,6 +366,7 @@ void SAL_CALL Player::setPlaybackLoop( sal_Bool bSet )
mbLooping = bSet;
}
+
sal_Bool SAL_CALL Player::isPlaybackLoop( )
throw (uno::RuntimeException)
{
@@ -364,6 +375,7 @@ sal_Bool SAL_CALL Player::isPlaybackLoop( )
return mbLooping;
}
+
void SAL_CALL Player::setMute( sal_Bool bSet )
throw (uno::RuntimeException)
{
@@ -376,6 +388,7 @@ void SAL_CALL Player::setMute( sal_Bool bSet )
}
}
+
sal_Bool SAL_CALL Player::isMute( )
throw (uno::RuntimeException)
{
@@ -384,6 +397,7 @@ sal_Bool SAL_CALL Player::isMute( )
return mbMuted;
}
+
void SAL_CALL Player::setVolumeDB( sal_Int16 nVolumeDB )
throw (uno::RuntimeException)
{
@@ -395,6 +409,7 @@ void SAL_CALL Player::setVolumeDB( sal_Int16 nVolumeDB )
mpBA->put_Volume( mnUnmutedVolume );
}
+
sal_Int16 SAL_CALL Player::getVolumeDB( )
throw (uno::RuntimeException)
{
@@ -403,6 +418,7 @@ sal_Int16 SAL_CALL Player::getVolumeDB( )
return( static_cast< sal_Int16 >( mnUnmutedVolume / 100 ) );
}
+
awt::Size SAL_CALL Player::getPreferredPlayerWindowSize( )
throw (uno::RuntimeException)
{
@@ -422,6 +438,7 @@ awt::Size SAL_CALL Player::getPreferredPlayerWindowSize( )
return aSize;
}
+
uno::Reference< ::media::XPlayerWindow > SAL_CALL Player::createPlayerWindow( const uno::Sequence< uno::Any >& aArguments )
throw (uno::RuntimeException)
{
@@ -443,6 +460,7 @@ uno::Reference< ::media::XPlayerWindow > SAL_CALL Player::createPlayerWindow( co
return xRet;
}
+
uno::Reference< media::XFrameGrabber > SAL_CALL Player::createFrameGrabber( )
throw (uno::RuntimeException)
{
@@ -461,18 +479,21 @@ uno::Reference< media::XFrameGrabber > SAL_CALL Player::createFrameGrabber( )
return xRet;
}
+
OUString SAL_CALL Player::getImplementationName( )
throw (uno::RuntimeException)
{
return OUString( AVMEDIA_WIN_PLAYER_IMPLEMENTATIONNAME );
}
+
sal_Bool SAL_CALL Player::supportsService( const OUString& ServiceName )
throw (uno::RuntimeException)
{
return cppu::supportsService(this, ServiceName);
}
+
uno::Sequence< OUString > SAL_CALL Player::getSupportedServiceNames( )
throw (uno::RuntimeException)
{
diff --git a/avmedia/source/win/player.hxx b/avmedia/source/win/player.hxx
index e7c8401..2923d0d 100644
--- a/avmedia/source/win/player.hxx
+++ b/avmedia/source/win/player.hxx
@@ -46,13 +46,10 @@ struct IDirectDrawSurface;
namespace avmedia { namespace win {
-
-// - Player -
-
-
typedef ::cppu::WeakComponentImplHelper< css::media::XPlayer,
css::lang::XServiceInfo > Player_BASE;
+
class Player : public cppu::BaseMutex,
public Player_BASE
{
diff --git a/avmedia/source/win/window.hxx b/avmedia/source/win/window.hxx
index fa01b19..ca44d39 100644
--- a/avmedia/source/win/window.hxx
+++ b/avmedia/source/win/window.hxx
@@ -34,12 +34,9 @@ struct IVideoWindow;
namespace avmedia { namespace win {
-
-// - Window -
-
-
class Player;
+
class Window : public ::cppu::WeakImplHelper< css::media::XPlayerWindow,
css::lang::XServiceInfo >
{
diff --git a/bridges/source/cpp_uno/gcc3_ios_arm/rtti.h b/bridges/source/cpp_uno/gcc3_ios_arm/rtti.h
index ec8ea8e..fd8ef37 100644
--- a/bridges/source/cpp_uno/gcc3_ios_arm/rtti.h
+++ b/bridges/source/cpp_uno/gcc3_ios_arm/rtti.h
@@ -6,17 +6,15 @@
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2, or (at your option)
// any later version.
-//
// GCC is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-//
// You should have received a copy of the GNU General Public License
// along with GCC; see the file COPYING. If not, write to
// the Free Software Foundation, 51 Franklin Street, Fifth Floor,
// Boston, MA 02110-1301, USA.
-
+//
// As a special exception, you may use this file as part of a free software
// library without restriction. Specifically, if other files instantiate
// templates or use macros or inline functions from this file, or you compile
@@ -25,10 +23,10 @@
// the GNU General Public License. This exception does not however
// invalidate any other reasons why the executable file might be covered by
// the GNU General Public License.
-
+//
// Written by Nathan Sidwell, Codesourcery LLC, <nathan at codesourcery.com>
#ifndef __RTTI_H
-#define __RTTI_H
+#define __RTTI_H
#include <typeinfo>
@@ -38,10 +36,10 @@ namespace __cxxabiv1
class __fundamental_type_info : public std::type_info
{
public:
- explicit
+ explicit
__fundamental_type_info(const char* __n) : std::type_info(__n) { }
- virtual
+ virtual
~__fundamental_type_info();
};
@@ -49,10 +47,10 @@ namespace __cxxabiv1
class __array_type_info : public std::type_info
{
public:
- explicit
+ explicit
__array_type_info(const char* __n) : std::type_info(__n) { }
- virtual
+ virtual
~__array_type_info();
};
@@ -60,15 +58,15 @@ namespace __cxxabiv1
class __function_type_info : public std::type_info
{
public:
- explicit
+ explicit
__function_type_info(const char* __n) : std::type_info(__n) { }
- virtual
+ virtual
~__function_type_info();
protected:
// Implementation defined member function.
- virtual bool
+ virtual bool
__is_function_p() const;
};
@@ -76,10 +74,10 @@ namespace __cxxabiv1
class __enum_type_info : public std::type_info
{
public:
- explicit
+ explicit
__enum_type_info(const char* __n) : std::type_info(__n) { }
- virtual
+ virtual
~__enum_type_info();
};
@@ -87,26 +85,26 @@ namespace __cxxabiv1
class __pbase_type_info : public std::type_info
{
public:
- unsigned int __flags; // Qualification of the target object.
- const std::type_info* __pointee; // Type of pointed to object.
+ unsigned int __flags; // Qualification of the target object.
+ const std::type_info* __pointee; // Type of pointed to object.
- explicit
- __pbase_type_info(const char* __n, int __quals,
- const std::type_info* __type)
+ explicit
+ __pbase_type_info(const char* __n, int __quals,
+ const std::type_info* __type)
: std::type_info(__n), __flags(__quals), __pointee(__type)
{ }
-
- virtual
+
+ virtual
~__pbase_type_info();
// Implementation defined type.
- enum __masks
+ enum __masks
{
- __const_mask = 0x1,
- __volatile_mask = 0x2,
- __restrict_mask = 0x4,
- __incomplete_mask = 0x8,
- __incomplete_class_mask = 0x10
+ __const_mask = 0x1,
+ __volatile_mask = 0x2,
+ __restrict_mask = 0x4,
+ __incomplete_mask = 0x8,
+ __incomplete_class_mask = 0x10
};
protected:
@@ -116,36 +114,36 @@ namespace __cxxabiv1
operator=(const __pbase_type_info&);
// Implementation defined member functions.
- virtual bool
- __do_catch(const std::type_info* __thr_type, void** __thr_obj,
- unsigned int __outer) const;
+ virtual bool
+ __do_catch(const std::type_info* __thr_type, void** __thr_obj,
+ unsigned int __outer) const;
- inline virtual bool
+ inline virtual bool
__pointer_catch(const __pbase_type_info* __thr_type, void** __thr_obj,
- unsigned __outer) const;
+ unsigned __outer) const;
};
// Type information for simple pointers.
class __pointer_type_info : public __pbase_type_info
{
public:
- explicit
- __pointer_type_info(const char* __n, int __quals,
- const std::type_info* __type)
+ explicit
+ __pointer_type_info(const char* __n, int __quals,
+ const std::type_info* __type)
: __pbase_type_info (__n, __quals, __type) { }
- virtual
+ virtual
~__pointer_type_info();
protected:
// Implementation defined member functions.
- virtual bool
+ virtual bool
__is_pointer_p() const;
- virtual bool
- __pointer_catch(const __pbase_type_info* __thr_type, void** __thr_obj,
- unsigned __outer) const;
+ virtual bool
+ __pointer_catch(const __pbase_type_info* __thr_type, void** __thr_obj,
+ unsigned __outer) const;
};
class __class_type_info;
@@ -156,13 +154,13 @@ namespace __cxxabiv1
public:
__class_type_info* __context; // Class of the member.
- explicit
+ explicit
__pointer_to_member_type_info(const char* __n, int __quals,
- const std::type_info* __type,
- __class_type_info* __klass)
+ const std::type_info* __type,
+ __class_type_info* __klass)
: __pbase_type_info(__n, __quals, __type), __context(__klass) { }
- virtual
+ virtual
~__pointer_to_member_type_info();
protected:
@@ -172,38 +170,38 @@ namespace __cxxabiv1
operator=(const __pointer_to_member_type_info&);
// Implementation defined member function.
- virtual bool
+ virtual bool
__pointer_catch(const __pbase_type_info* __thr_type, void** __thr_obj,
- unsigned __outer) const;
+ unsigned __outer) const;
};
// Helper class for __vmi_class_type.
class __base_class_type_info
{
public:
- const __class_type_info* __base_type; // Base class type.
- long __offset_flags; // Offset and info.
+ const __class_type_info* __base_type; // Base class type.
+ long __offset_flags; // Offset and info.
- enum __offset_flags_masks
+ enum __offset_flags_masks
{
- __virtual_mask = 0x1,
- __public_mask = 0x2,
- __hwm_bit = 2,
- __offset_shift = 8 // Bits to shift offset.
+ __virtual_mask = 0x1,
+ __public_mask = 0x2,
+ __hwm_bit = 2,
+ __offset_shift = 8 // Bits to shift offset.
};
-
+
// Implementation defined member functions.
- bool
+ bool
__is_virtual_p() const
{ return __offset_flags & __virtual_mask; }
- bool
+ bool
__is_public_p() const
{ return __offset_flags & __public_mask; }
- ptrdiff_t
+ ptrdiff_t
__offset() const
- {
+ {
// This shift, being of a signed type, is implementation
// defined. GCC implements such shifts as arithmetic, which is
// what we want.
@@ -215,10 +213,10 @@ namespace __cxxabiv1
class __class_type_info : public std::type_info
{
public:
- explicit
+ explicit
__class_type_info (const char *__n) : type_info(__n) { }
- virtual
+ virtual
~__class_type_info ();
// Implementation defined types.
@@ -228,27 +226,27 @@ namespace __cxxabiv1
// not publicly contained.
enum __sub_kind
{
- // We have no idea.
- __unknown = 0,
-
- // Not contained within us (in some circumstances this might
- // mean not contained publicly)
- __not_contained,
-
- // Contained ambiguously.
- __contained_ambig,
-
- // Via a virtual path.
- __contained_virtual_mask = __base_class_type_info::__virtual_mask,
-
- // Via a public path.
- __contained_public_mask = __base_class_type_info::__public_mask,
-
- // Contained within us.
- __contained_mask = 1 << __base_class_type_info::__hwm_bit,
-
- __contained_private = __contained_mask,
- __contained_public = __contained_mask | __contained_public_mask
+ // We have no idea.
+ __unknown = 0,
+
+ // Not contained within us (in some circumstances this might
+ // mean not contained publicly)
+ __not_contained,
+
+ // Contained ambiguously.
+ __contained_ambig,
+
+ // Via a virtual path.
+ __contained_virtual_mask = __base_class_type_info::__virtual_mask,
+
+ // Via a public path.
+ __contained_public_mask = __base_class_type_info::__public_mask,
+
+ // Contained within us.
+ __contained_mask = 1 << __base_class_type_info::__hwm_bit,
+
+ __contained_private = __contained_mask,
+ __contained_public = __contained_mask | __contained_public_mask
};
struct __upcast_result;
@@ -256,19 +254,19 @@ namespace __cxxabiv1
protected:
// Implementation defined member functions.
- virtual bool
+ virtual bool
__do_upcast(const __class_type_info* __dst_type, void**__obj_ptr) const;
- virtual bool
- __do_catch(const type_info* __thr_type, void** __thr_obj,
- unsigned __outer) const;
+ virtual bool
+ __do_catch(const type_info* __thr_type, void** __thr_obj,
+ unsigned __outer) const;
public:
- // Helper for upcast. See if DST is us, or one of our bases.
- // Return false if not found, true if found.
- virtual bool
+ // Helper for upcast. See if DST is us, or one of our bases.
+ // Return false if not found, true if found.
+ virtual bool
__do_upcast(const __class_type_info* __dst, const void* __obj,
- __upcast_result& __restrict __result) const;
+ __upcast_result& __restrict __result) const;
// Indicate whether SRC_PTR of type SRC_TYPE is contained publicly
// within OBJ_PTR. OBJ_PTR points to a base object of our type,
@@ -276,10 +274,10 @@ namespace __cxxabiv1
// objects might be contained within this type. If SRC_PTR is one
// of our SRC_TYPE bases, indicate the virtuality. Returns
// not_contained for non containment or private containment.
- inline __sub_kind
+ inline __sub_kind
__find_public_src(ptrdiff_t __src2dst, const void* __obj_ptr,
- const __class_type_info* __src_type,
- const void* __src_ptr) const;
+ const __class_type_info* __src_type,
+ const void* __src_ptr) const;
// Helper for dynamic cast. ACCESS_PATH gives the access from the
// most derived object to this base. DST_TYPE indicates the
@@ -288,20 +286,20 @@ namespace __cxxabiv1
// started from and SRC_PTR points to that base within the most
// derived object. Fill in RESULT with what we find. Return true
// if we have located an ambiguous match.
- virtual bool
+ virtual bool
__do_dyncast(ptrdiff_t __src2dst, __sub_kind __access_path,
- const __class_type_info* __dst_type, const void* __obj_ptr,
- const __class_type_info* __src_type, const void* __src_ptr,
- __dyncast_result& __result) const;
-
+ const __class_type_info* __dst_type, const void* __obj_ptr,
+ const __class_type_info* __src_type, const void* __src_ptr,
+ __dyncast_result& __result) const;
+
// Helper for find_public_subobj. SRC2DST indicates how SRC_TYPE
// bases are inherited by the type started from -- which is not
// necessarily the current type. The current type will be a base
// of the destination type. OBJ_PTR points to the current base.
- virtual __sub_kind
+ virtual __sub_kind
__do_find_public_src(ptrdiff_t __src2dst, const void* __obj_ptr,
- const __class_type_info* __src_type,
- const void* __src_ptr) const;
+ const __class_type_info* __src_type,
+ const void* __src_ptr) const;
};
// Type information for a class with a single non-virtual base.
@@ -310,11 +308,11 @@ namespace __cxxabiv1
public:
const __class_type_info* __base_type;
- explicit
+ explicit
__si_class_type_info(const char *__n, const __class_type_info *__base)
: __class_type_info(__n), __base_type(__base) { }
- virtual
+ virtual
~__si_class_type_info();
protected:
@@ -324,65 +322,65 @@ namespace __cxxabiv1
operator=(const __si_class_type_info&);
// Implementation defined member functions.
- virtual bool
+ virtual bool
__do_dyncast(ptrdiff_t __src2dst, __sub_kind __access_path,
- const __class_type_info* __dst_type, const void* __obj_ptr,
- const __class_type_info* __src_type, const void* __src_ptr,
- __dyncast_result& __result) const;
+ const __class_type_info* __dst_type, const void* __obj_ptr,
+ const __class_type_info* __src_type, const void* __src_ptr,
+ __dyncast_result& __result) const;
- virtual __sub_kind
+ virtual __sub_kind
__do_find_public_src(ptrdiff_t __src2dst, const void* __obj_ptr,
- const __class_type_info* __src_type,
- const void* __sub_ptr) const;
+ const __class_type_info* __src_type,
+ const void* __sub_ptr) const;
- virtual bool
+ virtual bool
__do_upcast(const __class_type_info*__dst, const void*__obj,
- __upcast_result& __restrict __result) const;
+ __upcast_result& __restrict __result) const;
};
// Type information for a class with multiple and/or virtual bases.
- class __vmi_class_type_info : public __class_type_info
+ class __vmi_class_type_info : public __class_type_info
{
public:
- unsigned int __flags; // Details about the class hierarchy.
- unsigned int __base_count; // Number of direct bases.
+ unsigned int __flags; // Details about the class hierarchy.
+ unsigned int __base_count; // Number of direct bases.
// The array of bases uses the trailing array struct hack so this
// class is not constructable with a normal constructor. It is
// internally generated by the compiler.
- __base_class_type_info __base_info[1]; // Array of bases.
+ __base_class_type_info __base_info[1]; // Array of bases.
- explicit
+ explicit
__vmi_class_type_info(const char* __n, int ___flags)
: __class_type_info(__n), __flags(___flags), __base_count(0) { }
- virtual
+ virtual
~__vmi_class_type_info();
// Implementation defined types.
- enum __flags_masks
+ enum __flags_masks
{
- __non_diamond_repeat_mask = 0x1, // Distinct instance of repeated base.
- __diamond_shaped_mask = 0x2, // Diamond shaped multiple inheritance.
- __flags_unknown_mask = 0x10
+ __non_diamond_repeat_mask = 0x1, // Distinct instance of repeated base.
+ __diamond_shaped_mask = 0x2, // Diamond shaped multiple inheritance.
+ __flags_unknown_mask = 0x10
};
protected:
// Implementation defined member functions.
- virtual bool
+ virtual bool
__do_dyncast(ptrdiff_t __src2dst, __sub_kind __access_path,
- const __class_type_info* __dst_type, const void* __obj_ptr,
- const __class_type_info* __src_type, const void* __src_ptr,
- __dyncast_result& __result) const;
-
- virtual __sub_kind
- __do_find_public_src(ptrdiff_t __src2dst, const void* __obj_ptr,
- const __class_type_info* __src_type,
- const void* __src_ptr) const;
-
- virtual bool
+ const __class_type_info* __dst_type, const void* __obj_ptr,
+ const __class_type_info* __src_type, const void* __src_ptr,
+ __dyncast_result& __result) const;
+
+ virtual __sub_kind
+ __do_find_public_src(ptrdiff_t __src2dst, const void* __obj_ptr,
+ const __class_type_info* __src_type,
+ const void* __src_ptr) const;
+
+ virtual bool
__do_upcast(const __class_type_info* __dst, const void* __obj,
- __upcast_result& __restrict __result) const;
+ __upcast_result& __restrict __result) const;
};
// Dynamic cast runtime.
@@ -394,9 +392,9 @@ namespace __cxxabiv1
// -3: src_type is a multiple public non-virtual base of dst_type
extern "C" void*
__dynamic_cast(const void* __src_ptr, // Starting object.
- const __class_type_info* __src_type, // Static type of object.
- const __class_type_info* __dst_type, // Desired target type.
- ptrdiff_t __src2dst); // How src and dst are related.
+ const __class_type_info* __src_type, // Static type of object.
+ const __class_type_info* __dst_type, // Desired target type.
+ ptrdiff_t __src2dst); // How src and dst are related.
// Returns the type_info for the currently handled exception [15.3/8], or
@@ -405,8 +403,8 @@ namespace __cxxabiv1
__cxa_current_exception_type();
} // namespace __cxxabiv1
-// User programs should use the alias `abi'.
+// User programs should use the alias `abi'.
namespace abi = __cxxabiv1;
-#endif // __RTTI_H
+#endif // __RTTI_H
diff --git a/connectivity/source/drivers/postgresql/pq_tools.cxx b/connectivity/source/drivers/postgresql/pq_tools.cxx
index 071fbd7..22a1453 100644
--- a/connectivity/source/drivers/postgresql/pq_tools.cxx
+++ b/connectivity/source/drivers/postgresql/pq_tools.cxx
@@ -1156,7 +1156,7 @@ OUString querySingleValue(
// copied from connectivity/source/dbtools, can't use the function directly
-bool implSetObject( const Reference< XParameters >& _rxParameters,
+bool implSetObject( const Reference< XParameters >& _rxParameters,
const sal_Int32 _nColumnIndex, const Any& _rValue)
{
bool bSuccessfullyReRouted = true;
diff --git a/connectivity/source/drivers/postgresql/pq_tools.hxx b/connectivity/source/drivers/postgresql/pq_tools.hxx
index 8fa7656..f68612a 100644
--- a/connectivity/source/drivers/postgresql/pq_tools.hxx
+++ b/connectivity/source/drivers/postgresql/pq_tools.hxx
@@ -139,7 +139,7 @@ void extractNameValuePairsFromInsert( String2StringMap & map, const OString & la
sal_Int32 typeNameToDataType( const OUString &typeName, const OUString &typtype );
// copied from connectivity/source/dbtools, can't use the function directly
-bool implSetObject( const com::sun::star::uno::Reference< com::sun::star::sdbc::XParameters >& _rxParameters,
+bool implSetObject( const com::sun::star::uno::Reference< com::sun::star::sdbc::XParameters >& _rxParameters,
const sal_Int32 _nColumnIndex, const com::sun::star::uno::Any& _rValue);
class DisposeGuard
diff --git a/connectivity/source/parse/sqlflex.l b/connectivity/source/parse/sqlflex.l
index be74010..94fa789 100644
--- a/connectivity/source/parse/sqlflex.l
+++ b/connectivity/source/parse/sqlflex.l
@@ -787,18 +787,15 @@ IParseContext::InternationalKeyCode OSQLScanner::getInternationalTokenID(const s
OSL_ENSURE(m_pContext, "OSQLScanner::getInternationalTokenID: No Context set");
return (m_bInternational) ? m_pContext->getIntlKeyCode(::rtl::OString(sToken) ) : IParseContext::KEY_NONE;
}
-// -------------------------------------------------------------------------
sal_Int32 OSQLScanner::GetGERRule() { return PREDICATE_GER; }
sal_Int32 OSQLScanner::GetENGRule() { return PREDICATE_ENG; }
sal_Int32 OSQLScanner::GetSQLRule() { return SQL; }
sal_Int32 OSQLScanner::GetDATERule() { return DATE; }
sal_Int32 OSQLScanner::GetSTRINGRule() { return STRING; }
-// -------------------------------------------------------------------------
void OSQLScanner::setScanner(bool _bNull)
{
xxx_pGLOBAL_SQLSCAN = _bNull ? NULL : this;
}
-// -------------------------------------------------------------------------
sal_Int32 OSQLScanner::SQLlex()
{
return SQLyylex();
diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx
index d1c50a1..dfb8297 100644
--- a/cui/source/dialogs/cuigaldlg.cxx
+++ b/cui/source/dialogs/cuigaldlg.cxx
@@ -51,11 +51,6 @@
#include <svx/dialogs.hrc>
#include <svx/dialmgr.hxx>
-
-
-// - Namespaces -
-
-
using namespace ::ucbhelper;
using namespace ::cppu;
using namespace ::com::sun::star::lang;
@@ -65,9 +60,6 @@ using namespace ::com::sun::star::ui::dialogs;
using namespace ::com::sun::star::uno;
-// - SearchThread -
-
-
SearchThread::SearchThread( SearchProgress* pProgess,
TPGalleryThemeProperties* pBrowser,
const INetURLObject& rStartURL ) :
@@ -79,13 +71,11 @@ SearchThread::SearchThread( SearchProgress* pProgess,
}
-
SearchThread::~SearchThread()
{
}
-
void SearchThread::execute()
{
const OUString aFileType( mpBrowser->m_pCbbFileType->GetText() );
@@ -114,7 +104,6 @@ void SearchThread::execute()
}
-
void SearchThread::ImplSearch( const INetURLObject& rStartURL,
const ::std::vector< OUString >& rFormats,
bool bRecursive )
@@ -200,9 +189,6 @@ void SearchThread::ImplSearch( const INetURLObject& rStartURL,
}
-// - SearchProgress -
-
-
SearchProgress::SearchProgress( vcl::Window* pParent, const INetURLObject& rStartURL )
: ModalDialog(pParent, "GallerySearchProgress", "cui/ui/gallerysearchprogress.ui")
, parent_(pParent)
@@ -215,11 +201,13 @@ SearchProgress::SearchProgress( vcl::Window* pParent, const INetURLObject& rStar
m_pBtnCancel->SetClickHdl( LINK( this, SearchProgress, ClickCancelBtn ) );
}
+
SearchProgress::~SearchProgress()
{
disposeOnce();
}
+
void SearchProgress::dispose()
{
m_pFtSearchDir.clear();
@@ -237,14 +225,12 @@ void SearchProgress::Terminate()
}
-
IMPL_LINK_NOARG_TYPED(SearchProgress, ClickCancelBtn, Button*, void)
{
Terminate();
}
-
IMPL_LINK_NOARG_TYPED(SearchProgress, CleanUpHdl, void*, void)
{
if (maSearchThread.is())
@@ -256,7 +242,6 @@ IMPL_LINK_NOARG_TYPED(SearchProgress, CleanUpHdl, void*, void)
}
-
short SearchProgress::Execute()
{
OSL_FAIL( "SearchProgress cannot be executed via Dialog::Execute!\n"
@@ -266,7 +251,6 @@ short SearchProgress::Execute()
}
-
void SearchProgress::StartExecuteModal( const Link<Dialog&,void>& rEndDialogHdl )
{
assert(!maSearchThread.is());
@@ -277,9 +261,6 @@ void SearchProgress::StartExecuteModal( const Link<Dialog&,void>& rEndDialogHdl
}
-// - TakeThread -
-
-
TakeThread::TakeThread(
TakeProgress* pProgess,
TPGalleryThemeProperties* pBrowser,
@@ -293,13 +274,11 @@ TakeThread::TakeThread(
}
-
TakeThread::~TakeThread()
{
}
-
void TakeThread::execute()
{
sal_Int32 nEntries;
@@ -340,7 +319,7 @@ void TakeThread::execute()
Application::PostUserEvent( LINK( mpProgress, TakeProgress, CleanUpHdl ), nullptr, true );
}
-// - TakeProgress -
+
TakeProgress::TakeProgress(vcl::Window* pWindow)
: ModalDialog(pWindow, "GalleryApplyProgress",
"cui/ui/galleryapplyprogress.ui")
@@ -352,11 +331,13 @@ TakeProgress::TakeProgress(vcl::Window* pWindow)
m_pBtnCancel->SetClickHdl( LINK( this, TakeProgress, ClickCancelBtn ) );
}
+
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list