summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2011-11-15 22:37:13 +0000
committerCaolán McNamara <caolanm@redhat.com>2011-11-16 13:24:05 +0000
commitabf7cdac13c66778ea7deac7251e5b2a6d385a72 (patch)
tree88efe821e3bafd5b1c1e467de6422d43cd8371b2 /vcl
parent25b119a02143e2e5b321ef16272c276d17414bad (diff)
UniqueIdContainer is only needed by binfilter
Diffstat (limited to 'vcl')
-rw-r--r--vcl/inc/svdata.hxx1
-rw-r--r--vcl/inc/vcl/svapp.hxx3
-rw-r--r--vcl/source/app/svapp.cxx11
-rw-r--r--vcl/source/app/svmain.cxx6
4 files changed, 0 insertions, 21 deletions
diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx
index a5276153d51c..6cb48900c386 100644
--- a/vcl/inc/svdata.hxx
+++ b/vcl/inc/svdata.hxx
@@ -150,7 +150,6 @@ struct ImplSVAppData
String* mpFontPath; // Additional Fontpath
Help* mpHelp; // Application help
PopupMenu* mpActivePopupMenu; // Actives Popup-Menu (in Execute)
- UniqueIdContainer* mpUniqueIdCont; // Fuer Eindeutige Id's
ImplIdleMgr* mpIdleMgr; // Idle-Manager
ImplWheelWindow* mpWheelWindow; // WheelWindow
ImplHotKey* mpFirstHotKey; // HotKey-Verwaltung
diff --git a/vcl/inc/vcl/svapp.hxx b/vcl/inc/vcl/svapp.hxx
index 07782dfb07aa..0350ee5f3c63 100644
--- a/vcl/inc/vcl/svapp.hxx
+++ b/vcl/inc/vcl/svapp.hxx
@@ -33,7 +33,6 @@
#include <osl/mutex.hxx>
#include <tools/string.hxx>
#include <tools/link.hxx>
-#include <tools/unqid.hxx>
#include <vcl/sv.h>
#include <vcl/dllapi.h>
#include <vcl/apptypes.hxx>
@@ -311,8 +310,6 @@ public:
static void SetDialogScaleX( short nScale );
- static UniqueItemId CreateUniqueId();
-
static ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDisplayConnection > GetDisplayConnection();
// The global service manager has to be created before!
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index e23192c33cc8..37658218e7f4 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -1569,17 +1569,6 @@ sal_uInt16 Application::GetSystemWindowMode()
// -----------------------------------------------------------------------
-UniqueItemId Application::CreateUniqueId()
-{
- ImplSVData* pSVData = ImplGetSVData();
-
- if ( !pSVData->maAppData.mpUniqueIdCont )
- pSVData->maAppData.mpUniqueIdCont = new UniqueIdContainer( UNIQUEID_SV_BEGIN );
- return pSVData->maAppData.mpUniqueIdCont->CreateId();
-}
-
-// -----------------------------------------------------------------------
-
::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit > Application::GetVCLToolkit()
{
::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit > xT;
diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx
index e1f9052792ff..df43cd20d661 100644
--- a/vcl/source/app/svmain.cxx
+++ b/vcl/source/app/svmain.cxx
@@ -36,7 +36,6 @@
#include "tools/tools.h"
#include "tools/debug.hxx"
-#include "tools/unqid.hxx"
#include "tools/resmgr.hxx"
#include "comphelper/processfactory.hxx"
@@ -513,11 +512,6 @@ void DeInitVCL()
delete pSVData->maAppData.mpAccelMgr;
pSVData->maAppData.mpAccelMgr = NULL;
}
- if ( pSVData->maAppData.mpUniqueIdCont )
- {
- delete pSVData->maAppData.mpUniqueIdCont;
- pSVData->maAppData.mpUniqueIdCont = NULL;
- }
if ( pSVData->maAppData.mpAppFileName )
{
delete pSVData->maAppData.mpAppFileName;