summaryrefslogtreecommitdiff
path: root/drawinglayer
diff options
context:
space:
mode:
Diffstat (limited to 'drawinglayer')
-rw-r--r--drawinglayer/inc/pch/precompiled_drawinglayer.hxx2
-rw-r--r--drawinglayer/source/primitive2d/textlayoutdevice.cxx6
2 files changed, 4 insertions, 4 deletions
diff --git a/drawinglayer/inc/pch/precompiled_drawinglayer.hxx b/drawinglayer/inc/pch/precompiled_drawinglayer.hxx
index d993b0664ec7..3c0c6d8efcf0 100644
--- a/drawinglayer/inc/pch/precompiled_drawinglayer.hxx
+++ b/drawinglayer/inc/pch/precompiled_drawinglayer.hxx
@@ -80,7 +80,7 @@
#include <comphelper/broadcasthelper.hxx>
#include <comphelper/processfactory.hxx>
#include <comphelper/random.hxx>
-#include <comphelper/scoped_disposing_ptr.hxx>
+#include <comphelper/unique_disposing_ptr.hxx>
#include <comphelper/string.hxx>
#include <cppuhelper/factory.hxx>
#include <cppuhelper/implbase2.hxx>
diff --git a/drawinglayer/source/primitive2d/textlayoutdevice.cxx b/drawinglayer/source/primitive2d/textlayoutdevice.cxx
index 12e83f6baf09..b1e1ad0f62a8 100644
--- a/drawinglayer/source/primitive2d/textlayoutdevice.cxx
+++ b/drawinglayer/source/primitive2d/textlayoutdevice.cxx
@@ -23,7 +23,7 @@
#include <drawinglayer/primitive2d/textlayoutdevice.hxx>
#include <comphelper/processfactory.hxx>
-#include <comphelper/scoped_disposing_ptr.hxx>
+#include <comphelper/unique_disposing_ptr.hxx>
#include <vcl/timer.hxx>
#include <vcl/virdev.hxx>
#include <vcl/font.hxx>
@@ -46,10 +46,10 @@ namespace
//The ImpTimerRefDev itself, if the timeout ever gets hit, will call
//reset on the scoped_timed_RefDev to release the ImpTimerRefDev early
//if its unused for a few minutes
- class scoped_timed_RefDev : public comphelper::scoped_disposing_ptr<ImpTimedRefDev>
+ class scoped_timed_RefDev : public comphelper::unique_disposing_ptr<ImpTimedRefDev>
{
public:
- scoped_timed_RefDev() : comphelper::scoped_disposing_ptr<ImpTimedRefDev>((::com::sun::star::uno::Reference<com::sun::star::lang::XComponent>(::comphelper::getProcessComponentContext(), ::com::sun::star::uno::UNO_QUERY_THROW)))
+ scoped_timed_RefDev() : comphelper::unique_disposing_ptr<ImpTimedRefDev>((::com::sun::star::uno::Reference<com::sun::star::lang::XComponent>(::comphelper::getProcessComponentContext(), ::com::sun::star::uno::UNO_QUERY_THROW)))
{
}
};
td>Noel Grandin 2014-04-06Kill superfluous vertical whitespaceTor Lillqvist 2014-03-26First batch of adding SAL_OVERRRIDE to overriding function declarationsStephan Bergmann 2014-03-17Consolidate framework::{Resetable,}GuardStephan Bergmann 2014-02-26cppuhelper: retrofit std::exception into overriding exception specsStephan Bergmann 2014-02-20Remove vcl/settings.hxx from vcl/svapp.hxx and vcl/outdev.hxxTobias Lippert 2014-02-09coverity#1169826 Dereference after null checkCaolán McNamara 2014-01-22Introduce static inline cppu::acquire(), and make use of that.Jan Holesovsky 2014-01-21Change _get_implementation()'s not to do initialization directly.Jan Holesovsky 2014-01-17fwk: Constructor feature for ControlMenuController.Matúš Kukan 2013-08-04Mark as const/staticTakeshi Abe 2013-06-23Resolves: #i121542# Unify the Menu APIAriel Constenla-Haile 2013-06-05fdo#46808, Convert some XMultiservice in framework moduleNoel Grandin 2013-04-07mass removal of rtl:: prefixes for O(U)String*Luboš Luňák 2013-03-29ResMgr with LanguageTagEike Rathke 2013-03-27-Wunused-macrosStephan Bergmann 2013-01-07allow menu items to be referred to by a nameCaolán McNamara 2012-11-22AllSettings with LanguageTagEike Rathke 2012-11-15re-base on ALv2 code. Includes:Michael Meeks 2012-08-08remove include comments and boxesThomas Arnhold