Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3393
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/93/3393/1
remove dead class SfxResourceManager
Change-Id: I33590e7907c593d821e2eafda0e04c76c8b99879
---
D sfx2/inc/resmgr.hxx
M sfx2/inc/sfx2/app.hxx
M sfx2/source/appl/appdata.cxx
M sfx2/source/inc/appdata.hxx
4 files changed, 0 insertions(+), 69 deletions(-)
diff --git a/sfx2/inc/resmgr.hxx b/sfx2/inc/resmgr.hxx
deleted file mode 100644
index 7e6f837..0000000
--- a/sfx2/inc/resmgr.hxx
+++ /dev/null
@@ -1,65 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#ifndef _SFX_RESMGR_HXX
-#define _SFX_RESMGR_HXX
-
-#include <sfx2/minarray.hxx>
-
-class SfxMessageDescription;
-class SfxMessageTable;
-class Bitmap;
-class ResMgr;
-
-DECL_PTRARRAY(SfxResMgrArr, ResMgr *, 1, 1);
-
-// INCLUDE ---------------------------------------------------------------
-
-class SfxResourceManager
-{
- SfxResMgrArr aResMgrArr;
- SfxResMgrArr aResMgrBmpArr;
- sal_uInt16 nEnterCount;
- SfxMessageTable* pMessageTable;
-
-private:
- void ClearMsgTable_Impl();
- SfxMessageDescription* MakeDesc_Impl(sal_uInt16);
-
-public:
- SfxResourceManager();
- ~SfxResourceManager();
-
- sal_uInt16 RegisterResource( const char *pFileName);
- void ReleaseResource( sal_uInt16 nRegisterId );
-
- sal_uInt16 RegisterBitmap(const char *pMono, const char *pColor);
-
- sal_uInt16 RegisterBitmap( const char *pSingleFile );
- void ReleaseBitmap( sal_uInt16 nRegisterId );
-
- Bitmap GetAllBitmap( sal_uInt16 nBmpsPerRow );
-
- void Enter();
- void Leave();
- SfxMessageDescription* CreateDescription( sal_uInt16 nId );
-};
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sfx2/app.hxx b/sfx2/inc/sfx2/app.hxx
index 2f81d6d..858140d 100644
--- a/sfx2/inc/sfx2/app.hxx
+++ b/sfx2/inc/sfx2/app.hxx
@@ -65,7 +65,6 @@
class SfxObjectShell;
class SfxObjectShellArr_Impl;
class SfxProgress;
-class SfxResourceManager;
class SfxSlotPool;
class SfxStbCtrlFactArr_Impl;
class SfxTbxCtrlFactArr_Impl;
diff --git a/sfx2/source/appl/appdata.cxx b/sfx2/source/appl/appdata.cxx
index 2988d8b..a2c79ca 100644
--- a/sfx2/source/appl/appdata.cxx
+++ b/sfx2/source/appl/appdata.cxx
@@ -112,7 +112,6 @@
, pBasMgrListener( new SfxBasicManagerCreationListener( *this ) )
, pViewFrame( 0 )
, pSlotPool( 0 )
- , pResMgr( 0 )
, pAppDispat( 0 )
, pInterfaces( 0 )
, nDocNo(0)
diff --git a/sfx2/source/inc/appdata.hxx b/sfx2/source/inc/appdata.hxx
index 786528a..3e92ccd8 100644
--- a/sfx2/source/inc/appdata.hxx
+++ b/sfx2/source/inc/appdata.hxx
@@ -56,7 +56,6 @@
class ResMgr;
class SfxViewFrame;
class SfxSlotPool;
-class SfxResourceManager;
class SfxDispatcher;
class SfxInterface;
class BasicManager;
@@ -129,7 +128,6 @@
pBasMgrListener;
SfxViewFrame* pViewFrame;
SfxSlotPool* pSlotPool;
- SfxResourceManager* pResMgr;
SfxDispatcher* pAppDispat; // Dispatcher if no document
SfxInterface** pInterfaces;
--
To view, visit https://gerrit.libreoffice.org/3393
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I33590e7907c593d821e2eafda0e04c76c8b99879
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Noel Grandin <noelgrandin@gmail.com>
Context
- [PATCH] remove dead class SfxResourceManager · Noel Grandin (via Code Review)
Privacy Policy |
Impressum (Legal Info) |
Copyright information: Unless otherwise specified, all text and images
on this website are licensed under the
Creative Commons Attribution-Share Alike 3.0 License.
This does not include the source code of LibreOffice, which is
licensed under the Mozilla Public License (
MPLv2).
"LibreOffice" and "The Document Foundation" are
registered trademarks of their corresponding registered owners or are
in actual use as trademarks in one or more countries. Their respective
logos and icons are also subject to international copyright laws. Use
thereof is explained in our
trademark policy.