From 5e3ff24a76d5819f2074716b7fc9a90eac51280b Mon Sep 17 00:00:00 2001 From: Christian Lippka Date: Wed, 2 Dec 2009 10:19:06 +0100 Subject: #i107213# added ViewOverlayManager --- sd/source/ui/inc/DrawViewShell.hxx | 2 + sd/source/ui/inc/smarttag.hxx | 9 +++ sd/source/ui/inc/strings.hrc | 38 +++++-------- sd/source/ui/inc/view/viewoverlaymanager.hxx | 82 ++++++++++++++++++++++++++++ 4 files changed, 107 insertions(+), 24 deletions(-) create mode 100644 sd/source/ui/inc/view/viewoverlaymanager.hxx (limited to 'sd/source/ui/inc') diff --git a/sd/source/ui/inc/DrawViewShell.hxx b/sd/source/ui/inc/DrawViewShell.hxx index b9a3e062955b..2b9ee36a2cc6 100644 --- a/sd/source/ui/inc/DrawViewShell.hxx +++ b/sd/source/ui/inc/DrawViewShell.hxx @@ -60,6 +60,7 @@ class LayerTabBar; class Ruler; class SdUnoDrawView; class AnnotationManager; +class ViewOverlayManager; #define CHECK_RANGE(nMin, nValue, nMax) ((nValue >= nMin) && (nValue <= nMax)) @@ -499,6 +500,7 @@ private: using ViewShell::Notify; ::std::auto_ptr< AnnotationManager > mpAnnotationManager; + ::std::auto_ptr< ViewOverlayManager > mpViewOverlayManager; }; diff --git a/sd/source/ui/inc/smarttag.hxx b/sd/source/ui/inc/smarttag.hxx index feaa0fa27fd8..561d2e495ebd 100644 --- a/sd/source/ui/inc/smarttag.hxx +++ b/sd/source/ui/inc/smarttag.hxx @@ -76,6 +76,12 @@ public: /** returns true if this smart tag is currently selected */ bool isSelected() const; + /** is called once if the mouse enters this tag */ + virtual void onMouseEnter(SmartHdl& rHdl); + + /** is called once if the mouse leaves this tag */ + virtual void onMouseLeave(); + ::sd::View& getView() const { return mrView; } protected: @@ -141,6 +147,8 @@ public: a special context, returned in rContext. */ bool getContext( SdrViewContext& rContext ) const; + void MouseMove(const MouseEvent& rMEvt); + // support point editing BOOL HasMarkablePoints() const; ULONG GetMarkablePointCount() const; @@ -166,6 +174,7 @@ private: ::sd::View& mrView; SmartTagReference mxSelectedTag; + SmartTagReference mxMouseOverTag; }; /** a derivation from this handle is the visual representation for a smart tag. diff --git a/sd/source/ui/inc/strings.hrc b/sd/source/ui/inc/strings.hrc index b04582046502..c29b8bc5f8fb 100644 --- a/sd/source/ui/inc/strings.hrc +++ b/sd/source/ui/inc/strings.hrc @@ -171,26 +171,20 @@ #define STR_DRAW_MEDIA_TOOLBOX RID_DRAW_MEDIA_TOOLBOX // IDs fuer Praesentationsfolien -#define STR_AUTOLAYOUT_NONE (RID_APP_START+210) -#define STR_AUTOLAYOUT_ONLY_TITLE (RID_APP_START+211) -#define STR_AUTOLAYOUT_TITLE (RID_APP_START+212) -#define STR_AUTOLAYOUT_OBJ (RID_APP_START+213) -#define STR_AUTOLAYOUT_ENUM (RID_APP_START+214) -#define STR_AUTOLAYOUT_CHART (RID_APP_START+215) -#define STR_AUTOLAYOUT_TAB (RID_APP_START+217) -#define STR_AUTOLAYOUT_CLIPTEXT (RID_APP_START+218) -#define STR_AUTOLAYOUT_2TEXT (RID_APP_START+219) -#define STR_AUTOLAYOUT_TEXTCHART (RID_APP_START+220) -#define STR_AUTOLAYOUT_TEXTCLIP (RID_APP_START+221) -#define STR_AUTOLAYOUT_CHARTTEXT (RID_APP_START+222) -#define STR_AUTOLAYOUT_TEXTOBJ (RID_APP_START+223) -#define STR_AUTOLAYOUT_TEXT2OBJ (RID_APP_START+224) -#define STR_AUTOLAYOUT_OBJTEXT (RID_APP_START+225) -#define STR_AUTOLAYOUT_OBJOVERTEXT (RID_APP_START+226) -#define STR_AUTOLAYOUT_2OBJTEXT (RID_APP_START+227) -#define STR_AUTOLAYOUT_2OBJOVERTEXT (RID_APP_START+228) -#define STR_AUTOLAYOUT_TEXTOVEROBJ (RID_APP_START+229) -#define STR_AUTOLAYOUT_4OBJ (RID_APP_START+230) +#define STR_AUTOLAYOUT_NONE (RID_APP_START+210) +#define STR_AUTOLAYOUT_ONLY_TITLE (RID_APP_START+211) +#define STR_AUTOLAYOUT_ONLY_TEXT (RID_APP_START+212) +#define STR_AUTOLAYOUT_TITLE (RID_APP_START+213) +#define STR_AUTOLAYOUT_CONTENT (RID_APP_START+214) +#define STR_AUTOLAYOUT_2CONTENT (RID_APP_START+215) +#define STR_AUTOLAYOUT_CONTENT_2CONTENT (RID_APP_START+217) +#define STR_AUTOLAYOUT_2CONTENT_CONTENT (RID_APP_START+218) +#define STR_AUTOLAYOUT_CONTENT_OVER_2CONTENT (RID_APP_START+219) +#define STR_AUTOLAYOUT_2CONTENT_OVER_CONTENT (RID_APP_START+220) +#define STR_AUTOLAYOUT_CONTENT_OVER_CONTENT (RID_APP_START+221) +#define STR_AUTOLAYOUT_4CONTENT (RID_APP_START+222) +#define STR_AUTOLAYOUT_6CONTENT (RID_APP_START+223) + #define STR_AUTOLAYOUT_HANDOUT1 (RID_APP_START+231) #define STR_AUTOLAYOUT_HANDOUT2 (RID_APP_START+232) #define STR_AUTOLAYOUT_HANDOUT3 (RID_APP_START+233) @@ -198,13 +192,9 @@ #define STR_AUTOLAYOUT_HANDOUT6 (RID_APP_START+235) #define STR_AUTOLAYOUT_NOTES (RID_APP_START+236) #define STR_AUTOLAYOUT_HANDOUT9 (RID_APP_START+237) -#define STR_AUTOLAYOUT_ONLY_TEXT (RID_APP_START+238) -#define STR_AUTOLAYOUT_4CLIPART (RID_APP_START+239) #define STR_TRANSFORM (RID_APP_START+240) -#define STR_AUTOLAYOUT_6CLIPART (RID_APP_START+241) - #define STR_EXPORT_HTML_NAME (RID_APP_START+244) #define STR_EXPORT_HTML_FILTER (RID_APP_START+245) #define STR_EXPORT_DIALOG_TITLE (RID_APP_START+261) diff --git a/sd/source/ui/inc/view/viewoverlaymanager.hxx b/sd/source/ui/inc/view/viewoverlaymanager.hxx new file mode 100644 index 000000000000..54164c08c138 --- /dev/null +++ b/sd/source/ui/inc/view/viewoverlaymanager.hxx @@ -0,0 +1,82 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2008 by Sun Microsystems, Inc. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * $RCSfile: $ + * $Revision: $ + * + * 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 + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#ifndef _SD_VIEWOVERLAYMANAGER_HXX +#define _SD_VIEWOVERLAYMANAGER_HXX + +//#include + +#include +#include +#include "EventMultiplexer.hxx" +#include "ViewShellBase.hxx" + +namespace sd +{ + +typedef std::vector< rtl::Reference< SmartTag > > ViewTagVector; + +class ViewOverlayManager : public SfxListener +{ +public: + ViewOverlayManager( ViewShellBase& rViewShellBase ); + virtual ~ViewOverlayManager(); + + void onZoomChanged(); + void UpdateTags(); + + DECL_LINK(EventMultiplexerListener, tools::EventMultiplexerEvent*); + DECL_LINK(UpdateTagsHdl, void *); + + bool CreateTags(); + bool DisposeTags(); + + virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint); + + static const int ButtonCount = 4; + static Image maLargeButtonImages[ButtonCount]; + static Image maSmallButtonImages[ButtonCount]; + static USHORT mnButtonSlots[ButtonCount]; + +private: + void UpdateImages(); + + ViewShellBase& mrBase; + ULONG mnUpdateTagsEvent; + + ViewTagVector maTagVector; + +// ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawView > mxView; +// ::com::sun::star::uno::Reference< ::com::sun::star::office::XAnnotationAccess > mxCurrentPage; +}; + +} + +#endif // _SD_VIEWOVERLAYMANAGER_HXX -- cgit From 1be43c60fb32783312c18e4f65d63f4d7a55ca70 Mon Sep 17 00:00:00 2001 From: Christian Lippka Date: Thu, 3 Dec 2009 18:53:41 +0100 Subject: renaissance01: #i107213# further layout work, initial support for new layout toolbox control --- sd/source/ui/inc/View.hxx | 2 ++ sd/source/ui/inc/layoutctrl.hxx | 53 +++++++++++++++++++++++++++++++++++++++++ sd/source/ui/inc/smarttag.hxx | 8 ------- 3 files changed, 55 insertions(+), 8 deletions(-) create mode 100644 sd/source/ui/inc/layoutctrl.hxx (limited to 'sd/source/ui/inc') diff --git a/sd/source/ui/inc/View.hxx b/sd/source/ui/inc/View.hxx index 6f63ab1c90f8..de30ee1292a9 100644 --- a/sd/source/ui/inc/View.hxx +++ b/sd/source/ui/inc/View.hxx @@ -211,6 +211,8 @@ public: void SetMarkedPointsSmoothPossible( bool bSet ) { bSetMarkedPointsSmoothPossible = bSet; } void SetMarkedSegmentsKindPossible( bool bSet ) { bSetMarkedSegmentsKindPossible = bSet; } + SdrObject* GetEmptyPresentationObject( PresObjKind eKind ); + protected: DECL_LINK( OnParagraphInsertedHdl, ::Outliner * ); DECL_LINK( OnParagraphRemovingHdl, ::Outliner * ); diff --git a/sd/source/ui/inc/layoutctrl.hxx b/sd/source/ui/inc/layoutctrl.hxx new file mode 100644 index 000000000000..de9f93ea524a --- /dev/null +++ b/sd/source/ui/inc/layoutctrl.hxx @@ -0,0 +1,53 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2008 by Sun Microsystems, Inc. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * $RCSfile: tmplctrl.hxx,v $ + * + * $Revision: 1.3 $ + * + * 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 + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ +#ifndef _SD_LAYOUTCTRL_HXX +#define _SD_LAYOUTCTRL_HXX + +#include + +class SdLayoutControl : public SfxToolBoxControl +{ +public: + SdLayoutControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ); + ~SdLayoutControl(); + + using SfxToolBoxControl::Select; + virtual void Select( BOOL bMod1 = FALSE ); + virtual void StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState ); + virtual SfxPopupWindowType GetPopupWindowType() const; + virtual SfxPopupWindow* CreatePopupWindow(); + + SFX_DECL_TOOLBOX_CONTROL(); +}; + + +#endif + diff --git a/sd/source/ui/inc/smarttag.hxx b/sd/source/ui/inc/smarttag.hxx index 561d2e495ebd..7a9f682f38a1 100644 --- a/sd/source/ui/inc/smarttag.hxx +++ b/sd/source/ui/inc/smarttag.hxx @@ -76,12 +76,6 @@ public: /** returns true if this smart tag is currently selected */ bool isSelected() const; - /** is called once if the mouse enters this tag */ - virtual void onMouseEnter(SmartHdl& rHdl); - - /** is called once if the mouse leaves this tag */ - virtual void onMouseLeave(); - ::sd::View& getView() const { return mrView; } protected: @@ -147,8 +141,6 @@ public: a special context, returned in rContext. */ bool getContext( SdrViewContext& rContext ) const; - void MouseMove(const MouseEvent& rMEvt); - // support point editing BOOL HasMarkablePoints() const; ULONG GetMarkablePointCount() const; -- cgit From f0efe6abc4156df0834f8e6953a8bcee9ead9506 Mon Sep 17 00:00:00 2001 From: Christian Lippka Date: Sun, 6 Dec 2009 19:11:52 +0100 Subject: renaissance01: #i107213# inital layout floater implementation --- sd/source/ui/inc/layoutdialog.hxx | 50 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 sd/source/ui/inc/layoutdialog.hxx (limited to 'sd/source/ui/inc') diff --git a/sd/source/ui/inc/layoutdialog.hxx b/sd/source/ui/inc/layoutdialog.hxx new file mode 100644 index 000000000000..e53cd7944fa4 --- /dev/null +++ b/sd/source/ui/inc/layoutdialog.hxx @@ -0,0 +1,50 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2008 by Sun Microsystems, Inc. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * $RCSfile: LayerDialogContent.hxx,v $ + * $Revision: 1.4 $ + * + * 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 + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#ifndef SD_LAYOUTDIALOG_HXX +#define SD_LAYOUTDIALOG_HXX + +#include + +namespace sd { + +class LayoutDialogChildWindow : public SfxChildWindow +{ +public: + LayoutDialogChildWindow ( ::Window*, USHORT, SfxBindings*, SfxChildWinInfo*); + virtual ~LayoutDialogChildWindow (void); + + SFX_DECL_CHILDWINDOW(LayerDialogChildWindow); +}; + +} // end of namespace sd + +#endif + -- cgit From dada72080460ab3a1bf4228a38454339b1d5f204 Mon Sep 17 00:00:00 2001 From: Christian Lippka Date: Tue, 8 Dec 2009 17:33:39 +0100 Subject: renaissance01: #i107213# more work on layout popup --- sd/source/ui/inc/layoutdialog.hxx | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'sd/source/ui/inc') diff --git a/sd/source/ui/inc/layoutdialog.hxx b/sd/source/ui/inc/layoutdialog.hxx index e53cd7944fa4..6dd427901856 100644 --- a/sd/source/ui/inc/layoutdialog.hxx +++ b/sd/source/ui/inc/layoutdialog.hxx @@ -33,6 +33,10 @@ #include +class SfxViewFrame; +class ::Window; +class SfxPopupWindow; + namespace sd { class LayoutDialogChildWindow : public SfxChildWindow @@ -42,6 +46,8 @@ public: virtual ~LayoutDialogChildWindow (void); SFX_DECL_CHILDWINDOW(LayerDialogChildWindow); + + static SfxPopupWindow* createChildWindow(SfxViewFrame& rViewFrame, ::Window* pParent); }; } // end of namespace sd -- cgit From 1d65329a9cdfa2ae72bfdd1fe56f0d6f1f3dd72a Mon Sep 17 00:00:00 2001 From: Christian Lippka Date: Sun, 10 Jan 2010 17:03:44 +0100 Subject: added new layout images --- sd/source/ui/inc/res_bmp.hrc | 139 ++++++++++++++------------- sd/source/ui/inc/view/viewoverlaymanager.hxx | 8 +- 2 files changed, 72 insertions(+), 75 deletions(-) (limited to 'sd/source/ui/inc') diff --git a/sd/source/ui/inc/res_bmp.hrc b/sd/source/ui/inc/res_bmp.hrc index 0dd5451c1f45..319f0765cd78 100644 --- a/sd/source/ui/inc/res_bmp.hrc +++ b/sd/source/ui/inc/res_bmp.hrc @@ -70,36 +70,6 @@ #define RID_GRAFFILTERS RID_APP_START+29 #define RID_GRAFFILTERS_TBX RID_APP_START+30 -#define BMP_FOIL_00 RID_APP_START+10 -#define BMP_FOIL_01 RID_APP_START+11 -#define BMP_FOIL_02 RID_APP_START+12 -#define BMP_FOIL_03 RID_APP_START+13 -#define BMP_FOIL_04 RID_APP_START+14 -#define BMP_FOIL_05 RID_APP_START+15 -#define BMP_FOIL_06 RID_APP_START+16 -#define BMP_FOIL_07 RID_APP_START+17 -#define BMP_FOIL_08 RID_APP_START+18 -#define BMP_FOIL_09 RID_APP_START+19 -#define BMP_FOIL_10 RID_APP_START+20 -#define BMP_FOIL_11 RID_APP_START+21 -#define BMP_FOIL_12 RID_APP_START+22 -#define BMP_FOIL_13 RID_APP_START+23 -#define BMP_FOIL_14 RID_APP_START+24 -#define BMP_FOIL_15 RID_APP_START+25 -#define BMP_FOIL_16 RID_APP_START+26 -#define BMP_FOIL_17 RID_APP_START+27 -#define BMP_FOIL_18 RID_APP_START+28 -#define BMP_FOIL_19 RID_APP_START+29 -#define BMP_FOIL_20 RID_APP_START+30 -#define BMP_FOILH_01 RID_APP_START+31 -#define BMP_FOILH_02 RID_APP_START+32 -#define BMP_FOILH_03 RID_APP_START+33 -#define BMP_FOILH_04 RID_APP_START+34 -#define BMP_FOILH_06 RID_APP_START+35 -#define BMP_FOILH_09 RID_APP_START+36 -#define BMP_FOILN_01 RID_APP_START+40 -#define BMP_FOIL_25 RID_APP_START+41 - // Bitmaps fuer Tree-ListBox im Effekte-TabDialog #define BMP_PAGE RID_APP_START+42 #define BMP_PAGEOBJS RID_APP_START+43 @@ -173,38 +143,6 @@ #define BMP_EFFECT_UNCOVER_TO_B RID_APP_START+171 #define BMP_EFFECT_UNCOVER_TO_LL RID_APP_START+172 -#define BMP_FOIL_00_H RID_SD_START+182 -#define BMP_FOIL_01_H RID_SD_START+183 -#define BMP_FOIL_02_H RID_SD_START+184 -#define BMP_FOIL_03_H RID_SD_START+185 -#define BMP_FOIL_04_H RID_SD_START+186 -#define BMP_FOIL_05_H RID_SD_START+187 -#define BMP_FOIL_06_H RID_SD_START+188 -#define BMP_FOIL_07_H RID_SD_START+189 -#define BMP_FOIL_08_H RID_SD_START+190 -#define BMP_FOIL_09_H RID_SD_START+191 -#define BMP_FOIL_10_H RID_SD_START+192 -#define BMP_FOIL_11_H RID_SD_START+193 -#define BMP_FOIL_12_H RID_SD_START+194 -#define BMP_FOIL_13_H RID_SD_START+195 -#define BMP_FOIL_14_H RID_SD_START+196 -#define BMP_FOIL_15_H RID_SD_START+197 -#define BMP_FOIL_16_H RID_SD_START+198 -#define BMP_FOIL_17_H RID_SD_START+199 -#define BMP_FOIL_18_H RID_SD_START+200 -#define BMP_FOIL_19_H RID_SD_START+201 -#define BMP_FOIL_20_H RID_SD_START+202 -#define BMP_FOIL_21_H RID_SD_START+203 -#define BMP_FOIL_22_H RID_SD_START+204 -#define BMP_FOIL_23_H RID_SD_START+205 -#define BMP_FOIL_24_H RID_SD_START+206 -#define BMP_FOILH_01_H RID_SD_START+207 -#define BMP_FOILH_02_H RID_SD_START+208 -#define BMP_FOILH_03_H RID_SD_START+209 -#define BMP_FOILH_04_H RID_SD_START+210 -#define BMP_FOILH_06_H RID_SD_START+211 -#define BMP_FOILN_01_H RID_SD_START+212 - #define BMP_PAGE_H RID_SD_START+213 #define BMP_PAGEOBJS_H RID_SD_START+214 #define BMP_OBJECTS_H RID_SD_START+215 @@ -231,15 +169,80 @@ #define BMP_FADE_EFFECT_INDICATOR RID_SD_START+331 #define BMP_FADE_EFFECT_INDICATOR_H RID_SD_START+332 -#define BMP_FOILH_09_H RID_SD_START+333 -#define BMP_FOIL_25_H RID_SD_START+334 -#define BMP_FOIL_26_H RID_SD_START+335 -#define BMP_FOIL_27 RID_SD_START+336 -#define BMP_FOIL_27_H RID_SD_START+337 - #define BMP_COMMENTS_INDICATOR RID_SD_START+338 #define BMP_COMMENTS_INDICATOR_H RID_SD_START+339 +#define BMP_ADDEMPTY_57X71 RID_SD_START+340 +#define BMP_LAYOUT_ADDEMPTY_57X71_H RID_SD_START+341 +#define BMP_LAYOUT_ADDHEAD01_57X71 RID_SD_START+342 +#define BMP_LAYOUT_ADDHEAD01_57X71_H RID_SD_START+343 +#define BMP_LAYOUT_ADDHEAD02_57X71 RID_SD_START+344 +#define BMP_LAYOUT_ADDHEAD02_57X71_H RID_SD_START+345 +#define BMP_LAYOUT_ADDHEAD02A_57X71 RID_SD_START+346 +#define BMP_LAYOUT_ADDHEAD02A_57X71_H RID_SD_START+347 +#define BMP_LAYOUT_ADDHEAD02B_57X71 RID_SD_START+348 +#define BMP_LAYOUT_ADDHEAD02B_57X71_H RID_SD_START+349 +#define BMP_LAYOUT_ADDHEAD03_57X71 RID_SD_START+350 +#define BMP_LAYOUT_ADDHEAD03_57X71_H RID_SD_START+351 +#define BMP_LAYOUT_ADDHEAD03A_57X71 RID_SD_START+352 +#define BMP_LAYOUT_ADDHEAD03A_57X71_H RID_SD_START+353 +#define BMP_LAYOUT_ADDHEAD04_57X71 RID_SD_START+354 +#define BMP_LAYOUT_ADDHEAD04_57X71_H RID_SD_START+355 +#define BMP_LAYOUT_ADDHEAD06_57X71 RID_SD_START+356 +#define BMP_LAYOUT_ADDHEAD06_57X71_H RID_SD_START+357 +#define BMP_LAYOUT_ADDTEXTONLY_57X71 RID_SD_START+358 +#define BMP_LAYOUT_ADDTEXTONLY_57X71_H RID_SD_START+359 +#define BMP_LAYOUT_ADDVERTICAL01_57X71 RID_SD_START+360 +#define BMP_LAYOUT_ADDVERTICAL01_57X71_H RID_SD_START+361 +#define BMP_LAYOUT_ADDVERTICAL02_57X71 RID_SD_START+362 +#define BMP_LAYOUT_ADDVERTICAL02_57X71_H RID_SD_START+363 +#define BMP_LAYOUT_EMPTY_57X71 RID_SD_START+364 +#define BMP_LAYOUT_EMPTY_57X71_H RID_SD_START+365 +#define BMP_LAYOUT_HEAD01_57X71 RID_SD_START+366 +#define BMP_LAYOUT_HEAD01_57X71_H RID_SD_START+367 +#define BMP_LAYOUT_HEAD02_57X71 RID_SD_START+368 +#define BMP_LAYOUT_HEAD02_57X71_H RID_SD_START+369 +#define BMP_LAYOUT_HEAD02A_57X71 RID_SD_START+370 +#define BMP_LAYOUT_HEAD02A_57X71_H RID_SD_START+371 +#define BMP_LAYOUT_HEAD02B_57X71 RID_SD_START+372 +#define BMP_LAYOUT_HEAD02B_57X71_H RID_SD_START+373 +#define BMP_LAYOUT_HEAD03_57X71 RID_SD_START+374 +#define BMP_LAYOUT_HEAD03_57X71_H RID_SD_START+375 +#define BMP_LAYOUT_HEAD03A_57X71 RID_SD_START+376 +#define BMP_LAYOUT_HEAD03A_57X71_H RID_SD_START+377 +#define BMP_LAYOUT_HEAD04_57X71 RID_SD_START+378 +#define BMP_LAYOUT_HEAD04_57X71_H RID_SD_START+379 +#define BMP_LAYOUT_HEAD06_57X71 RID_SD_START+380 +#define BMP_LAYOUT_HEAD06_57X71_H RID_SD_START+381 +#define BMP_LAYOUT_TEXTONLY_57X71 RID_SD_START+382 +#define BMP_LAYOUT_TEXTONLY_57X71_H RID_SD_START+383 +#define BMP_LAYOUT_VERTICAL01_57X71 RID_SD_START+384 +#define BMP_LAYOUT_VERTICAL01_57X71_H RID_SD_START+385 +#define BMP_LAYOUT_VERTICAL02_57X71 RID_SD_START+386 +#define BMP_LAYOUT_VERTICAL02_57X71_H RID_SD_START+387 + +#define BMP_FOILH_01 RID_SD_START+388 +#define BMP_FOILH_01_H RID_SD_START+389 +#define BMP_FOILH_02 RID_SD_START+390 +#define BMP_FOILH_02_H RID_SD_START+391 +#define BMP_FOILH_03 RID_SD_START+392 +#define BMP_FOILH_03_H RID_SD_START+393 +#define BMP_FOILH_04 RID_SD_START+394 +#define BMP_FOILH_04_H RID_SD_START+395 +#define BMP_FOILH_06 RID_SD_START+396 +#define BMP_FOILH_06_H RID_SD_START+397 +#define BMP_FOILH_09 RID_SD_START+398 +#define BMP_FOILH_09_H RID_SD_START+399 + +#define BMP_PLACEHOLDER_CHART_57X71 RID_SD_START+400 +#define BMP_PLACEHOLDER_CHART_57X71_H RID_SD_START+401 +#define BMP_PLACEHOLDER_IMAGE_57X71 RID_SD_START+402 +#define BMP_PLACEHOLDER_IMAGE_57X71_H RID_SD_START+403 +#define BMP_PLACEHOLDER_MOVIE_57X71 RID_SD_START+404 +#define BMP_PLACEHOLDER_MOVIE_57X71_H RID_SD_START+405 +#define BMP_PLACEHOLDER_TABLE_57X71 RID_SD_START+406 +#define BMP_PLACEHOLDER_TABLE_57X71_H RID_SD_START+407 + // ----------------------------------------------------------------------------- #define IMG_PIPETTE_H RID_APP_START+21 diff --git a/sd/source/ui/inc/view/viewoverlaymanager.hxx b/sd/source/ui/inc/view/viewoverlaymanager.hxx index 54164c08c138..a87d14541cd8 100644 --- a/sd/source/ui/inc/view/viewoverlaymanager.hxx +++ b/sd/source/ui/inc/view/viewoverlaymanager.hxx @@ -31,10 +31,8 @@ #ifndef _SD_VIEWOVERLAYMANAGER_HXX #define _SD_VIEWOVERLAYMANAGER_HXX -//#include - #include -#include +#include #include "EventMultiplexer.hxx" #include "ViewShellBase.hxx" @@ -63,7 +61,6 @@ public: static const int ButtonCount = 4; static Image maLargeButtonImages[ButtonCount]; static Image maSmallButtonImages[ButtonCount]; - static USHORT mnButtonSlots[ButtonCount]; private: void UpdateImages(); @@ -72,9 +69,6 @@ private: ULONG mnUpdateTagsEvent; ViewTagVector maTagVector; - -// ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawView > mxView; -// ::com::sun::star::uno::Reference< ::com::sun::star::office::XAnnotationAccess > mxCurrentPage; }; } -- cgit From cc1e430e1a6bdaad393720867db0ea5738439177 Mon Sep 17 00:00:00 2001 From: Christian Lippka Date: Wed, 13 Jan 2010 19:12:02 +0100 Subject: toolbar menu rendering finetuning --- sd/source/ui/inc/ViewShellImplementation.hxx | 4 +--- sd/source/ui/inc/layoutdialog.hxx | 25 +++++++++++++++++-------- sd/source/ui/inc/strings.hrc | 2 ++ 3 files changed, 20 insertions(+), 11 deletions(-) (limited to 'sd/source/ui/inc') diff --git a/sd/source/ui/inc/ViewShellImplementation.hxx b/sd/source/ui/inc/ViewShellImplementation.hxx index e107d3af6987..537c62b3d46d 100644 --- a/sd/source/ui/inc/ViewShellImplementation.hxx +++ b/sd/source/ui/inc/ViewShellImplementation.hxx @@ -127,9 +127,7 @@ public: @param pPage If a NULL pointer is given then this call is ignored. */ - void AssignLayout ( - SdPage* pPage, - AutoLayout aLayout); + void AssignLayout ( SfxRequest& rRequest, PageKind ePageKind ); /** Determine the view id of the view shell. This corresponds to the view id stored in the SfxViewFrame class. diff --git a/sd/source/ui/inc/layoutdialog.hxx b/sd/source/ui/inc/layoutdialog.hxx index 6dd427901856..b9d92f8e53f3 100644 --- a/sd/source/ui/inc/layoutdialog.hxx +++ b/sd/source/ui/inc/layoutdialog.hxx @@ -31,25 +31,34 @@ #ifndef SD_LAYOUTDIALOG_HXX #define SD_LAYOUTDIALOG_HXX -#include +#include + +#include + +#include -class SfxViewFrame; class ::Window; -class SfxPopupWindow; +class ValueSet; namespace sd { -class LayoutDialogChildWindow : public SfxChildWindow +class ViewShellBase; + +class SdLayoutDialogContent : public ToolbarMenu { public: - LayoutDialogChildWindow ( ::Window*, USHORT, SfxBindings*, SfxChildWinInfo*); - virtual ~LayoutDialogChildWindow (void); + SdLayoutDialogContent( ViewShellBase& rBase, ::Window* pParent); + virtual ~SdLayoutDialogContent(); - SFX_DECL_CHILDWINDOW(LayerDialogChildWindow); +protected: + DECL_LINK( SelectHdl, void * ); - static SfxPopupWindow* createChildWindow(SfxViewFrame& rViewFrame, ::Window* pParent); +private: + ValueSet* mpLayoutSet; + ViewShellBase& mrBase; }; + } // end of namespace sd #endif diff --git a/sd/source/ui/inc/strings.hrc b/sd/source/ui/inc/strings.hrc index c29b8bc5f8fb..0b763d9df058 100644 --- a/sd/source/ui/inc/strings.hrc +++ b/sd/source/ui/inc/strings.hrc @@ -505,6 +505,8 @@ #define STR_NAVIGATOR_SHOW_ALL_SHAPES (RID_APP_START+719) #define STR_NAVIGATOR_SHAPE_BASE_NAME (RID_APP_START+720) +#define STR_RESET_LAYOUT (RID_APP_START+721) + /****************************************************************************** * The ids in glob.hrc start at RID_APP_START+750! ******************************************************************************/ -- cgit From 502398fcb5e26a00ff590563dca28fe7eb4ffebd Mon Sep 17 00:00:00 2001 From: Christian Lippka Date: Sun, 17 Jan 2010 18:25:26 +0100 Subject: allow vcl::DockManager popup with ToolbarMenu class for a nicer look --- sd/source/ui/inc/layoutctrl.hxx | 3 +++ 1 file changed, 3 insertions(+) (limited to 'sd/source/ui/inc') diff --git a/sd/source/ui/inc/layoutctrl.hxx b/sd/source/ui/inc/layoutctrl.hxx index de9f93ea524a..fdd0628b49b5 100644 --- a/sd/source/ui/inc/layoutctrl.hxx +++ b/sd/source/ui/inc/layoutctrl.hxx @@ -46,6 +46,9 @@ public: virtual SfxPopupWindow* CreatePopupWindow(); SFX_DECL_TOOLBOX_CONTROL(); + +private: + DECL_LINK( WindowEventListener, VclSimpleEvent* ); }; -- cgit From c5cf21811d1c40d9d78e220e846f04187c86deba Mon Sep 17 00:00:00 2001 From: Christian Lippka Date: Tue, 19 Jan 2010 18:28:50 +0100 Subject: added vertical layouts again --- sd/source/ui/inc/layoutdialog.hxx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'sd/source/ui/inc') diff --git a/sd/source/ui/inc/layoutdialog.hxx b/sd/source/ui/inc/layoutdialog.hxx index b9d92f8e53f3..8254e7763676 100644 --- a/sd/source/ui/inc/layoutdialog.hxx +++ b/sd/source/ui/inc/layoutdialog.hxx @@ -54,7 +54,8 @@ protected: DECL_LINK( SelectHdl, void * ); private: - ValueSet* mpLayoutSet; + boost::scoped_ptr< ValueSet > mpLayoutSet1; + boost::scoped_ptr< ValueSet > mpLayoutSet2; ViewShellBase& mrBase; }; -- cgit From de4d52bd5546170ccdf93e97faee5f8cfb2d904c Mon Sep 17 00:00:00 2001 From: Christian Lippka Date: Thu, 21 Jan 2010 18:32:05 +0100 Subject: added new toolbar controler for insert page --- sd/source/ui/inc/ViewShellBase.hxx | 4 +- sd/source/ui/inc/layoutdialog.hxx | 9 ++-- sd/source/ui/inc/res_bmp.hrc | 100 ++++++++++++++++++------------------- 3 files changed, 59 insertions(+), 54 deletions(-) (limited to 'sd/source/ui/inc') diff --git a/sd/source/ui/inc/ViewShellBase.hxx b/sd/source/ui/inc/ViewShellBase.hxx index 383bd12fcdb5..8dca51128bd5 100644 --- a/sd/source/ui/inc/ViewShellBase.hxx +++ b/sd/source/ui/inc/ViewShellBase.hxx @@ -31,6 +31,8 @@ #ifndef SD_VIEW_SHELL_BASE_HXX #define SD_VIEW_SHELL_BASE_HXX +#include + #include "ViewShell.hxx" #include "glob.hxx" @@ -261,7 +263,7 @@ public: /** returns the ui descriptive name for the given uno slot. The result is taken from the configuration and not cached, so do not use it excessive (f.e. in status updates) */ - ::rtl::OUString RetrieveLabelFromCommand( const ::rtl::OUString& aCmdURL ) const; + ::rtl::OUString RetrieveLabelFromCommand( const ::rtl::OUString& aCmdURL ) const; protected: osl::Mutex maMutex; diff --git a/sd/source/ui/inc/layoutdialog.hxx b/sd/source/ui/inc/layoutdialog.hxx index 8254e7763676..860b2ca8d054 100644 --- a/sd/source/ui/inc/layoutdialog.hxx +++ b/sd/source/ui/inc/layoutdialog.hxx @@ -47,16 +47,19 @@ class ViewShellBase; class SdLayoutDialogContent : public ToolbarMenu { public: - SdLayoutDialogContent( ViewShellBase& rBase, ::Window* pParent); + SdLayoutDialogContent( ViewShellBase& rBase, ::Window* pParent, const bool bInsertPage ); virtual ~SdLayoutDialogContent(); + virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException ); protected: DECL_LINK( SelectHdl, void * ); private: - boost::scoped_ptr< ValueSet > mpLayoutSet1; - boost::scoped_ptr< ValueSet > mpLayoutSet2; ViewShellBase& mrBase; + bool mbInsertPage; + ValueSet* mpLayoutSet1; + ValueSet* mpLayoutSet2; + const rtl::OUString msAssignLayout; }; diff --git a/sd/source/ui/inc/res_bmp.hrc b/sd/source/ui/inc/res_bmp.hrc index 319f0765cd78..43d0d85aa65f 100644 --- a/sd/source/ui/inc/res_bmp.hrc +++ b/sd/source/ui/inc/res_bmp.hrc @@ -84,8 +84,6 @@ #define BMP_COLLAPSE RID_APP_START+52 #define BMP_GRAPHIC RID_APP_START+53 -#define BMP_FOIL_26 RID_APP_START+54 - // Bimaps fuer ValueSet im EffekteWindow #define BMP_EFFECT_NONE RID_APP_START+105 #define BMP_TEXTEFFECT_DISCARD_FROM_T RID_APP_START+106 @@ -172,54 +170,54 @@ #define BMP_COMMENTS_INDICATOR RID_SD_START+338 #define BMP_COMMENTS_INDICATOR_H RID_SD_START+339 -#define BMP_ADDEMPTY_57X71 RID_SD_START+340 -#define BMP_LAYOUT_ADDEMPTY_57X71_H RID_SD_START+341 -#define BMP_LAYOUT_ADDHEAD01_57X71 RID_SD_START+342 -#define BMP_LAYOUT_ADDHEAD01_57X71_H RID_SD_START+343 -#define BMP_LAYOUT_ADDHEAD02_57X71 RID_SD_START+344 -#define BMP_LAYOUT_ADDHEAD02_57X71_H RID_SD_START+345 -#define BMP_LAYOUT_ADDHEAD02A_57X71 RID_SD_START+346 -#define BMP_LAYOUT_ADDHEAD02A_57X71_H RID_SD_START+347 -#define BMP_LAYOUT_ADDHEAD02B_57X71 RID_SD_START+348 -#define BMP_LAYOUT_ADDHEAD02B_57X71_H RID_SD_START+349 -#define BMP_LAYOUT_ADDHEAD03_57X71 RID_SD_START+350 -#define BMP_LAYOUT_ADDHEAD03_57X71_H RID_SD_START+351 -#define BMP_LAYOUT_ADDHEAD03A_57X71 RID_SD_START+352 -#define BMP_LAYOUT_ADDHEAD03A_57X71_H RID_SD_START+353 -#define BMP_LAYOUT_ADDHEAD04_57X71 RID_SD_START+354 -#define BMP_LAYOUT_ADDHEAD04_57X71_H RID_SD_START+355 -#define BMP_LAYOUT_ADDHEAD06_57X71 RID_SD_START+356 -#define BMP_LAYOUT_ADDHEAD06_57X71_H RID_SD_START+357 -#define BMP_LAYOUT_ADDTEXTONLY_57X71 RID_SD_START+358 -#define BMP_LAYOUT_ADDTEXTONLY_57X71_H RID_SD_START+359 -#define BMP_LAYOUT_ADDVERTICAL01_57X71 RID_SD_START+360 -#define BMP_LAYOUT_ADDVERTICAL01_57X71_H RID_SD_START+361 -#define BMP_LAYOUT_ADDVERTICAL02_57X71 RID_SD_START+362 -#define BMP_LAYOUT_ADDVERTICAL02_57X71_H RID_SD_START+363 -#define BMP_LAYOUT_EMPTY_57X71 RID_SD_START+364 -#define BMP_LAYOUT_EMPTY_57X71_H RID_SD_START+365 -#define BMP_LAYOUT_HEAD01_57X71 RID_SD_START+366 -#define BMP_LAYOUT_HEAD01_57X71_H RID_SD_START+367 -#define BMP_LAYOUT_HEAD02_57X71 RID_SD_START+368 -#define BMP_LAYOUT_HEAD02_57X71_H RID_SD_START+369 -#define BMP_LAYOUT_HEAD02A_57X71 RID_SD_START+370 -#define BMP_LAYOUT_HEAD02A_57X71_H RID_SD_START+371 -#define BMP_LAYOUT_HEAD02B_57X71 RID_SD_START+372 -#define BMP_LAYOUT_HEAD02B_57X71_H RID_SD_START+373 -#define BMP_LAYOUT_HEAD03_57X71 RID_SD_START+374 -#define BMP_LAYOUT_HEAD03_57X71_H RID_SD_START+375 -#define BMP_LAYOUT_HEAD03A_57X71 RID_SD_START+376 -#define BMP_LAYOUT_HEAD03A_57X71_H RID_SD_START+377 -#define BMP_LAYOUT_HEAD04_57X71 RID_SD_START+378 -#define BMP_LAYOUT_HEAD04_57X71_H RID_SD_START+379 -#define BMP_LAYOUT_HEAD06_57X71 RID_SD_START+380 -#define BMP_LAYOUT_HEAD06_57X71_H RID_SD_START+381 -#define BMP_LAYOUT_TEXTONLY_57X71 RID_SD_START+382 -#define BMP_LAYOUT_TEXTONLY_57X71_H RID_SD_START+383 -#define BMP_LAYOUT_VERTICAL01_57X71 RID_SD_START+384 -#define BMP_LAYOUT_VERTICAL01_57X71_H RID_SD_START+385 -#define BMP_LAYOUT_VERTICAL02_57X71 RID_SD_START+386 -#define BMP_LAYOUT_VERTICAL02_57X71_H RID_SD_START+387 +#define BMP_LAYOUT_EMPTY_57X71 RID_SD_START+340 +#define BMP_LAYOUT_EMPTY_57X71_H RID_SD_START+341 +#define BMP_LAYOUT_HEAD01_57X71 RID_SD_START+342 +#define BMP_LAYOUT_HEAD01_57X71_H RID_SD_START+343 +#define BMP_LAYOUT_HEAD02_57X71 RID_SD_START+344 +#define BMP_LAYOUT_HEAD02_57X71_H RID_SD_START+345 +#define BMP_LAYOUT_HEAD02A_57X71 RID_SD_START+346 +#define BMP_LAYOUT_HEAD02A_57X71_H RID_SD_START+347 +#define BMP_LAYOUT_HEAD02B_57X71 RID_SD_START+348 +#define BMP_LAYOUT_HEAD02B_57X71_H RID_SD_START+349 +#define BMP_LAYOUT_HEAD03_57X71 RID_SD_START+350 +#define BMP_LAYOUT_HEAD03_57X71_H RID_SD_START+351 +#define BMP_LAYOUT_HEAD03A_57X71 RID_SD_START+352 +#define BMP_LAYOUT_HEAD03A_57X71_H RID_SD_START+353 +#define BMP_LAYOUT_HEAD04_57X71 RID_SD_START+354 +#define BMP_LAYOUT_HEAD04_57X71_H RID_SD_START+355 +#define BMP_LAYOUT_HEAD06_57X71 RID_SD_START+356 +#define BMP_LAYOUT_HEAD06_57X71_H RID_SD_START+357 +#define BMP_LAYOUT_TEXTONLY_57X71 RID_SD_START+358 +#define BMP_LAYOUT_TEXTONLY_57X71_H RID_SD_START+359 +#define BMP_LAYOUT_VERTICAL01_57X71 RID_SD_START+360 +#define BMP_LAYOUT_VERTICAL01_57X71_H RID_SD_START+361 +#define BMP_LAYOUT_VERTICAL02_57X71 RID_SD_START+362 +#define BMP_LAYOUT_VERTICAL02_57X71_H RID_SD_START+363 +#define BMP_LAYOUT_ADDEMPTY_57X71 RID_SD_START+364 +#define BMP_LAYOUT_ADDEMPTY_57X71_H RID_SD_START+365 +#define BMP_LAYOUT_ADDHEAD01_57X71 RID_SD_START+366 +#define BMP_LAYOUT_ADDHEAD01_57X71_H RID_SD_START+367 +#define BMP_LAYOUT_ADDHEAD02_57X71 RID_SD_START+368 +#define BMP_LAYOUT_ADDHEAD02_57X71_H RID_SD_START+369 +#define BMP_LAYOUT_ADDHEAD02A_57X71 RID_SD_START+370 +#define BMP_LAYOUT_ADDHEAD02A_57X71_H RID_SD_START+371 +#define BMP_LAYOUT_ADDHEAD02B_57X71 RID_SD_START+372 +#define BMP_LAYOUT_ADDHEAD02B_57X71_H RID_SD_START+373 +#define BMP_LAYOUT_ADDHEAD03_57X71 RID_SD_START+374 +#define BMP_LAYOUT_ADDHEAD03_57X71_H RID_SD_START+375 +#define BMP_LAYOUT_ADDHEAD03A_57X71 RID_SD_START+376 +#define BMP_LAYOUT_ADDHEAD03A_57X71_H RID_SD_START+377 +#define BMP_LAYOUT_ADDHEAD04_57X71 RID_SD_START+378 +#define BMP_LAYOUT_ADDHEAD04_57X71_H RID_SD_START+379 +#define BMP_LAYOUT_ADDHEAD06_57X71 RID_SD_START+380 +#define BMP_LAYOUT_ADDHEAD06_57X71_H RID_SD_START+381 +#define BMP_LAYOUT_ADDTEXTONLY_57X71 RID_SD_START+382 +#define BMP_LAYOUT_ADDTEXTONLY_57X71_H RID_SD_START+383 +#define BMP_LAYOUT_ADDVERTICAL01_57X71 RID_SD_START+384 +#define BMP_LAYOUT_ADDVERTICAL01_57X71_H RID_SD_START+385 +#define BMP_LAYOUT_ADDVERTICAL02_57X71 RID_SD_START+386 +#define BMP_LAYOUT_ADDVERTICAL02_57X71_H RID_SD_START+387 #define BMP_FOILH_01 RID_SD_START+388 #define BMP_FOILH_01_H RID_SD_START+389 @@ -243,6 +241,8 @@ #define BMP_PLACEHOLDER_TABLE_57X71 RID_SD_START+406 #define BMP_PLACEHOLDER_TABLE_57X71_H RID_SD_START+407 +#define BMP_FOILN_01 RID_SD_START+408 +#define BMP_FOILN_01_H RID_SD_START+409 // ----------------------------------------------------------------------------- #define IMG_PIPETTE_H RID_APP_START+21 -- cgit From ff855671c4238bf3bfcc3ba9630f1bcbe559acd5 Mon Sep 17 00:00:00 2001 From: "Frank Schoenheit [fs]" Date: Fri, 12 Mar 2010 09:37:32 +0100 Subject: slidecopy: removed unused artifact (referring the currently-unused SID_TOOLPANEL) --- sd/source/ui/inc/ToolPanelChildWindow.hrc | 33 ------------------ sd/source/ui/inc/ToolPanelChildWindow.hxx | 58 ------------------------------- 2 files changed, 91 deletions(-) delete mode 100644 sd/source/ui/inc/ToolPanelChildWindow.hrc delete mode 100644 sd/source/ui/inc/ToolPanelChildWindow.hxx (limited to 'sd/source/ui/inc') diff --git a/sd/source/ui/inc/ToolPanelChildWindow.hrc b/sd/source/ui/inc/ToolPanelChildWindow.hrc deleted file mode 100644 index f5ccbd536561..000000000000 --- a/sd/source/ui/inc/ToolPanelChildWindow.hrc +++ /dev/null @@ -1,33 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile: ToolPanelChildWindow.hrc,v $ - * $Revision: 1.4 $ - * - * 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 - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#define FLT_WIN_TOOLPANEL 788 - -#define TOOLPANEL 1 diff --git a/sd/source/ui/inc/ToolPanelChildWindow.hxx b/sd/source/ui/inc/ToolPanelChildWindow.hxx deleted file mode 100644 index fa347cdf2675..000000000000 --- a/sd/source/ui/inc/ToolPanelChildWindow.hxx +++ /dev/null @@ -1,58 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile: ToolPanelChildWindow.hxx,v $ - * $Revision: 1.4 $ - * - * 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 - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef SD_TOOL_PANEL_CHILD_WINDOW_HXX -#define SD_TOOL_PANEL_CHILD_WINDOW_HXX - -#include - -#define TOOLPANEL_CHILD_WINDOW() ( \ - static_cast< ::sd::toolpanel::ToolPanelChildWindow*>( \ - SfxViewFrame::Current()->GetChildWindow( \ - ::sd::toolpanel::ToolPanelChildWindow::GetChildWindowId() \ - )->GetWindow())) - - -namespace sd { namespace toolpanel { - -class ToolPanelChildWindow - : public SfxChildWindow -{ -public: - ToolPanelChildWindow (::Window*, USHORT, SfxBindings*, SfxChildWinInfo*); - virtual ~ToolPanelChildWindow (void); - - SFX_DECL_CHILDWINDOW (ToolPanelChildWindow); -}; - - -} } // end of namespaces ::sd::toolpanel - -#endif -- cgit From 9a0e6f1451435e0c2223d91dec51e95b1ccb0b35 Mon Sep 17 00:00:00 2001 From: Christian Lippka Date: Wed, 10 Feb 2010 15:20:01 +0100 Subject: some placeholder bitmap finetuning --- sd/source/ui/inc/res_bmp.hrc | 76 ++++++++++++++++---------------------------- 1 file changed, 28 insertions(+), 48 deletions(-) (limited to 'sd/source/ui/inc') diff --git a/sd/source/ui/inc/res_bmp.hrc b/sd/source/ui/inc/res_bmp.hrc index 43d0d85aa65f..ae6cdc1a20e1 100644 --- a/sd/source/ui/inc/res_bmp.hrc +++ b/sd/source/ui/inc/res_bmp.hrc @@ -170,54 +170,34 @@ #define BMP_COMMENTS_INDICATOR RID_SD_START+338 #define BMP_COMMENTS_INDICATOR_H RID_SD_START+339 -#define BMP_LAYOUT_EMPTY_57X71 RID_SD_START+340 -#define BMP_LAYOUT_EMPTY_57X71_H RID_SD_START+341 -#define BMP_LAYOUT_HEAD01_57X71 RID_SD_START+342 -#define BMP_LAYOUT_HEAD01_57X71_H RID_SD_START+343 -#define BMP_LAYOUT_HEAD02_57X71 RID_SD_START+344 -#define BMP_LAYOUT_HEAD02_57X71_H RID_SD_START+345 -#define BMP_LAYOUT_HEAD02A_57X71 RID_SD_START+346 -#define BMP_LAYOUT_HEAD02A_57X71_H RID_SD_START+347 -#define BMP_LAYOUT_HEAD02B_57X71 RID_SD_START+348 -#define BMP_LAYOUT_HEAD02B_57X71_H RID_SD_START+349 -#define BMP_LAYOUT_HEAD03_57X71 RID_SD_START+350 -#define BMP_LAYOUT_HEAD03_57X71_H RID_SD_START+351 -#define BMP_LAYOUT_HEAD03A_57X71 RID_SD_START+352 -#define BMP_LAYOUT_HEAD03A_57X71_H RID_SD_START+353 -#define BMP_LAYOUT_HEAD04_57X71 RID_SD_START+354 -#define BMP_LAYOUT_HEAD04_57X71_H RID_SD_START+355 -#define BMP_LAYOUT_HEAD06_57X71 RID_SD_START+356 -#define BMP_LAYOUT_HEAD06_57X71_H RID_SD_START+357 -#define BMP_LAYOUT_TEXTONLY_57X71 RID_SD_START+358 -#define BMP_LAYOUT_TEXTONLY_57X71_H RID_SD_START+359 -#define BMP_LAYOUT_VERTICAL01_57X71 RID_SD_START+360 -#define BMP_LAYOUT_VERTICAL01_57X71_H RID_SD_START+361 -#define BMP_LAYOUT_VERTICAL02_57X71 RID_SD_START+362 -#define BMP_LAYOUT_VERTICAL02_57X71_H RID_SD_START+363 -#define BMP_LAYOUT_ADDEMPTY_57X71 RID_SD_START+364 -#define BMP_LAYOUT_ADDEMPTY_57X71_H RID_SD_START+365 -#define BMP_LAYOUT_ADDHEAD01_57X71 RID_SD_START+366 -#define BMP_LAYOUT_ADDHEAD01_57X71_H RID_SD_START+367 -#define BMP_LAYOUT_ADDHEAD02_57X71 RID_SD_START+368 -#define BMP_LAYOUT_ADDHEAD02_57X71_H RID_SD_START+369 -#define BMP_LAYOUT_ADDHEAD02A_57X71 RID_SD_START+370 -#define BMP_LAYOUT_ADDHEAD02A_57X71_H RID_SD_START+371 -#define BMP_LAYOUT_ADDHEAD02B_57X71 RID_SD_START+372 -#define BMP_LAYOUT_ADDHEAD02B_57X71_H RID_SD_START+373 -#define BMP_LAYOUT_ADDHEAD03_57X71 RID_SD_START+374 -#define BMP_LAYOUT_ADDHEAD03_57X71_H RID_SD_START+375 -#define BMP_LAYOUT_ADDHEAD03A_57X71 RID_SD_START+376 -#define BMP_LAYOUT_ADDHEAD03A_57X71_H RID_SD_START+377 -#define BMP_LAYOUT_ADDHEAD04_57X71 RID_SD_START+378 -#define BMP_LAYOUT_ADDHEAD04_57X71_H RID_SD_START+379 -#define BMP_LAYOUT_ADDHEAD06_57X71 RID_SD_START+380 -#define BMP_LAYOUT_ADDHEAD06_57X71_H RID_SD_START+381 -#define BMP_LAYOUT_ADDTEXTONLY_57X71 RID_SD_START+382 -#define BMP_LAYOUT_ADDTEXTONLY_57X71_H RID_SD_START+383 -#define BMP_LAYOUT_ADDVERTICAL01_57X71 RID_SD_START+384 -#define BMP_LAYOUT_ADDVERTICAL01_57X71_H RID_SD_START+385 -#define BMP_LAYOUT_ADDVERTICAL02_57X71 RID_SD_START+386 -#define BMP_LAYOUT_ADDVERTICAL02_57X71_H RID_SD_START+387 +#define BMP_LAYOUT_EMPTY RID_SD_START+340 +#define BMP_LAYOUT_EMPTY_H RID_SD_START+341 +#define BMP_LAYOUT_HEAD01 RID_SD_START+342 +#define BMP_LAYOUT_HEAD01_H RID_SD_START+343 +#define BMP_LAYOUT_HEAD02 RID_SD_START+344 +#define BMP_LAYOUT_HEAD02_H RID_SD_START+345 +#define BMP_LAYOUT_HEAD02A RID_SD_START+346 +#define BMP_LAYOUT_HEAD02A_H RID_SD_START+347 +#define BMP_LAYOUT_HEAD02B RID_SD_START+348 +#define BMP_LAYOUT_HEAD02B_H RID_SD_START+349 +#define BMP_LAYOUT_HEAD03 RID_SD_START+350 +#define BMP_LAYOUT_HEAD03_H RID_SD_START+351 +#define BMP_LAYOUT_HEAD03A RID_SD_START+352 +#define BMP_LAYOUT_HEAD03A_H RID_SD_START+353 +#define BMP_LAYOUT_HEAD03B RID_SD_START+354 +#define BMP_LAYOUT_HEAD03B_H RID_SD_START+355 +#define BMP_LAYOUT_HEAD03C RID_SD_START+356 +#define BMP_LAYOUT_HEAD03C_H RID_SD_START+357 +#define BMP_LAYOUT_HEAD04 RID_SD_START+358 +#define BMP_LAYOUT_HEAD04_H RID_SD_START+359 +#define BMP_LAYOUT_HEAD06 RID_SD_START+360 +#define BMP_LAYOUT_HEAD06_H RID_SD_START+361 +#define BMP_LAYOUT_TEXTONLY RID_SD_START+362 +#define BMP_LAYOUT_TEXTONLY_H RID_SD_START+363 +#define BMP_LAYOUT_VERTICAL01 RID_SD_START+364 +#define BMP_LAYOUT_VERTICAL01_H RID_SD_START+365 +#define BMP_LAYOUT_VERTICAL02 RID_SD_START+366 +#define BMP_LAYOUT_VERTICAL02_H RID_SD_START+367 #define BMP_FOILH_01 RID_SD_START+388 #define BMP_FOILH_01_H RID_SD_START+389 -- cgit From 9b03159e7030963753dcc7ff82f0b49207bd42b4 Mon Sep 17 00:00:00 2001 From: Christian Lippka Date: Thu, 11 Mar 2010 18:18:08 +0100 Subject: moved toolbarmenu to svtools and reworked to non sfx2 code --- sd/source/ui/inc/layoutctrl.hxx | 56 ------------------------------- sd/source/ui/inc/layoutdialog.hxx | 69 --------------------------------------- 2 files changed, 125 deletions(-) delete mode 100644 sd/source/ui/inc/layoutctrl.hxx delete mode 100644 sd/source/ui/inc/layoutdialog.hxx (limited to 'sd/source/ui/inc') diff --git a/sd/source/ui/inc/layoutctrl.hxx b/sd/source/ui/inc/layoutctrl.hxx deleted file mode 100644 index fdd0628b49b5..000000000000 --- a/sd/source/ui/inc/layoutctrl.hxx +++ /dev/null @@ -1,56 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile: tmplctrl.hxx,v $ - * - * $Revision: 1.3 $ - * - * 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 - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _SD_LAYOUTCTRL_HXX -#define _SD_LAYOUTCTRL_HXX - -#include - -class SdLayoutControl : public SfxToolBoxControl -{ -public: - SdLayoutControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ); - ~SdLayoutControl(); - - using SfxToolBoxControl::Select; - virtual void Select( BOOL bMod1 = FALSE ); - virtual void StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState ); - virtual SfxPopupWindowType GetPopupWindowType() const; - virtual SfxPopupWindow* CreatePopupWindow(); - - SFX_DECL_TOOLBOX_CONTROL(); - -private: - DECL_LINK( WindowEventListener, VclSimpleEvent* ); -}; - - -#endif - diff --git a/sd/source/ui/inc/layoutdialog.hxx b/sd/source/ui/inc/layoutdialog.hxx deleted file mode 100644 index 860b2ca8d054..000000000000 --- a/sd/source/ui/inc/layoutdialog.hxx +++ /dev/null @@ -1,69 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile: LayerDialogContent.hxx,v $ - * $Revision: 1.4 $ - * - * 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 - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef SD_LAYOUTDIALOG_HXX -#define SD_LAYOUTDIALOG_HXX - -#include - -#include - -#include - -class ::Window; -class ValueSet; - -namespace sd { - -class ViewShellBase; - -class SdLayoutDialogContent : public ToolbarMenu -{ -public: - SdLayoutDialogContent( ViewShellBase& rBase, ::Window* pParent, const bool bInsertPage ); - virtual ~SdLayoutDialogContent(); - - virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException ); -protected: - DECL_LINK( SelectHdl, void * ); - -private: - ViewShellBase& mrBase; - bool mbInsertPage; - ValueSet* mpLayoutSet1; - ValueSet* mpLayoutSet2; - const rtl::OUString msAssignLayout; -}; - - -} // end of namespace sd - -#endif - -- cgit From f391eb8768b00e1db5bdf8a510ba5cce3669f572 Mon Sep 17 00:00:00 2001 From: "Frank Schoenheit [fs]" Date: Mon, 15 Mar 2010 13:53:19 +0100 Subject: slidecopy: initial version of a "Tool Panel" At the moment, this implementation is parallel to the existing TaskPane implementation, but on the medium term, it is intended to replace it. No change in functionality is planned for the moment, just the panel selection is done via a tab bar, instead of the the "jumping drawers". Pending tasks (as known so far): - Accessibility. No implementation at all, yet. - showing/hiding tool panels from the "View" drop down menu - connection to the resource framework. At the moment, de/activating panels completely bypasses the resource framework. - alternative implementation of the PanelDeckLayouter which mimics the old design. To be activated by default, for the moment. - removal of the (old, by then) TaskPane implementation. Care needs to be taken that the framework API stays unchanged, i.e., the current ToolPanel resource must be renamed back to RightPane when RightPane is not occupied anymore by the old implementation. Same for other resource names. --- sd/source/ui/inc/PaneChildWindows.hxx | 18 +- sd/source/ui/inc/PaneDockingWindow.hrc | 7 +- sd/source/ui/inc/PaneDockingWindow.hxx | 12 +- sd/source/ui/inc/PaneShells.hxx | 10 ++ sd/source/ui/inc/TaskPaneViewShell.hxx | 25 --- sd/source/ui/inc/ViewShell.hxx | 3 +- sd/source/ui/inc/framework/FrameworkHelper.hxx | 2 + sd/source/ui/inc/taskpane/ScrollPanel.hxx | 8 + sd/source/ui/inc/taskpane/SubToolPanel.hxx | 3 +- .../ui/inc/taskpane/TaskPaneControlFactory.hxx | 45 +++++ sd/source/ui/inc/taskpane/TaskPaneTreeNode.hxx | 8 - sd/source/ui/inc/taskpane/TitleBar.hxx | 2 +- sd/source/ui/inc/taskpane/TitledControl.hxx | 2 +- sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx | 182 +++++++++++++++++++++ 14 files changed, 279 insertions(+), 48 deletions(-) create mode 100644 sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx (limited to 'sd/source/ui/inc') diff --git a/sd/source/ui/inc/PaneChildWindows.hxx b/sd/source/ui/inc/PaneChildWindows.hxx index a3fb7f6f763b..0d8967f7f005 100644 --- a/sd/source/ui/inc/PaneChildWindows.hxx +++ b/sd/source/ui/inc/PaneChildWindows.hxx @@ -44,8 +44,8 @@ public: USHORT nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo, - const ResId& rResId, - const ::rtl::OUString& rsTitle, + const USHORT nDockWinTitleResId, + const USHORT nTitleBarResId, SfxChildAlignment eAlignment); virtual ~PaneChildWindow (void); }; @@ -87,6 +87,20 @@ public: }; +//====================================================================================================================== +//= ToolPanelChildWindow +//====================================================================================================================== +class ToolPanelChildWindow : public PaneChildWindow +{ +public: + ToolPanelChildWindow( + ::Window* i_pParentWindow, + USHORT i_nId, + SfxBindings* i_pBindings, + SfxChildWinInfo* i_pChildWindowInfo ); + + SFX_DECL_CHILDWINDOW( ToolPanelChildWindow ); +}; } // end of namespace ::sd diff --git a/sd/source/ui/inc/PaneDockingWindow.hrc b/sd/source/ui/inc/PaneDockingWindow.hrc index 7a1a75d9bdde..9eb1ad1c53fd 100644 --- a/sd/source/ui/inc/PaneDockingWindow.hrc +++ b/sd/source/ui/inc/PaneDockingWindow.hrc @@ -28,6 +28,7 @@ * ************************************************************************/ -#define FLT_LEFT_PANE_IMPRESS_DOCKING_WINDOW 792 -#define FLT_LEFT_PANE_DRAW_DOCKING_WINDOW 793 -#define FLT_RIGHT_PANE_DOCKING_WINDOW 794 +#define FLT_LEFT_PANE_IMPRESS_DOCKING_WINDOW 792 +#define FLT_LEFT_PANE_DRAW_DOCKING_WINDOW 793 +#define FLT_RIGHT_PANE_DOCKING_WINDOW 794 +#define FLT_TOOL_PANEL_DOCKING_WINDOW 795 diff --git a/sd/source/ui/inc/PaneDockingWindow.hxx b/sd/source/ui/inc/PaneDockingWindow.hxx index 138e5c4132c5..acb245e6221d 100644 --- a/sd/source/ui/inc/PaneDockingWindow.hxx +++ b/sd/source/ui/inc/PaneDockingWindow.hxx @@ -68,7 +68,6 @@ public: SfxChildWindow *pChildWindow, ::Window* pParent, const ResId& rResId, - const ::rtl::OUString& rsPaneURL, const ::rtl::OUString& rsTitle); virtual ~PaneDockingWindow (void); @@ -80,6 +79,8 @@ public: virtual void StateChanged( StateChangedType nType ); virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual void EndDocking( const Rectangle& rRect, BOOL bFloatMode ); + /** Initializing the title tool box either creates a new title tool box or clears all items from an existing one. A closer is added as only item. @@ -96,6 +97,9 @@ public: */ USHORT AddMenu (const String& rsMenuName, ULONG nHelpId, const Link& rCallback); + void SetEndDockingHdl( const Link& i_rEndDockingHdl ) { maEndDockingHdl = i_rEndDockingHdl; } + const Link& GetEndDockingHdl() const { return maEndDockingHdl; } + /** Set the title of the docking window to the given string. Use this method when the title is not yet known at the time of construction or can not be passed to the constructor. @@ -107,10 +111,6 @@ public: ::boost::shared_ptr GetTitleToolBox (void) const; private: - /** The pane which is represented by the docking window. - */ - ::rtl::OUString msPaneURL; - /** Title that is shown at the top of the docking window. */ ::rtl::OUString msTitle; @@ -130,6 +130,8 @@ private: ::boost::scoped_ptr< ::Window> mpContentWindow; + Link maEndDockingHdl; + /** Remember that a layout is pending, i.e. Resize() has been called since the last Paint(). */ diff --git a/sd/source/ui/inc/PaneShells.hxx b/sd/source/ui/inc/PaneShells.hxx index e0c6f4901d9b..78020c9c7c6b 100644 --- a/sd/source/ui/inc/PaneShells.hxx +++ b/sd/source/ui/inc/PaneShells.hxx @@ -89,6 +89,16 @@ public: virtual ~RightPaneShell (void); }; +class ToolPanelPaneShell : public SfxShell +{ +public: + TYPEINFO(); + SFX_DECL_INTERFACE( SD_IF_SDTOOLPANELPANESHELL ) + + ToolPanelPaneShell(); + virtual ~ToolPanelPaneShell(); +}; + } // end of namespace sd #endif diff --git a/sd/source/ui/inc/TaskPaneViewShell.hxx b/sd/source/ui/inc/TaskPaneViewShell.hxx index e1f55540bd10..e17881529079 100644 --- a/sd/source/ui/inc/TaskPaneViewShell.hxx +++ b/sd/source/ui/inc/TaskPaneViewShell.hxx @@ -90,12 +90,6 @@ public: FrameView* pFrameView); virtual ~TaskPaneViewShell (void); - /** Register the SFX interfaces so that (some of) the controls can be - pushed as SFX shells on the shell stack and process slot calls and - so on. - */ - static void RegisterControls (void); - virtual void GetFocus (void); virtual void LoseFocus (void); virtual void KeyInput (const KeyEvent& rEvent); @@ -205,25 +199,6 @@ private: -/** This functor makes visible a panel in the task pane. It can be used - with the FrameworkHelper to make a panel visible after an asynchonous - update of the configuration, e.g. after switching to another view. -*/ -class PanelActivation -{ -public: - /** Create a new object that, when its operator() method is called, will - make the specified panel visible in the task pane that belongs to - the application window specified by the given ViewShellBase. - */ - PanelActivation (ViewShellBase& rBase, TaskPaneViewShell::PanelId nPanelId); - void operator() (bool); -private: - ViewShellBase& mrBase; - TaskPaneViewShell::PanelId mnPanelId; -}; - - } } // end of namespace ::sd::toolpanel #endif diff --git a/sd/source/ui/inc/ViewShell.hxx b/sd/source/ui/inc/ViewShell.hxx index 395566f0cded..bf360a766dfc 100644 --- a/sd/source/ui/inc/ViewShell.hxx +++ b/sd/source/ui/inc/ViewShell.hxx @@ -118,7 +118,8 @@ public: ST_OUTLINE, ST_SLIDE_SORTER, ST_PRESENTATION, - ST_TASK_PANE + ST_TASK_PANE, + ST_TOOL_PANEL }; static const int MAX_HSPLIT_CNT = 1; static const int MAX_VSPLIT_CNT = 1; diff --git a/sd/source/ui/inc/framework/FrameworkHelper.hxx b/sd/source/ui/inc/framework/FrameworkHelper.hxx index 27ed5f6f8bef..d3197ce0d44c 100644 --- a/sd/source/ui/inc/framework/FrameworkHelper.hxx +++ b/sd/source/ui/inc/framework/FrameworkHelper.hxx @@ -80,6 +80,7 @@ public: static const ::rtl::OUString msLeftImpressPaneURL; static const ::rtl::OUString msLeftDrawPaneURL; static const ::rtl::OUString msRightPaneURL; + static const ::rtl::OUString msToolPanelPaneURL; // URLs of frequently used views. static const ::rtl::OUString msViewURLPrefix; @@ -91,6 +92,7 @@ public: static const ::rtl::OUString msSlideSorterURL; static const ::rtl::OUString msPresentationViewURL; static const ::rtl::OUString msTaskPaneURL; + static const ::rtl::OUString msToolPanelViewURL; // URLs of frequently used tool bars. static const ::rtl::OUString msToolBarURLPrefix; diff --git a/sd/source/ui/inc/taskpane/ScrollPanel.hxx b/sd/source/ui/inc/taskpane/ScrollPanel.hxx index 2808049ec6e0..6daca266414f 100644 --- a/sd/source/ui/inc/taskpane/ScrollPanel.hxx +++ b/sd/source/ui/inc/taskpane/ScrollPanel.hxx @@ -63,6 +63,10 @@ public: parent. This will usually be a child window. */ ScrollPanel (TreeNode* pParent); + /** Create a new scroll panel which itself is the root of a TreeNode hierarchy + parent. This will usually be a child window. + */ + ScrollPanel (::Window& i_rParentWindow); virtual ~ScrollPanel (void); /** Add a control to the sub panel. An title bar is added above the @@ -174,6 +178,10 @@ private: */ sal_Int32 LayoutChildren (void); + /** ctor-impl + */ + void Construct(); + Size SetupScrollBars (const Size& rRequiresSize); sal_Int32 SetupVerticalScrollBar (bool bShow, sal_Int32 nRange); sal_Int32 SetupHorizontalScrollBar (bool bShow, sal_Int32 nRange); diff --git a/sd/source/ui/inc/taskpane/SubToolPanel.hxx b/sd/source/ui/inc/taskpane/SubToolPanel.hxx index 331edcdb7e55..77bc1ab51b92 100644 --- a/sd/source/ui/inc/taskpane/SubToolPanel.hxx +++ b/sd/source/ui/inc/taskpane/SubToolPanel.hxx @@ -43,8 +43,6 @@ class Window; namespace sd { namespace toolpanel { -class ToolPanel; - /** The sub tool panel is in function similar to the tool panel. It differes in two points. First, it is a control that can be used as element in a tool panel and thus is actually a nested tool @@ -70,6 +68,7 @@ public: parent. This will usually be a child window. */ SubToolPanel (TreeNode* pParent); + SubToolPanel (Window& i_rParentWindow); virtual ~SubToolPanel (void); /** Add a control to the sub panel. diff --git a/sd/source/ui/inc/taskpane/TaskPaneControlFactory.hxx b/sd/source/ui/inc/taskpane/TaskPaneControlFactory.hxx index 12c1868a0b57..67462c132f52 100644 --- a/sd/source/ui/inc/taskpane/TaskPaneControlFactory.hxx +++ b/sd/source/ui/inc/taskpane/TaskPaneControlFactory.hxx @@ -66,11 +66,21 @@ public: */ ::std::auto_ptr CreateControl (TreeNode* pTreeNode); + /** creates a tree node which acts as root of an own tree + + An implementation is allowed to return NULL here, but must return non-NULL then in the other + factory method. + Derived classes should overload InternalCreateControl. + */ + ::std::auto_ptr CreateRootControl( ::Window& i_rParent ); + protected: /** This is the internal hook for derived classes to overload in order to provide a new control instance. */ virtual TreeNode* InternalCreateControl (TreeNode* pTreeNode) = 0; + + virtual TreeNode* InternalCreateRootControl( ::Window& i_rParent ) = 0; }; @@ -94,6 +104,41 @@ protected: return new ControlType(pTreeNode, mrArgument); } + virtual TreeNode* InternalCreateRootControl( ::Window& i_rParent ) + { + OSL_ENSURE( false, "ControlFactoryWithArgs1::InternalCreateRootControl: not implemented!" ); + return NULL; + } + +private: + ArgumentType& mrArgument; +}; + + +/** A simple helper class that realizes a ControlFactory that is able to create root controls, providing + the to-be-created control with an additional parameter. +*/ +template +class RootControlFactoryWithArg + : public ControlFactory +{ +public: + RootControlFactoryWithArg (ArgumentType& rArgument) + : mrArgument(rArgument) + {} + +protected: + virtual TreeNode* InternalCreateControl (TreeNode* pTreeNode) + { + OSL_ENSURE( false, "ControlFactoryWithArgs1::InternalCreateControl: not implemented!" ); + return NULL; + } + + virtual TreeNode* InternalCreateRootControl( ::Window& i_rParent ) + { + return new ControlType( i_rParent, mrArgument ); + } + private: ArgumentType& mrArgument; }; diff --git a/sd/source/ui/inc/taskpane/TaskPaneTreeNode.hxx b/sd/source/ui/inc/taskpane/TaskPaneTreeNode.hxx index 0f3d6eabbb45..3bed3f41a8de 100644 --- a/sd/source/ui/inc/taskpane/TaskPaneTreeNode.hxx +++ b/sd/source/ui/inc/taskpane/TaskPaneTreeNode.hxx @@ -97,14 +97,6 @@ public: */ virtual sal_Int32 GetMinimumWidth (void); - /** Give each node access to the object bar manager of the tool panel. - - At least the root node has to overwrite this method since the - default implementation simply returns the object bar manager of the - parent. - */ - virtual ObjectBarManager* GetObjectBarManager (void); - /** The default implementaion always returns */ virtual bool IsResizable (void); diff --git a/sd/source/ui/inc/taskpane/TitleBar.hxx b/sd/source/ui/inc/taskpane/TitleBar.hxx index f80242e412a2..28af936e240a 100644 --- a/sd/source/ui/inc/taskpane/TitleBar.hxx +++ b/sd/source/ui/inc/taskpane/TitleBar.hxx @@ -92,7 +92,7 @@ public: virtual void Paint (const Rectangle& rBoundingBox); virtual bool Expand (bool bFlag = true); virtual bool IsExpanded (void) const; - virtual void SetEnabledState(bool bFlag); + virtual void SetEnabledState(bool bFlag); void SetFocus (bool bFlag); diff --git a/sd/source/ui/inc/taskpane/TitledControl.hxx b/sd/source/ui/inc/taskpane/TitledControl.hxx index e0974b864b96..f82bafd3669f 100644 --- a/sd/source/ui/inc/taskpane/TitledControl.hxx +++ b/sd/source/ui/inc/taskpane/TitledControl.hxx @@ -135,7 +135,7 @@ public: */ virtual bool IsExpandable (void) const; - virtual void SetEnabledState(bool bFlag); + virtual void SetEnabledState(bool bFlag); /** Ownership of the given data remains with the caller. The data is thus not destroyed when the destructor of this class is diff --git a/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx b/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx new file mode 100644 index 000000000000..ae9b94cdfc04 --- /dev/null +++ b/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx @@ -0,0 +1,182 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2008 by Sun Microsystems, Inc. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * $RCSfile: ToolPanelViewShell.hxx,v $ + * $Revision: 1.12 $ + * + * 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 + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#ifndef SD_TOOL_PANEL_VIEW_SHELL_HXX +#define SD_TOOL_PANEL_VIEW_SHELL_HXX + +#include "ViewShell.hxx" +#include "glob.hxx" +#include "framework/FrameworkHelper.hxx" +#include +#include +#include +#include + +#include +#include + +class PopupMenu; + +namespace sd { +class PaneDockingWindow; + +namespace toolpanel { +class TaskPaneShellManager; +class TitleToolBox; +class TitleBar; +class TitledControl; +class ToolPanelDeck; + +/** The tool panel is a view shell for some very specific reasons: + - It fits better into the concept of panes being docking windows whose + content, a view shell, can be exchanged on runtime. + - A control in the tool panel that wants to show a context menu has to + do that over the dispatcher of a shell. These shells, usually + implemented by the controls themselves, have to be managed by someone. + If interpreted as object bars this can be handled by the + ObjectBarManager of the ViewShell. +*/ +class ToolPanelViewShell + : public ViewShell +{ +public: + TYPEINFO(); + SFX_DECL_INTERFACE(SD_IF_SDTOOLPANELSHELL) + + /** List of top level panels that can be shown in the task pane. + */ + enum PanelId + { + PID__START = 0, + PID_UNKNOWN = PID__START, + PID_MASTER_PAGES, + PID_LAYOUT, + PID_TABLE_DESIGN, + PID_ANIMATION_SCHEMES, + PID_CUSTOM_ANIMATION, + PID_SLIDE_TRANSITION, + PID__END = PID_SLIDE_TRANSITION + }; + + ToolPanelViewShell ( + SfxViewFrame* pFrame, + ViewShellBase& rViewShellBase, + ::Window* pParentWindow, + FrameView* pFrameView); + virtual ~ToolPanelViewShell (void); + + /** Register the SFX interfaces so that (some of) the controls can be + pushed as SFX shells on the shell stack and process slot calls and + so on. + */ + static void RegisterControls (void); + + virtual void GetFocus (void); + virtual void LoseFocus (void); + virtual void KeyInput (const KeyEvent& rEvent); + using sd::ViewShell::KeyInput; + + virtual SdPage* GetActualPage (void); + virtual SdPage* getCurrentPage (void) const; + + void Execute (SfxRequest& rRequest); + void GetState (SfxItemSet& rItemSet); + + virtual void ArrangeGUIElements (void); + + TaskPaneShellManager& GetSubShellManager (void) const; + + /** Called when a mouse button has been pressed but not yet + released, this handler is used to show the popup menu of the + title bar. + */ + DECL_LINK(ToolboxClickHandler, ToolBox*); + DECL_LINK(MenuSelectHandler, Menu*); + DECL_LINK(DockingChanged, PaneDockingWindow*); + + virtual ::com::sun::star::uno::Reference< + ::com::sun::star::accessibility::XAccessible> + CreateAccessibleDocumentView (::sd::Window* pWindow); + + virtual css::uno::Reference CreateSubController (void); + + /** Relocate all toplevel controls to the given parent window. + */ + virtual bool RelocateToParentWindow (::Window* pParentWindow); + +private: + class Implementation; + ::boost::scoped_ptr< Implementation > mpImpl; + ::boost::scoped_ptr< ToolPanelDeck > mpPanelDeck; + + bool mbIsInitialized; + + ::boost::shared_ptr mpSubShellManager; + + /** The id of the menu in the menu bar/tool box of the parent docking + window. + */ + USHORT mnMenuId; + + /** Create a popup menu. it contains two sections, one for + docking or un-docking the tool panel, one for toggling the + visibility state of the tool panel items. + @param bIsDocking + According to this flag one of the lock/unlock entries is + made disabled. + */ + ::std::auto_ptr CreatePopupMenu (bool bIsDocking); + + + /** Return a pointer to the docking window that is the parent or a + predecessor of the content window. + @return + When the view shell is not placed in a docking window, e.g. when + shown in the center pane, then is returned. + */ + DockingWindow* GetDockingWindow (void); + + /** connects to a (new) (Pane)DockingWindow + */ + void ConnectToDockingWindow(); + + /** Initialize the task pane view shell if that has not yet been done + before. If mbIsInitialized is already set to then this + method returns immediately. + */ + void Initialize (void); +}; + + + + +} } // end of namespace ::sd::toolpanel + +#endif -- cgit From 263bcb1a8f686afe66f4fe53b76929423fc6ce43 Mon Sep 17 00:00:00 2001 From: "Frank Schoenheit [fs]" Date: Mon, 15 Mar 2010 15:54:52 +0100 Subject: slidecopy: showing and hiding of panels in the new ToolPanel implementation --- sd/source/ui/inc/TaskPaneViewShell.hxx | 1 - sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx | 1 - 2 files changed, 2 deletions(-) (limited to 'sd/source/ui/inc') diff --git a/sd/source/ui/inc/TaskPaneViewShell.hxx b/sd/source/ui/inc/TaskPaneViewShell.hxx index e17881529079..a290291f7e7c 100644 --- a/sd/source/ui/inc/TaskPaneViewShell.hxx +++ b/sd/source/ui/inc/TaskPaneViewShell.hxx @@ -77,7 +77,6 @@ public: PID_MASTER_PAGES, PID_LAYOUT, PID_TABLE_DESIGN, - PID_ANIMATION_SCHEMES, PID_CUSTOM_ANIMATION, PID_SLIDE_TRANSITION, PID__END = PID_SLIDE_TRANSITION diff --git a/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx b/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx index ae9b94cdfc04..ab687b55de47 100644 --- a/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx +++ b/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx @@ -79,7 +79,6 @@ public: PID_MASTER_PAGES, PID_LAYOUT, PID_TABLE_DESIGN, - PID_ANIMATION_SCHEMES, PID_CUSTOM_ANIMATION, PID_SLIDE_TRANSITION, PID__END = PID_SLIDE_TRANSITION -- cgit From c2297610c51057e3a8f4716ffc0b9a570c4876e8 Mon Sep 17 00:00:00 2001 From: "Frank Schoenheit [fs]" Date: Tue, 16 Mar 2010 13:36:35 +0100 Subject: slidecopy: de/activate panels via the drawing framework Instead of simply letting svtool's ToolPanelDeck decide on panel activation, requests are re-routed through the view's ConfigurationController. So, clicking onto a tab just requests the activation of the respective resource, which in turn - when the requested configuration becomes the active configuration - will activate the ToolPanel. --- sd/source/ui/inc/TaskPaneViewShell.hxx | 15 +------ sd/source/ui/inc/taskpane/PanelId.hxx | 56 ++++++++++++++++++++++++ sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx | 23 ++++------ 3 files changed, 66 insertions(+), 28 deletions(-) create mode 100644 sd/source/ui/inc/taskpane/PanelId.hxx (limited to 'sd/source/ui/inc') diff --git a/sd/source/ui/inc/TaskPaneViewShell.hxx b/sd/source/ui/inc/TaskPaneViewShell.hxx index a290291f7e7c..d116b23e2140 100644 --- a/sd/source/ui/inc/TaskPaneViewShell.hxx +++ b/sd/source/ui/inc/TaskPaneViewShell.hxx @@ -34,6 +34,7 @@ #include "ViewShell.hxx" #include "glob.hxx" #include "framework/FrameworkHelper.hxx" +#include "taskpane/PanelId.hxx" #include #include #include @@ -68,20 +69,6 @@ public: TYPEINFO(); SFX_DECL_INTERFACE(SD_IF_SDTASKPANEVIEWSHELL) - /** List of top level panels that can be shown in the task pane. - */ - enum PanelId - { - PID__START = 0, - PID_UNKNOWN = PID__START, - PID_MASTER_PAGES, - PID_LAYOUT, - PID_TABLE_DESIGN, - PID_CUSTOM_ANIMATION, - PID_SLIDE_TRANSITION, - PID__END = PID_SLIDE_TRANSITION - }; - TaskPaneViewShell ( SfxViewFrame* pFrame, ViewShellBase& rViewShellBase, diff --git a/sd/source/ui/inc/taskpane/PanelId.hxx b/sd/source/ui/inc/taskpane/PanelId.hxx new file mode 100644 index 000000000000..dbd618118ecf --- /dev/null +++ b/sd/source/ui/inc/taskpane/PanelId.hxx @@ -0,0 +1,56 @@ +/************************************************************************* + * 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 + * + * for a copy of the LGPLv3 License. + * +************************************************************************/ + +#ifndef SD_UI_TASKPANE_PANELID_HXX +#define SD_UI_TASKPANE_PANELID_HXX + +//...................................................................................................................... +namespace sd { namespace toolpanel +{ +//...................................................................................................................... + + //================================================================================================================== + //= PanelId + //================================================================================================================== + /** List of top level panels that can be shown in the task pane. + */ + enum PanelId + { + PID__START = 0, + PID_UNKNOWN = PID__START, + PID_MASTER_PAGES, + PID_LAYOUT, + PID_TABLE_DESIGN, + PID_CUSTOM_ANIMATION, + PID_SLIDE_TRANSITION, + PID__END = PID_SLIDE_TRANSITION + }; + +//...................................................................................................................... +} } // namespace sd::toolpanel +//...................................................................................................................... + +#endif // SD_UI_TASKPANE_PANELID_HXX diff --git a/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx b/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx index ab687b55de47..a4eb499076e6 100644 --- a/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx +++ b/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx @@ -33,6 +33,7 @@ #include "ViewShell.hxx" #include "glob.hxx" +#include "taskpane/PanelId.hxx" #include "framework/FrameworkHelper.hxx" #include #include @@ -70,20 +71,6 @@ public: TYPEINFO(); SFX_DECL_INTERFACE(SD_IF_SDTOOLPANELSHELL) - /** List of top level panels that can be shown in the task pane. - */ - enum PanelId - { - PID__START = 0, - PID_UNKNOWN = PID__START, - PID_MASTER_PAGES, - PID_LAYOUT, - PID_TABLE_DESIGN, - PID_CUSTOM_ANIMATION, - PID_SLIDE_TRANSITION, - PID__END = PID_SLIDE_TRANSITION - }; - ToolPanelViewShell ( SfxViewFrame* pFrame, ViewShellBase& rViewShellBase, @@ -112,6 +99,14 @@ public: TaskPaneShellManager& GetSubShellManager (void) const; + /** activates the given panel, bypassing the configuration controller, deactivates the previously active one. + */ + void ActivatePanel( const PanelId i_ePanelId ); + + /** deactivates the given panel, bypassing the configuration controller + */ + void DeactivatePanel( const PanelId i_ePanelId ); + /** Called when a mouse button has been pressed but not yet released, this handler is used to show the popup menu of the title bar. -- cgit From d6cc951ebb78f774700d4653ba12af933167c777 Mon Sep 17 00:00:00 2001 From: "Frank Schoenheit [fs]" Date: Tue, 16 Mar 2010 23:44:33 +0100 Subject: slidecopy: add a IDeckLayouter implementation which mimics the old task panel look/behavior. In non-release builds, allow to switch between this old and the new (not yet polished) tab layout via the task pane's menu --- sd/source/ui/inc/taskpane/TitleBar.hxx | 10 ++-------- sd/source/ui/inc/taskpane/ToolPanel.hxx | 13 ++++++++++++- sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx | 1 - 3 files changed, 14 insertions(+), 10 deletions(-) (limited to 'sd/source/ui/inc') diff --git a/sd/source/ui/inc/taskpane/TitleBar.hxx b/sd/source/ui/inc/taskpane/TitleBar.hxx index 28af936e240a..9616a081ff47 100644 --- a/sd/source/ui/inc/taskpane/TitleBar.hxx +++ b/sd/source/ui/inc/taskpane/TitleBar.hxx @@ -50,16 +50,12 @@ namespace sd { namespace toolpanel { TBT_SUB_CONTROL_HEADLINE both show a expansion indicator in front of the title string that shows whether the associated control is visible (expanded) or not. - A title bar with TBT_WINDOW_TITLE is typically used only once as the - title bar of the whole task pane. -

