[Libreoffice-commits] .: 2 commits - sd/inc sd/Library_sd.mk sd/source
Takeshi Abe
tabe at kemper.freedesktop.org
Fri Jun 29 06:47:18 PDT 2012
sd/Library_sd.mk | 2
sd/inc/CustomAnimationEffect.hxx | 1
sd/inc/Outliner.hxx | 4
sd/inc/OutlinerIterator.hxx | 1
sd/inc/anminfo.hxx | 5
sd/inc/drawdoc.hxx | 11
sd/inc/sdabstdlg.hxx | 5
sd/inc/sddll.hxx | 6
sd/inc/sdfilter.hxx | 1
sd/inc/sdgrffilter.hxx | 2
sd/inc/sdmod.hxx | 5
sd/inc/undo/undoobjects.hxx | 2
sd/source/ui/animations/CustomAnimationPane.hxx | 1
sd/source/ui/animations/SlideTransitionPane.hxx | 1
sd/source/ui/annotations/annotationwindow.hxx | 3
sd/source/ui/dlg/sddlgfact.hxx | 1
sd/source/ui/framework/factories/ChildWindowPane.hxx | 2
sd/source/ui/framework/module/ToolPanelModule.hxx | 2
sd/source/ui/inc/DrawDocShell.hxx | 4
sd/source/ui/inc/DrawViewShell.hxx | 3
sd/source/ui/inc/SdUnoOutlineView.hxx | 2
sd/source/ui/inc/SdUnoSlideView.hxx | 4
sd/source/ui/inc/TextObjectBar.hxx | 1
sd/source/ui/inc/View.hxx | 1
sd/source/ui/inc/ViewShell.hxx | 9
sd/source/ui/inc/ViewShellBase.hxx | 1
sd/source/ui/inc/ViewShellImplementation.hxx | 2
sd/source/ui/inc/bulmaper.hxx | 2
sd/source/ui/inc/celltempl.hxx | 4
sd/source/ui/inc/copydlg.hxx | 2
sd/source/ui/inc/dlgpage.hxx | 4
sd/source/ui/inc/drawview.hxx | 2
sd/source/ui/inc/framework/ConfigurationController.hxx | 5
sd/source/ui/inc/fuconbez.hxx | 2
sd/source/ui/inc/fuconcs.hxx | 2
sd/source/ui/inc/fuprlout.hxx | 1
sd/source/ui/inc/futext.hxx | 1
sd/source/ui/inc/headerfooterdlg.hxx | 1
sd/source/ui/inc/navigatr.hxx | 1
sd/source/ui/inc/optsitem.hxx | 1
sd/source/ui/inc/prltempl.hxx | 6
sd/source/ui/inc/taskpane/ControlContainer.hxx | 2
sd/source/ui/inc/taskpane/TaskPaneControlFactory.hxx | 4
sd/source/ui/inc/taskpane/TaskPaneTreeNode.hxx | 4
sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx | 5
sd/source/ui/inc/unosrch.hxx | 1
sd/source/ui/slideshow/showwindow.hxx | 2
sd/source/ui/toolpanel/LayoutMenu.hxx | 1
sd/source/ui/toolpanel/TestMenu.cxx | 310 ------------
sd/source/ui/toolpanel/TestMenu.hxx | 78 ---
sd/source/ui/toolpanel/TestPanel.cxx | 172 ------
sd/source/ui/toolpanel/TestPanel.hxx | 51 -
sd/source/ui/toolpanel/ToolPanelUIElement.hxx | 2
sd/source/ui/toolpanel/controls/AllMasterPagesSelector.hxx | 4
sd/source/ui/toolpanel/controls/CustomAnimationPanel.hxx | 4
sd/source/ui/toolpanel/controls/MasterPageContainer.hxx | 6
sd/source/ui/toolpanel/controls/MasterPagesSelector.hxx | 4
sd/source/ui/toolpanel/controls/RecentlyUsedMasterPages.hxx | 2
sd/source/ui/toolpanel/controls/SlideTransitionPanel.hxx | 4
sd/source/ui/toolpanel/controls/TableDesignPanel.hxx | 4
60 files changed, 5 insertions(+), 771 deletions(-)
New commits:
commit bf5115328ed454f43b4443f3891a0183dfd62814
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date: Fri Jun 29 18:13:20 2012 +0900
removed unnecessary forward declarations of class
except
* sd::ViewTabBar moved to ViewShellBase.hxx
* sd::TemplateEntry moved to AllMasterPageSelector.hxx
Change-Id: I802cdc0b77027bbe0843fbb259ce1a5a46354fc3
diff --git a/sd/inc/CustomAnimationEffect.hxx b/sd/inc/CustomAnimationEffect.hxx
index 860db64..458bba4 100644
--- a/sd/inc/CustomAnimationEffect.hxx
+++ b/sd/inc/CustomAnimationEffect.hxx
@@ -55,7 +55,6 @@ namespace sd {
enum EValue { VALUE_FROM, VALUE_TO, VALUE_BY, VALUE_FIRST, VALUE_LAST };
class CustomAnimationEffect;
-class AnimationTrigger;
class CustomAnimationPreset;
typedef boost::shared_ptr< CustomAnimationPreset > CustomAnimationPresetPtr;
diff --git a/sd/inc/Outliner.hxx b/sd/inc/Outliner.hxx
index 805b1ef..8149787 100644
--- a/sd/inc/Outliner.hxx
+++ b/sd/inc/Outliner.hxx
@@ -40,16 +40,12 @@
#include <boost/noncopyable.hpp>
class Dialog;
-class SdPage;
class SdrObject;
class SdrTextObj;
class SdDrawDocument;
-class SfxStyleSheetPool;
-class SdrObjListIter;
namespace sd {
-class DrawViewShell;
class View;
class ViewShell;
class Window;
diff --git a/sd/inc/OutlinerIterator.hxx b/sd/inc/OutlinerIterator.hxx
index b60ff2d..87e1ab9 100644
--- a/sd/inc/OutlinerIterator.hxx
+++ b/sd/inc/OutlinerIterator.hxx
@@ -33,7 +33,6 @@ namespace sd {
class ViewShell;
class Outliner;
-class View;
namespace outliner {
diff --git a/sd/inc/anminfo.hxx b/sd/inc/anminfo.hxx
index e2d6c07..7379c4c 100644
--- a/sd/inc/anminfo.hxx
+++ b/sd/inc/anminfo.hxx
@@ -29,13 +29,8 @@
#include <tools/color.hxx>
#include <sddllapi.h>
-class Polygon;
-class Point;
-class SvStream;
-class SdrObjSurrogate;
class SdrObject;
class SdrPathObj;
-class SdDrawDocument;
class SdAnimationInfo : public SdrObjUserData
{
diff --git a/sd/inc/drawdoc.hxx b/sd/inc/drawdoc.hxx
index b8026e3..5063f4b 100644
--- a/sd/inc/drawdoc.hxx
+++ b/sd/inc/drawdoc.hxx
@@ -54,14 +54,6 @@ namespace com
{
namespace star
{
- namespace embed
- {
- class XStorage;
- }
- namespace io
- {
- class XStream;
- }
namespace presentation
{
class XPresentation2;
@@ -79,7 +71,6 @@ namespace sd
class Timer;
class SfxObjectShell;
-class SdDrawDocShell;
class SdPage;
class SdAnimationInfo;
class SdIMapInfo;
@@ -87,9 +78,7 @@ class IMapObject;
class SdStyleSheetPool;
class SfxMedium;
class SvxSearchItem;
-class SdrOle2Obj;
class EditStatus;
-class Graphic;
class Point;
class Window;
class SdTransferable;
diff --git a/sd/inc/sdabstdlg.hxx b/sd/inc/sdabstdlg.hxx
index 95ae85d..f009214 100644
--- a/sd/inc/sdabstdlg.hxx
+++ b/sd/inc/sdabstdlg.hxx
@@ -51,12 +51,7 @@ namespace sd {
class DrawView;
}
-class SfxTabPage;
-class SfxViewFrame;
-class SfxBindings;
-class ResId;
class String;
-class SfxItemPool;
class SfxObjectShell;
class SfxObjectShellLock;
class SvxFieldData;
diff --git a/sd/inc/sddll.hxx b/sd/inc/sddll.hxx
index 642d655..8386305 100644
--- a/sd/inc/sddll.hxx
+++ b/sd/inc/sddll.hxx
@@ -32,12 +32,6 @@
#include <sfx2/module.hxx>
#include <sfx2/sfxdefs.hxx>
-class SvFactory;
-class SotFactory;
-class SfxMedium;
-class SfxFilter;
-
-
/*************************************************************************
|*
|* This class is a wrapper for a Load-On-Demand-DLL. One instance
diff --git a/sd/inc/sdfilter.hxx b/sd/inc/sdfilter.hxx
index abedb41..1f3ea80 100644
--- a/sd/inc/sdfilter.hxx
+++ b/sd/inc/sdfilter.hxx
@@ -35,7 +35,6 @@ namespace sd {
class DrawDocShell;
}
class SdDrawDocument;
-class SfxProgress;
namespace osl { class Module; }
class SdFilter
diff --git a/sd/inc/sdgrffilter.hxx b/sd/inc/sdgrffilter.hxx
index 1a0a16e..f6eddc0 100644
--- a/sd/inc/sdgrffilter.hxx
+++ b/sd/inc/sdgrffilter.hxx
@@ -25,8 +25,6 @@
#include <tools/errinf.hxx>
#include "sdfilter.hxx"
-class Graphic;
-
// ---------------
// - SdCGMFilter -
// ---------------
diff --git a/sd/inc/sdmod.hxx b/sd/inc/sdmod.hxx
index c6f5900..2341435 100644
--- a/sd/inc/sdmod.hxx
+++ b/sd/inc/sdmod.hxx
@@ -34,17 +34,12 @@
#include <memory>
class SdOptions;
-class BasicIDE;
class SvxSearchItem;
-class SdAppLinkHdl;
-class SvxErrorHandler;
class EditFieldInfo;
-class SvFactory;
class SdTransferable;
class SvNumberFormatter;
class SfxErrorHandler;
class OutputDevice;
-class SdPage;
class SdDrawDocument;
class SfxFrame;
diff --git a/sd/inc/undo/undoobjects.hxx b/sd/inc/undo/undoobjects.hxx
index 1bca0eb..f615af6 100644
--- a/sd/inc/undo/undoobjects.hxx
+++ b/sd/inc/undo/undoobjects.hxx
@@ -30,8 +30,6 @@ class SdPage;
namespace sd
{
- class UndoManager;
-
///////////////////////////////////////////////////////////////////////
class UndoRemovePresObjectImpl
diff --git a/sd/source/ui/animations/CustomAnimationPane.hxx b/sd/source/ui/animations/CustomAnimationPane.hxx
index 0b59daf..c8b9ffc 100644
--- a/sd/source/ui/animations/CustomAnimationPane.hxx
+++ b/sd/source/ui/animations/CustomAnimationPane.hxx
@@ -47,7 +47,6 @@ class FixedText;
class ListBox;
class ComboBox;
class CheckBox;
-class SdDrawDocument;
namespace com { namespace sun { namespace star { namespace animations {
class XAnimationNode;
diff --git a/sd/source/ui/animations/SlideTransitionPane.hxx b/sd/source/ui/animations/SlideTransitionPane.hxx
index e5db4fb..20d12bb 100644
--- a/sd/source/ui/animations/SlideTransitionPane.hxx
+++ b/sd/source/ui/animations/SlideTransitionPane.hxx
@@ -44,7 +44,6 @@
#include <map>
class SdDrawDocument;
-class SdPage;
namespace sd
{
diff --git a/sd/source/ui/annotations/annotationwindow.hxx b/sd/source/ui/annotations/annotationwindow.hxx
index da49c76..12e70af 100644
--- a/sd/source/ui/annotations/annotationwindow.hxx
+++ b/sd/source/ui/annotations/annotationwindow.hxx
@@ -43,11 +43,8 @@
class OutlinerView;
class Outliner;
class ScrollBar;
-class Edit;
class MultiLineEdit;
-class PopupMenu;
class SvxLanguageItem;
-class OutlinerParaObject;
class SdDrawDocument;
namespace sd {
diff --git a/sd/source/ui/dlg/sddlgfact.hxx b/sd/source/ui/dlg/sddlgfact.hxx
index c06200e..31f8e5e 100644
--- a/sd/source/ui/dlg/sddlgfact.hxx
+++ b/sd/source/ui/dlg/sddlgfact.hxx
@@ -219,7 +219,6 @@ class AbstractSdPresLayoutDlg_Impl : public AbstractSdPresLayoutDlg
};
// add for SdActionDlg
-class SfxSingleTabDialog;
class AbstractSfxDialog_Impl : public SfxAbstractDialog
{
DECL_ABSTDLG_BASE(AbstractSfxDialog_Impl,SfxModalDialog)
diff --git a/sd/source/ui/framework/factories/ChildWindowPane.hxx b/sd/source/ui/framework/factories/ChildWindowPane.hxx
index 5a41bd6..b95c7f8 100644
--- a/sd/source/ui/framework/factories/ChildWindowPane.hxx
+++ b/sd/source/ui/framework/factories/ChildWindowPane.hxx
@@ -40,8 +40,6 @@ typedef ::cppu::ImplInheritanceHelper1 <
} // end of anonymous namespace.
-class SfxViewFrame;
-
namespace sd { class ViewShellBase; }
namespace sd { namespace framework {
diff --git a/sd/source/ui/framework/module/ToolPanelModule.hxx b/sd/source/ui/framework/module/ToolPanelModule.hxx
index 0e664b7..90b78fa 100644
--- a/sd/source/ui/framework/module/ToolPanelModule.hxx
+++ b/sd/source/ui/framework/module/ToolPanelModule.hxx
@@ -26,8 +26,6 @@
namespace sd { namespace framework {
-class ReadOnlyModeObserver;
-
/** This module is responsible for showing the task pane.
*/
class ToolPanelModule
diff --git a/sd/source/ui/inc/DrawDocShell.hxx b/sd/source/ui/inc/DrawDocShell.hxx
index 0083f53..9f5c348 100644
--- a/sd/source/ui/inc/DrawDocShell.hxx
+++ b/sd/source/ui/inc/DrawDocShell.hxx
@@ -40,11 +40,8 @@
#include "fupoor.hxx"
class SfxStyleSheetBasePool;
-class SfxStatusBarManager;
-class SdStyleSheetPool;
class FontList;
class SdDrawDocument;
-class SvxItemFactory;
class SdPage;
class SfxPrinter;
struct SpellCallbackInfo;
@@ -54,7 +51,6 @@ class SfxUndoManager;
namespace sd {
class FrameView;
-class View;
class ViewShell;
// ------------------
diff --git a/sd/source/ui/inc/DrawViewShell.hxx b/sd/source/ui/inc/DrawViewShell.hxx
index 57b3238..7384091 100644
--- a/sd/source/ui/inc/DrawViewShell.hxx
+++ b/sd/source/ui/inc/DrawViewShell.hxx
@@ -41,8 +41,6 @@
class SdPage;
class DrawDocShell;
-class SdAnimationWin;
-class SdRuler;
class TabBar;
class SdrObject;
class SdrPageView;
@@ -57,7 +55,6 @@ namespace sd {
class DrawView;
class LayerTabBar;
class Ruler;
-class SdUnoDrawView;
class AnnotationManager;
class ViewOverlayManager;
diff --git a/sd/source/ui/inc/SdUnoOutlineView.hxx b/sd/source/ui/inc/SdUnoOutlineView.hxx
index b4b53c2..1c812be 100644
--- a/sd/source/ui/inc/SdUnoOutlineView.hxx
+++ b/sd/source/ui/inc/SdUnoOutlineView.hxx
@@ -25,8 +25,6 @@
#include <com/sun/star/lang/EventObject.hpp>
-class SdPage;
-
namespace css = ::com::sun::star;
namespace sd {
diff --git a/sd/source/ui/inc/SdUnoSlideView.hxx b/sd/source/ui/inc/SdUnoSlideView.hxx
index ea5d9b0..8264522 100644
--- a/sd/source/ui/inc/SdUnoSlideView.hxx
+++ b/sd/source/ui/inc/SdUnoSlideView.hxx
@@ -39,10 +39,6 @@ namespace sd { namespace slidesorter {
class SlideSorter;
} }
-namespace sd { namespace slidesorter { namespace controller {
-class PageSelector;
-} } }
-
namespace sd {
class DrawController;
diff --git a/sd/source/ui/inc/TextObjectBar.hxx b/sd/source/ui/inc/TextObjectBar.hxx
index 878cead..c7421dd 100644
--- a/sd/source/ui/inc/TextObjectBar.hxx
+++ b/sd/source/ui/inc/TextObjectBar.hxx
@@ -31,7 +31,6 @@ namespace sd {
class View;
class ViewShell;
-class Window;
class TextObjectBar
: public SfxShell
diff --git a/sd/source/ui/inc/View.hxx b/sd/source/ui/inc/View.hxx
index 7c3fa7d..ca6b4fe 100644
--- a/sd/source/ui/inc/View.hxx
+++ b/sd/source/ui/inc/View.hxx
@@ -46,7 +46,6 @@ class SdrOle2Obj;
class SdrGrafObj;
class SdrMediaObj;
class OutputDevice;
-class VirtualDevice;
class ImageMap;
class Point;
class Graphic;
diff --git a/sd/source/ui/inc/ViewShell.hxx b/sd/source/ui/inc/ViewShell.hxx
index 58fc6af..e1a2b79 100644
--- a/sd/source/ui/inc/ViewShell.hxx
+++ b/sd/source/ui/inc/ViewShell.hxx
@@ -52,9 +52,6 @@ class SdrOle2Obj; // fuer die, die Teile von SVDRAW rausdefiniert haben
class ScrollBarBox;
class SdDrawDocument;
class ScrollBar;
-class FmFormShell;
-class SdOptionsPrintItem;
-class MultiSelection;
extern const String aEmptyStr;
@@ -67,17 +64,11 @@ namespace css = ::com::sun::star;
namespace sd {
-class Client;
class DrawDocShell;
-class DrawSubController;
class FrameView;
-class FuPoor;
-class FuSearch;
-class SlideShow;
class LayerTabBar;
class View;
class ViewShellBase;
-class ViewTabBar;
class Window;
class WindowUpdater;
class ZoomList;
diff --git a/sd/source/ui/inc/ViewShellBase.hxx b/sd/source/ui/inc/ViewShellBase.hxx
index 6c6ee69..4dbbbf9 100644
--- a/sd/source/ui/inc/ViewShellBase.hxx
+++ b/sd/source/ui/inc/ViewShellBase.hxx
@@ -57,6 +57,7 @@ class FormShellManager;
class ToolBarManager;
class ViewShell;
class ViewShellManager;
+class ViewTabBar;
/** SfxViewShell descendant that the stacked Draw/Impress shells are
based on.
diff --git a/sd/source/ui/inc/ViewShellImplementation.hxx b/sd/source/ui/inc/ViewShellImplementation.hxx
index 0efa987..2fa57d3 100644
--- a/sd/source/ui/inc/ViewShellImplementation.hxx
+++ b/sd/source/ui/inc/ViewShellImplementation.hxx
@@ -42,8 +42,6 @@ class SvxIMapDlg;
namespace sd {
-class DrawController;
-
/** This class contains (will contain) the implementation of methods that
have not be accessible from the outside.
*/
diff --git a/sd/source/ui/inc/bulmaper.hxx b/sd/source/ui/inc/bulmaper.hxx
index 6b9eb3b..a7ffa11 100644
--- a/sd/source/ui/inc/bulmaper.hxx
+++ b/sd/source/ui/inc/bulmaper.hxx
@@ -32,8 +32,6 @@
#include <sddllapi.h>
class SfxItemSet;
-class SvxBulletItem;
-class SvxNumberFormat;
class SvxNumRule;
class SD_DLLPUBLIC SdBulletMapper
diff --git a/sd/source/ui/inc/celltempl.hxx b/sd/source/ui/inc/celltempl.hxx
index 621c750..1abf4b8 100644
--- a/sd/source/ui/inc/celltempl.hxx
+++ b/sd/source/ui/inc/celltempl.hxx
@@ -31,10 +31,6 @@
#include <sfx2/styledlg.hxx>
-class XColorList;
-class XGradientList;
-class XHatchList;
-class XBitmapList;
class SfxStyleSheetBase;
class SdrModel;
diff --git a/sd/source/ui/inc/copydlg.hxx b/sd/source/ui/inc/copydlg.hxx
index c327e1e..2cbbc69 100644
--- a/sd/source/ui/inc/copydlg.hxx
+++ b/sd/source/ui/inc/copydlg.hxx
@@ -36,8 +36,6 @@
#include <vcl/fixed.hxx>
#include <sfx2/basedlgs.hxx>
-class XColorList;
-
namespace sd {
class View;
diff --git a/sd/source/ui/inc/dlgpage.hxx b/sd/source/ui/inc/dlgpage.hxx
index 1b7e8de..713e620 100644
--- a/sd/source/ui/inc/dlgpage.hxx
+++ b/sd/source/ui/inc/dlgpage.hxx
@@ -34,10 +34,6 @@
#include "dlgpage.hrc"
class SfxObjectShell;
-class XColorList;
-class XGradientList;
-class XHatchList;
-class XBitmapList;
typedef sal_uInt16 ChangeType;
diff --git a/sd/source/ui/inc/drawview.hxx b/sd/source/ui/inc/drawview.hxx
index 5e79daa..a2b27c3 100644
--- a/sd/source/ui/inc/drawview.hxx
+++ b/sd/source/ui/inc/drawview.hxx
@@ -27,8 +27,6 @@ namespace sd {
class DrawDocShell;
class DrawViewShell;
-class FuSlideShow;
-class SlideShow;
#define SDDRAWVIEW_MAGIC 0x456789BA
diff --git a/sd/source/ui/inc/framework/ConfigurationController.hxx b/sd/source/ui/inc/framework/ConfigurationController.hxx
index ad60b1d..93c73fc 100644
--- a/sd/source/ui/inc/framework/ConfigurationController.hxx
+++ b/sd/source/ui/inc/framework/ConfigurationController.hxx
@@ -56,11 +56,6 @@ namespace sd { class ViewShellBase; }
namespace sd { namespace framework {
-class ChangeRequestQueueProcessor;
-class ConfigurationControllerBroadcaster;
-class ConfigurationUpdater;
-class ConfigurationUpdaterLock;
-
/** The configuration controller is responsible for maintaining the current
configuration.
diff --git a/sd/source/ui/inc/fuconbez.hxx b/sd/source/ui/inc/fuconbez.hxx
index 17de46f..de9786c 100644
--- a/sd/source/ui/inc/fuconbez.hxx
+++ b/sd/source/ui/inc/fuconbez.hxx
@@ -36,8 +36,6 @@ class SdDrawDocument;
namespace sd {
-class DrawView;
-class DrawViewShell;
class Window;
diff --git a/sd/source/ui/inc/fuconcs.hxx b/sd/source/ui/inc/fuconcs.hxx
index 258fb21..351b4a9 100644
--- a/sd/source/ui/inc/fuconcs.hxx
+++ b/sd/source/ui/inc/fuconcs.hxx
@@ -34,8 +34,6 @@
class KeyEvent;
class SdDrawDocument;
class SdrObject;
-class SdxRequest;
-class SfxItemSet;
namespace sd {
diff --git a/sd/source/ui/inc/fuprlout.hxx b/sd/source/ui/inc/fuprlout.hxx
index d1bb005..80b37af 100644
--- a/sd/source/ui/inc/fuprlout.hxx
+++ b/sd/source/ui/inc/fuprlout.hxx
@@ -24,7 +24,6 @@
class SdDrawDocument;
class SfxRequest;
-class SfxStyleSheetBasePool;
namespace sd {
diff --git a/sd/source/ui/inc/futext.hxx b/sd/source/ui/inc/futext.hxx
index 290a43e..6a65411 100644
--- a/sd/source/ui/inc/futext.hxx
+++ b/sd/source/ui/inc/futext.hxx
@@ -35,7 +35,6 @@
struct StyleRequestData;
class SdrTextObj;
-class OutlinerParaObject;
class FontList;
class OutlinerView;
diff --git a/sd/source/ui/inc/headerfooterdlg.hxx b/sd/source/ui/inc/headerfooterdlg.hxx
index 9439160..53dea9e 100644
--- a/sd/source/ui/inc/headerfooterdlg.hxx
+++ b/sd/source/ui/inc/headerfooterdlg.hxx
@@ -36,7 +36,6 @@
#include "headerfooterdlg.hrc"
#include "sdpage.hxx"
-class SfxObjectShell;
class SdUndoGroup;
namespace sd
diff --git a/sd/source/ui/inc/navigatr.hxx b/sd/source/ui/inc/navigatr.hxx
index 7ddee51..4489da7 100644
--- a/sd/source/ui/inc/navigatr.hxx
+++ b/sd/source/ui/inc/navigatr.hxx
@@ -59,7 +59,6 @@
namespace sd {
class DrawDocShell;
class NavigatorChildWindow;
-class View;
}
class Menu;
class SdNavigatorControllerItem;
diff --git a/sd/source/ui/inc/optsitem.hxx b/sd/source/ui/inc/optsitem.hxx
index 0cd66e1..e9563df 100644
--- a/sd/source/ui/inc/optsitem.hxx
+++ b/sd/source/ui/inc/optsitem.hxx
@@ -56,7 +56,6 @@
// - Forwards -
// ------------
-class SfxConfigItem;
class SdOptions;
namespace sd {
diff --git a/sd/source/ui/inc/prltempl.hxx b/sd/source/ui/inc/prltempl.hxx
index eafa1a3..7c49f3a 100644
--- a/sd/source/ui/inc/prltempl.hxx
+++ b/sd/source/ui/inc/prltempl.hxx
@@ -37,12 +37,6 @@
#include "prlayout.hxx" // fuer enum PresentationObjects
-class XColorList;
-class XGradientList;
-class XHatchList;
-class XBitmapList;
-class XDashList;
-class XLineEndList;
class SfxObjectShell;
class SfxStyleSheetBase;
class SfxStyleSheetBasePool;
diff --git a/sd/source/ui/inc/taskpane/ControlContainer.hxx b/sd/source/ui/inc/taskpane/ControlContainer.hxx
index 3d0ab36..db075e6 100644
--- a/sd/source/ui/inc/taskpane/ControlContainer.hxx
+++ b/sd/source/ui/inc/taskpane/ControlContainer.hxx
@@ -25,8 +25,6 @@
#include <vector>
#include <memory>
-class Window;
-
namespace sd { namespace toolpanel {
class TreeNode;
diff --git a/sd/source/ui/inc/taskpane/TaskPaneControlFactory.hxx b/sd/source/ui/inc/taskpane/TaskPaneControlFactory.hxx
index 619fe65..298e583 100644
--- a/sd/source/ui/inc/taskpane/TaskPaneControlFactory.hxx
+++ b/sd/source/ui/inc/taskpane/TaskPaneControlFactory.hxx
@@ -24,10 +24,6 @@
#include <memory>
-namespace sd {
-class ViewShellBase;
-}
-
namespace sd { namespace toolpanel {
class TreeNode;
} }
diff --git a/sd/source/ui/inc/taskpane/TaskPaneTreeNode.hxx b/sd/source/ui/inc/taskpane/TaskPaneTreeNode.hxx
index 945ce74..146e505 100644
--- a/sd/source/ui/inc/taskpane/TaskPaneTreeNode.hxx
+++ b/sd/source/ui/inc/taskpane/TaskPaneTreeNode.hxx
@@ -26,10 +26,6 @@
#include <com/sun/star/accessibility/XAccessible.hpp>
#include <tools/link.hxx>
-namespace sd {
-class ObjectBarManager;
-}
-
namespace sd { namespace toolpanel {
class ControlContainer;
diff --git a/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx b/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx
index 015f5ef..89a0931 100644
--- a/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx
+++ b/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx
@@ -39,13 +39,8 @@ namespace com { namespace sun { namespace star { namespace ui {
} } } }
namespace sd {
-class PaneDockingWindow;
-
namespace toolpanel {
class TaskPaneShellManager;
-class TitleToolBox;
-class TitleBar;
-class TitledControl;
class ToolPanelViewShell_Impl;
/** The tool panel is a view shell for some very specific reasons:
- It fits better into the concept of panes being docking windows whose
diff --git a/sd/source/ui/inc/unosrch.hxx b/sd/source/ui/inc/unosrch.hxx
index 9b44e84..caf5006 100644
--- a/sd/source/ui/inc/unosrch.hxx
+++ b/sd/source/ui/inc/unosrch.hxx
@@ -31,7 +31,6 @@
#include <editeng/editdata.hxx>
#include <editeng/unoipset.hxx>
-class SdrObject;
class SvxItemPropertySet;
class SdUnoSearchReplaceDescriptor;
diff --git a/sd/source/ui/slideshow/showwindow.hxx b/sd/source/ui/slideshow/showwindow.hxx
index aec9926..0df2485 100644
--- a/sd/source/ui/slideshow/showwindow.hxx
+++ b/sd/source/ui/slideshow/showwindow.hxx
@@ -46,8 +46,6 @@
namespace sd {
class SlideshowImpl;
-class PreviewWindow;
-class ViewShell;
// -----------
// - Defines -
diff --git a/sd/source/ui/toolpanel/LayoutMenu.hxx b/sd/source/ui/toolpanel/LayoutMenu.hxx
index 6f544de..8255129 100644
--- a/sd/source/ui/toolpanel/LayoutMenu.hxx
+++ b/sd/source/ui/toolpanel/LayoutMenu.hxx
@@ -46,7 +46,6 @@ class SfxModule;
namespace sd {
class DrawDocShell;
-class PaneManagerEvent;
class ViewShellBase;
}
diff --git a/sd/source/ui/toolpanel/ToolPanelUIElement.hxx b/sd/source/ui/toolpanel/ToolPanelUIElement.hxx
index c3f6e90..ff0dfda 100644
--- a/sd/source/ui/toolpanel/ToolPanelUIElement.hxx
+++ b/sd/source/ui/toolpanel/ToolPanelUIElement.hxx
@@ -33,8 +33,6 @@ namespace sd { namespace toolpanel
{
//......................................................................................................................
- class TreeNode;
-
//==================================================================================================================
//= ToolPanelUIElement
//==================================================================================================================
diff --git a/sd/source/ui/toolpanel/controls/AllMasterPagesSelector.hxx b/sd/source/ui/toolpanel/controls/AllMasterPagesSelector.hxx
index 024f89d..af01f25 100644
--- a/sd/source/ui/toolpanel/controls/AllMasterPagesSelector.hxx
+++ b/sd/source/ui/toolpanel/controls/AllMasterPagesSelector.hxx
@@ -24,6 +24,10 @@
#include <memory>
+namespace sd {
+class TemplateEntry;
+}
+
namespace sd { namespace toolpanel { namespace controls {
diff --git a/sd/source/ui/toolpanel/controls/CustomAnimationPanel.hxx b/sd/source/ui/toolpanel/controls/CustomAnimationPanel.hxx
index 8181bc6..cb47272 100644
--- a/sd/source/ui/toolpanel/controls/CustomAnimationPanel.hxx
+++ b/sd/source/ui/toolpanel/controls/CustomAnimationPanel.hxx
@@ -22,10 +22,6 @@
#include "taskpane/SubToolPanel.hxx"
-namespace sd {
-class ViewShellBase;
-}
-
namespace sd { namespace toolpanel {
class TreeNode;
class ControlFactory;
diff --git a/sd/source/ui/toolpanel/controls/MasterPageContainer.hxx b/sd/source/ui/toolpanel/controls/MasterPageContainer.hxx
index ece2db1..6893958 100644
--- a/sd/source/ui/toolpanel/controls/MasterPageContainer.hxx
+++ b/sd/source/ui/toolpanel/controls/MasterPageContainer.hxx
@@ -34,12 +34,6 @@
#include <boost/shared_ptr.hpp>
class SdPage;
-class SdDrawDocument;
-class SfxObjectShellLock;
-
-namespace sd {
-class DrawDocShell;
-}
namespace sd { namespace toolpanel { namespace controls {
diff --git a/sd/source/ui/toolpanel/controls/MasterPagesSelector.hxx b/sd/source/ui/toolpanel/controls/MasterPagesSelector.hxx
index 74a5491..b69a0f6 100644
--- a/sd/source/ui/toolpanel/controls/MasterPagesSelector.hxx
+++ b/sd/source/ui/toolpanel/controls/MasterPagesSelector.hxx
@@ -44,12 +44,8 @@
class MouseEvent;
class SdDrawDocument;
class SdPage;
-class SfxModule;
namespace sd {
-class DrawViewShell;
-class TemplateEntry;
-class TemplateDir;
class ViewShellBase;
}
diff --git a/sd/source/ui/toolpanel/controls/RecentlyUsedMasterPages.hxx b/sd/source/ui/toolpanel/controls/RecentlyUsedMasterPages.hxx
index 291a2c7..4d43ae3 100644
--- a/sd/source/ui/toolpanel/controls/RecentlyUsedMasterPages.hxx
+++ b/sd/source/ui/toolpanel/controls/RecentlyUsedMasterPages.hxx
@@ -30,8 +30,6 @@
#include "MasterPageContainer.hxx"
#include <com/sun/star/uno/XInterface.hpp>
-class SdPage;
-
namespace sd {
class MasterPageObserverEvent;
}
diff --git a/sd/source/ui/toolpanel/controls/SlideTransitionPanel.hxx b/sd/source/ui/toolpanel/controls/SlideTransitionPanel.hxx
index df152b8..a3671c3 100644
--- a/sd/source/ui/toolpanel/controls/SlideTransitionPanel.hxx
+++ b/sd/source/ui/toolpanel/controls/SlideTransitionPanel.hxx
@@ -21,10 +21,6 @@
#include "taskpane/SubToolPanel.hxx"
-namespace sd {
-class ViewShellBase;
-}
-
namespace sd { namespace toolpanel {
class ControlFactory;
class TreeNode;
diff --git a/sd/source/ui/toolpanel/controls/TableDesignPanel.hxx b/sd/source/ui/toolpanel/controls/TableDesignPanel.hxx
index ce5f4d3..82e862d 100644
--- a/sd/source/ui/toolpanel/controls/TableDesignPanel.hxx
+++ b/sd/source/ui/toolpanel/controls/TableDesignPanel.hxx
@@ -22,10 +22,6 @@
#include "taskpane/SubToolPanel.hxx"
-namespace sd {
-class ViewShellBase;
-}
-
namespace sd { namespace toolpanel {
class TreeNode;
class ControlFactory;
commit 3f501522a838e245431a4558af5639b602566e33
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date: Fri Jun 29 17:43:01 2012 +0900
removed unused TestMenu & TestPanel
Change-Id: Ibd9bea6ea749090d7d72d3da66378d4e84a0a63d
diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk
index 1e5be7b..2f3c0d0 100644
--- a/sd/Library_sd.mk
+++ b/sd/Library_sd.mk
@@ -387,8 +387,6 @@ $(eval $(call gb_Library_add_exception_objects,sd,\
sd/source/ui/toolpanel/TaskPaneFocusManager \
sd/source/ui/toolpanel/TaskPaneShellManager \
sd/source/ui/toolpanel/TaskPaneTreeNode \
- sd/source/ui/toolpanel/TestMenu \
- sd/source/ui/toolpanel/TestPanel \
sd/source/ui/toolpanel/TitleBar \
sd/source/ui/toolpanel/TitledControl \
sd/source/ui/toolpanel/ToolPanel \
diff --git a/sd/source/ui/toolpanel/TestMenu.cxx b/sd/source/ui/toolpanel/TestMenu.cxx
deleted file mode 100644
index fa6e59c..0000000
--- a/sd/source/ui/toolpanel/TestMenu.cxx
+++ /dev/null
@@ -1,310 +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 .
- */
-
-
-#include "TestMenu.hxx"
-
-#include "taskpane/TaskPaneControlFactory.hxx"
-
-#include <vcl/image.hxx>
-#include <vcl/svapp.hxx>
-
-namespace sd { namespace toolpanel {
-
-#ifdef SHOW_COLOR_MENU
-/** This factory class is used to create instances of ColorMenu. It can be
- extended so that its constructor stores arguments that later are passed
- to new ColorMenu objects.
-*/
-class ColorMenuFactory
- : public ControlFactory
-{
-protected:
- virtual TreeNode* InternalCreateControl( ::Window& i_rParent )
- {
- return new ColorMenu (&i_rParent);
- }
-};
-
-
-ColorMenu::ColorMenu (::Window* i_pParent)
- : Window (i_pParent),
- TreeNode(NULL),
- maSet (this),
- mnPreferredColumnCount(2)
-{
- WinBits aStyle =
- WB_ITEMBORDER
- | WB_DOUBLEBORDER
- | WB_NAMEFIELD
- | WB_FLATVALUESET
- | WB_TABSTOP
- | WB_VSCROLL;
-
- maSet.SetStyle (maSet.GetStyle() | aStyle);
- maSet.SetExtraSpacing(2);
-
- Fill ();
- maSet.Show();
- i_pParent->Resize();
-}
-
-
-
-
-ColorMenu::~ColorMenu (void)
-{
-}
-
-
-::std::auto_ptr<ControlFactory> ColorMenu::CreateControlFactory (void)
-{
- return ::std::auto_ptr<ControlFactory>(new ColorMenuFactory());
-}
-
-
-/** The preferred size depends on the preferred number of columns, the
- number of items, and the size of the items.
-*/
-Size ColorMenu::GetPreferredSize (void)
-{
- Size aItemSize = maSet.CalcItemSizePixel (Size());
- Size aPreferredWindowSize = maSet.CalcWindowSizePixel (
- aItemSize,
- (sal_uInt16)mnPreferredColumnCount,
- (sal_uInt16)CalculateRowCount (aItemSize, (sal_uInt16)mnPreferredColumnCount));
- return aPreferredWindowSize;
-}
-
-
-
-
-sal_Int32 ColorMenu::GetPreferredWidth (sal_Int32 nHeight)
-{
- sal_Int32 nPreferredWidth = 0;
- if (maSet.GetItemCount() > 0)
- {
- Image aImage = maSet.GetItemImage(maSet.GetItemId(0));
- Size aItemSize = maSet.CalcItemSizePixel (aImage.GetSizePixel());
- if (nHeight>0 && aItemSize.Height()>0)
- {
- int nRowCount = nHeight / aItemSize.Height();
- if (nRowCount <= 0)
- nRowCount = 1;
- int nColumnCount = (maSet.GetItemCount() + nRowCount-1)
- / nRowCount;
- nPreferredWidth = nColumnCount * aItemSize.Width();
- }
- }
-
- return nPreferredWidth;
-}
-
-
-
-
-sal_Int32 ColorMenu::GetPreferredHeight (sal_Int32 nWidth)
-{
- sal_Int32 nPreferredHeight = 0;
- if (maSet.GetItemCount()>0)
- {
- Image aImage = maSet.GetItemImage(maSet.GetItemId(0));
- Size aItemSize = maSet.CalcItemSizePixel (aImage.GetSizePixel());
- if (nWidth>0 && aItemSize.Width()>0)
- {
- int nColumnCount = nWidth / aItemSize.Width();
- if (nColumnCount <= 0)
- nColumnCount = 1;
- else if (nColumnCount > 4)
- nColumnCount = 4;
- int nRowCount = (maSet.GetItemCount() + nColumnCount-1)
- / nColumnCount;
- nPreferredHeight = nRowCount * aItemSize.Height();
- }
- }
- return nPreferredHeight;
-}
-
-
-
-
-bool ColorMenu::IsResizable (void)
-{
- return true;
-}
-
-
-
-
-::Window* ColorMenu::GetWindow (void)
-{
- return this;
-}
-
-
-
-
-void ColorMenu::Resize (void)
-{
- ::Window::Resize();
- Size aWindowSize = GetOutputSizePixel();
- maSet.SetPosSizePixel (Point(0,0), aWindowSize);
- if (IsVisible() && aWindowSize.Width() > 0)
- {
- // maSet.SetPosSizePixel (
- // Point (0,0),
- // aWindowSize);
-
- // Calculate the number of rows and columns.
- if (maSet.GetItemCount() > 0)
- {
- Image aImage = maSet.GetItemImage(maSet.GetItemId(0));
- Size aItemSize = maSet.CalcItemSizePixel (
- aImage.GetSizePixel());
- int nColumnCount = aWindowSize.Width() / 30;
- if (nColumnCount < 1)
- nColumnCount = 1;
- else if (nColumnCount > 4)
- nColumnCount = 4;
-
- sal_uInt16 nRowCount = (sal_uInt16)CalculateRowCount (aItemSize, nColumnCount);
-
- maSet.SetColCount ((sal_uInt16)nColumnCount);
- maSet.SetLineCount (nRowCount);
- }
- }
-
-}
-
-
-
-
-int ColorMenu::CalculateRowCount (const Size&, int nColumnCount)
-{
- int nRowCount = 0;
-
- if (maSet.GetItemCount()>0 && nColumnCount>0)
- {
- nRowCount = GetOutputSizePixel().Height() / 30;
- if (nRowCount < 1)
- nRowCount = 1;
- }
-
- return nRowCount;
-}
-
-
-
-
-void ColorMenu::Fill (void)
-{
- const StyleSettings& rSettings (
- Application::GetSettings().GetStyleSettings());
- maSet.Clear();
- maSet.SetItemWidth (30);
- maSet.SetItemHeight (30);
- sal_uInt16 i = 0;
- maSet.InsertItem (++i, rSettings.GetFaceColor());
- maSet.SetItemText (i, String::CreateFromAscii("FaceColor"));
- maSet.InsertItem (++i, rSettings.GetCheckedColor());
- maSet.SetItemText (i, String::CreateFromAscii("CheckedColor"));
- maSet.InsertItem (++i, rSettings.GetLightColor());
- maSet.SetItemText (i, String::CreateFromAscii("LightColor"));
- maSet.InsertItem (++i, rSettings.GetLightBorderColor());
- maSet.SetItemText (i, String::CreateFromAscii("LightBorderColor"));
- maSet.InsertItem (++i, rSettings.GetShadowColor());
- maSet.SetItemText (i, String::CreateFromAscii("ShadowColor"));
- maSet.InsertItem (++i, rSettings.GetDarkShadowColor());
- maSet.SetItemText (i, String::CreateFromAscii("DarkShadowColor"));
- maSet.InsertItem (++i, rSettings.GetButtonTextColor());
- maSet.SetItemText (i, String::CreateFromAscii("ButtonTextColor"));
- maSet.InsertItem (++i, rSettings.GetRadioCheckTextColor());
- maSet.SetItemText (i, String::CreateFromAscii("RadioCheckTextColor"));
- maSet.InsertItem (++i, rSettings.GetGroupTextColor());
- maSet.SetItemText (i, String::CreateFromAscii("GroupTextColor"));
- maSet.InsertItem (++i, rSettings.GetLabelTextColor());
- maSet.SetItemText (i, String::CreateFromAscii("LabelTextColor"));
- maSet.InsertItem (++i, rSettings.GetInfoTextColor());
- maSet.SetItemText (i, String::CreateFromAscii("InfoTextColor"));
- maSet.InsertItem (++i, rSettings.GetWindowColor());
- maSet.SetItemText (i, String::CreateFromAscii("WindowColor"));
- maSet.InsertItem (++i, rSettings.GetWindowTextColor());
- maSet.SetItemText (i, String::CreateFromAscii("WindowTextColor"));
- maSet.InsertItem (++i, rSettings.GetDialogColor());
- maSet.SetItemText (i, String::CreateFromAscii("DialogColor"));
- maSet.InsertItem (++i, rSettings.GetDialogTextColor());
- maSet.SetItemText (i, String::CreateFromAscii("DialogTextColor"));
- maSet.InsertItem (++i, rSettings.GetWorkspaceColor());
- maSet.SetItemText (i, String::CreateFromAscii("WorkspaceColor"));
- maSet.InsertItem (++i, rSettings.GetFieldColor());
- maSet.SetItemText (i, String::CreateFromAscii("FieldColor"));
- maSet.InsertItem (++i, rSettings.GetFieldTextColor());
- maSet.SetItemText (i, String::CreateFromAscii("FieldTextColor"));
- maSet.InsertItem (++i, rSettings.GetActiveColor());
- maSet.SetItemText (i, String::CreateFromAscii("ActiveColor"));
- maSet.InsertItem (++i, rSettings.GetActiveColor2());
- maSet.SetItemText (i, String::CreateFromAscii("ActiveColor2"));
- maSet.InsertItem (++i, rSettings.GetActiveTextColor());
- maSet.SetItemText (i, String::CreateFromAscii("ActiveTextColor"));
- maSet.InsertItem (++i, rSettings.GetActiveBorderColor());
- maSet.SetItemText (i, String::CreateFromAscii("ActiveBorderColor"));
- maSet.InsertItem (++i, rSettings.GetDeactiveColor());
- maSet.SetItemText (i, String::CreateFromAscii("DeactiveColor"));
- maSet.InsertItem (++i, rSettings.GetDeactiveColor2());
- maSet.SetItemText (i, String::CreateFromAscii("DeactiveColor2"));
- maSet.InsertItem (++i, rSettings.GetDeactiveTextColor());
- maSet.SetItemText (i, String::CreateFromAscii("DeactiveTextColor"));
- maSet.InsertItem (++i, rSettings.GetDeactiveBorderColor());
- maSet.SetItemText (i, String::CreateFromAscii("DeactiveBorderColor"));
- maSet.InsertItem (++i, rSettings.GetHighlightColor());
- maSet.SetItemText (i, String::CreateFromAscii("HighlightColor"));
- maSet.InsertItem (++i, rSettings.GetHighlightTextColor());
- maSet.SetItemText (i, String::CreateFromAscii("HighlightTextColor"));
- maSet.InsertItem (++i, rSettings.GetDisableColor());
- maSet.SetItemText (i, String::CreateFromAscii("DisableColor"));
- maSet.InsertItem (++i, rSettings.GetHelpColor());
- maSet.SetItemText (i, String::CreateFromAscii("HelpColor"));
- maSet.InsertItem (++i, rSettings.GetHelpTextColor());
- maSet.SetItemText (i, String::CreateFromAscii("HelpTextColor"));
- maSet.InsertItem (++i, rSettings.GetMenuColor());
- maSet.SetItemText (i, String::CreateFromAscii("MenuColor"));
- maSet.InsertItem (++i, rSettings.GetMenuBarColor());
- maSet.SetItemText (i, String::CreateFromAscii("MenuBarColor"));
- maSet.InsertItem (++i, rSettings.GetMenuBorderColor());
- maSet.SetItemText (i, String::CreateFromAscii("MenuBorderColor"));
- maSet.InsertItem (++i, rSettings.GetMenuTextColor());
- maSet.SetItemText (i, String::CreateFromAscii("MenuTextColor"));
- maSet.InsertItem (++i, rSettings.GetMenuHighlightColor());
- maSet.SetItemText (i, String::CreateFromAscii("MenuHighlightColor"));
- maSet.InsertItem (++i, rSettings.GetMenuHighlightTextColor());
- maSet.SetItemText (i, String::CreateFromAscii("MenuHighlightTextColor"));
- maSet.InsertItem (++i, rSettings.GetLinkColor());
- maSet.SetItemText (i, String::CreateFromAscii("LinkColor"));
- maSet.InsertItem (++i, rSettings.GetVisitedLinkColor());
- maSet.SetItemText (i, String::CreateFromAscii("VisitedLinkColor"));
- maSet.InsertItem (++i, rSettings.GetHighlightLinkColor());
- maSet.SetItemText (i, String::CreateFromAscii("HighlightLinkColor"));
- maSet.InsertItem (++i, rSettings.GetFontColor());
- maSet.SetItemText (i, String::CreateFromAscii("FontColor"));
-}
-#endif
-
-} } // end of namespace ::sd::toolpanel
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/toolpanel/TestMenu.hxx b/sd/source/ui/toolpanel/TestMenu.hxx
deleted file mode 100644
index 24b8d74..0000000
--- a/sd/source/ui/toolpanel/TestMenu.hxx
+++ /dev/null
@@ -1,78 +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 SD_TASKPANE_COLOR_MENU_HXX
-#define SD_TASKPANE_COLOR_MENU_HXX
-
-#include "taskpane/TaskPaneTreeNode.hxx"
-#include <svtools/valueset.hxx>
-#include <vcl/window.hxx>
-
-#include <memory>
-
-
-namespace sd { namespace toolpanel {
-
-class ControlFactory;
-
-#ifdef SHOW_COLOR_MENU
-
-/** This demo menu shows the colors that are available from the
- StyleSettings.
-*/
-class ColorMenu
- : public ::Window,
- public TreeNode
-{
-public:
- ColorMenu (::Window* i_pParent);
- virtual ~ColorMenu (void);
-
- static ::std::auto_ptr<ControlFactory> CreateControlFactory (void);
-
- // From ILayoutableWindow
- virtual Size GetPreferredSize (void);
- virtual sal_Int32 GetPreferredWidth (sal_Int32 nHeight);
- virtual sal_Int32 GetPreferredHeight (sal_Int32 nWidth);
- virtual bool IsResizable (void);
- virtual ::Window* GetWindow (void);
-
- // From ::Window
- virtual void Resize (void);
-
- using Window::GetWindow;
-
-private:
- ValueSet maSet;
- int mnPreferredColumnCount;
-
- /** Depending on the given number of columns and the item size
- calculate the number of rows that are necessary to display all
- items.
- */
- int CalculateRowCount (const Size& rItemSize, int nColumnCount);
- void Fill (void);
-};
-#endif
-
-} } // end of namespace ::sd::toolpanel
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/toolpanel/TestPanel.cxx b/sd/source/ui/toolpanel/TestPanel.cxx
deleted file mode 100644
index 3bbea1b..0000000
--- a/sd/source/ui/toolpanel/TestPanel.cxx
+++ /dev/null
@@ -1,172 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-
-#include "TestPanel.hxx"
-#include "taskpane/ScrollPanel.hxx"
-#include "taskpane/TaskPaneControlFactory.hxx"
-
-#include <vcl/lstbox.hxx>
-#include <vcl/button.hxx>
-
-namespace sd { namespace toolpanel {
-
-#ifdef SHOW_TEST_PANEL
-/** This factory class is used to create instances of TestPanel. It can be
- extended so that its constructor stores arguments that later are passed
- to new TestPanel objects.
-*/
-class TestPanelFactory
- : public ControlFactory
-{
-protected:
- virtual TreeNode* InternalCreateControl( ::Window& i_rParent )
- {
- return new TestPanel (i_rParent);
- }
-};
-
-
-class Wrapper
- : public TreeNode
-{
-public:
- Wrapper (
- TreeNode* pParent,
- Size aPreferredSize,
- ::Window* pWrappedControl,
- bool bIsResizable)
- : TreeNode (pParent),
- maPreferredSize(aPreferredSize),
- mpWrappedControl(pWrappedControl),
- mbIsResizable(bIsResizable)
- {
- mpWrappedControl->Show();
- }
- virtual ~Wrapper (void)
- {
- delete mpWrappedControl;
- }
-
- virtual Size GetPreferredSize (void)
- {
- return maPreferredSize;
- }
- virtual sal_Int32 GetPreferredWidth (sal_Int32 )
- {
- return maPreferredSize.Width();
- }
- virtual sal_Int32 GetPreferredHeight (sal_Int32 )
- {
- return maPreferredSize.Height();
- }
- virtual ::Window* GetWindow (void)
- {
- return mpWrappedControl;
- }
- virtual bool IsResizable (void)
- {
- return mbIsResizable;
- }
- virtual bool IsExpandable (void) const
- {
- return false;
- }
- virtual bool IsExpanded (void) const
- {
- return true;
- }
-
-private:
- Size maPreferredSize;
- ::Window* mpWrappedControl;
- bool mbIsResizable;
-};
-
-
-TestPanel::TestPanel (::Window& i_rParent)
- : SubToolPanel (i_rParent)
-{
- // Create a scrollable panel with two list boxes.
- ScrollPanel* pScrollPanel = new ScrollPanel (this);
-
- ListBox* pBox = new ListBox (pScrollPanel->GetWindow());
- for (sal_Int32 i=1; i<=20; i++)
- {
- rtl::OUStringBuffer aString ("Text ");
- aString.append(i).append("/20");
- pBox->InsertEntry(aString.makeStringAndClear());
- }
- pScrollPanel->AddControl (
- ::std::auto_ptr<TreeNode>(new Wrapper (
- pScrollPanel, Size (200,300), pBox, true)),
- rtl::OUString("First ListBox"),
- "");
-
- pBox = new ListBox (pScrollPanel->GetWindow());
- for (sal_Int32 i=1; i<=20; i++)
- {
- rtl::OUStringBuffer aString("More Text ");
- aString.append(i).append("/20");
- pBox->InsertEntry(aString.makeStringAndClear());
- }
- pScrollPanel->AddControl (
- ::std::auto_ptr<TreeNode>(new Wrapper (
- pScrollPanel, Size (200,300), pBox, true)),
- String::CreateFromAscii ("Second ListBox"),
- "");
-
- AddControl (::std::auto_ptr<TreeNode>(pScrollPanel));
-
- // Add a fixed size button.
- Button* pButton = new OKButton (this);
- AddControl (
- ::std::auto_ptr<TreeNode>(new Wrapper (
- this, Size (100,30), pButton, false)),
- String::CreateFromAscii ("Button Area"),
- "");
-}
-
-
-
-
-
-TestPanel::~TestPanel (void)
-{
-}
-
-std::auto_ptr<ControlFactory> TestPanel::CreateControlFactory (void)
-{
- return std::auto_ptr<ControlFactory>(new TestPanelFactory());
-}
-#endif
-
-
-} } // end of namespace ::sd::toolpanel
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/toolpanel/TestPanel.hxx b/sd/source/ui/toolpanel/TestPanel.hxx
deleted file mode 100644
index c2b39de..0000000
--- a/sd/source/ui/toolpanel/TestPanel.hxx
+++ /dev/null
@@ -1,51 +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 SD_TASKPANE_TEST_PANEL_HXX
-#define SD_TASKPANE_TEST_PANEL_HXX
-
-#include "taskpane/SubToolPanel.hxx"
-
-
-namespace sd { namespace toolpanel {
-
-class ControlFactory;
-class TreeNode;
-
-#ifdef SHOW_TEST_PANEL
-
-/** This panel demonstrates how to create a panel for the task pane.
-*/
-class TestPanel
- : public SubToolPanel
-{
-public:
- TestPanel (::Window& i_rParent);
- virtual ~TestPanel (void);
-
- static std::auto_ptr<ControlFactory> CreateControlFactory (void);
-};
-
-#endif
-
-} } // end of namespace ::sd::toolpanel
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
More information about the Libreoffice-commits
mailing list