[Libreoffice-commits] core.git: 2 commits - avmedia/source include/avmedia include/basebmp sw/source
Caolán McNamara
caolanm at redhat.com
Fri Jan 9 09:38:32 PST 2015
avmedia/source/viewer/mediawindow.cxx | 14 +++++++-------
avmedia/source/viewer/mediawindow_impl.hxx | 2 +-
avmedia/source/vlc/vlcmanager.hxx | 6 +++---
include/avmedia/mediaitem.hxx | 5 ++---
include/avmedia/mediawindow.hxx | 4 ++--
include/basebmp/bitmapdevice.hxx | 4 ++--
sw/source/filter/ww8/ww8scan.cxx | 11 ++++++-----
7 files changed, 23 insertions(+), 23 deletions(-)
New commits:
commit b7d07699c8142e33f9d05d4e203b6fb567f36a9b
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Jan 9 16:44:07 2015 +0000
asan: heap-buffer-overflow on ooo8726-1.doc
Change-Id: I9fd7b873b6e64a6450c1bd946cd9bb08c293290a
diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index 6b8b9b4..62b9039 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -358,11 +358,12 @@ const wwSprmSearcher *wwSprmParser::GetWW6SprmSearcher()
{108, { 0, L_VAR} }, // "sprmCMajority50" chp.fBold, chp.fItalic, ...
{109, { 2, L_FIX} }, // "sprmCHpsMul" chp.hps percentage to grow hps
{110, { 2, L_FIX} }, // "sprmCCondHyhen" chp.ysri ysri
- {111, { 2, L_FIX} }, // rtl bold
- {112, { 2, L_FIX} }, // rtl italic
- {113, { 0, L_VAR} }, // rtl property ?
- {115, { 0, L_VAR} }, // rtl property ?
- {116, { 0, L_VAR} }, // unknown
+ {111, { 2, L_FIX} }, // ww7 font
+ {112, { 2, L_FIX} }, // ww7 CJK font
+ {113, { 2, L_FIX} }, // ww7 rtl font
+ {114, { 2, L_FIX} }, // ww7 lid
+ {115, { 2, L_FIX} }, // ww7 rtl colour ?
+ {116, { 2, L_FIX} }, // ww7 fontsize
{117, { 1, L_FIX} }, // "sprmCFSpec" chp.fSpec 1 or 0 bit
{118, { 1, L_FIX} }, // "sprmCFObj" chp.fObj 1 or 0 bit
{119, { 1, L_FIX} }, // "sprmPicBrcl" pic.brcl brcl (see PIC definition)
commit 82f02d7248f5959409a9a90f936649d602905067
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Jan 9 16:23:36 2015 +0000
boost::scoped_ptr->std::unique_ptr
Change-Id: I844532d08123ed0c91ccec73cc806277fd821089
diff --git a/avmedia/source/viewer/mediawindow.cxx b/avmedia/source/viewer/mediawindow.cxx
index 22326a6..7912bf5 100644
--- a/avmedia/source/viewer/mediawindow.cxx
+++ b/avmedia/source/viewer/mediawindow.cxx
@@ -20,7 +20,6 @@
#include <stdio.h>
#include <avmedia/mediawindow.hxx>
-#include <boost/scoped_ptr.hpp>
#include "mediawindow_impl.hxx"
#include "mediamisc.hxx"
#include "mediawindow.hrc"
@@ -34,6 +33,7 @@
#include "com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp"
#include "com/sun/star/ui/dialogs/TemplateDescription.hpp"
#include "com/sun/star/ui/dialogs/XFilePickerControlAccess.hpp"
+#include <memory>
#define AVMEDIA_FRAMEGRABBER_DEFAULTFRAME_MEDIATIME 3.0
@@ -404,7 +404,7 @@ uno::Reference< graphic::XGraphic > MediaWindow::grabFrame( const OUString& rURL
{
uno::Reference< media::XPlayer > xPlayer( createPlayer( rURL, rReferer, &sMimeType ) );
uno::Reference< graphic::XGraphic > xRet;
- boost::scoped_ptr< Graphic > apGraphic;
+ std::unique_ptr< Graphic > xGraphic;
if( xPlayer.is() )
{
@@ -428,19 +428,19 @@ uno::Reference< graphic::XGraphic > MediaWindow::grabFrame( const OUString& rURL
if( !aPrefSize.Width && !aPrefSize.Height )
{
const BitmapEx aBmpEx( getAudioLogo() );
- apGraphic.reset( new Graphic( aBmpEx ) );
+ xGraphic.reset( new Graphic( aBmpEx ) );
}
}
}
- if( !xRet.is() && !apGraphic.get() )
+ if( !xRet.is() && !xGraphic.get() )
{
const BitmapEx aBmpEx( getEmptyLogo() );
- apGraphic.reset( new Graphic( aBmpEx ) );
+ xGraphic.reset( new Graphic( aBmpEx ) );
}
- if( apGraphic.get() )
- xRet = apGraphic->GetXGraphic();
+ if( xGraphic.get() )
+ xRet = xGraphic->GetXGraphic();
return xRet;
}
diff --git a/avmedia/source/viewer/mediawindow_impl.hxx b/avmedia/source/viewer/mediawindow_impl.hxx
index ce2c24b..c5c65fa 100644
--- a/avmedia/source/viewer/mediawindow_impl.hxx
+++ b/avmedia/source/viewer/mediawindow_impl.hxx
@@ -173,7 +173,7 @@ namespace avmedia
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > mxEventsIf;
MediaEventListenersImpl* mpEvents;
bool mbEventTransparent;
- boost::scoped_ptr<MediaChildWindow> mpChildWindow;
+ std::unique_ptr<MediaChildWindow> mpChildWindow;
MediaWindowControl* mpMediaWindowControl;
BitmapEx* mpEmptyBmpEx;
BitmapEx* mpAudioBmpEx;
diff --git a/avmedia/source/vlc/vlcmanager.hxx b/avmedia/source/vlc/vlcmanager.hxx
index 36eebce..f9b1a1c 100644
--- a/avmedia/source/vlc/vlcmanager.hxx
+++ b/avmedia/source/vlc/vlcmanager.hxx
@@ -19,10 +19,10 @@
#ifndef INCLUDED_AVMEDIA_SOURCE_VLC_VLCMANAGER_HXX
#define INCLUDED_AVMEDIA_SOURCE_VLC_VLCMANAGER_HXX
-#include <boost/scoped_ptr.hpp>
#include <com/sun/star/media/XManager.hpp>
#include "vlccommon.hxx"
#include "wrapper/Wrapper.hxx"
+#include <memory>
namespace avmedia {
namespace vlc {
@@ -30,7 +30,7 @@ namespace vlc {
class Manager : public ::cppu::WeakImplHelper2 < ::com::sun::star::media::XManager,
::com::sun::star::lang::XServiceInfo >
{
- boost::scoped_ptr<wrapper::Instance> mInstance;
+ std::unique_ptr<wrapper::Instance> mInstance;
wrapper::EventHandler mEventHandler;
public:
Manager( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxMgr );
@@ -55,4 +55,4 @@ private:
#endif
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/avmedia/mediaitem.hxx b/include/avmedia/mediaitem.hxx
index e3300b3..84cb424 100644
--- a/include/avmedia/mediaitem.hxx
+++ b/include/avmedia/mediaitem.hxx
@@ -20,14 +20,13 @@
#ifndef INCLUDED_AVMEDIA_MEDIAITEM_HXX
#define INCLUDED_AVMEDIA_MEDIAITEM_HXX
-#include <boost/scoped_ptr.hpp>
-
#include <tools/rtti.hxx>
#include <svl/poolitem.hxx>
#include <com/sun/star/media/ZoomLevel.hpp>
#include <com/sun/star/frame/XModel.hpp>
#include <com/sun/star/embed/XStorage.hpp>
#include <avmedia/avmediadllapi.h>
+#include <memory>
#define AVMEDIA_SETMASK_NONE ((sal_uInt32)(0x00000000))
#define AVMEDIA_SETMASK_STATE ((sal_uInt32)(0x00000001))
@@ -120,7 +119,7 @@ public:
private:
struct Impl;
- ::boost::scoped_ptr<Impl> m_pImpl;
+ std::unique_ptr<Impl> m_pImpl;
};
typedef ::avmedia::MediaItem avmedia_MediaItem;
diff --git a/include/avmedia/mediawindow.hxx b/include/avmedia/mediawindow.hxx
index 1ab2c05..71cf1fa 100644
--- a/include/avmedia/mediawindow.hxx
+++ b/include/avmedia/mediawindow.hxx
@@ -20,8 +20,8 @@
#ifndef INCLUDED_AVMEDIA_MEDIAWINDOW_HXX
#define INCLUDED_AVMEDIA_MEDIAWINDOW_HXX
+#include <memory>
#include <vector>
-#include <boost/scoped_ptr.hpp>
#include <tools/gen.hxx>
#include <com/sun/star/media/ZoomLevel.hpp>
#include <com/sun/star/media/XPlayer.hpp>
@@ -117,7 +117,7 @@ namespace avmedia
AVMEDIA_DLLPRIVATE MediaWindow& operator =( const MediaWindow& );
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > mxIFace;
- boost::scoped_ptr<priv::MediaWindowImpl> mpImpl;
+ std::unique_ptr<priv::MediaWindowImpl> mpImpl;
};
}
diff --git a/include/basebmp/bitmapdevice.hxx b/include/basebmp/bitmapdevice.hxx
index 600eabe..48c6d47 100644
--- a/include/basebmp/bitmapdevice.hxx
+++ b/include/basebmp/bitmapdevice.hxx
@@ -25,11 +25,11 @@
#include <basebmp/scanlineformats.hxx>
#include <basebmp/basebmpdllapi.h>
-#include <boost/scoped_ptr.hpp>
#include <boost/shared_ptr.hpp>
#include <boost/shared_array.hpp>
#include <boost/enable_shared_from_this.hpp>
#include <boost/noncopyable.hpp>
+#include <memory>
#include <vector>
namespace basegfx
@@ -656,7 +656,7 @@ private:
BitmapDeviceSharedPtr getGenericRenderer() const;
- boost::scoped_ptr< ImplBitmapDevice > mpImpl;
+ std::unique_ptr< ImplBitmapDevice > mpImpl;
};
/** Function to create a BitmapDevice for given scanline format
More information about the Libreoffice-commits
mailing list