The title bar shows three kinds of indicators: 1) Expansion is +

The title bar shows two kinds of indicators: 1) Expansion is displayed by two sets of two bitmaps, a triangle pointing to the right resp. a minus in a square indicates that the control is collapsed, a triangle pointing down resp. a plus in a square stands for an expanded - control. 2) Keyboard focus is indicated by a dotted rectangle. 3) An - underlined title string is a mouse over indicator for a - selectable/expandable control.

+ control. 2) Keyboard focus is indicated by a dotted rectangle. */ class TitleBar : public ::Window, @@ -67,7 +63,6 @@ class TitleBar { public: enum TitleBarType { - TBT_WINDOW_TITLE, TBT_CONTROL_TITLE, TBT_SUB_CONTROL_HEADLINE }; @@ -162,7 +157,6 @@ private: const Rectangle& rTextBox, int nTitleBarWidth); - void PaintWindowTitleBar (void); void PaintPanelControlTitle (void); void PaintSubPanelHeadLineBar (void); diff --git a/sd/source/ui/inc/taskpane/ToolPanel.hxx b/sd/source/ui/inc/taskpane/ToolPanel.hxx index e7b1140406da..dd165e8310b9 100644 --- a/sd/source/ui/inc/taskpane/ToolPanel.hxx +++ b/sd/source/ui/inc/taskpane/ToolPanel.hxx @@ -42,6 +42,7 @@ class Window; namespace sd { namespace toolpanel { class TaskPaneViewShell; +class ToolPanelViewShell; class ControlFactory; /** This control is basically a layout manager for the vertical @@ -64,6 +65,10 @@ public: ::Window* pParentWindow, TaskPaneViewShell& rViewShell); + ToolPanel ( + ::Window* pParentWindow, + ToolPanelViewShell& rViewShell); + virtual ~ToolPanel (void); /** Append the given control to the end of the list of controls that are @@ -85,6 +90,11 @@ public: ULONG nHelpId, const TitledControl::ClickHandler& rClickHandler); + /** returns the area occupied by the content of the active control (i.e. the area of the active control, + minus the are for its title) + */ + Rectangle GetActiveControlContentArea() const; + virtual void Resize (void); virtual Size GetPreferredSize (void); @@ -110,7 +120,8 @@ protected: void ListHasChanged (void); private: - TaskPaneViewShell& mrViewShell; + TaskPaneViewShell* mpTaskPaneViewShell; + ToolPanelViewShell* mpToolPanelViewShell; /// Guard against recursive calls or Rearrange(). bool mbRearrangeActive; diff --git a/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx b/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx index a4eb499076e6..bfe3b9419748 100644 --- a/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx +++ b/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx @@ -128,7 +128,6 @@ public: private: class Implementation; ::boost::scoped_ptr< Implementation > mpImpl; - ::boost::scoped_ptr< ToolPanelDeck > mpPanelDeck; bool mbIsInitialized; -- cgit From e966bf219edd4ae4ef91d8af38ebb69c17961960 Mon Sep 17 00:00:00 2001 From: "Frank Schoenheit [fs]" Date: Wed, 17 Mar 2010 09:21:56 +0100 Subject: slidecopy: keyboard accessibility for the ToolPanelDrawer implementation --- sd/source/ui/inc/taskpane/TitleBar.hxx | 4 ++-- sd/source/ui/inc/taskpane/TitledControl.hxx | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'sd/source/ui/inc') diff --git a/sd/source/ui/inc/taskpane/TitleBar.hxx b/sd/source/ui/inc/taskpane/TitleBar.hxx index 9616a081ff47..7998599b2e11 100644 --- a/sd/source/ui/inc/taskpane/TitleBar.hxx +++ b/sd/source/ui/inc/taskpane/TitleBar.hxx @@ -88,8 +88,8 @@ public: virtual bool Expand (bool bFlag = true); virtual bool IsExpanded (void) const; virtual void SetEnabledState(bool bFlag); - - void SetFocus (bool bFlag); + virtual void GetFocus (void); + virtual void LoseFocus (void); virtual void MouseMove(const MouseEvent& rEvent); /** Empty implementation prevents forwarding to docking window. diff --git a/sd/source/ui/inc/taskpane/TitledControl.hxx b/sd/source/ui/inc/taskpane/TitledControl.hxx index f82bafd3669f..d1d38aa0fd36 100644 --- a/sd/source/ui/inc/taskpane/TitledControl.hxx +++ b/sd/source/ui/inc/taskpane/TitledControl.hxx @@ -101,7 +101,6 @@ public: virtual void Resize (void); virtual void GetFocus (void); - virtual void LoseFocus (void); virtual void KeyInput (const KeyEvent& rEvent); // void Select (bool bExpansionState); -- cgit From 7f2bd815816cf70719b5de8af78f1c86545fcc60 Mon Sep 17 00:00:00 2001 From: "Frank Schoenheit [fs]" Date: Wed, 17 Mar 2010 10:48:49 +0100 Subject: slidecopy: removed the old TaskPane implementation, now completely superseded by the new one carrying both implementations was only temporary, to be able to easily compare both. The new implementation still has not A11Y API implementation, that's on the TODO list. --- sd/source/ui/inc/AccessibleTaskPane.hxx | 73 --------- sd/source/ui/inc/PaneChildWindows.hxx | 10 -- sd/source/ui/inc/PaneShells.hxx | 11 -- sd/source/ui/inc/TaskPaneViewShell.hxx | 190 ------------------------ sd/source/ui/inc/ViewShell.hxx | 3 +- sd/source/ui/inc/framework/FrameworkHelper.hxx | 2 - sd/source/ui/inc/taskpane/ILayoutableWindow.hxx | 2 +- sd/source/ui/inc/taskpane/TaskPaneTreeNode.hxx | 8 +- sd/source/ui/inc/taskpane/ToolPanel.hxx | 139 ----------------- 9 files changed, 6 insertions(+), 432 deletions(-) delete mode 100644 sd/source/ui/inc/AccessibleTaskPane.hxx delete mode 100644 sd/source/ui/inc/TaskPaneViewShell.hxx delete mode 100644 sd/source/ui/inc/taskpane/ToolPanel.hxx (limited to 'sd/source/ui/inc') diff --git a/sd/source/ui/inc/AccessibleTaskPane.hxx b/sd/source/ui/inc/AccessibleTaskPane.hxx deleted file mode 100644 index 7167c51eaa8f..000000000000 --- a/sd/source/ui/inc/AccessibleTaskPane.hxx +++ /dev/null @@ -1,73 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile: AccessibleTaskPane.hxx,v $ - * $Revision: 1.4 $ - * - * 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 - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef SD_ACCESSIBILITY_ACCESSIBLE_TASK_PANE_HXX -#define SD_ACCESSIBILITY_ACCESSIBLE_TASK_PANE_HXX - -#include "AccessibleTreeNode.hxx" - -namespace sd { namespace toolpanel { -class ToolPanel; -} } - - -namespace accessibility { - -/** Make the task pane as implemented by sd::toolpanel::ToolPanel - accessible. - This derived class exists in order to disable the FOCUSED state. -*/ -class AccessibleTaskPane - : public AccessibleTreeNode -{ -public: - AccessibleTaskPane ( - const ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible> & rxParent, - const ::rtl::OUString& rsName, - const ::rtl::OUString& rsDescription, - ::sd::toolpanel::ToolPanel& rTaskPane); - ~AccessibleTaskPane (void); - - //===== XServiceInfo ==================================================== - - /** Returns an identifier for the implementation of this object. - */ - virtual ::rtl::OUString SAL_CALL - getImplementationName (void) - throw (::com::sun::star::uno::RuntimeException); - -protected: - virtual void UpdateStateSet (void); -}; - -} // end of namespace accessibility - -#endif diff --git a/sd/source/ui/inc/PaneChildWindows.hxx b/sd/source/ui/inc/PaneChildWindows.hxx index 0d8967f7f005..ead7c90dbedc 100644 --- a/sd/source/ui/inc/PaneChildWindows.hxx +++ b/sd/source/ui/inc/PaneChildWindows.hxx @@ -77,16 +77,6 @@ public: -class RightPaneChildWindow - : public PaneChildWindow -{ -public: - RightPaneChildWindow (::Window*, USHORT, SfxBindings*, SfxChildWinInfo*); - - SFX_DECL_CHILDWINDOW(RightPaneChildWindow); -}; - - //====================================================================================================================== //= ToolPanelChildWindow //====================================================================================================================== diff --git a/sd/source/ui/inc/PaneShells.hxx b/sd/source/ui/inc/PaneShells.hxx index 78020c9c7c6b..2e683f13d895 100644 --- a/sd/source/ui/inc/PaneShells.hxx +++ b/sd/source/ui/inc/PaneShells.hxx @@ -78,17 +78,6 @@ public: /** Shell that displays the right pane for both Impress and Draw. The shell does not do anything else and has especially no slots. */ -class RightPaneShell - : public SfxShell -{ -public: - TYPEINFO(); - SFX_DECL_INTERFACE(SD_IF_SDRIGHTPANESHELL) - - RightPaneShell (void); - virtual ~RightPaneShell (void); -}; - class ToolPanelPaneShell : public SfxShell { public: diff --git a/sd/source/ui/inc/TaskPaneViewShell.hxx b/sd/source/ui/inc/TaskPaneViewShell.hxx deleted file mode 100644 index d116b23e2140..000000000000 --- a/sd/source/ui/inc/TaskPaneViewShell.hxx +++ /dev/null @@ -1,190 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile: TaskPaneViewShell.hxx,v $ - * $Revision: 1.12 $ - * - * 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 - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef SD_TOOLPANEL_TASK_PANE_VIEW_SHELL_HXX -#define SD_TOOLPANEL_TASK_PANE_VIEW_SHELL_HXX - -#include "ViewShell.hxx" -#include "glob.hxx" -#include "framework/FrameworkHelper.hxx" -#include "taskpane/PanelId.hxx" -#include -#include -#include -#include - -#include -#include - -class PopupMenu; - -namespace sd { namespace toolpanel { - -class TaskPaneShellManager; -class TitleToolBox; -class TitleBar; -class TitledControl; -class ToolPanel; - -/** The tool panel is a view shell for some very specific reasons: - - It fits better into the concept of panes being docking windows whose - content, a view shell, can be exchanged on runtime. - - A control in the tool panel that wants to show a context menu has to - do that over the dispatcher of a shell. These shells, usually - implemented by the controls themselves, have to be managed by someone. - If interpreted as object bars this can be handled by the - ObjectBarManager of the ViewShell. -*/ -class TaskPaneViewShell - : public ViewShell -{ -public: - TYPEINFO(); - SFX_DECL_INTERFACE(SD_IF_SDTASKPANEVIEWSHELL) - - TaskPaneViewShell ( - SfxViewFrame* pFrame, - ViewShellBase& rViewShellBase, - ::Window* pParentWindow, - FrameView* pFrameView); - virtual ~TaskPaneViewShell (void); - - virtual void GetFocus (void); - virtual void LoseFocus (void); - virtual void KeyInput (const KeyEvent& rEvent); - using sd::ViewShell::KeyInput; - - virtual SdPage* GetActualPage (void); - virtual SdPage* getCurrentPage (void) const; - - void Execute (SfxRequest& rRequest); - void GetState (SfxItemSet& rItemSet); - - virtual void ArrangeGUIElements (void); - - TaskPaneShellManager& GetSubShellManager (void) const; - - /** Called when a mouse button has been pressed but not yet - released, this handler is used to show the popup menu of the - title bar. - */ - DECL_LINK(ToolboxClickHandler, ToolBox*); - DECL_LINK(MenuSelectHandler, Menu*); - - /** Make the specified panel visible and expand it. - @param nId - The id of the panel that is to be made visible. - */ - void ShowPanel (const PanelId nId); - - /** Hide and collapse the specified panel. - @param nId - The id of the panel that is to hide. - */ - void HidePanel (const PanelId nId); - - /** Expand the specified panel. Its visibility state is not modified. - @param nId - The id of the panel that is to expand. - */ - void ExpandPanel (const PanelId nId); - - /** Collapse the specified panel. Its visibility state is not - modified. - @param nId - The id of the panel that is to collapse. - */ - void CollapsePanel (const PanelId nId); - - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible> - CreateAccessibleDocumentView (::sd::Window* pWindow); - - virtual css::uno::Reference CreateSubController (void); - - /** Relocate all toplevel controls to the given parent window. - */ - virtual bool RelocateToParentWindow (::Window* pParentWindow); - -private: - class Implementation; - ::std::auto_ptr mpImpl; - - ::std::auto_ptr mpTaskPane; - - bool mbIsInitialized; - - ::boost::shared_ptr mpSubShellManager; - - /** The id of the menu in the menu bar/tool box of the parent docking - window. - */ - USHORT mnMenuId; - - /** Create a popup menu. it contains three sections, one for - docking or un-docking the tool panel, one for toggling the - visibility state of the tool panel items, and one for bringing - up a customization dialog. - @param bIsDocking - According to this flag one of the lock/unlock entries is - made disabled. - */ - ::std::auto_ptr CreatePopupMenu (bool bIsDocking); - - - /** Make sure that as long as there is at least one visible - control there is exactly one expanded control. - If the currently expanded control is being hidden then try to - expand the control after the hidden one or if that does not - exist expand the one before. - */ - void EnsureExpandedControl (TitledControl* pHiddenControl); - - /** Return a pointer to the docking window that is the parent or a - predecessor of the content window. - @return - When the view shell is not placed in a docking window, e.g. when - shown in the center pane, then is returned. - */ - DockingWindow* GetDockingWindow (void); - - /** Initialize the task pane view shell if that has not yet been done - before. If mbIsInitialized is already set to then this - method returns immediately. - */ - void Initialize (void); -}; - - - - -} } // end of namespace ::sd::toolpanel - -#endif diff --git a/sd/source/ui/inc/ViewShell.hxx b/sd/source/ui/inc/ViewShell.hxx index bf360a766dfc..395566f0cded 100644 --- a/sd/source/ui/inc/ViewShell.hxx +++ b/sd/source/ui/inc/ViewShell.hxx @@ -118,8 +118,7 @@ public: ST_OUTLINE, ST_SLIDE_SORTER, ST_PRESENTATION, - ST_TASK_PANE, - ST_TOOL_PANEL + ST_TASK_PANE }; static const int MAX_HSPLIT_CNT = 1; static const int MAX_VSPLIT_CNT = 1; diff --git a/sd/source/ui/inc/framework/FrameworkHelper.hxx b/sd/source/ui/inc/framework/FrameworkHelper.hxx index d3197ce0d44c..27ed5f6f8bef 100644 --- a/sd/source/ui/inc/framework/FrameworkHelper.hxx +++ b/sd/source/ui/inc/framework/FrameworkHelper.hxx @@ -80,7 +80,6 @@ public: static const ::rtl::OUString msLeftImpressPaneURL; static const ::rtl::OUString msLeftDrawPaneURL; static const ::rtl::OUString msRightPaneURL; - static const ::rtl::OUString msToolPanelPaneURL; // URLs of frequently used views. static const ::rtl::OUString msViewURLPrefix; @@ -92,7 +91,6 @@ public: static const ::rtl::OUString msSlideSorterURL; static const ::rtl::OUString msPresentationViewURL; static const ::rtl::OUString msTaskPaneURL; - static const ::rtl::OUString msToolPanelViewURL; // URLs of frequently used tool bars. static const ::rtl::OUString msToolBarURLPrefix; diff --git a/sd/source/ui/inc/taskpane/ILayoutableWindow.hxx b/sd/source/ui/inc/taskpane/ILayoutableWindow.hxx index 217125e781ba..a86cc74822fd 100644 --- a/sd/source/ui/inc/taskpane/ILayoutableWindow.hxx +++ b/sd/source/ui/inc/taskpane/ILayoutableWindow.hxx @@ -51,7 +51,7 @@ public: /** This interface has to be implemented by windows that want to be - layouted by a ToolPanel, SubToolPanel, or ScrollablePanel object. + layouted by a SubToolPanel or ScrollablePanel object. */ class ILayoutableWindow { diff --git a/sd/source/ui/inc/taskpane/TaskPaneTreeNode.hxx b/sd/source/ui/inc/taskpane/TaskPaneTreeNode.hxx index 3bed3f41a8de..f62d1d6de5e0 100644 --- a/sd/source/ui/inc/taskpane/TaskPaneTreeNode.hxx +++ b/sd/source/ui/inc/taskpane/TaskPaneTreeNode.hxx @@ -56,9 +56,9 @@ enum TreeNodeStateChangeEventId { /** Base class for all members of the object hierarchy that makes up the - tool panel. There are usually at least three levels. At the top level - is the ToolPanel with one instance: the root of the tree. At the - middle level there are SubToolPanels and Window/Control objects. At the + tool panel. In the task pane, there are multiple hierarchies of such nodes, + with every panel having an own tree. The pane node is the root of the tree, below + that there are SubToolPanels and Window/Control objects. At the lowest level there are only Window or Control objects. This class provides the means of communication between objects on @@ -146,7 +146,7 @@ public: ControlContainer& GetControlContainer (void); /** Give each node access to a shell manage. This usually is the shell - manager of the TaskPaneViewShell. + manager of the ToolPanelViewShell. At least the root node has to overwrite this method since the default implementation simply returns the shell manager of its diff --git a/sd/source/ui/inc/taskpane/ToolPanel.hxx b/sd/source/ui/inc/taskpane/ToolPanel.hxx deleted file mode 100644 index dd165e8310b9..000000000000 --- a/sd/source/ui/inc/taskpane/ToolPanel.hxx +++ /dev/null @@ -1,139 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile: ToolPanel.hxx,v $ - * $Revision: 1.6 $ - * - * 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 - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef SD_TOOL_PANEL_HXX -#define SD_TOOL_PANEL_HXX - -#include "taskpane/TaskPaneTreeNode.hxx" -#include "taskpane/TitledControl.hxx" -#include - -#include -#include - -class Window; - -namespace sd { namespace toolpanel { - -class TaskPaneViewShell; -class ToolPanelViewShell; -class ControlFactory; - -/** This control is basically a layout manager for the vertical - stacking of controls. At any one time there is exactly one of - them visible. For the others only their title bar is shown. - -

Each control is independant of both other controls and the tool - panel itself. To be usable by the tool panel they only have to be - derived from the vcl Window class.

-*/ -class ToolPanel - : public Control, - public TreeNode -{ -public: - /** Create a new tool panel with the given window as its parent. - This will usually be a child window. - */ - ToolPanel ( - ::Window* pParentWindow, - TaskPaneViewShell& rViewShell); - - ToolPanel ( - ::Window* pParentWindow, - ToolPanelViewShell& rViewShell); - - virtual ~ToolPanel (void); - - /** Append the given control to the end of the list of controls that are - managed by the tool panel. - @param pControlFactory - Factory that provides the control on demand, typically when it - is expanded the first time. - @param rTitle - The string that is displayed in the title bar above the control. - @param nHelpId - The help id is set at the title bar not the actual control. - @param rClickHandler - The click handler typically expands a control when the user has - clicked on its title. - */ - sal_uInt32 AddControl ( - ::std::auto_ptr pControlFactory, - const String& rTitle, - ULONG nHelpId, - const TitledControl::ClickHandler& rClickHandler); - - /** returns the area occupied by the content of the active control (i.e. the area of the active control, - minus the are for its title) - */ - Rectangle GetActiveControlContentArea() const; - - virtual void Resize (void); - - 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); - - virtual void RequestResize (void); - - virtual TaskPaneShellManager* GetShellManager (void); - - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible> CreateAccessibleObject ( - const ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible>& rxParent); - - using Window::GetWindow; - -protected: - /** Initiate a rearrangement of the controls. - */ - void ListHasChanged (void); - -private: - TaskPaneViewShell* mpTaskPaneViewShell; - ToolPanelViewShell* mpToolPanelViewShell; - - /// Guard against recursive calls or Rearrange(). - bool mbRearrangeActive; - - /** Calculate position, size, and visibility of the controls. - Call this method after the list of controls has changed. - */ - void Rearrange (void); -}; - - - -} } // end of namespace ::sd::toolpanel - -#endif -- cgit From cd3ef5819cb644515289776b8872970218c0ac65 Mon Sep 17 00:00:00 2001 From: "Frank Schoenheit [fs]" Date: Thu, 18 Mar 2010 15:25:13 +0100 Subject: slidecopy: initial implementation for custom tool panels The idea is to allow third-party components to plug additional tool panels into the task pane, by using the drawing framework (http://wiki.services.openoffice.org/wiki/Drawing_framework). This first step is not finished at all, it just adds a configuration scheme/data for such custom tool panels, and implements basic functionality in the ToolPanelDeck to respect this config data. Additionally, the first version of an example extension for a custom tool panel is implemented in sd/workben/custompanel. Still, except showing a drawer in the tool panel deck, representing the custom panel, nothing works. More to come :) --- sd/source/ui/inc/taskpane/PanelId.hxx | 16 ++++++++-------- sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx | 2 -- 2 files changed, 8 insertions(+), 10 deletions(-) (limited to 'sd/source/ui/inc') diff --git a/sd/source/ui/inc/taskpane/PanelId.hxx b/sd/source/ui/inc/taskpane/PanelId.hxx index dbd618118ecf..6ce1c4693267 100644 --- a/sd/source/ui/inc/taskpane/PanelId.hxx +++ b/sd/source/ui/inc/taskpane/PanelId.hxx @@ -39,14 +39,14 @@ namespace sd { namespace toolpanel */ enum PanelId { - PID__START = 0, - PID_UNKNOWN = PID__START, - PID_MASTER_PAGES, - PID_LAYOUT, - PID_TABLE_DESIGN, - PID_CUSTOM_ANIMATION, - PID_SLIDE_TRANSITION, - PID__END = PID_SLIDE_TRANSITION + PID_UNKNOWN = 0, + PID_MASTER_PAGES = 1, + PID_LAYOUT = 2, + PID_TABLE_DESIGN = 3, + PID_CUSTOM_ANIMATION = 4, + PID_SLIDE_TRANSITION = 5, + + PID_FIRST_CUSTOM_PANEL = 6 }; //...................................................................................................................... diff --git a/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx b/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx index bfe3b9419748..9e02194a71c6 100644 --- a/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx +++ b/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx @@ -129,8 +129,6 @@ private: class Implementation; ::boost::scoped_ptr< Implementation > mpImpl; - bool mbIsInitialized; - ::boost::shared_ptr mpSubShellManager; /** The id of the menu in the menu bar/tool box of the parent docking -- cgit From 0dec5536c50fb545cf26701c6ecf158d3f9ab38a Mon Sep 17 00:00:00 2001 From: "Frank Schoenheit [fs]" Date: Fri, 19 Mar 2010 11:16:52 +0100 Subject: slidecopy: XResourceFactory::createResource now allows to raise IllegalArgument/WrappedTargetException --- sd/source/ui/inc/framework/PresentationFactory.hxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sd/source/ui/inc') diff --git a/sd/source/ui/inc/framework/PresentationFactory.hxx b/sd/source/ui/inc/framework/PresentationFactory.hxx index 0e735f74a565..009facaf6438 100644 --- a/sd/source/ui/inc/framework/PresentationFactory.hxx +++ b/sd/source/ui/inc/framework/PresentationFactory.hxx @@ -86,7 +86,7 @@ public: SAL_CALL createResource ( const css::uno::Reference< css::drawing::framework::XResourceId>& rxViewId) - throw(css::uno::RuntimeException); + throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException); virtual void SAL_CALL releaseResource ( const css::uno::Reference& xView) -- cgit From 35ce77a82b374828ef7b85bca8029672dced337f Mon Sep 17 00:00:00 2001 From: "Frank Schoenheit [fs]" Date: Mon, 22 Mar 2010 12:09:10 +0100 Subject: slidecopy: allow custom tool panels in the task pane to be implemented as extensions --- sd/source/ui/inc/framework/ViewShellWrapper.hxx | 63 ++++++++++++++---------- sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx | 25 +++++----- 2 files changed, 52 insertions(+), 36 deletions(-) (limited to 'sd/source/ui/inc') diff --git a/sd/source/ui/inc/framework/ViewShellWrapper.hxx b/sd/source/ui/inc/framework/ViewShellWrapper.hxx index c648c2336bb3..d8406adb1632 100644 --- a/sd/source/ui/inc/framework/ViewShellWrapper.hxx +++ b/sd/source/ui/inc/framework/ViewShellWrapper.hxx @@ -33,22 +33,26 @@ #include "MutexOwner.hxx" #include +#include #include #include #include #include -#include +#include +#include #include namespace { -typedef ::cppu::WeakComponentImplHelper4 < - ::com::sun::star::drawing::framework::XView, - ::com::sun::star::lang::XUnoTunnel, - ::com::sun::star::awt::XWindowListener, - ::com::sun::star::drawing::framework::XRelocatableResource - > ViewShellWrapperInterfaceBase; +typedef ::cppu::WeakComponentImplHelper3 < ::com::sun::star::lang::XUnoTunnel + , ::com::sun::star::awt::XWindowListener + , ::com::sun::star::drawing::framework::XRelocatableResource + > ViewShellWrapperInterfaceBase; +typedef ::cppu::ImplHelper1 < ::com::sun::star::drawing::framework::XView + > ViewShellWrapper_ViewBase; +typedef ::cppu::ImplHelper1 < ::com::sun::star::drawing::framework::XPane + > ViewShellWrapper_PaneBase; } // end of anonymous namespace. @@ -60,9 +64,10 @@ namespace sd { namespace framework { Most importantly it provides a tunnel to the ViewShell implementation. Then it forwards size changes of the pane window to the view shell. */ -class ViewShellWrapper - : private sd::MutexOwner, - public ViewShellWrapperInterfaceBase +class ViewShellWrapper :private sd::MutexOwner + ,public ViewShellWrapperInterfaceBase + ,public ViewShellWrapper_ViewBase + ,public ViewShellWrapper_PaneBase { public: /** Create a new ViewShellWrapper object that wraps the given ViewShell @@ -93,22 +98,26 @@ public: */ ::boost::shared_ptr GetViewShell (void); - /** Returns whether there is exactly one reference to the called - ViewShellWrapper object (the number of references to the wrapped - ViewShell object is not taken into account). This method is - typically used by the owner of a ViewShellWrapper object to verify - that, at the end of the ViewShellWrapper object's lifetime, the - owner holds the last reference and by releasing it will destroy the - object. - */ - bool IsUnique (void); - - // XUnoTunnel virtual sal_Int64 SAL_CALL getSomething (const com::sun::star::uno::Sequence& rId) throw (com::sun::star::uno::RuntimeException); + // XInterface + + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL acquire( ) throw (); + virtual void SAL_CALL release( ) throw (); + + // XTypeProvider + + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::sal_Int8 > SAL_CALL getImplementationId( ) throw (::com::sun::star::uno::RuntimeException); + + // XPane + + virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > SAL_CALL getWindow( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCanvas > SAL_CALL getCanvas( ) throw (::com::sun::star::uno::RuntimeException); // XResource @@ -154,10 +163,14 @@ public: throw (com::sun::star::uno::RuntimeException); private: - ::boost::shared_ptr mpViewShell; - const ::com::sun::star::uno::Reference< - com::sun::star::drawing::framework::XResourceId> mxViewId; - ::com::sun::star::uno::Reference mxWindow; + ::boost::shared_ptr< ViewShell > mpViewShell; + const ::com::sun::star::uno::Reference< com::sun::star::drawing::framework::XResourceId > mxViewId; + ::com::sun::star::uno::Reference mxWindow; + const bool mbIsPane; + +private: + // only to be called when mbIsPane is + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > impl_getPaneWindowOrCanvas( const bool i_bWindow ); }; } } // end of namespace sd::framework diff --git a/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx b/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx index 9e02194a71c6..a82908ec56e3 100644 --- a/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx +++ b/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx @@ -54,7 +54,7 @@ class TitleToolBox; class TitleBar; class TitledControl; class ToolPanelDeck; - +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 content, a view shell, can be exchanged on runtime. @@ -99,6 +99,10 @@ public: TaskPaneShellManager& GetSubShellManager (void) const; + /** returns the window which should be used as parent for tool panel windows + */ + ::Window* GetToolPanelParentWindow(); + /** activates the given panel, bypassing the configuration controller, deactivates the previously active one. */ void ActivatePanel( const PanelId i_ePanelId ); @@ -107,6 +111,14 @@ public: */ void DeactivatePanel( const PanelId i_ePanelId ); + /** Return a pointer to the docking window that is the parent or a + predecessor of the content window. + @return + When the view shell is not placed in a docking window, e.g. when + shown in the center pane, then is returned. + */ + DockingWindow* GetDockingWindow (void); + /** Called when a mouse button has been pressed but not yet released, this handler is used to show the popup menu of the title bar. @@ -126,8 +138,7 @@ public: virtual bool RelocateToParentWindow (::Window* pParentWindow); private: - class Implementation; - ::boost::scoped_ptr< Implementation > mpImpl; + ::boost::scoped_ptr< ToolPanelViewShell_Impl > mpImpl; ::boost::shared_ptr mpSubShellManager; @@ -146,14 +157,6 @@ private: ::std::auto_ptr CreatePopupMenu (bool bIsDocking); - /** Return a pointer to the docking window that is the parent or a - predecessor of the content window. - @return - When the view shell is not placed in a docking window, e.g. when - shown in the center pane, then is returned. - */ - DockingWindow* GetDockingWindow (void); - /** connects to a (new) (Pane)DockingWindow */ void ConnectToDockingWindow(); -- cgit From 644a203f684e5b9286c8c5b8c2b0c0e6455c7cd1 Mon Sep 17 00:00:00 2001 From: "Frank Schoenheit [fs]" Date: Mon, 22 Mar 2010 13:19:00 +0100 Subject: slidecopy: removed the remaints of the old task panel implementation - in particular, creating tool panels as non-roots of a control tree is not needed anymore by now --- .../ui/inc/taskpane/SlideSorterCacheDisplay.hxx | 2 - .../ui/inc/taskpane/TaskPaneControlFactory.hxx | 54 ++-------------------- sd/source/ui/inc/taskpane/TitledControl.hxx | 12 +---- 3 files changed, 5 insertions(+), 63 deletions(-) (limited to 'sd/source/ui/inc') diff --git a/sd/source/ui/inc/taskpane/SlideSorterCacheDisplay.hxx b/sd/source/ui/inc/taskpane/SlideSorterCacheDisplay.hxx index 61b22470272c..79e7d46ea5aa 100644 --- a/sd/source/ui/inc/taskpane/SlideSorterCacheDisplay.hxx +++ b/sd/source/ui/inc/taskpane/SlideSorterCacheDisplay.hxx @@ -74,8 +74,6 @@ public: virtual void Paint (const Rectangle& rBoundingBox); virtual void Resize (void); - static std::auto_ptr CreateControlFactory (const SdDrawDocument* pDocument); - static SlideSorterCacheDisplay* Instance (const SdDrawDocument* pDocument); void SetPageCount (sal_Int32 nPageCount); diff --git a/sd/source/ui/inc/taskpane/TaskPaneControlFactory.hxx b/sd/source/ui/inc/taskpane/TaskPaneControlFactory.hxx index 67462c132f52..bdc514f248f5 100644 --- a/sd/source/ui/inc/taskpane/TaskPaneControlFactory.hxx +++ b/sd/source/ui/inc/taskpane/TaskPaneControlFactory.hxx @@ -61,60 +61,18 @@ public: ControlFactory (void); virtual ~ControlFactory (void); - /** Derived classes should overload InternalCreateControl(), not this - method. - */ - ::std::auto_ptr CreateControl (TreeNode* pTreeNode); - /** creates a tree node which acts as root of an own tree - An implementation is allowed to return NULL here, but must return non-NULL then in the other - factory method. Derived classes should overload InternalCreateControl. */ - ::std::auto_ptr CreateRootControl( ::Window& i_rParent ); + ::std::auto_ptr CreateControl( ::Window& i_rParent ); protected: - /** This is the internal hook for derived classes to overload in order - to provide a new control instance. - */ - virtual TreeNode* InternalCreateControl (TreeNode* pTreeNode) = 0; - - virtual TreeNode* InternalCreateRootControl( ::Window& i_rParent ) = 0; + virtual TreeNode* InternalCreateControl( ::Window& i_rParent ) = 0; }; -/** A simple helper class that realizes a ControlFactory that provides its - newly created controls with one additional argument (additional to the - parent TreeNode). -*/ -template -class ControlFactoryWithArgs1 - : public ControlFactory -{ -public: - ControlFactoryWithArgs1 (ArgumentType& rArgument) - : mrArgument(rArgument) - {} - -protected: - virtual TreeNode* InternalCreateControl (TreeNode* pTreeNode) - { - return new ControlType(pTreeNode, mrArgument); - } - - virtual TreeNode* InternalCreateRootControl( ::Window& i_rParent ) - { - OSL_ENSURE( false, "ControlFactoryWithArgs1::InternalCreateRootControl: not implemented!" ); - return NULL; - } - -private: - ArgumentType& mrArgument; -}; - - /** A simple helper class that realizes a ControlFactory that is able to create root controls, providing the to-be-created control with an additional parameter. */ @@ -128,13 +86,7 @@ public: {} protected: - virtual TreeNode* InternalCreateControl (TreeNode* pTreeNode) - { - OSL_ENSURE( false, "ControlFactoryWithArgs1::InternalCreateControl: not implemented!" ); - return NULL; - } - - virtual TreeNode* InternalCreateRootControl( ::Window& i_rParent ) + virtual TreeNode* InternalCreateControl( ::Window& i_rParent ) { return new ControlType( i_rParent, mrArgument ); } diff --git a/sd/source/ui/inc/taskpane/TitledControl.hxx b/sd/source/ui/inc/taskpane/TitledControl.hxx index d1d38aa0fd36..44ebcf4e5834 100644 --- a/sd/source/ui/inc/taskpane/TitledControl.hxx +++ b/sd/source/ui/inc/taskpane/TitledControl.hxx @@ -83,13 +83,6 @@ public: const ClickHandler& rClickHandler, TitleBar::TitleBarType eType); - TitledControl ( - TreeNode* pParent, - ::std::auto_ptr pControlFactory, - const String& rTitle, - const ClickHandler& rClickHandler, - TitleBar::TitleBarType eType); - virtual ~TitledControl (void); @@ -110,8 +103,8 @@ public: the control has not yet been created and the given flag is then the control is created. */ - TreeNode* GetControl (bool bCreate=true); - const TreeNode* GetConstControl (bool bCreate=true) const; + TreeNode* GetControl (void); + const TreeNode* GetConstControl () const; const String& GetTitle (void) const; @@ -158,7 +151,6 @@ private: String msTitle; bool mbVisible; void* mpUserData; - ::std::auto_ptr mpControlFactory; ::std::auto_ptr mpClickHandler; /** Remember whether to toggle (true) the expansion state when the title -- cgit From ce1737da191a210ecf75faa33c515e5f51168d3a Mon Sep 17 00:00:00 2001 From: "Frank Schoenheit [fs]" Date: Thu, 25 Mar 2010 10:55:53 +0100 Subject: slidecopy: when the ToolPanelViewShell is first created, recognize the fact that the requested configuration already contains a tool panel resource, and properly set up the tool panel deck then --- sd/source/ui/inc/taskpane/PanelId.hxx | 2 ++ 1 file changed, 2 insertions(+) (limited to 'sd/source/ui/inc') diff --git a/sd/source/ui/inc/taskpane/PanelId.hxx b/sd/source/ui/inc/taskpane/PanelId.hxx index 6ce1c4693267..7e26c4e66e68 100644 --- a/sd/source/ui/inc/taskpane/PanelId.hxx +++ b/sd/source/ui/inc/taskpane/PanelId.hxx @@ -49,6 +49,8 @@ namespace sd { namespace toolpanel PID_FIRST_CUSTOM_PANEL = 6 }; + PanelId GetStandardPanelId( const ::rtl::OUString& i_rTaskPanelResourceURL ); + //...................................................................................................................... } } // namespace sd::toolpanel //...................................................................................................................... -- cgit From 1944067cc6a1a36ef556fd6afe7315459053a811 Mon Sep 17 00:00:00 2001 From: Christian Lippka Date: Thu, 25 Mar 2010 12:32:42 +0100 Subject: added new placeholder icons --- sd/source/ui/inc/res_bmp.hrc | 35 +++++++++++++++++++--------- sd/source/ui/inc/view/viewoverlaymanager.hxx | 6 ++--- 2 files changed, 27 insertions(+), 14 deletions(-) (limited to 'sd/source/ui/inc') diff --git a/sd/source/ui/inc/res_bmp.hrc b/sd/source/ui/inc/res_bmp.hrc index bc488e22240e..abf4d054e2ad 100644 --- a/sd/source/ui/inc/res_bmp.hrc +++ b/sd/source/ui/inc/res_bmp.hrc @@ -209,17 +209,30 @@ #define BMP_FOILH_09 RID_SD_START+398 #define BMP_FOILH_09_H RID_SD_START+399 -#define BMP_PLACEHOLDER_CHART_57X71 RID_SD_START+400 -#define BMP_PLACEHOLDER_CHART_57X71_H RID_SD_START+401 -#define BMP_PLACEHOLDER_IMAGE_57X71 RID_SD_START+402 -#define BMP_PLACEHOLDER_IMAGE_57X71_H RID_SD_START+403 -#define BMP_PLACEHOLDER_MOVIE_57X71 RID_SD_START+404 -#define BMP_PLACEHOLDER_MOVIE_57X71_H RID_SD_START+405 -#define BMP_PLACEHOLDER_TABLE_57X71 RID_SD_START+406 -#define BMP_PLACEHOLDER_TABLE_57X71_H RID_SD_START+407 - -#define BMP_FOILN_01 RID_SD_START+408 -#define BMP_FOILN_01_H RID_SD_START+409 +#define BMP_FOILN_01 RID_SD_START+400 +#define BMP_FOILN_01_H RID_SD_START+401 + +#define BMP_PLACEHOLDER_SMALL_START (RID_SD_START+402) // these ids must stay in order! +#define BMP_PLACEHOLDER_TABLE_SMALL (RID_SD_START+402) +#define BMP_PLACEHOLDER_CHART_SMALL (RID_SD_START+403) +#define BMP_PLACEHOLDER_IMAGE_SMALL (RID_SD_START+404) +#define BMP_PLACEHOLDER_MOVIE_SMALL (RID_SD_START+405) +#define BMP_PLACEHOLDER_TABLE_SMALL_HOVER (RID_SD_START+406) +#define BMP_PLACEHOLDER_CHART_SMALL_HOVER (RID_SD_START+407) +#define BMP_PLACEHOLDER_IMAGE_SMALL_HOVER (RID_SD_START+408) +#define BMP_PLACEHOLDER_MOVIE_SMALL_HOVER (RID_SD_START+409) +#define BMP_PLACEHOLDER_SMALL_END (RID_SD_START+410) +#define BMP_PLACEHOLDER_LARGE_START (RID_SD_START+410) +#define BMP_PLACEHOLDER_TABLE_LARGE (RID_SD_START+410) +#define BMP_PLACEHOLDER_CHART_LARGE (RID_SD_START+411) +#define BMP_PLACEHOLDER_IMAGE_LARGE (RID_SD_START+412) +#define BMP_PLACEHOLDER_MOVIE_LARGE (RID_SD_START+413) +#define BMP_PLACEHOLDER_TABLE_LARGE_HOVER (RID_SD_START+414) +#define BMP_PLACEHOLDER_CHART_LARGE_HOVER (RID_SD_START+415) +#define BMP_PLACEHOLDER_IMAGE_LARGE_HOVER (RID_SD_START+416) +#define BMP_PLACEHOLDER_MOVIE_LARGE_HOVER (RID_SD_START+417) +#define BMP_PLACEHOLDER_LARGE_END (RID_SD_START+418) // until here! + // ----------------------------------------------------------------------------- #define IMG_PIPETTE_H RID_APP_START+21 diff --git a/sd/source/ui/inc/view/viewoverlaymanager.hxx b/sd/source/ui/inc/view/viewoverlaymanager.hxx index a87d14541cd8..29cc5221865a 100644 --- a/sd/source/ui/inc/view/viewoverlaymanager.hxx +++ b/sd/source/ui/inc/view/viewoverlaymanager.hxx @@ -35,6 +35,7 @@ #include #include "EventMultiplexer.hxx" #include "ViewShellBase.hxx" +#include "res_bmp.hrc" namespace sd { @@ -58,9 +59,8 @@ public: virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint); - static const int ButtonCount = 4; - static Image maLargeButtonImages[ButtonCount]; - static Image maSmallButtonImages[ButtonCount]; + static Image maLargeButtonImages[BMP_PLACEHOLDER_LARGE_END - BMP_PLACEHOLDER_LARGE_START]; + static Image maSmallButtonImages[BMP_PLACEHOLDER_SMALL_END - BMP_PLACEHOLDER_SMALL_START]; private: void UpdateImages(); -- cgit From 21cdc409181bc82a5aec83a1f09f62984b12537f Mon Sep 17 00:00:00 2001 From: "Frank Schoenheit [fs]" Date: Tue, 30 Mar 2010 13:46:11 +0200 Subject: slidecopy: A11Y for the ToolPanelDeck VCL control --- sd/source/ui/inc/taskpane/ControlContainer.hxx | 1 - 1 file changed, 1 deletion(-) mode change 100644 => 100755 sd/source/ui/inc/taskpane/ControlContainer.hxx (limited to 'sd/source/ui/inc') diff --git a/sd/source/ui/inc/taskpane/ControlContainer.hxx b/sd/source/ui/inc/taskpane/ControlContainer.hxx old mode 100644 new mode 100755 index 57312cfc9417..90164d3fdfad --- a/sd/source/ui/inc/taskpane/ControlContainer.hxx +++ b/sd/source/ui/inc/taskpane/ControlContainer.hxx @@ -31,7 +31,6 @@ #ifndef SD_TOOLPANEL_CONTROL_CONTAINER_HXX #define SD_TOOLPANEL_CONTROL_CONTAINER_HXX -#include "TitleBar.hxx" #include #include -- cgit From 646895d3ee78647feb51582e3cdea75d01960cd5 Mon Sep 17 00:00:00 2001 From: Christian Lippka Date: Thu, 1 Apr 2010 11:00:20 +0200 Subject: enalbe assign slide layout dropdown for notes and handout view --- sd/source/ui/inc/DrawController.hxx | 3 +- sd/source/ui/inc/DrawSubController.hxx | 23 ++++++++++++--- sd/source/ui/inc/SdUnoDrawView.hxx | 7 +++++ sd/source/ui/inc/SdUnoOutlineView.hxx | 5 ++++ sd/source/ui/inc/SdUnoPresView.hxx | 54 ---------------------------------- sd/source/ui/inc/SdUnoSlideView.hxx | 5 ++++ 6 files changed, 38 insertions(+), 59 deletions(-) delete mode 100644 sd/source/ui/inc/SdUnoPresView.hxx (limited to 'sd/source/ui/inc') diff --git a/sd/source/ui/inc/DrawController.hxx b/sd/source/ui/inc/DrawController.hxx index 5afda083abbc..d2f56501f492 100644 --- a/sd/source/ui/inc/DrawController.hxx +++ b/sd/source/ui/inc/DrawController.hxx @@ -104,7 +104,8 @@ public: PROPERTY_ACTIVE_LAYER = 5, PROPERTY_ZOOMTYPE = 6, PROPERTY_ZOOMVALUE = 7, - PROPERTY_VIEWOFFSET = 8 + PROPERTY_VIEWOFFSET = 8, + PROPERTY_DRAWVIEWMODE = 9 }; /** Create a new DrawController object for the given ViewShellBase. diff --git a/sd/source/ui/inc/DrawSubController.hxx b/sd/source/ui/inc/DrawSubController.hxx index 11816fa45902..3b02d74d05c0 100644 --- a/sd/source/ui/inc/DrawSubController.hxx +++ b/sd/source/ui/inc/DrawSubController.hxx @@ -29,12 +29,27 @@ #define SD_DRAW_SUB_CONTROLLER_HXX #include -#include +#include +#include namespace { - typedef ::cppu::WeakComponentImplHelper1 < - ::com::sun::star::drawing::XDrawSubController - > DrawSubControllerInterfaceBase; + + class DrawSubControllerInterfaceBase : public ::cppu::WeakComponentImplHelper2< + ::com::sun::star::drawing::XDrawSubController, + ::com::sun::star::lang::XServiceInfo > + { + public: + DrawSubControllerInterfaceBase( ::osl::Mutex& aMutex ) + : ::cppu::WeakComponentImplHelper2< + ::com::sun::star::drawing::XDrawSubController, + ::com::sun::star::lang::XServiceInfo >( aMutex ) {} + + // XServiceInfo + virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException) = 0; + virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException) = 0; + virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException) = 0; + }; + } diff --git a/sd/source/ui/inc/SdUnoDrawView.hxx b/sd/source/ui/inc/SdUnoDrawView.hxx index afd03acd256f..d29ca3b09d32 100644 --- a/sd/source/ui/inc/SdUnoDrawView.hxx +++ b/sd/source/ui/inc/SdUnoDrawView.hxx @@ -106,6 +106,11 @@ public: css::lang::WrappedTargetException, css::uno::RuntimeException); + // XServiceInfo + virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); + protected: sal_Bool getMasterPageMode(void) const throw(); void setMasterPageMode(sal_Bool MasterPageMode_) throw(); @@ -133,6 +138,8 @@ protected: void SetZoomType( sal_Int16 nType ); + ::com::sun::star::uno::Any getDrawViewMode() const; + private: DrawController& mrController; DrawViewShell& mrDrawViewShell; diff --git a/sd/source/ui/inc/SdUnoOutlineView.hxx b/sd/source/ui/inc/SdUnoOutlineView.hxx index a8c97b2e2610..d2a4d4bfd39d 100644 --- a/sd/source/ui/inc/SdUnoOutlineView.hxx +++ b/sd/source/ui/inc/SdUnoOutlineView.hxx @@ -111,6 +111,11 @@ public: disposing (const ::com::sun::star::lang::EventObject& rEventObject) throw (::com::sun::star::uno::RuntimeException); + // XServiceInfo + virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); + private: DrawController& mrController; OutlineViewShell& mrOutlineViewShell; diff --git a/sd/source/ui/inc/SdUnoPresView.hxx b/sd/source/ui/inc/SdUnoPresView.hxx deleted file mode 100644 index 8edf171f60cc..000000000000 --- a/sd/source/ui/inc/SdUnoPresView.hxx +++ /dev/null @@ -1,54 +0,0 @@ -/************************************************************************* - * - * 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 - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef SD_UNO_PRES_VIEW_HXX -#define SD_UNO_PRES_VIEW_HXX - -#include "SdUnoDrawView.hxx" - -namespace sd { - -/** The sub controller for the slide show (or preview?) It formerly reduced - the property set inherited from SdUnoDrawView to just 'CurrentPage'. - Now that we have to always support the whole set, we can as well try to - do that as best as we can. Therefore the inherited functionality is - provided as is. -*/ -class SdUnoPresView - : public SdUnoDrawView -{ -public: - SdUnoPresView ( - DrawController& rController, - DrawViewShell& rViewShell, - View& rView) throw(); - virtual ~SdUnoPresView (void) throw(); -}; - -} // end of namespace sd - -#endif diff --git a/sd/source/ui/inc/SdUnoSlideView.hxx b/sd/source/ui/inc/SdUnoSlideView.hxx index e468d416bf56..6005704ec895 100644 --- a/sd/source/ui/inc/SdUnoSlideView.hxx +++ b/sd/source/ui/inc/SdUnoSlideView.hxx @@ -109,6 +109,11 @@ public: css::lang::WrappedTargetException, css::uno::RuntimeException); + // XServiceInfo + virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); + private: DrawController& mrController; slidesorter::SlideSorter& mrSlideSorter; -- cgit From 46a3b5deb5df0bc8dc64d2a01956dab08dd7798f Mon Sep 17 00:00:00 2001 From: "Frank Schoenheit [fs]" Date: Wed, 7 Apr 2010 22:36:24 +0200 Subject: slidecopy: outsourced the TaskPane/ToolPanel's drawer (TitleBar, type TBT_CONTROL_TITLE) from sd to svtools, to be used with generic tool panel decks, not only within sd diff -r b53c58c139b0 -r 348318a2bab4 default_images/sd/res/triangle_down.png Binary file default_images/sd/res/triangle_down.png has changed diff -r b53c58c139b0 -r 348318a2bab4 default_images/sd/res/triangle_down_hc.png Binary file default_images/sd/res/triangle_down_hc.png has changed diff -r b53c58c139b0 -r 348318a2bab4 default_images/sd/res/triangle_right.png Binary file default_images/sd/res/triangle_right.png has changed diff -r b53c58c139b0 -r 348318a2bab4 default_images/sd/res/triangle_right_hc.png Binary file default_images/sd/res/triangle_right_hc.png has changed diff -r b53c58c139b0 -r 348318a2bab4 default_images/svtools/res/triangle_down.png Binary file default_images/svtools/res/triangle_down.png has changed diff -r b53c58c139b0 -r 348318a2bab4 default_images/svtools/res/triangle_down_hc.png Binary file default_images/svtools/res/triangle_down_hc.png has changed diff -r b53c58c139b0 -r 348318a2bab4 default_images/svtools/res/triangle_right.png Binary file default_images/svtools/res/triangle_right.png has changed diff -r b53c58c139b0 -r 348318a2bab4 default_images/svtools/res/triangle_right_hc.png Binary file default_images/svtools/res/triangle_right_hc.png has changed --- sd/source/ui/inc/res_bmp.hrc | 8 ++++---- sd/source/ui/inc/taskpane/TitleBar.hxx | 24 ++---------------------- sd/source/ui/inc/taskpane/TitledControl.hxx | 6 ------ 3 files changed, 6 insertions(+), 32 deletions(-) (limited to 'sd/source/ui/inc') diff --git a/sd/source/ui/inc/res_bmp.hrc b/sd/source/ui/inc/res_bmp.hrc index 0dd5451c1f45..61f9130f547b 100644 --- a/sd/source/ui/inc/res_bmp.hrc +++ b/sd/source/ui/inc/res_bmp.hrc @@ -224,10 +224,10 @@ #define BMP_CLOSE_DOC RID_SD_START+325 #define BMP_CLOSE_DOC_H RID_SD_START+326 -#define BMP_TRIANGLE_RIGHT RID_SD_START+327 -#define BMP_TRIANGLE_RIGHT_H RID_SD_START+328 -#define BMP_TRIANGLE_DOWN RID_SD_START+329 -#define BMP_TRIANGLE_DOWN_H RID_SD_START+330 + // FREE + // FREE + // FREE + // FREE #define BMP_FADE_EFFECT_INDICATOR RID_SD_START+331 #define BMP_FADE_EFFECT_INDICATOR_H RID_SD_START+332 diff --git a/sd/source/ui/inc/taskpane/TitleBar.hxx b/sd/source/ui/inc/taskpane/TitleBar.hxx index 7998599b2e11..6128d39aecc3 100644 --- a/sd/source/ui/inc/taskpane/TitleBar.hxx +++ b/sd/source/ui/inc/taskpane/TitleBar.hxx @@ -44,12 +44,7 @@ class VirtualDevice; namespace sd { namespace toolpanel { -/** The title bar above a control in a tool panel or sub tool panel. - The way the title bar is displayed depends on the TitleBarType - given to the constructor. TBT_CONTROL_TITLE and - TBT_SUB_CONTROL_HEADLINE both show a expansion indicator in front of - the title string that shows whether the associated control is - visible (expanded) or not. +/** The title bar above a control in a sub tool panel.

The title bar shows two kinds of indicators: 1) Expansion is displayed by two sets of two bitmaps, a triangle pointing to the right @@ -63,9 +58,8 @@ class TitleBar { public: enum TitleBarType { - TBT_CONTROL_TITLE, TBT_SUB_CONTROL_HEADLINE - }; + }; /** Create a new title bar whose content, the given title string, will be formatted according to the given type. @@ -113,17 +107,10 @@ private: String msTitle; bool mbExpanded; bool mbFocused; - bool mbMouseOver; // Size of the bounding box that encloses the title string. - Size maStringBox; ::std::auto_ptr mpDevice; bool mbIsExpandable; - /** Set the mbMouseOver flag to the given value and paint the - title bar accordingly. - */ - void SetMouseOver (bool bFlag); - /** Return whether this TitleBar object has an expansion indicator bitmap. It is safe to call GetExpansionIndicator() when this method returns but unnecessary. @@ -157,7 +144,6 @@ private: const Rectangle& rTextBox, int nTitleBarWidth); - void PaintPanelControlTitle (void); void PaintSubPanelHeadLineBar (void); void PaintBackground (const Rectangle& rTextBox); @@ -165,12 +151,6 @@ private: /// Paint a focus indicator that encloses the given rectangle. void PaintFocusIndicator (const Rectangle& rIndicatorBox); - /** Paint a mouse over indicator. If the mouse is over the title - bar than the text enclosed by the given rectangle is - underlined. - */ - void PaintMouseOverIndicator (const Rectangle& rIndicatorBox); - Rectangle PaintExpansionIndicator (const Rectangle& rTextBox); void PaintText (const Rectangle& rTextBox); diff --git a/sd/source/ui/inc/taskpane/TitledControl.hxx b/sd/source/ui/inc/taskpane/TitledControl.hxx index 44ebcf4e5834..e79aeb170507 100644 --- a/sd/source/ui/inc/taskpane/TitledControl.hxx +++ b/sd/source/ui/inc/taskpane/TitledControl.hxx @@ -153,12 +153,6 @@ private: void* mpUserData; ::std::auto_ptr mpClickHandler; - /** Remember whether to toggle (true) the expansion state when the title - bar is clicked on. When set to false then the control is always - expanded. - */ - bool mbExpansionModeIsToggle; - /// Do not use! Assignment operator is not supported. const TitledControl& operator= ( const TitledControl& aDescriptor); -- cgit From 57ed5c1c87b267de23b1b73a71851dcdc46a6bab Mon Sep 17 00:00:00 2001 From: "Frank Schoenheit [fs]" Date: Thu, 8 Apr 2010 13:24:23 +0200 Subject: slidecopy: FLT_RIGHT_PANE_DOCKING_WINDOW is obsolete (superseded by FLT_TOOL_PANEL_DOCKING_WINDOW) for quite some time now ... --- sd/source/ui/inc/PaneDockingWindow.hrc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'sd/source/ui/inc') diff --git a/sd/source/ui/inc/PaneDockingWindow.hrc b/sd/source/ui/inc/PaneDockingWindow.hrc index 9eb1ad1c53fd..94be1eaa60ee 100644 --- a/sd/source/ui/inc/PaneDockingWindow.hrc +++ b/sd/source/ui/inc/PaneDockingWindow.hrc @@ -30,5 +30,4 @@ #define FLT_LEFT_PANE_IMPRESS_DOCKING_WINDOW 792 #define FLT_LEFT_PANE_DRAW_DOCKING_WINDOW 793 -#define FLT_RIGHT_PANE_DOCKING_WINDOW 794 -#define FLT_TOOL_PANEL_DOCKING_WINDOW 795 +#define FLT_TOOL_PANEL_DOCKING_WINDOW 794 -- cgit From d817753ec5fa141527973769135e112d82a783cb Mon Sep 17 00:00:00 2001 From: "Frank Schoenheit [fs]" Date: Fri, 9 Apr 2010 09:21:37 +0200 Subject: slidecopy: moved SD's version of DockingWindows (bearing a title bar, and a closer when docked) to SFX, and based the new TaskPane on it --- sd/source/ui/inc/PaneDockingWindow.hxx | 79 +++------------------------------- sd/source/ui/inc/res_bmp.hrc | 6 --- 2 files changed, 6 insertions(+), 79 deletions(-) (limited to 'sd/source/ui/inc') diff --git a/sd/source/ui/inc/PaneDockingWindow.hxx b/sd/source/ui/inc/PaneDockingWindow.hxx index acb245e6221d..791917194376 100644 --- a/sd/source/ui/inc/PaneDockingWindow.hxx +++ b/sd/source/ui/inc/PaneDockingWindow.hxx @@ -31,7 +31,7 @@ #ifndef SD_PANE_DOCKING_WINDOW_HXX #define SD_PANE_DOCKING_WINDOW_HXX -#include +#include #include #include @@ -41,15 +41,10 @@ class ToolBox; namespace sd { -class PaneDockingWindow - : public SfxDockingWindow + class PaneDockingWindow : public ::sfx2::TitledDockingWindow { public: - /** Create a new docking window that will be displayed in the specified - pane. - The constructor will determine the ViewShellBase via the given - bindings and tell its PaneManager about the new window. It will ask - the PaneManager for a window title. + /** Create a new docking window. @param pBindings Used, among others, to determine the ViewShellBase and PaneManager that manage the new docking window. @@ -60,8 +55,8 @@ public: The parent window of the new docking window. @param rResId The resource is used to determine initial size and attributes. - @param ePane - The pane in which to show the docking window. + @param rsTitle + the initial title */ PaneDockingWindow ( SfxBindings *pBindings, @@ -72,79 +67,17 @@ public: virtual ~PaneDockingWindow (void); - virtual void Paint (const Rectangle& rRectangle); - virtual void Resize (void); - - virtual long Notify( NotifyEvent& rNEvt ); virtual void StateChanged( StateChangedType nType ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); virtual void EndDocking( const Rectangle& rRect, BOOL bFloatMode ); - /** Initializing the title tool box either creates a new title tool box - or clears all items from an existing one. A closer is added as only - item. - */ - void InitializeTitleToolBox (void); - - /** Add a top down menu to the title bar or rather the top-level menu - entry. The given callback is called when the menu is clicked and it - is the task of the callback to show the menu. - @return - The id of the new menu is returned. It can be compared by the - callback to the value of GetCurItemId() when called at the given - tool box. - */ - USHORT AddMenu (const String& rsMenuName, ULONG nHelpId, const Link& rCallback); - void SetEndDockingHdl( const Link& i_rEndDockingHdl ) { maEndDockingHdl = i_rEndDockingHdl; } const Link& GetEndDockingHdl() const { return maEndDockingHdl; } - /** Set the title of the docking window to the given string. Use this - method when the title is not yet known at the time of construction - or can not be passed to the constructor. - */ - void SetTitle (const String& rsTitle); - - ::Window* GetContentWindow (void); - - ::boost::shared_ptr GetTitleToolBox (void) const; + void ResetToolBox(); private: - /** Title that is shown at the top of the docking window. - */ - ::rtl::OUString msTitle; - - /** The tool box that is displayed in the window title area contains - menus and the closer button. - */ - ::boost::shared_ptr mpTitleToolBox; - - /** The border that is painted arround the inner window. The bevel - shadow lines are part of the border, so where the border is 0 no - such line is painted. - */ - SvBorder maBorder; - - sal_uInt16 mnChildWindowId; - - ::boost::scoped_ptr< ::Window> mpContentWindow; - Link maEndDockingHdl; - - /** Remember that a layout is pending, i.e. Resize() has been called - since the last Paint(). - */ - bool mbIsLayoutPending; - - DECL_LINK(ToolboxSelectHandler, ToolBox*); - - /** This does the actual placing and sizing of the title bar and the - content window after the size of the docking window has changed. - This method is called from withing the Paint() method when since its - last invocation the size of the docking window has changed. - */ - void Layout (void); }; } // end of namespace ::sd diff --git a/sd/source/ui/inc/res_bmp.hrc b/sd/source/ui/inc/res_bmp.hrc index 61f9130f547b..5099261b1643 100644 --- a/sd/source/ui/inc/res_bmp.hrc +++ b/sd/source/ui/inc/res_bmp.hrc @@ -222,12 +222,6 @@ #define BMP_GROUP_H RID_SD_START+226 #define BMP_WAIT_ICON_H RID_SD_START+229 -#define BMP_CLOSE_DOC RID_SD_START+325 -#define BMP_CLOSE_DOC_H RID_SD_START+326 - // FREE - // FREE - // FREE - // FREE #define BMP_FADE_EFFECT_INDICATOR RID_SD_START+331 #define BMP_FADE_EFFECT_INDICATOR_H RID_SD_START+332 -- cgit From c08e0f6a88407fac29857a71314f0a704fa7c393 Mon Sep 17 00:00:00 2001 From: "Frank Schoenheit [fs]" Date: Mon, 12 Apr 2010 13:17:03 +0200 Subject: slidecopy: removed unused forward declaration --- sd/source/ui/inc/taskpane/SlideSorterCacheDisplay.hxx | 1 - sd/source/ui/inc/taskpane/TitledControl.hxx | 1 - 2 files changed, 2 deletions(-) (limited to 'sd/source/ui/inc') diff --git a/sd/source/ui/inc/taskpane/SlideSorterCacheDisplay.hxx b/sd/source/ui/inc/taskpane/SlideSorterCacheDisplay.hxx index 79e7d46ea5aa..709b713bfeb6 100644 --- a/sd/source/ui/inc/taskpane/SlideSorterCacheDisplay.hxx +++ b/sd/source/ui/inc/taskpane/SlideSorterCacheDisplay.hxx @@ -57,7 +57,6 @@ class Window; namespace sd { namespace toolpanel { -class ControlFactory; class TreeNode; /** This panel demonstrates how to create a panel for the task pane. diff --git a/sd/source/ui/inc/taskpane/TitledControl.hxx b/sd/source/ui/inc/taskpane/TitledControl.hxx index e79aeb170507..3089ca732b89 100644 --- a/sd/source/ui/inc/taskpane/TitledControl.hxx +++ b/sd/source/ui/inc/taskpane/TitledControl.hxx @@ -48,7 +48,6 @@ class Window; namespace sd { namespace toolpanel { class ControlContainer; -class ControlFactory; /** This wrapper adds a title bar to a control. Both title bar and control are child windows. -- cgit From a7df7372429ea4ea2d17852588b1c0fbf7a91d2f Mon Sep 17 00:00:00 2001 From: Christian Lippka Date: Tue, 13 Apr 2010 12:10:03 +0200 Subject: fixed unix warnings --- sd/source/ui/inc/3dchld.hxx | 0 sd/source/ui/inc/AccessibleDocumentViewBase.hxx | 0 sd/source/ui/inc/AccessibleDrawDocumentView.hxx | 0 sd/source/ui/inc/AccessibleOutlineEditSource.hxx | 0 sd/source/ui/inc/AccessibleOutlineView.hxx | 0 sd/source/ui/inc/AccessiblePageShape.hxx | 0 sd/source/ui/inc/AccessiblePresentationGraphicShape.hxx | 0 sd/source/ui/inc/AccessiblePresentationOLEShape.hxx | 0 sd/source/ui/inc/AccessiblePresentationShape.hxx | 0 sd/source/ui/inc/AccessibleScrollPanel.hxx | 0 sd/source/ui/inc/AccessibleSlideSorterObject.hxx | 0 sd/source/ui/inc/AccessibleSlideSorterView.hxx | 0 sd/source/ui/inc/AccessibleSlideView.hxx | 0 sd/source/ui/inc/AccessibleTaskPane.hxx | 0 sd/source/ui/inc/AccessibleTreeNode.hxx | 0 sd/source/ui/inc/AccessibleViewForwarder.hxx | 0 sd/source/ui/inc/AnimationChildWindow.hxx | 0 sd/source/ui/inc/BezierObjectBar.hxx | 0 sd/source/ui/inc/BreakDlg.hxx | 0 sd/source/ui/inc/Client.hxx | 0 sd/source/ui/inc/ClientView.hxx | 0 sd/source/ui/inc/CustomAnimation.hxx | 0 sd/source/ui/inc/DialogListBox.hxx | 0 sd/source/ui/inc/DocumentRenderer.hxx | 0 sd/source/ui/inc/DrawController.hxx | 0 sd/source/ui/inc/DrawDocShell.hxx | 0 sd/source/ui/inc/DrawSubController.hxx | 2 +- sd/source/ui/inc/DrawViewShell.hxx | 0 sd/source/ui/inc/EventMultiplexer.hxx | 0 sd/source/ui/inc/FormShellManager.hxx | 0 sd/source/ui/inc/FrameView.hxx | 0 sd/source/ui/inc/GraphicDocShell.hxx | 0 sd/source/ui/inc/GraphicObjectBar.hxx | 0 sd/source/ui/inc/GraphicViewShell.hxx | 0 sd/source/ui/inc/GraphicViewShellBase.hxx | 0 sd/source/ui/inc/ImpressViewShellBase.hxx | 0 sd/source/ui/inc/LayerDialog.hrc | 0 sd/source/ui/inc/LayerDialogChildWindow.hxx | 0 sd/source/ui/inc/LayerDialogContent.hxx | 0 sd/source/ui/inc/LayerTabBar.hxx | 0 sd/source/ui/inc/MasterPageObserver.hxx | 0 sd/source/ui/inc/MediaObjectBar.hxx | 0 sd/source/ui/inc/MutexOwner.hxx | 0 sd/source/ui/inc/NavigatorChildWindow.hxx | 0 sd/source/ui/inc/NotesChildWindow.hrc | 0 sd/source/ui/inc/NotesChildWindow.hxx | 0 sd/source/ui/inc/OutlineBulletDlg.hxx | 0 sd/source/ui/inc/OutlineView.hxx | 0 sd/source/ui/inc/OutlineViewShell.hxx | 0 sd/source/ui/inc/OutlineViewShellBase.hxx | 0 sd/source/ui/inc/OutlinerIteratorImpl.hxx | 0 sd/source/ui/inc/PaneChildWindows.hxx | 0 sd/source/ui/inc/PaneDockingWindow.hrc | 0 sd/source/ui/inc/PaneDockingWindow.hxx | 0 sd/source/ui/inc/PaneShells.hxx | 0 sd/source/ui/inc/PresentationViewShell.hxx | 0 sd/source/ui/inc/PresentationViewShellBase.hxx | 0 sd/source/ui/inc/PreviewRenderer.hxx | 0 sd/source/ui/inc/Ruler.hxx | 0 sd/source/ui/inc/SdUnoDrawView.hxx | 0 sd/source/ui/inc/SdUnoOutlineView.hxx | 0 sd/source/ui/inc/SdUnoSlideView.hxx | 0 sd/source/ui/inc/ShellFactory.hxx | 0 sd/source/ui/inc/SlideSorter.hxx | 0 sd/source/ui/inc/SlideSorterChildWindow.hrc | 0 sd/source/ui/inc/SlideSorterChildWindow.hxx | 0 sd/source/ui/inc/SlideSorterViewShell.hxx | 0 sd/source/ui/inc/SlideSorterViewShellBase.hxx | 0 sd/source/ui/inc/SlideView.hxx | 0 sd/source/ui/inc/SlideViewShell.hxx | 0 sd/source/ui/inc/SpellDialogChildWindow.hxx | 0 sd/source/ui/inc/TabControl.hxx | 0 sd/source/ui/inc/TaskPaneViewShell.hxx | 0 sd/source/ui/inc/TemplateScanner.hxx | 0 sd/source/ui/inc/TextLogger.hxx | 0 sd/source/ui/inc/TextObjectBar.hxx | 0 sd/source/ui/inc/ToolBarManager.hxx | 0 sd/source/ui/inc/ToolPanelChildWindow.hrc | 0 sd/source/ui/inc/ToolPanelChildWindow.hxx | 0 sd/source/ui/inc/UpdateLockManager.hxx | 0 sd/source/ui/inc/View.hxx | 0 sd/source/ui/inc/ViewClipboard.hxx | 0 sd/source/ui/inc/ViewShell.hxx | 0 sd/source/ui/inc/ViewShellBase.hxx | 0 sd/source/ui/inc/ViewShellHint.hxx | 0 sd/source/ui/inc/ViewShellImplementation.hxx | 0 sd/source/ui/inc/ViewShellManager.hxx | 0 sd/source/ui/inc/ViewTabBar.hxx | 0 sd/source/ui/inc/ViewTabControl.hxx | 0 sd/source/ui/inc/Window.hxx | 0 sd/source/ui/inc/WindowUpdater.hxx | 0 sd/source/ui/inc/animobjs.hrc | 0 sd/source/ui/inc/animobjs.hxx | 0 sd/source/ui/inc/assclass.hxx | 0 sd/source/ui/inc/bmcache.hxx | 0 sd/source/ui/inc/brkdlg.hrc | 0 sd/source/ui/inc/bulmaper.hxx | 0 sd/source/ui/inc/celltempl.hrc | 0 sd/source/ui/inc/celltempl.hxx | 0 sd/source/ui/inc/cfgids.hxx | 0 sd/source/ui/inc/copydlg.hrc | 0 sd/source/ui/inc/copydlg.hxx | 0 sd/source/ui/inc/custsdlg.hrc | 0 sd/source/ui/inc/custsdlg.hxx | 0 sd/source/ui/inc/diactrl.hxx | 0 sd/source/ui/inc/dialogs.hrc | 0 sd/source/ui/inc/dlg_char.hrc | 0 sd/source/ui/inc/dlg_char.hxx | 0 sd/source/ui/inc/dlgass.hrc | 0 sd/source/ui/inc/dlgass.hxx | 0 sd/source/ui/inc/dlgctrls.hxx | 0 sd/source/ui/inc/dlgfield.hrc | 0 sd/source/ui/inc/dlgfield.hxx | 0 sd/source/ui/inc/dlgolbul.hrc | 0 sd/source/ui/inc/dlgpage.hrc | 0 sd/source/ui/inc/dlgpage.hxx | 0 sd/source/ui/inc/dlgsnap.hrc | 0 sd/source/ui/inc/dlgsnap.hxx | 0 sd/source/ui/inc/docprev.hxx | 0 sd/source/ui/inc/drawview.hxx | 0 sd/source/ui/inc/enumdlg.hrc | 0 sd/source/ui/inc/filedlg.hxx | 0 sd/source/ui/inc/fontwork.hrc | 0 sd/source/ui/inc/framework/Configuration.hxx | 0 sd/source/ui/inc/framework/ConfigurationController.hxx | 0 sd/source/ui/inc/framework/DrawModule.hxx | 0 sd/source/ui/inc/framework/FrameworkHelper.hxx | 0 sd/source/ui/inc/framework/ImpressModule.hxx | 0 sd/source/ui/inc/framework/ModuleController.hxx | 0 sd/source/ui/inc/framework/Pane.hxx | 0 sd/source/ui/inc/framework/PresentationFactory.hxx | 0 sd/source/ui/inc/framework/PresentationModule.hxx | 0 sd/source/ui/inc/framework/ResourceId.hxx | 0 sd/source/ui/inc/framework/ViewShellWrapper.hxx | 0 sd/source/ui/inc/fuarea.hxx | 0 sd/source/ui/inc/fubullet.hxx | 0 sd/source/ui/inc/fuchar.hxx | 0 sd/source/ui/inc/fucon3d.hxx | 0 sd/source/ui/inc/fuconarc.hxx | 0 sd/source/ui/inc/fuconbez.hxx | 0 sd/source/ui/inc/fuconcs.hxx | 0 sd/source/ui/inc/fuconnct.hxx | 0 sd/source/ui/inc/fuconrec.hxx | 0 sd/source/ui/inc/fuconstr.hxx | 0 sd/source/ui/inc/fuconuno.hxx | 0 sd/source/ui/inc/fucopy.hxx | 0 sd/source/ui/inc/fucushow.hxx | 0 sd/source/ui/inc/fudraw.hxx | 0 sd/source/ui/inc/fudspord.hxx | 0 sd/source/ui/inc/fuediglu.hxx | 0 sd/source/ui/inc/fuexpand.hxx | 0 sd/source/ui/inc/fuformatpaintbrush.hxx | 0 sd/source/ui/inc/fugrid.hxx | 0 sd/source/ui/inc/fuhhconv.hxx | 0 sd/source/ui/inc/fuinsert.hxx | 0 sd/source/ui/inc/fuinsfil.hxx | 0 sd/source/ui/inc/fuline.hxx | 0 sd/source/ui/inc/fulinend.hxx | 0 sd/source/ui/inc/fulink.hxx | 0 sd/source/ui/inc/fumeasur.hxx | 0 sd/source/ui/inc/fumorph.hxx | 0 sd/source/ui/inc/fuoaprms.hxx | 0 sd/source/ui/inc/fuolbull.hxx | 0 sd/source/ui/inc/fuoltext.hxx | 0 sd/source/ui/inc/fuoutl.hxx | 0 sd/source/ui/inc/fupage.hxx | 0 sd/source/ui/inc/fuparagr.hxx | 0 sd/source/ui/inc/fupoor.hxx | 0 sd/source/ui/inc/fuprlout.hxx | 0 sd/source/ui/inc/fuprobjs.hxx | 0 sd/source/ui/inc/fuscale.hxx | 0 sd/source/ui/inc/fusearch.hxx | 0 sd/source/ui/inc/fusel.hxx | 0 sd/source/ui/inc/fusldlg.hxx | 0 sd/source/ui/inc/fuslhide.hxx | 0 sd/source/ui/inc/fuslid.hxx | 0 sd/source/ui/inc/fuslsel.hxx | 0 sd/source/ui/inc/fusnapln.hxx | 0 sd/source/ui/inc/fuspell.hxx | 0 sd/source/ui/inc/fusumry.hxx | 0 sd/source/ui/inc/futempl.hxx | 0 sd/source/ui/inc/futext.hxx | 0 sd/source/ui/inc/futhes.hxx | 0 sd/source/ui/inc/futransf.hxx | 0 sd/source/ui/inc/futxtatt.hxx | 0 sd/source/ui/inc/fuvect.hxx | 0 sd/source/ui/inc/fuzoom.hxx | 0 sd/source/ui/inc/gluectrl.hxx | 0 sd/source/ui/inc/headerfooterdlg.hrc | 0 sd/source/ui/inc/headerfooterdlg.hxx | 0 sd/source/ui/inc/ins_paste.hrc | 0 sd/source/ui/inc/ins_paste.hxx | 0 sd/source/ui/inc/inspagob.hrc | 0 sd/source/ui/inc/inspagob.hxx | 0 sd/source/ui/inc/layeroptionsdlg.hrc | 0 sd/source/ui/inc/layeroptionsdlg.hxx | 0 sd/source/ui/inc/masterlayoutdlg.hrc | 0 sd/source/ui/inc/masterlayoutdlg.hxx | 0 sd/source/ui/inc/morphdlg.hrc | 0 sd/source/ui/inc/morphdlg.hxx | 0 sd/source/ui/inc/navigatr.hrc | 0 sd/source/ui/inc/navigatr.hxx | 0 sd/source/ui/inc/optdlg.hrc | 0 sd/source/ui/inc/optdlg.hxx | 0 sd/source/ui/inc/optsitem.hxx | 0 sd/source/ui/inc/outlinfo.hxx | 0 sd/source/ui/inc/packgdlg.hrc | 0 sd/source/ui/inc/paragr.hrc | 0 sd/source/ui/inc/paragr.hxx | 0 sd/source/ui/inc/pgjump.hxx | 0 sd/source/ui/inc/present.hrc | 0 sd/source/ui/inc/present.hxx | 0 sd/source/ui/inc/preview.hrc | 0 sd/source/ui/inc/printdialog.hxx | 0 sd/source/ui/inc/printdlg.hrc | 0 sd/source/ui/inc/printdlg.hxx | 0 sd/source/ui/inc/prltempl.hrc | 0 sd/source/ui/inc/prltempl.hxx | 0 sd/source/ui/inc/prntopts.hrc | 0 sd/source/ui/inc/prntopts.hxx | 0 sd/source/ui/inc/pubdlg.hrc | 0 sd/source/ui/inc/pubdlg.hxx | 0 sd/source/ui/inc/res_bmp.hrc | 0 sd/source/ui/inc/sdpopup.hxx | 0 sd/source/ui/inc/sdpreslt.hrc | 0 sd/source/ui/inc/sdpreslt.hxx | 0 sd/source/ui/inc/sdstring.hrc | 0 sd/source/ui/inc/sdtreelb.hxx | 0 sd/source/ui/inc/sdundogr.hxx | 0 sd/source/ui/inc/sdxfer.hxx | 0 sd/source/ui/inc/showview.hxx | 0 sd/source/ui/inc/slideshow.hxx | 0 sd/source/ui/inc/smarttag.hxx | 0 sd/source/ui/inc/sprite.hxx | 0 sd/source/ui/inc/strings.hrc | 0 sd/source/ui/inc/tabtempl.hrc | 0 sd/source/ui/inc/tabtempl.hxx | 0 sd/source/ui/inc/taskpane/ControlContainer.hxx | 0 sd/source/ui/inc/taskpane/ILayoutableWindow.hxx | 0 sd/source/ui/inc/taskpane/ScrollPanel.hxx | 0 sd/source/ui/inc/taskpane/SlideSorterCacheDisplay.hxx | 0 sd/source/ui/inc/taskpane/SubToolPanel.hxx | 0 sd/source/ui/inc/taskpane/TaskPaneControlFactory.hxx | 0 sd/source/ui/inc/taskpane/TaskPaneTreeNode.hxx | 0 sd/source/ui/inc/taskpane/TitleBar.hxx | 0 sd/source/ui/inc/taskpane/TitledControl.hxx | 0 sd/source/ui/inc/taskpane/ToolPanel.hxx | 0 sd/source/ui/inc/tbx_ww.hrc | 0 sd/source/ui/inc/tbx_ww.hxx | 0 sd/source/ui/inc/tmplctrl.hxx | 0 sd/source/ui/inc/tools/AsynchronousCall.hxx | 0 sd/source/ui/inc/tools/AsynchronousTask.hxx | 0 sd/source/ui/inc/tools/ConfigurationAccess.hxx | 0 sd/source/ui/inc/tools/IconCache.hxx | 0 sd/source/ui/inc/tools/IdleDetection.hxx | 0 sd/source/ui/inc/tools/PropertySet.hxx | 0 sd/source/ui/inc/tools/SdGlobalResourceContainer.hxx | 0 sd/source/ui/inc/tools/SlotStateListener.hxx | 0 sd/source/ui/inc/tools/TimerBasedTaskExecution.hxx | 0 sd/source/ui/inc/tpaction.hrc | 0 sd/source/ui/inc/tpaction.hxx | 0 sd/source/ui/inc/tpoption.hrc | 0 sd/source/ui/inc/tpoption.hxx | 0 sd/source/ui/inc/unchss.hxx | 0 sd/source/ui/inc/undoback.hxx | 0 sd/source/ui/inc/undoheaderfooter.hxx | 0 sd/source/ui/inc/undolayer.hxx | 0 sd/source/ui/inc/undopage.hxx | 0 sd/source/ui/inc/unmodpg.hxx | 0 sd/source/ui/inc/unmovss.hxx | 0 sd/source/ui/inc/unoaprms.hxx | 0 sd/source/ui/inc/unokywds.hxx | 0 sd/source/ui/inc/unomodel.hxx | 0 sd/source/ui/inc/unoprnms.hxx | 0 sd/source/ui/inc/unosrch.hxx | 0 sd/source/ui/inc/unprlout.hxx | 0 sd/source/ui/inc/unslsel.hxx | 0 sd/source/ui/inc/vectdlg.hrc | 0 sd/source/ui/inc/vectdlg.hxx | 0 sd/source/ui/inc/view/viewoverlaymanager.hxx | 0 sd/source/ui/inc/zoomlist.hxx | 0 281 files changed, 1 insertion(+), 1 deletion(-) mode change 100644 => 100755 sd/source/ui/inc/3dchld.hxx mode change 100644 => 100755 sd/source/ui/inc/AccessibleDocumentViewBase.hxx mode change 100644 => 100755 sd/source/ui/inc/AccessibleDrawDocumentView.hxx mode change 100644 => 100755 sd/source/ui/inc/AccessibleOutlineEditSource.hxx mode change 100644 => 100755 sd/source/ui/inc/AccessibleOutlineView.hxx mode change 100644 => 100755 sd/source/ui/inc/AccessiblePageShape.hxx mode change 100644 => 100755 sd/source/ui/inc/AccessiblePresentationGraphicShape.hxx mode change 100644 => 100755 sd/source/ui/inc/AccessiblePresentationOLEShape.hxx mode change 100644 => 100755 sd/source/ui/inc/AccessiblePresentationShape.hxx mode change 100644 => 100755 sd/source/ui/inc/AccessibleScrollPanel.hxx mode change 100644 => 100755 sd/source/ui/inc/AccessibleSlideSorterObject.hxx mode change 100644 => 100755 sd/source/ui/inc/AccessibleSlideSorterView.hxx mode change 100644 => 100755 sd/source/ui/inc/AccessibleSlideView.hxx mode change 100644 => 100755 sd/source/ui/inc/AccessibleTaskPane.hxx mode change 100644 => 100755 sd/source/ui/inc/AccessibleTreeNode.hxx mode change 100644 => 100755 sd/source/ui/inc/AccessibleViewForwarder.hxx mode change 100644 => 100755 sd/source/ui/inc/AnimationChildWindow.hxx mode change 100644 => 100755 sd/source/ui/inc/BezierObjectBar.hxx mode change 100644 => 100755 sd/source/ui/inc/BreakDlg.hxx mode change 100644 => 100755 sd/source/ui/inc/Client.hxx mode change 100644 => 100755 sd/source/ui/inc/ClientView.hxx mode change 100644 => 100755 sd/source/ui/inc/CustomAnimation.hxx mode change 100644 => 100755 sd/source/ui/inc/DialogListBox.hxx mode change 100644 => 100755 sd/source/ui/inc/DocumentRenderer.hxx mode change 100644 => 100755 sd/source/ui/inc/DrawController.hxx mode change 100644 => 100755 sd/source/ui/inc/DrawDocShell.hxx mode change 100644 => 100755 sd/source/ui/inc/DrawSubController.hxx mode change 100644 => 100755 sd/source/ui/inc/DrawViewShell.hxx mode change 100644 => 100755 sd/source/ui/inc/EventMultiplexer.hxx mode change 100644 => 100755 sd/source/ui/inc/FormShellManager.hxx mode change 100644 => 100755 sd/source/ui/inc/FrameView.hxx mode change 100644 => 100755 sd/source/ui/inc/GraphicDocShell.hxx mode change 100644 => 100755 sd/source/ui/inc/GraphicObjectBar.hxx mode change 100644 => 100755 sd/source/ui/inc/GraphicViewShell.hxx mode change 100644 => 100755 sd/source/ui/inc/GraphicViewShellBase.hxx mode change 100644 => 100755 sd/source/ui/inc/ImpressViewShellBase.hxx mode change 100644 => 100755 sd/source/ui/inc/LayerDialog.hrc mode change 100644 => 100755 sd/source/ui/inc/LayerDialogChildWindow.hxx mode change 100644 => 100755 sd/source/ui/inc/LayerDialogContent.hxx mode change 100644 => 100755 sd/source/ui/inc/LayerTabBar.hxx mode change 100644 => 100755 sd/source/ui/inc/MasterPageObserver.hxx mode change 100644 => 100755 sd/source/ui/inc/MediaObjectBar.hxx mode change 100644 => 100755 sd/source/ui/inc/MutexOwner.hxx mode change 100644 => 100755 sd/source/ui/inc/NavigatorChildWindow.hxx mode change 100644 => 100755 sd/source/ui/inc/NotesChildWindow.hrc mode change 100644 => 100755 sd/source/ui/inc/NotesChildWindow.hxx mode change 100644 => 100755 sd/source/ui/inc/OutlineBulletDlg.hxx mode change 100644 => 100755 sd/source/ui/inc/OutlineView.hxx mode change 100644 => 100755 sd/source/ui/inc/OutlineViewShell.hxx mode change 100644 => 100755 sd/source/ui/inc/OutlineViewShellBase.hxx mode change 100644 => 100755 sd/source/ui/inc/OutlinerIteratorImpl.hxx mode change 100644 => 100755 sd/source/ui/inc/PaneChildWindows.hxx mode change 100644 => 100755 sd/source/ui/inc/PaneDockingWindow.hrc mode change 100644 => 100755 sd/source/ui/inc/PaneDockingWindow.hxx mode change 100644 => 100755 sd/source/ui/inc/PaneShells.hxx mode change 100644 => 100755 sd/source/ui/inc/PresentationViewShell.hxx mode change 100644 => 100755 sd/source/ui/inc/PresentationViewShellBase.hxx mode change 100644 => 100755 sd/source/ui/inc/PreviewRenderer.hxx mode change 100644 => 100755 sd/source/ui/inc/Ruler.hxx mode change 100644 => 100755 sd/source/ui/inc/SdUnoDrawView.hxx mode change 100644 => 100755 sd/source/ui/inc/SdUnoOutlineView.hxx mode change 100644 => 100755 sd/source/ui/inc/SdUnoSlideView.hxx mode change 100644 => 100755 sd/source/ui/inc/ShellFactory.hxx mode change 100644 => 100755 sd/source/ui/inc/SlideSorter.hxx mode change 100644 => 100755 sd/source/ui/inc/SlideSorterChildWindow.hrc mode change 100644 => 100755 sd/source/ui/inc/SlideSorterChildWindow.hxx mode change 100644 => 100755 sd/source/ui/inc/SlideSorterViewShell.hxx mode change 100644 => 100755 sd/source/ui/inc/SlideSorterViewShellBase.hxx mode change 100644 => 100755 sd/source/ui/inc/SlideView.hxx mode change 100644 => 100755 sd/source/ui/inc/SlideViewShell.hxx mode change 100644 => 100755 sd/source/ui/inc/SpellDialogChildWindow.hxx mode change 100644 => 100755 sd/source/ui/inc/TabControl.hxx mode change 100644 => 100755 sd/source/ui/inc/TaskPaneViewShell.hxx mode change 100644 => 100755 sd/source/ui/inc/TemplateScanner.hxx mode change 100644 => 100755 sd/source/ui/inc/TextLogger.hxx mode change 100644 => 100755 sd/source/ui/inc/TextObjectBar.hxx mode change 100644 => 100755 sd/source/ui/inc/ToolBarManager.hxx mode change 100644 => 100755 sd/source/ui/inc/ToolPanelChildWindow.hrc mode change 100644 => 100755 sd/source/ui/inc/ToolPanelChildWindow.hxx mode change 100644 => 100755 sd/source/ui/inc/UpdateLockManager.hxx mode change 100644 => 100755 sd/source/ui/inc/View.hxx mode change 100644 => 100755 sd/source/ui/inc/ViewClipboard.hxx mode change 100644 => 100755 sd/source/ui/inc/ViewShell.hxx mode change 100644 => 100755 sd/source/ui/inc/ViewShellBase.hxx mode change 100644 => 100755 sd/source/ui/inc/ViewShellHint.hxx mode change 100644 => 100755 sd/source/ui/inc/ViewShellImplementation.hxx mode change 100644 => 100755 sd/source/ui/inc/ViewShellManager.hxx mode change 100644 => 100755 sd/source/ui/inc/ViewTabBar.hxx mode change 100644 => 100755 sd/source/ui/inc/ViewTabControl.hxx mode change 100644 => 100755 sd/source/ui/inc/Window.hxx mode change 100644 => 100755 sd/source/ui/inc/WindowUpdater.hxx mode change 100644 => 100755 sd/source/ui/inc/animobjs.hrc mode change 100644 => 100755 sd/source/ui/inc/animobjs.hxx mode change 100644 => 100755 sd/source/ui/inc/assclass.hxx mode change 100644 => 100755 sd/source/ui/inc/bmcache.hxx mode change 100644 => 100755 sd/source/ui/inc/brkdlg.hrc mode change 100644 => 100755 sd/source/ui/inc/bulmaper.hxx mode change 100644 => 100755 sd/source/ui/inc/celltempl.hrc mode change 100644 => 100755 sd/source/ui/inc/celltempl.hxx mode change 100644 => 100755 sd/source/ui/inc/cfgids.hxx mode change 100644 => 100755 sd/source/ui/inc/copydlg.hrc mode change 100644 => 100755 sd/source/ui/inc/copydlg.hxx mode change 100644 => 100755 sd/source/ui/inc/custsdlg.hrc mode change 100644 => 100755 sd/source/ui/inc/custsdlg.hxx mode change 100644 => 100755 sd/source/ui/inc/diactrl.hxx mode change 100644 => 100755 sd/source/ui/inc/dialogs.hrc mode change 100644 => 100755 sd/source/ui/inc/dlg_char.hrc mode change 100644 => 100755 sd/source/ui/inc/dlg_char.hxx mode change 100644 => 100755 sd/source/ui/inc/dlgass.hrc mode change 100644 => 100755 sd/source/ui/inc/dlgass.hxx mode change 100644 => 100755 sd/source/ui/inc/dlgctrls.hxx mode change 100644 => 100755 sd/source/ui/inc/dlgfield.hrc mode change 100644 => 100755 sd/source/ui/inc/dlgfield.hxx mode change 100644 => 100755 sd/source/ui/inc/dlgolbul.hrc mode change 100644 => 100755 sd/source/ui/inc/dlgpage.hrc mode change 100644 => 100755 sd/source/ui/inc/dlgpage.hxx mode change 100644 => 100755 sd/source/ui/inc/dlgsnap.hrc mode change 100644 => 100755 sd/source/ui/inc/dlgsnap.hxx mode change 100644 => 100755 sd/source/ui/inc/docprev.hxx mode change 100644 => 100755 sd/source/ui/inc/drawview.hxx mode change 100644 => 100755 sd/source/ui/inc/enumdlg.hrc mode change 100644 => 100755 sd/source/ui/inc/filedlg.hxx mode change 100644 => 100755 sd/source/ui/inc/fontwork.hrc mode change 100644 => 100755 sd/source/ui/inc/framework/Configuration.hxx mode change 100644 => 100755 sd/source/ui/inc/framework/ConfigurationController.hxx mode change 100644 => 100755 sd/source/ui/inc/framework/DrawModule.hxx mode change 100644 => 100755 sd/source/ui/inc/framework/FrameworkHelper.hxx mode change 100644 => 100755 sd/source/ui/inc/framework/ImpressModule.hxx mode change 100644 => 100755 sd/source/ui/inc/framework/ModuleController.hxx mode change 100644 => 100755 sd/source/ui/inc/framework/Pane.hxx mode change 100644 => 100755 sd/source/ui/inc/framework/PresentationFactory.hxx mode change 100644 => 100755 sd/source/ui/inc/framework/PresentationModule.hxx mode change 100644 => 100755 sd/source/ui/inc/framework/ResourceId.hxx mode change 100644 => 100755 sd/source/ui/inc/framework/ViewShellWrapper.hxx mode change 100644 => 100755 sd/source/ui/inc/fuarea.hxx mode change 100644 => 100755 sd/source/ui/inc/fubullet.hxx mode change 100644 => 100755 sd/source/ui/inc/fuchar.hxx mode change 100644 => 100755 sd/source/ui/inc/fucon3d.hxx mode change 100644 => 100755 sd/source/ui/inc/fuconarc.hxx mode change 100644 => 100755 sd/source/ui/inc/fuconbez.hxx mode change 100644 => 100755 sd/source/ui/inc/fuconcs.hxx mode change 100644 => 100755 sd/source/ui/inc/fuconnct.hxx mode change 100644 => 100755 sd/source/ui/inc/fuconrec.hxx mode change 100644 => 100755 sd/source/ui/inc/fuconstr.hxx mode change 100644 => 100755 sd/source/ui/inc/fuconuno.hxx mode change 100644 => 100755 sd/source/ui/inc/fucopy.hxx mode change 100644 => 100755 sd/source/ui/inc/fucushow.hxx mode change 100644 => 100755 sd/source/ui/inc/fudraw.hxx mode change 100644 => 100755 sd/source/ui/inc/fudspord.hxx mode change 100644 => 100755 sd/source/ui/inc/fuediglu.hxx mode change 100644 => 100755 sd/source/ui/inc/fuexpand.hxx mode change 100644 => 100755 sd/source/ui/inc/fuformatpaintbrush.hxx mode change 100644 => 100755 sd/source/ui/inc/fugrid.hxx mode change 100644 => 100755 sd/source/ui/inc/fuhhconv.hxx mode change 100644 => 100755 sd/source/ui/inc/fuinsert.hxx mode change 100644 => 100755 sd/source/ui/inc/fuinsfil.hxx mode change 100644 => 100755 sd/source/ui/inc/fuline.hxx mode change 100644 => 100755 sd/source/ui/inc/fulinend.hxx mode change 100644 => 100755 sd/source/ui/inc/fulink.hxx mode change 100644 => 100755 sd/source/ui/inc/fumeasur.hxx mode change 100644 => 100755 sd/source/ui/inc/fumorph.hxx mode change 100644 => 100755 sd/source/ui/inc/fuoaprms.hxx mode change 100644 => 100755 sd/source/ui/inc/fuolbull.hxx mode change 100644 => 100755 sd/source/ui/inc/fuoltext.hxx mode change 100644 => 100755 sd/source/ui/inc/fuoutl.hxx mode change 100644 => 100755 sd/source/ui/inc/fupage.hxx mode change 100644 => 100755 sd/source/ui/inc/fuparagr.hxx mode change 100644 => 100755 sd/source/ui/inc/fupoor.hxx mode change 100644 => 100755 sd/source/ui/inc/fuprlout.hxx mode change 100644 => 100755 sd/source/ui/inc/fuprobjs.hxx mode change 100644 => 100755 sd/source/ui/inc/fuscale.hxx mode change 100644 => 100755 sd/source/ui/inc/fusearch.hxx mode change 100644 => 100755 sd/source/ui/inc/fusel.hxx mode change 100644 => 100755 sd/source/ui/inc/fusldlg.hxx mode change 100644 => 100755 sd/source/ui/inc/fuslhide.hxx mode change 100644 => 100755 sd/source/ui/inc/fuslid.hxx mode change 100644 => 100755 sd/source/ui/inc/fuslsel.hxx mode change 100644 => 100755 sd/source/ui/inc/fusnapln.hxx mode change 100644 => 100755 sd/source/ui/inc/fuspell.hxx mode change 100644 => 100755 sd/source/ui/inc/fusumry.hxx mode change 100644 => 100755 sd/source/ui/inc/futempl.hxx mode change 100644 => 100755 sd/source/ui/inc/futext.hxx mode change 100644 => 100755 sd/source/ui/inc/futhes.hxx mode change 100644 => 100755 sd/source/ui/inc/futransf.hxx mode change 100644 => 100755 sd/source/ui/inc/futxtatt.hxx mode change 100644 => 100755 sd/source/ui/inc/fuvect.hxx mode change 100644 => 100755 sd/source/ui/inc/fuzoom.hxx mode change 100644 => 100755 sd/source/ui/inc/gluectrl.hxx mode change 100644 => 100755 sd/source/ui/inc/headerfooterdlg.hrc mode change 100644 => 100755 sd/source/ui/inc/headerfooterdlg.hxx mode change 100644 => 100755 sd/source/ui/inc/ins_paste.hrc mode change 100644 => 100755 sd/source/ui/inc/ins_paste.hxx mode change 100644 => 100755 sd/source/ui/inc/inspagob.hrc mode change 100644 => 100755 sd/source/ui/inc/inspagob.hxx mode change 100644 => 100755 sd/source/ui/inc/layeroptionsdlg.hrc mode change 100644 => 100755 sd/source/ui/inc/layeroptionsdlg.hxx mode change 100644 => 100755 sd/source/ui/inc/masterlayoutdlg.hrc mode change 100644 => 100755 sd/source/ui/inc/masterlayoutdlg.hxx mode change 100644 => 100755 sd/source/ui/inc/morphdlg.hrc mode change 100644 => 100755 sd/source/ui/inc/morphdlg.hxx mode change 100644 => 100755 sd/source/ui/inc/navigatr.hrc mode change 100644 => 100755 sd/source/ui/inc/navigatr.hxx mode change 100644 => 100755 sd/source/ui/inc/optdlg.hrc mode change 100644 => 100755 sd/source/ui/inc/optdlg.hxx mode change 100644 => 100755 sd/source/ui/inc/optsitem.hxx mode change 100644 => 100755 sd/source/ui/inc/outlinfo.hxx mode change 100644 => 100755 sd/source/ui/inc/packgdlg.hrc mode change 100644 => 100755 sd/source/ui/inc/paragr.hrc mode change 100644 => 100755 sd/source/ui/inc/paragr.hxx mode change 100644 => 100755 sd/source/ui/inc/pgjump.hxx mode change 100644 => 100755 sd/source/ui/inc/present.hrc mode change 100644 => 100755 sd/source/ui/inc/present.hxx mode change 100644 => 100755 sd/source/ui/inc/preview.hrc mode change 100644 => 100755 sd/source/ui/inc/printdialog.hxx mode change 100644 => 100755 sd/source/ui/inc/printdlg.hrc mode change 100644 => 100755 sd/source/ui/inc/printdlg.hxx mode change 100644 => 100755 sd/source/ui/inc/prltempl.hrc mode change 100644 => 100755 sd/source/ui/inc/prltempl.hxx mode change 100644 => 100755 sd/source/ui/inc/prntopts.hrc mode change 100644 => 100755 sd/source/ui/inc/prntopts.hxx mode change 100644 => 100755 sd/source/ui/inc/pubdlg.hrc mode change 100644 => 100755 sd/source/ui/inc/pubdlg.hxx mode change 100644 => 100755 sd/source/ui/inc/res_bmp.hrc mode change 100644 => 100755 sd/source/ui/inc/sdpopup.hxx mode change 100644 => 100755 sd/source/ui/inc/sdpreslt.hrc mode change 100644 => 100755 sd/source/ui/inc/sdpreslt.hxx mode change 100644 => 100755 sd/source/ui/inc/sdstring.hrc mode change 100644 => 100755 sd/source/ui/inc/sdtreelb.hxx mode change 100644 => 100755 sd/source/ui/inc/sdundogr.hxx mode change 100644 => 100755 sd/source/ui/inc/sdxfer.hxx mode change 100644 => 100755 sd/source/ui/inc/showview.hxx mode change 100644 => 100755 sd/source/ui/inc/slideshow.hxx mode change 100644 => 100755 sd/source/ui/inc/smarttag.hxx mode change 100644 => 100755 sd/source/ui/inc/sprite.hxx mode change 100644 => 100755 sd/source/ui/inc/strings.hrc mode change 100644 => 100755 sd/source/ui/inc/tabtempl.hrc mode change 100644 => 100755 sd/source/ui/inc/tabtempl.hxx mode change 100644 => 100755 sd/source/ui/inc/taskpane/ControlContainer.hxx mode change 100644 => 100755 sd/source/ui/inc/taskpane/ILayoutableWindow.hxx mode change 100644 => 100755 sd/source/ui/inc/taskpane/ScrollPanel.hxx mode change 100644 => 100755 sd/source/ui/inc/taskpane/SlideSorterCacheDisplay.hxx mode change 100644 => 100755 sd/source/ui/inc/taskpane/SubToolPanel.hxx mode change 100644 => 100755 sd/source/ui/inc/taskpane/TaskPaneControlFactory.hxx mode change 100644 => 100755 sd/source/ui/inc/taskpane/TaskPaneTreeNode.hxx mode change 100644 => 100755 sd/source/ui/inc/taskpane/TitleBar.hxx mode change 100644 => 100755 sd/source/ui/inc/taskpane/TitledControl.hxx mode change 100644 => 100755 sd/source/ui/inc/taskpane/ToolPanel.hxx mode change 100644 => 100755 sd/source/ui/inc/tbx_ww.hrc mode change 100644 => 100755 sd/source/ui/inc/tbx_ww.hxx mode change 100644 => 100755 sd/source/ui/inc/tmplctrl.hxx mode change 100644 => 100755 sd/source/ui/inc/tools/AsynchronousCall.hxx mode change 100644 => 100755 sd/source/ui/inc/tools/AsynchronousTask.hxx mode change 100644 => 100755 sd/source/ui/inc/tools/ConfigurationAccess.hxx mode change 100644 => 100755 sd/source/ui/inc/tools/IconCache.hxx mode change 100644 => 100755 sd/source/ui/inc/tools/IdleDetection.hxx mode change 100644 => 100755 sd/source/ui/inc/tools/PropertySet.hxx mode change 100644 => 100755 sd/source/ui/inc/tools/SdGlobalResourceContainer.hxx mode change 100644 => 100755 sd/source/ui/inc/tools/SlotStateListener.hxx mode change 100644 => 100755 sd/source/ui/inc/tools/TimerBasedTaskExecution.hxx mode change 100644 => 100755 sd/source/ui/inc/tpaction.hrc mode change 100644 => 100755 sd/source/ui/inc/tpaction.hxx mode change 100644 => 100755 sd/source/ui/inc/tpoption.hrc mode change 100644 => 100755 sd/source/ui/inc/tpoption.hxx mode change 100644 => 100755 sd/source/ui/inc/unchss.hxx mode change 100644 => 100755 sd/source/ui/inc/undoback.hxx mode change 100644 => 100755 sd/source/ui/inc/undoheaderfooter.hxx mode change 100644 => 100755 sd/source/ui/inc/undolayer.hxx mode change 100644 => 100755 sd/source/ui/inc/undopage.hxx mode change 100644 => 100755 sd/source/ui/inc/unmodpg.hxx mode change 100644 => 100755 sd/source/ui/inc/unmovss.hxx mode change 100644 => 100755 sd/source/ui/inc/unoaprms.hxx mode change 100644 => 100755 sd/source/ui/inc/unokywds.hxx mode change 100644 => 100755 sd/source/ui/inc/unomodel.hxx mode change 100644 => 100755 sd/source/ui/inc/unoprnms.hxx mode change 100644 => 100755 sd/source/ui/inc/unosrch.hxx mode change 100644 => 100755 sd/source/ui/inc/unprlout.hxx mode change 100644 => 100755 sd/source/ui/inc/unslsel.hxx mode change 100644 => 100755 sd/source/ui/inc/vectdlg.hrc mode change 100644 => 100755 sd/source/ui/inc/vectdlg.hxx mode change 100644 => 100755 sd/source/ui/inc/view/viewoverlaymanager.hxx mode change 100644 => 100755 sd/source/ui/inc/zoomlist.hxx (limited to 'sd/source/ui/inc') diff --git a/sd/source/ui/inc/3dchld.hxx b/sd/source/ui/inc/3dchld.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/AccessibleDocumentViewBase.hxx b/sd/source/ui/inc/AccessibleDocumentViewBase.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/AccessibleDrawDocumentView.hxx b/sd/source/ui/inc/AccessibleDrawDocumentView.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/AccessibleOutlineEditSource.hxx b/sd/source/ui/inc/AccessibleOutlineEditSource.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/AccessibleOutlineView.hxx b/sd/source/ui/inc/AccessibleOutlineView.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/AccessiblePageShape.hxx b/sd/source/ui/inc/AccessiblePageShape.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/AccessiblePresentationGraphicShape.hxx b/sd/source/ui/inc/AccessiblePresentationGraphicShape.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/AccessiblePresentationOLEShape.hxx b/sd/source/ui/inc/AccessiblePresentationOLEShape.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/AccessiblePresentationShape.hxx b/sd/source/ui/inc/AccessiblePresentationShape.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/AccessibleScrollPanel.hxx b/sd/source/ui/inc/AccessibleScrollPanel.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/AccessibleSlideSorterObject.hxx b/sd/source/ui/inc/AccessibleSlideSorterObject.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/AccessibleSlideSorterView.hxx b/sd/source/ui/inc/AccessibleSlideSorterView.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/AccessibleSlideView.hxx b/sd/source/ui/inc/AccessibleSlideView.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/AccessibleTaskPane.hxx b/sd/source/ui/inc/AccessibleTaskPane.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/AccessibleTreeNode.hxx b/sd/source/ui/inc/AccessibleTreeNode.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/AccessibleViewForwarder.hxx b/sd/source/ui/inc/AccessibleViewForwarder.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/AnimationChildWindow.hxx b/sd/source/ui/inc/AnimationChildWindow.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/BezierObjectBar.hxx b/sd/source/ui/inc/BezierObjectBar.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/BreakDlg.hxx b/sd/source/ui/inc/BreakDlg.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/Client.hxx b/sd/source/ui/inc/Client.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/ClientView.hxx b/sd/source/ui/inc/ClientView.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/CustomAnimation.hxx b/sd/source/ui/inc/CustomAnimation.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/DialogListBox.hxx b/sd/source/ui/inc/DialogListBox.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/DocumentRenderer.hxx b/sd/source/ui/inc/DocumentRenderer.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/DrawController.hxx b/sd/source/ui/inc/DrawController.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/DrawDocShell.hxx b/sd/source/ui/inc/DrawDocShell.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/DrawSubController.hxx b/sd/source/ui/inc/DrawSubController.hxx old mode 100644 new mode 100755 index 3b02d74d05c0..22d3afb5dd4a --- a/sd/source/ui/inc/DrawSubController.hxx +++ b/sd/source/ui/inc/DrawSubController.hxx @@ -32,7 +32,7 @@ #include #include -namespace { +namespace sd { class DrawSubControllerInterfaceBase : public ::cppu::WeakComponentImplHelper2< ::com::sun::star::drawing::XDrawSubController, diff --git a/sd/source/ui/inc/DrawViewShell.hxx b/sd/source/ui/inc/DrawViewShell.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/EventMultiplexer.hxx b/sd/source/ui/inc/EventMultiplexer.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/FormShellManager.hxx b/sd/source/ui/inc/FormShellManager.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/FrameView.hxx b/sd/source/ui/inc/FrameView.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/GraphicDocShell.hxx b/sd/source/ui/inc/GraphicDocShell.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/GraphicObjectBar.hxx b/sd/source/ui/inc/GraphicObjectBar.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/GraphicViewShell.hxx b/sd/source/ui/inc/GraphicViewShell.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/GraphicViewShellBase.hxx b/sd/source/ui/inc/GraphicViewShellBase.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/ImpressViewShellBase.hxx b/sd/source/ui/inc/ImpressViewShellBase.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/LayerDialog.hrc b/sd/source/ui/inc/LayerDialog.hrc old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/LayerDialogChildWindow.hxx b/sd/source/ui/inc/LayerDialogChildWindow.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/LayerDialogContent.hxx b/sd/source/ui/inc/LayerDialogContent.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/LayerTabBar.hxx b/sd/source/ui/inc/LayerTabBar.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/MasterPageObserver.hxx b/sd/source/ui/inc/MasterPageObserver.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/MediaObjectBar.hxx b/sd/source/ui/inc/MediaObjectBar.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/MutexOwner.hxx b/sd/source/ui/inc/MutexOwner.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/NavigatorChildWindow.hxx b/sd/source/ui/inc/NavigatorChildWindow.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/NotesChildWindow.hrc b/sd/source/ui/inc/NotesChildWindow.hrc old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/NotesChildWindow.hxx b/sd/source/ui/inc/NotesChildWindow.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/OutlineBulletDlg.hxx b/sd/source/ui/inc/OutlineBulletDlg.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/OutlineView.hxx b/sd/source/ui/inc/OutlineView.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/OutlineViewShell.hxx b/sd/source/ui/inc/OutlineViewShell.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/OutlineViewShellBase.hxx b/sd/source/ui/inc/OutlineViewShellBase.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/OutlinerIteratorImpl.hxx b/sd/source/ui/inc/OutlinerIteratorImpl.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/PaneChildWindows.hxx b/sd/source/ui/inc/PaneChildWindows.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/PaneDockingWindow.hrc b/sd/source/ui/inc/PaneDockingWindow.hrc old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/PaneDockingWindow.hxx b/sd/source/ui/inc/PaneDockingWindow.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/PaneShells.hxx b/sd/source/ui/inc/PaneShells.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/PresentationViewShell.hxx b/sd/source/ui/inc/PresentationViewShell.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/PresentationViewShellBase.hxx b/sd/source/ui/inc/PresentationViewShellBase.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/PreviewRenderer.hxx b/sd/source/ui/inc/PreviewRenderer.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/Ruler.hxx b/sd/source/ui/inc/Ruler.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/SdUnoDrawView.hxx b/sd/source/ui/inc/SdUnoDrawView.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/SdUnoOutlineView.hxx b/sd/source/ui/inc/SdUnoOutlineView.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/SdUnoSlideView.hxx b/sd/source/ui/inc/SdUnoSlideView.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/ShellFactory.hxx b/sd/source/ui/inc/ShellFactory.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/SlideSorter.hxx b/sd/source/ui/inc/SlideSorter.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/SlideSorterChildWindow.hrc b/sd/source/ui/inc/SlideSorterChildWindow.hrc old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/SlideSorterChildWindow.hxx b/sd/source/ui/inc/SlideSorterChildWindow.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/SlideSorterViewShell.hxx b/sd/source/ui/inc/SlideSorterViewShell.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/SlideSorterViewShellBase.hxx b/sd/source/ui/inc/SlideSorterViewShellBase.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/SlideView.hxx b/sd/source/ui/inc/SlideView.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/SlideViewShell.hxx b/sd/source/ui/inc/SlideViewShell.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/SpellDialogChildWindow.hxx b/sd/source/ui/inc/SpellDialogChildWindow.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/TabControl.hxx b/sd/source/ui/inc/TabControl.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/TaskPaneViewShell.hxx b/sd/source/ui/inc/TaskPaneViewShell.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/TemplateScanner.hxx b/sd/source/ui/inc/TemplateScanner.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/TextLogger.hxx b/sd/source/ui/inc/TextLogger.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/TextObjectBar.hxx b/sd/source/ui/inc/TextObjectBar.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/ToolBarManager.hxx b/sd/source/ui/inc/ToolBarManager.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/ToolPanelChildWindow.hrc b/sd/source/ui/inc/ToolPanelChildWindow.hrc old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/ToolPanelChildWindow.hxx b/sd/source/ui/inc/ToolPanelChildWindow.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/UpdateLockManager.hxx b/sd/source/ui/inc/UpdateLockManager.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/View.hxx b/sd/source/ui/inc/View.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/ViewClipboard.hxx b/sd/source/ui/inc/ViewClipboard.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/ViewShell.hxx b/sd/source/ui/inc/ViewShell.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/ViewShellBase.hxx b/sd/source/ui/inc/ViewShellBase.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/ViewShellHint.hxx b/sd/source/ui/inc/ViewShellHint.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/ViewShellImplementation.hxx b/sd/source/ui/inc/ViewShellImplementation.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/ViewShellManager.hxx b/sd/source/ui/inc/ViewShellManager.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/ViewTabBar.hxx b/sd/source/ui/inc/ViewTabBar.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/ViewTabControl.hxx b/sd/source/ui/inc/ViewTabControl.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/Window.hxx b/sd/source/ui/inc/Window.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/WindowUpdater.hxx b/sd/source/ui/inc/WindowUpdater.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/animobjs.hrc b/sd/source/ui/inc/animobjs.hrc old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/animobjs.hxx b/sd/source/ui/inc/animobjs.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/assclass.hxx b/sd/source/ui/inc/assclass.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/bmcache.hxx b/sd/source/ui/inc/bmcache.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/brkdlg.hrc b/sd/source/ui/inc/brkdlg.hrc old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/bulmaper.hxx b/sd/source/ui/inc/bulmaper.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/celltempl.hrc b/sd/source/ui/inc/celltempl.hrc old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/celltempl.hxx b/sd/source/ui/inc/celltempl.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/cfgids.hxx b/sd/source/ui/inc/cfgids.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/copydlg.hrc b/sd/source/ui/inc/copydlg.hrc old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/copydlg.hxx b/sd/source/ui/inc/copydlg.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/custsdlg.hrc b/sd/source/ui/inc/custsdlg.hrc old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/custsdlg.hxx b/sd/source/ui/inc/custsdlg.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/diactrl.hxx b/sd/source/ui/inc/diactrl.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/dialogs.hrc b/sd/source/ui/inc/dialogs.hrc old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/dlg_char.hrc b/sd/source/ui/inc/dlg_char.hrc old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/dlg_char.hxx b/sd/source/ui/inc/dlg_char.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/dlgass.hrc b/sd/source/ui/inc/dlgass.hrc old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/dlgass.hxx b/sd/source/ui/inc/dlgass.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/dlgctrls.hxx b/sd/source/ui/inc/dlgctrls.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/dlgfield.hrc b/sd/source/ui/inc/dlgfield.hrc old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/dlgfield.hxx b/sd/source/ui/inc/dlgfield.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/dlgolbul.hrc b/sd/source/ui/inc/dlgolbul.hrc old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/dlgpage.hrc b/sd/source/ui/inc/dlgpage.hrc old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/dlgpage.hxx b/sd/source/ui/inc/dlgpage.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/dlgsnap.hrc b/sd/source/ui/inc/dlgsnap.hrc old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/dlgsnap.hxx b/sd/source/ui/inc/dlgsnap.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/docprev.hxx b/sd/source/ui/inc/docprev.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/drawview.hxx b/sd/source/ui/inc/drawview.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/enumdlg.hrc b/sd/source/ui/inc/enumdlg.hrc old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/filedlg.hxx b/sd/source/ui/inc/filedlg.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/fontwork.hrc b/sd/source/ui/inc/fontwork.hrc old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/framework/Configuration.hxx b/sd/source/ui/inc/framework/Configuration.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/framework/ConfigurationController.hxx b/sd/source/ui/inc/framework/ConfigurationController.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/framework/DrawModule.hxx b/sd/source/ui/inc/framework/DrawModule.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/framework/FrameworkHelper.hxx b/sd/source/ui/inc/framework/FrameworkHelper.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/framework/ImpressModule.hxx b/sd/source/ui/inc/framework/ImpressModule.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/framework/ModuleController.hxx b/sd/source/ui/inc/framework/ModuleController.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/framework/Pane.hxx b/sd/source/ui/inc/framework/Pane.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/framework/PresentationFactory.hxx b/sd/source/ui/inc/framework/PresentationFactory.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/framework/PresentationModule.hxx b/sd/source/ui/inc/framework/PresentationModule.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/framework/ResourceId.hxx b/sd/source/ui/inc/framework/ResourceId.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/framework/ViewShellWrapper.hxx b/sd/source/ui/inc/framework/ViewShellWrapper.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/fuarea.hxx b/sd/source/ui/inc/fuarea.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/fubullet.hxx b/sd/source/ui/inc/fubullet.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/fuchar.hxx b/sd/source/ui/inc/fuchar.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/fucon3d.hxx b/sd/source/ui/inc/fucon3d.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/fuconarc.hxx b/sd/source/ui/inc/fuconarc.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/fuconbez.hxx b/sd/source/ui/inc/fuconbez.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/fuconcs.hxx b/sd/source/ui/inc/fuconcs.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/fuconnct.hxx b/sd/source/ui/inc/fuconnct.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/fuconrec.hxx b/sd/source/ui/inc/fuconrec.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/fuconstr.hxx b/sd/source/ui/inc/fuconstr.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/fuconuno.hxx b/sd/source/ui/inc/fuconuno.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/fucopy.hxx b/sd/source/ui/inc/fucopy.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/fucushow.hxx b/sd/source/ui/inc/fucushow.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/fudraw.hxx b/sd/source/ui/inc/fudraw.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/fudspord.hxx b/sd/source/ui/inc/fudspord.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/fuediglu.hxx b/sd/source/ui/inc/fuediglu.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/fuexpand.hxx b/sd/source/ui/inc/fuexpand.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/fuformatpaintbrush.hxx b/sd/source/ui/inc/fuformatpaintbrush.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/fugrid.hxx b/sd/source/ui/inc/fugrid.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/fuhhconv.hxx b/sd/source/ui/inc/fuhhconv.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/fuinsert.hxx b/sd/source/ui/inc/fuinsert.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/fuinsfil.hxx b/sd/source/ui/inc/fuinsfil.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/fuline.hxx b/sd/source/ui/inc/fuline.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/fulinend.hxx b/sd/source/ui/inc/fulinend.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/fulink.hxx b/sd/source/ui/inc/fulink.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/fumeasur.hxx b/sd/source/ui/inc/fumeasur.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/fumorph.hxx b/sd/source/ui/inc/fumorph.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/fuoaprms.hxx b/sd/source/ui/inc/fuoaprms.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/fuolbull.hxx b/sd/source/ui/inc/fuolbull.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/fuoltext.hxx b/sd/source/ui/inc/fuoltext.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/fuoutl.hxx b/sd/source/ui/inc/fuoutl.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/fupage.hxx b/sd/source/ui/inc/fupage.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/fuparagr.hxx b/sd/source/ui/inc/fuparagr.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/fupoor.hxx b/sd/source/ui/inc/fupoor.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/fuprlout.hxx b/sd/source/ui/inc/fuprlout.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/fuprobjs.hxx b/sd/source/ui/inc/fuprobjs.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/fuscale.hxx b/sd/source/ui/inc/fuscale.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/fusearch.hxx b/sd/source/ui/inc/fusearch.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/fusel.hxx b/sd/source/ui/inc/fusel.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/fusldlg.hxx b/sd/source/ui/inc/fusldlg.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/fuslhide.hxx b/sd/source/ui/inc/fuslhide.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/fuslid.hxx b/sd/source/ui/inc/fuslid.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/fuslsel.hxx b/sd/source/ui/inc/fuslsel.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/fusnapln.hxx b/sd/source/ui/inc/fusnapln.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/fuspell.hxx b/sd/source/ui/inc/fuspell.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/fusumry.hxx b/sd/source/ui/inc/fusumry.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/futempl.hxx b/sd/source/ui/inc/futempl.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/futext.hxx b/sd/source/ui/inc/futext.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/futhes.hxx b/sd/source/ui/inc/futhes.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/futransf.hxx b/sd/source/ui/inc/futransf.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/futxtatt.hxx b/sd/source/ui/inc/futxtatt.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/fuvect.hxx b/sd/source/ui/inc/fuvect.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/fuzoom.hxx b/sd/source/ui/inc/fuzoom.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/gluectrl.hxx b/sd/source/ui/inc/gluectrl.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/headerfooterdlg.hrc b/sd/source/ui/inc/headerfooterdlg.hrc old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/headerfooterdlg.hxx b/sd/source/ui/inc/headerfooterdlg.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/ins_paste.hrc b/sd/source/ui/inc/ins_paste.hrc old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/ins_paste.hxx b/sd/source/ui/inc/ins_paste.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/inspagob.hrc b/sd/source/ui/inc/inspagob.hrc old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/inspagob.hxx b/sd/source/ui/inc/inspagob.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/layeroptionsdlg.hrc b/sd/source/ui/inc/layeroptionsdlg.hrc old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/layeroptionsdlg.hxx b/sd/source/ui/inc/layeroptionsdlg.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/masterlayoutdlg.hrc b/sd/source/ui/inc/masterlayoutdlg.hrc old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/masterlayoutdlg.hxx b/sd/source/ui/inc/masterlayoutdlg.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/morphdlg.hrc b/sd/source/ui/inc/morphdlg.hrc old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/morphdlg.hxx b/sd/source/ui/inc/morphdlg.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/navigatr.hrc b/sd/source/ui/inc/navigatr.hrc old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/navigatr.hxx b/sd/source/ui/inc/navigatr.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/optdlg.hrc b/sd/source/ui/inc/optdlg.hrc old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/optdlg.hxx b/sd/source/ui/inc/optdlg.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/optsitem.hxx b/sd/source/ui/inc/optsitem.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/outlinfo.hxx b/sd/source/ui/inc/outlinfo.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/packgdlg.hrc b/sd/source/ui/inc/packgdlg.hrc old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/paragr.hrc b/sd/source/ui/inc/paragr.hrc old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/paragr.hxx b/sd/source/ui/inc/paragr.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/pgjump.hxx b/sd/source/ui/inc/pgjump.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/present.hrc b/sd/source/ui/inc/present.hrc old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/present.hxx b/sd/source/ui/inc/present.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/preview.hrc b/sd/source/ui/inc/preview.hrc old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/printdialog.hxx b/sd/source/ui/inc/printdialog.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/printdlg.hrc b/sd/source/ui/inc/printdlg.hrc old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/printdlg.hxx b/sd/source/ui/inc/printdlg.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/prltempl.hrc b/sd/source/ui/inc/prltempl.hrc old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/prltempl.hxx b/sd/source/ui/inc/prltempl.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/prntopts.hrc b/sd/source/ui/inc/prntopts.hrc old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/prntopts.hxx b/sd/source/ui/inc/prntopts.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/pubdlg.hrc b/sd/source/ui/inc/pubdlg.hrc old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/pubdlg.hxx b/sd/source/ui/inc/pubdlg.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/res_bmp.hrc b/sd/source/ui/inc/res_bmp.hrc old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/sdpopup.hxx b/sd/source/ui/inc/sdpopup.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/sdpreslt.hrc b/sd/source/ui/inc/sdpreslt.hrc old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/sdpreslt.hxx b/sd/source/ui/inc/sdpreslt.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/sdstring.hrc b/sd/source/ui/inc/sdstring.hrc old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/sdtreelb.hxx b/sd/source/ui/inc/sdtreelb.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/sdundogr.hxx b/sd/source/ui/inc/sdundogr.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/sdxfer.hxx b/sd/source/ui/inc/sdxfer.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/showview.hxx b/sd/source/ui/inc/showview.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/slideshow.hxx b/sd/source/ui/inc/slideshow.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/smarttag.hxx b/sd/source/ui/inc/smarttag.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/sprite.hxx b/sd/source/ui/inc/sprite.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/strings.hrc b/sd/source/ui/inc/strings.hrc old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/tabtempl.hrc b/sd/source/ui/inc/tabtempl.hrc old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/tabtempl.hxx b/sd/source/ui/inc/tabtempl.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/taskpane/ControlContainer.hxx b/sd/source/ui/inc/taskpane/ControlContainer.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/taskpane/ILayoutableWindow.hxx b/sd/source/ui/inc/taskpane/ILayoutableWindow.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/taskpane/ScrollPanel.hxx b/sd/source/ui/inc/taskpane/ScrollPanel.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/taskpane/SlideSorterCacheDisplay.hxx b/sd/source/ui/inc/taskpane/SlideSorterCacheDisplay.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/taskpane/SubToolPanel.hxx b/sd/source/ui/inc/taskpane/SubToolPanel.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/taskpane/TaskPaneControlFactory.hxx b/sd/source/ui/inc/taskpane/TaskPaneControlFactory.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/taskpane/TaskPaneTreeNode.hxx b/sd/source/ui/inc/taskpane/TaskPaneTreeNode.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/taskpane/TitleBar.hxx b/sd/source/ui/inc/taskpane/TitleBar.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/taskpane/TitledControl.hxx b/sd/source/ui/inc/taskpane/TitledControl.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/taskpane/ToolPanel.hxx b/sd/source/ui/inc/taskpane/ToolPanel.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/tbx_ww.hrc b/sd/source/ui/inc/tbx_ww.hrc old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/tbx_ww.hxx b/sd/source/ui/inc/tbx_ww.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/tmplctrl.hxx b/sd/source/ui/inc/tmplctrl.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/tools/AsynchronousCall.hxx b/sd/source/ui/inc/tools/AsynchronousCall.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/tools/AsynchronousTask.hxx b/sd/source/ui/inc/tools/AsynchronousTask.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/tools/ConfigurationAccess.hxx b/sd/source/ui/inc/tools/ConfigurationAccess.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/tools/IconCache.hxx b/sd/source/ui/inc/tools/IconCache.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/tools/IdleDetection.hxx b/sd/source/ui/inc/tools/IdleDetection.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/tools/PropertySet.hxx b/sd/source/ui/inc/tools/PropertySet.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/tools/SdGlobalResourceContainer.hxx b/sd/source/ui/inc/tools/SdGlobalResourceContainer.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/tools/SlotStateListener.hxx b/sd/source/ui/inc/tools/SlotStateListener.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/tools/TimerBasedTaskExecution.hxx b/sd/source/ui/inc/tools/TimerBasedTaskExecution.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/tpaction.hrc b/sd/source/ui/inc/tpaction.hrc old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/tpaction.hxx b/sd/source/ui/inc/tpaction.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/tpoption.hrc b/sd/source/ui/inc/tpoption.hrc old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/tpoption.hxx b/sd/source/ui/inc/tpoption.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/unchss.hxx b/sd/source/ui/inc/unchss.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/undoback.hxx b/sd/source/ui/inc/undoback.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/undoheaderfooter.hxx b/sd/source/ui/inc/undoheaderfooter.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/undolayer.hxx b/sd/source/ui/inc/undolayer.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/undopage.hxx b/sd/source/ui/inc/undopage.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/unmodpg.hxx b/sd/source/ui/inc/unmodpg.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/unmovss.hxx b/sd/source/ui/inc/unmovss.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/unoaprms.hxx b/sd/source/ui/inc/unoaprms.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/unokywds.hxx b/sd/source/ui/inc/unokywds.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/unomodel.hxx b/sd/source/ui/inc/unomodel.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/unoprnms.hxx b/sd/source/ui/inc/unoprnms.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/unosrch.hxx b/sd/source/ui/inc/unosrch.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/unprlout.hxx b/sd/source/ui/inc/unprlout.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/unslsel.hxx b/sd/source/ui/inc/unslsel.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/vectdlg.hrc b/sd/source/ui/inc/vectdlg.hrc old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/vectdlg.hxx b/sd/source/ui/inc/vectdlg.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/view/viewoverlaymanager.hxx b/sd/source/ui/inc/view/viewoverlaymanager.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/inc/zoomlist.hxx b/sd/source/ui/inc/zoomlist.hxx old mode 100644 new mode 100755 -- cgit From 0c5e350b2ae8c46a24407cf122114e58852fb072 Mon Sep 17 00:00:00 2001 From: "Frank Schoenheit [fs]" Date: Tue, 13 Apr 2010 12:17:53 +0200 Subject: slidecopy: moved SD's task pane implementation to the new base implementation from SFX. Still not all previous functionality restored. --- sd/source/ui/inc/framework/ViewShellWrapper.hxx | 33 +++--------------------- sd/source/ui/inc/taskpane/PanelId.hxx | 5 ++++ sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx | 26 ++++++++++++------- 3 files changed, 24 insertions(+), 40 deletions(-) (limited to 'sd/source/ui/inc') diff --git a/sd/source/ui/inc/framework/ViewShellWrapper.hxx b/sd/source/ui/inc/framework/ViewShellWrapper.hxx index d8406adb1632..09ea3a0910ae 100644 --- a/sd/source/ui/inc/framework/ViewShellWrapper.hxx +++ b/sd/source/ui/inc/framework/ViewShellWrapper.hxx @@ -33,26 +33,22 @@ #include "MutexOwner.hxx" #include -#include #include #include #include #include -#include +#include #include #include namespace { -typedef ::cppu::WeakComponentImplHelper3 < ::com::sun::star::lang::XUnoTunnel +typedef ::cppu::WeakComponentImplHelper4 < ::com::sun::star::lang::XUnoTunnel , ::com::sun::star::awt::XWindowListener , ::com::sun::star::drawing::framework::XRelocatableResource + , ::com::sun::star::drawing::framework::XView > ViewShellWrapperInterfaceBase; -typedef ::cppu::ImplHelper1 < ::com::sun::star::drawing::framework::XView - > ViewShellWrapper_ViewBase; -typedef ::cppu::ImplHelper1 < ::com::sun::star::drawing::framework::XPane - > ViewShellWrapper_PaneBase; } // end of anonymous namespace. @@ -66,8 +62,6 @@ namespace sd { namespace framework { */ class ViewShellWrapper :private sd::MutexOwner ,public ViewShellWrapperInterfaceBase - ,public ViewShellWrapper_ViewBase - ,public ViewShellWrapper_PaneBase { public: /** Create a new ViewShellWrapper object that wraps the given ViewShell @@ -103,22 +97,6 @@ public: virtual sal_Int64 SAL_CALL getSomething (const com::sun::star::uno::Sequence& rId) throw (com::sun::star::uno::RuntimeException); - // XInterface - - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL acquire( ) throw (); - virtual void SAL_CALL release( ) throw (); - - // XTypeProvider - - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::sal_Int8 > SAL_CALL getImplementationId( ) throw (::com::sun::star::uno::RuntimeException); - - // XPane - - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > SAL_CALL getWindow( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCanvas > SAL_CALL getCanvas( ) throw (::com::sun::star::uno::RuntimeException); - // XResource virtual ::com::sun::star::uno::Reference @@ -166,11 +144,6 @@ private: ::boost::shared_ptr< ViewShell > mpViewShell; const ::com::sun::star::uno::Reference< com::sun::star::drawing::framework::XResourceId > mxViewId; ::com::sun::star::uno::Reference mxWindow; - const bool mbIsPane; - -private: - // only to be called when mbIsPane is - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > impl_getPaneWindowOrCanvas( const bool i_bWindow ); }; } } // end of namespace sd::framework diff --git a/sd/source/ui/inc/taskpane/PanelId.hxx b/sd/source/ui/inc/taskpane/PanelId.hxx index 7e26c4e66e68..e89b76a1cf07 100644 --- a/sd/source/ui/inc/taskpane/PanelId.hxx +++ b/sd/source/ui/inc/taskpane/PanelId.hxx @@ -27,6 +27,11 @@ #ifndef SD_UI_TASKPANE_PANELID_HXX #define SD_UI_TASKPANE_PANELID_HXX +namespace rtl +{ + class OUString; +} + //...................................................................................................................... namespace sd { namespace toolpanel { diff --git a/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx b/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx index a82908ec56e3..4d16dd8d26e4 100644 --- a/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx +++ b/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx @@ -45,6 +45,10 @@ class PopupMenu; +namespace com { namespace sun { namespace star { namespace ui { + class XUIElement; +} } } } + namespace sd { class PaneDockingWindow; @@ -53,7 +57,6 @@ class TaskPaneShellManager; class TitleToolBox; class TitleBar; class TitledControl; -class ToolPanelDeck; 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 @@ -99,17 +102,9 @@ public: TaskPaneShellManager& GetSubShellManager (void) const; - /** returns the window which should be used as parent for tool panel windows - */ - ::Window* GetToolPanelParentWindow(); - - /** activates the given panel, bypassing the configuration controller, deactivates the previously active one. - */ - void ActivatePanel( const PanelId i_ePanelId ); - /** deactivates the given panel, bypassing the configuration controller */ - void DeactivatePanel( const PanelId i_ePanelId ); + void DeactivatePanel( const ::rtl::OUString& i_rPanelResourceURL ); /** Return a pointer to the docking window that is the parent or a predecessor of the content window. @@ -137,6 +132,17 @@ public: */ virtual bool RelocateToParentWindow (::Window* pParentWindow); + /// returns if and only if the given window is the panel anchor window of our ToolPanelDeck + bool IsPanelAnchorWindow( const ::Window& i_rWindow ) const; + + /** creates an XUIElement for the given standard panel + */ + ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIElement > + CreatePanelUIElement( + const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& i_rDocFrame, + const ::rtl::OUString& i_rPanelResourceURL + ); + private: ::boost::scoped_ptr< ToolPanelViewShell_Impl > mpImpl; -- cgit From 8522a74e1d1f5c3eb3287c144709275b33daa458 Mon Sep 17 00:00:00 2001 From: "Frank Schoenheit [fs]" Date: Wed, 14 Apr 2010 10:37:41 +0200 Subject: slidecopy: re-implemented the TaskPane's "View" menu in SFX, using the code formerly found in SD --- sd/source/ui/inc/PaneDockingWindow.hxx | 10 ---------- sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx | 12 ------------ 2 files changed, 22 deletions(-) (limited to 'sd/source/ui/inc') diff --git a/sd/source/ui/inc/PaneDockingWindow.hxx b/sd/source/ui/inc/PaneDockingWindow.hxx index 791917194376..fd36fca1ce25 100644 --- a/sd/source/ui/inc/PaneDockingWindow.hxx +++ b/sd/source/ui/inc/PaneDockingWindow.hxx @@ -68,16 +68,6 @@ public: virtual ~PaneDockingWindow (void); virtual void StateChanged( StateChangedType nType ); - - virtual void EndDocking( const Rectangle& rRect, BOOL bFloatMode ); - - void SetEndDockingHdl( const Link& i_rEndDockingHdl ) { maEndDockingHdl = i_rEndDockingHdl; } - const Link& GetEndDockingHdl() const { return maEndDockingHdl; } - - void ResetToolBox(); - -private: - Link maEndDockingHdl; }; } // end of namespace ::sd diff --git a/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx b/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx index 4d16dd8d26e4..9f56fa9bf25a 100644 --- a/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx +++ b/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx @@ -114,14 +114,6 @@ public: */ DockingWindow* GetDockingWindow (void); - /** Called when a mouse button has been pressed but not yet - released, this handler is used to show the popup menu of the - title bar. - */ - DECL_LINK(ToolboxClickHandler, ToolBox*); - DECL_LINK(MenuSelectHandler, Menu*); - DECL_LINK(DockingChanged, PaneDockingWindow*); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> CreateAccessibleDocumentView (::sd::Window* pWindow); @@ -163,10 +155,6 @@ private: ::std::auto_ptr CreatePopupMenu (bool bIsDocking); - /** connects to a (new) (Pane)DockingWindow - */ - void ConnectToDockingWindow(); - /** Initialize the task pane view shell if that has not yet been done before. If mbIsInitialized is already set to then this method returns immediately. -- cgit From f8f7f1f674de6802a3601a89b725ce6f9cb80cb0 Mon Sep 17 00:00:00 2001 From: "Frank Schoenheit [fs]" Date: Wed, 14 Apr 2010 13:30:12 +0200 Subject: slidecopy: removed PID_FIRST_CUSTOM_PANEL (not used anymore) --- sd/source/ui/inc/taskpane/PanelId.hxx | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'sd/source/ui/inc') diff --git a/sd/source/ui/inc/taskpane/PanelId.hxx b/sd/source/ui/inc/taskpane/PanelId.hxx index e89b76a1cf07..43018f11f177 100644 --- a/sd/source/ui/inc/taskpane/PanelId.hxx +++ b/sd/source/ui/inc/taskpane/PanelId.hxx @@ -49,9 +49,7 @@ namespace sd { namespace toolpanel PID_LAYOUT = 2, PID_TABLE_DESIGN = 3, PID_CUSTOM_ANIMATION = 4, - PID_SLIDE_TRANSITION = 5, - - PID_FIRST_CUSTOM_PANEL = 6 + PID_SLIDE_TRANSITION = 5 }; PanelId GetStandardPanelId( const ::rtl::OUString& i_rTaskPanelResourceURL ); -- cgit From 8602973c35b4a3bd545ca9ae280e5e7125ae73dd Mon Sep 17 00:00:00 2001 From: "Frank Schoenheit [fs]" Date: Wed, 14 Apr 2010 20:24:29 +0200 Subject: slidecopy: allow sorting the tool panels in the TaskPane (so far, the implicit ordering was defined by the order in which the config nodes were returned by the config manager) --- sd/source/ui/inc/taskpane/PanelId.hxx | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'sd/source/ui/inc') diff --git a/sd/source/ui/inc/taskpane/PanelId.hxx b/sd/source/ui/inc/taskpane/PanelId.hxx index 43018f11f177..565745f97140 100644 --- a/sd/source/ui/inc/taskpane/PanelId.hxx +++ b/sd/source/ui/inc/taskpane/PanelId.hxx @@ -44,12 +44,13 @@ namespace sd { namespace toolpanel */ enum PanelId { - PID_UNKNOWN = 0, - PID_MASTER_PAGES = 1, - PID_LAYOUT = 2, - PID_TABLE_DESIGN = 3, - PID_CUSTOM_ANIMATION = 4, - PID_SLIDE_TRANSITION = 5 + PID_MASTER_PAGES = 0, + PID_LAYOUT = 1, + PID_TABLE_DESIGN = 2, + PID_CUSTOM_ANIMATION = 3, + PID_SLIDE_TRANSITION = 4, + + PID_UNKNOWN = 5 }; PanelId GetStandardPanelId( const ::rtl::OUString& i_rTaskPanelResourceURL ); -- cgit From 4e342ea4a3186487d1af024784c1ee7b2c911978 Mon Sep 17 00:00:00 2001 From: Christian Lippka Date: Fri, 16 Apr 2010 10:06:13 +0200 Subject: merged placeholder handles into one to avoid display errors due to pixel rounding in some zoom levels --- sd/source/ui/inc/view/viewoverlaymanager.hxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'sd/source/ui/inc') diff --git a/sd/source/ui/inc/view/viewoverlaymanager.hxx b/sd/source/ui/inc/view/viewoverlaymanager.hxx index 29cc5221865a..0693d1faea7a 100755 --- a/sd/source/ui/inc/view/viewoverlaymanager.hxx +++ b/sd/source/ui/inc/view/viewoverlaymanager.hxx @@ -59,8 +59,8 @@ public: virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint); - static Image maLargeButtonImages[BMP_PLACEHOLDER_LARGE_END - BMP_PLACEHOLDER_LARGE_START]; - static Image maSmallButtonImages[BMP_PLACEHOLDER_SMALL_END - BMP_PLACEHOLDER_SMALL_START]; + static BitmapEx maLargeButtonImages[BMP_PLACEHOLDER_LARGE_END - BMP_PLACEHOLDER_LARGE_START]; + static BitmapEx maSmallButtonImages[BMP_PLACEHOLDER_SMALL_END - BMP_PLACEHOLDER_SMALL_START]; private: void UpdateImages(); -- cgit From 54bec7096ff8dbb82be4f05d2e8220bf2bbad8e1 Mon Sep 17 00:00:00 2001 From: Christian Lippka Date: Tue, 20 Apr 2010 16:57:49 +0200 Subject: #i107213# finalized layout grippies tooltips --- sd/source/ui/inc/strings.hrc | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'sd/source/ui/inc') diff --git a/sd/source/ui/inc/strings.hrc b/sd/source/ui/inc/strings.hrc index a1ae102ac93c..d9dc93a1ef20 100755 --- a/sd/source/ui/inc/strings.hrc +++ b/sd/source/ui/inc/strings.hrc @@ -503,6 +503,10 @@ #define STR_NAVIGATOR_SHAPE_BASE_NAME (RID_APP_START+720) #define STR_RESET_LAYOUT (RID_APP_START+721) +#define STR_INSERT_TABLE (RID_APP_START+722) +#define STR_INSERT_CHART (RID_APP_START+723) +#define STR_INSERT_PICTURE (RID_APP_START+724) +#define STR_INSERT_MOVIE (RID_APP_START+725) /****************************************************************************** * The ids in glob.hrc start at RID_APP_START+750! -- cgit From 66973bc3700b4593c93e3fe2667a37f915381e29 Mon Sep 17 00:00:00 2001 From: Christian Lippka Date: Fri, 30 Apr 2010 10:43:18 +0200 Subject: fixed unix compiler warnings --- sd/source/ui/inc/View.hxx | 1 - 1 file changed, 1 deletion(-) (limited to 'sd/source/ui/inc') diff --git a/sd/source/ui/inc/View.hxx b/sd/source/ui/inc/View.hxx index c2aacfaa2cb7..2b6c1a8abb77 100755 --- a/sd/source/ui/inc/View.hxx +++ b/sd/source/ui/inc/View.hxx @@ -209,7 +209,6 @@ public: void SetMarkedSegmentsKindPossible( bool bSet ) { bSetMarkedSegmentsKindPossible = bSet; } SdrObject* GetEmptyPresentationObject( PresObjKind eKind ); - protected: DECL_LINK( OnParagraphInsertedHdl, ::Outliner * ); DECL_LINK( OnParagraphRemovingHdl, ::Outliner * ); -- cgit From 95a1ee178b4548a3471f9f1211608fbcbed5620b Mon Sep 17 00:00:00 2001 From: "Frank Schoenheit [fs]" Date: Fri, 7 May 2010 10:19:42 +0200 Subject: slidecopy: allow activating a tool panel view XLayoutManager::showElement --- sd/source/ui/inc/PaneChildWindows.hxx | 7 ++++++- sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx | 5 +++++ 2 files changed, 11 insertions(+), 1 deletion(-) (limited to 'sd/source/ui/inc') diff --git a/sd/source/ui/inc/PaneChildWindows.hxx b/sd/source/ui/inc/PaneChildWindows.hxx index c43cd371eb24..9ba0a1f03720 100644 --- a/sd/source/ui/inc/PaneChildWindows.hxx +++ b/sd/source/ui/inc/PaneChildWindows.hxx @@ -29,6 +29,7 @@ #define SD_PANE_CHILD_WINDOWS_HXX #include +#include namespace sd { @@ -77,7 +78,8 @@ public: //====================================================================================================================== //= ToolPanelChildWindow //====================================================================================================================== -class ToolPanelChildWindow : public PaneChildWindow +class ToolPanelChildWindow :public PaneChildWindow + ,public ::sfx2::ITaskPaneToolPanelAccess { public: ToolPanelChildWindow( @@ -87,6 +89,9 @@ public: SfxChildWinInfo* i_pChildWindowInfo ); SFX_DECL_CHILDWINDOW( ToolPanelChildWindow ); + + // ::sfx2::ITaskPaneToolPanelAccess + virtual void ActivateToolPanel( const ::rtl::OUString& i_rPanelURL ); }; diff --git a/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx b/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx index 9f56fa9bf25a..5bd0cd877803 100644 --- a/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx +++ b/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx @@ -102,6 +102,11 @@ public: TaskPaneShellManager& GetSubShellManager (void) const; + /** deactivates the given panel, bypassing the configuration controller. Only valid for tool panels which are + not under the drawing framework's control. + */ + void ActivatePanel( const ::rtl::OUString& i_rPanelResourceURL ); + /** deactivates the given panel, bypassing the configuration controller */ void DeactivatePanel( const ::rtl::OUString& i_rPanelResourceURL ); -- cgit