From f351e9aa30010fec27deb0ad705fd35744675c5b Mon Sep 17 00:00:00 2001 From: Thomas Lange Date: Thu, 17 Sep 2009 07:30:11 +0000 Subject: #i1601# Sentence case, Title case, and Toggle case transliteration added --- sd/sdi/_drvwsh.sdi | 15 +++++++++++++++ sd/sdi/outlnvsh.sdi | 15 +++++++++++++++ sd/source/ui/view/drviewse.cxx | 15 ++++++++++++++- sd/source/ui/view/drviewsf.cxx | 3 +++ sd/source/ui/view/outlnvsh.cxx | 18 +++++++++++++++++- sd/uiconfig/sdraw/menubar/menubar.xml | 5 ++++- sd/uiconfig/simpress/menubar/menubar.xml | 5 ++++- 7 files changed, 72 insertions(+), 4 deletions(-) (limited to 'sd') diff --git a/sd/sdi/_drvwsh.sdi b/sd/sdi/_drvwsh.sdi index 8f758dda5858..4284594241fc 100644 --- a/sd/sdi/_drvwsh.sdi +++ b/sd/sdi/_drvwsh.sdi @@ -2176,6 +2176,21 @@ interface DrawView ExecMethod = FuSupport ; StateMethod = GetCtrlState ; ] + SID_TRANSLITERATE_SENTENCE_CASE // ole : no, status : ? + [ + ExecMethod = FuSupport ; + StateMethod = GetCtrlState ; + ] + SID_TRANSLITERATE_TITLE_CASE // ole : no, status : ? + [ + ExecMethod = FuSupport ; + StateMethod = GetCtrlState ; + ] + SID_TRANSLITERATE_TOGGLE_CASE // ole : no, status : ? + [ + ExecMethod = FuSupport ; + StateMethod = GetCtrlState ; + ] SID_TRANSLITERATE_LOWER // ole : no, status : ? [ ExecMethod = FuSupport ; diff --git a/sd/sdi/outlnvsh.sdi b/sd/sdi/outlnvsh.sdi index 3b0c49af6901..2b865562ed75 100644 --- a/sd/sdi/outlnvsh.sdi +++ b/sd/sdi/outlnvsh.sdi @@ -436,6 +436,21 @@ interface OutlineView ExecMethod = FuSupport ; StateMethod = GetMenuState ; ] + SID_TRANSLITERATE_SENTENCE_CASE // ole : no, status : ? + [ + ExecMethod = FuSupport ; + StateMethod = GetCtrlState ; + ] + SID_TRANSLITERATE_TITLE_CASE // ole : no, status : ? + [ + ExecMethod = FuSupport ; + StateMethod = GetCtrlState ; + ] + SID_TRANSLITERATE_TOGGLE_CASE // ole : no, status : ? + [ + ExecMethod = FuSupport ; + StateMethod = GetCtrlState ; + ] SID_TRANSLITERATE_UPPER // ole : no, status : ? [ ExecMethod = FuSupport ; diff --git a/sd/source/ui/view/drviewse.cxx b/sd/source/ui/view/drviewse.cxx index 0b3ecf1af6e7..3693b114a862 100644 --- a/sd/source/ui/view/drviewse.cxx +++ b/sd/source/ui/view/drviewse.cxx @@ -34,7 +34,8 @@ #include #include #include -#include +#include +#include #include @@ -1386,6 +1387,9 @@ void DrawViewShell::FuSupport(SfxRequest& rReq) } break; + case SID_TRANSLITERATE_SENTENCE_CASE: + case SID_TRANSLITERATE_TITLE_CASE: + case SID_TRANSLITERATE_TOGGLE_CASE: case SID_TRANSLITERATE_UPPER: case SID_TRANSLITERATE_LOWER: case SID_TRANSLITERATE_HALFWIDTH: @@ -1401,6 +1405,15 @@ void DrawViewShell::FuSupport(SfxRequest& rReq) switch( nSId ) { + case SID_TRANSLITERATE_SENTENCE_CASE: + nType = TransliterationModulesExtra::SENTENCE_CASE; + break; + case SID_TRANSLITERATE_TITLE_CASE: + nType = TransliterationModulesExtra::TITLE_CASE; + break; + case SID_TRANSLITERATE_TOGGLE_CASE: + nType = TransliterationModulesExtra::TOGGLE_CASE; + break; case SID_TRANSLITERATE_UPPER: nType = TransliterationModules_LOWERCASE_UPPERCASE; break; diff --git a/sd/source/ui/view/drviewsf.cxx b/sd/source/ui/view/drviewsf.cxx index 2b1b7518666c..09e0a3692f5d 100644 --- a/sd/source/ui/view/drviewsf.cxx +++ b/sd/source/ui/view/drviewsf.cxx @@ -254,6 +254,9 @@ void DrawViewShell::GetCtrlState(SfxItemSet &rSet) GetViewFrame()->GetBindings().SetVisibleState( SID_TRANSLITERATE_KATAGANA, sal_True ); } + rSet.DisableItem( SID_TRANSLITERATE_SENTENCE_CASE ); + rSet.DisableItem( SID_TRANSLITERATE_TITLE_CASE ); + rSet.DisableItem( SID_TRANSLITERATE_TOGGLE_CASE ); rSet.DisableItem( SID_TRANSLITERATE_UPPER ); rSet.DisableItem( SID_TRANSLITERATE_LOWER ); rSet.DisableItem( SID_TRANSLITERATE_HALFWIDTH ); diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx index e4eb22af0552..9c0a42534cf1 100644 --- a/sd/source/ui/view/outlnvsh.cxx +++ b/sd/source/ui/view/outlnvsh.cxx @@ -63,7 +63,8 @@ #include #include #include -#include +#include +#include #include #include #include @@ -532,6 +533,9 @@ void OutlineViewShell::FuSupport(SfxRequest &rReq) std::auto_ptr< OutlineViewModelChangeGuard > aGuard; if( pOlView && ( + (nSlot == SID_TRANSLITERATE_SENTENCE_CASE) || + (nSlot == SID_TRANSLITERATE_TITLE_CASE) || + (nSlot == SID_TRANSLITERATE_TOGGLE_CASE) || (nSlot == SID_TRANSLITERATE_UPPER) || (nSlot == SID_TRANSLITERATE_LOWER) || (nSlot == SID_TRANSLITERATE_HALFWIDTH) || @@ -665,6 +669,9 @@ void OutlineViewShell::FuSupport(SfxRequest &rReq) } break; + case SID_TRANSLITERATE_SENTENCE_CASE: + case SID_TRANSLITERATE_TITLE_CASE: + case SID_TRANSLITERATE_TOGGLE_CASE: case SID_TRANSLITERATE_UPPER: case SID_TRANSLITERATE_LOWER: case SID_TRANSLITERATE_HALFWIDTH: @@ -680,6 +687,15 @@ void OutlineViewShell::FuSupport(SfxRequest &rReq) switch( nSlot ) { + case SID_TRANSLITERATE_SENTENCE_CASE: + nType = TransliterationModulesExtra::SENTENCE_CASE; + break; + case SID_TRANSLITERATE_TITLE_CASE: + nType = TransliterationModulesExtra::TITLE_CASE; + break; + case SID_TRANSLITERATE_TOGGLE_CASE: + nType = TransliterationModulesExtra::TOGGLE_CASE; + break; case SID_TRANSLITERATE_UPPER: nType = TransliterationModules_LOWERCASE_UPPERCASE; break; diff --git a/sd/uiconfig/sdraw/menubar/menubar.xml b/sd/uiconfig/sdraw/menubar/menubar.xml index e34baec0f29c..560714b115b4 100644 --- a/sd/uiconfig/sdraw/menubar/menubar.xml +++ b/sd/uiconfig/sdraw/menubar/menubar.xml @@ -183,8 +183,11 @@ - + + + + diff --git a/sd/uiconfig/simpress/menubar/menubar.xml b/sd/uiconfig/simpress/menubar/menubar.xml index ece53ad4c918..8fdb862a081c 100644 --- a/sd/uiconfig/simpress/menubar/menubar.xml +++ b/sd/uiconfig/simpress/menubar/menubar.xml @@ -201,8 +201,11 @@ - + + + + -- cgit From 26999baa19f28e4916df28bc8c2eca2f88b70cbd Mon Sep 17 00:00:00 2001 From: Thomas Lange Date: Wed, 25 Nov 2009 16:50:53 +0000 Subject: #i51258# thesaurus for right click context menu --- sd/sdi/drtxtob.sdi | 6 ++++++ sd/source/ui/view/drtxtob.cxx | 29 +++++++++++++++++++++++++++++ sd/source/ui/view/drtxtob1.cxx | 16 ++++++++++++++++ sd/uiconfig/sdraw/menubar/menubar.xml | 2 +- sd/uiconfig/simpress/menubar/menubar.xml | 2 +- 5 files changed, 53 insertions(+), 2 deletions(-) (limited to 'sd') diff --git a/sd/sdi/drtxtob.sdi b/sd/sdi/drtxtob.sdi index 4e2ca49c0b82..f4133f0f4643 100644 --- a/sd/sdi/drtxtob.sdi +++ b/sd/sdi/drtxtob.sdi @@ -202,5 +202,11 @@ shell TextObjectBar ExecMethod = Execute; StateMethod = GetAttrState; ] + SID_THES + [ + ExecMethod = Execute ; + StateMethod = GetAttrState ; + ] + } diff --git a/sd/source/ui/view/drtxtob.cxx b/sd/source/ui/view/drtxtob.cxx index 55980ff02050..7e3e48b7a59d 100644 --- a/sd/source/ui/view/drtxtob.cxx +++ b/sd/source/ui/view/drtxtob.cxx @@ -33,14 +33,21 @@ #include "TextObjectBar.hxx" +#include +#include #include #include #include +#include +#include +#include +#include #include #include #include #include +#include #include #include #include @@ -73,6 +80,8 @@ using namespace sd; +using namespace ::com::sun::star; + #define TextObjectBar #include "sdslots.hxx" @@ -373,6 +382,26 @@ void TextObjectBar::GetAttrState( SfxItemSet& rSet ) } break; + case SID_THES: + { + EditView & rEditView = mpView->GetTextEditOutlinerView()->GetEditView();; + String aStatusVal; + LanguageType nLang = LANGUAGE_NONE; + bool bIsLookUpWord = GetStatusValueForThesaurusFromContext( aStatusVal, nLang, rEditView ); + rSet.Put( SfxStringItem( SID_THES, aStatusVal ) ); + + // disable "Thesaurus" context menu entry if there is nothing to look up + lang::Locale aLocale( SvxCreateLocale( nLang ) ); + uno::Reference< linguistic2::XThesaurus > xThes( LinguMgr::GetThesaurus() ); + if (!bIsLookUpWord || + !xThes.is() || nLang == LANGUAGE_NONE || !xThes->hasLocale( aLocale )) + rSet.DisableItem( SID_THES ); + + //! avoid puting the same item as SfxBoolItem at the end of this function + nSlotId = 0; + } + break; + default: break; } diff --git a/sd/source/ui/view/drtxtob1.cxx b/sd/source/ui/view/drtxtob1.cxx index 9c2733c933dd..b128472ac61c 100644 --- a/sd/source/ui/view/drtxtob1.cxx +++ b/sd/source/ui/view/drtxtob1.cxx @@ -33,6 +33,12 @@ #include "TextObjectBar.hxx" +#include + +//#include +#include +#include +#include #include #ifndef _ULSPITEM_HXX @@ -341,6 +347,16 @@ void TextObjectBar::Execute( SfxRequest &rReq ) } break; + case SID_THES: + { + String aReplaceText; + SFX_REQUEST_ARG( rReq, pItem2, SfxStringItem, SID_THES, sal_False ); + if (pItem2) + aReplaceText = pItem2->GetValue(); + if (aReplaceText.Len() > 0) + ReplaceTextWithSynonym( pOLV->GetEditView(), aReplaceText ); + } + break; default: { diff --git a/sd/uiconfig/sdraw/menubar/menubar.xml b/sd/uiconfig/sdraw/menubar/menubar.xml index 04e085c6050f..a7ce6d3f76cb 100644 --- a/sd/uiconfig/sdraw/menubar/menubar.xml +++ b/sd/uiconfig/sdraw/menubar/menubar.xml @@ -214,7 +214,7 @@ - + diff --git a/sd/uiconfig/simpress/menubar/menubar.xml b/sd/uiconfig/simpress/menubar/menubar.xml index 2483b61bd01e..fd565d5d7c8c 100644 --- a/sd/uiconfig/simpress/menubar/menubar.xml +++ b/sd/uiconfig/simpress/menubar/menubar.xml @@ -242,7 +242,7 @@ - + -- cgit 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/inc/cusshow.hxx | 4 +- sd/inc/shapelist.hxx | 2 + sd/source/core/cusshow.cxx | 10 + sd/source/ui/app/strings.src | 77 +--- sd/source/ui/dlg/custsdlg.cxx | 1 - sd/source/ui/dlg/ins_paste.cxx | 4 + sd/source/ui/func/smarttag.cxx | 55 +++ 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 ++++ sd/source/ui/toolpanel/LayoutMenu.cxx | 83 ++-- sd/source/ui/view/drviews1.cxx | 4 + sd/source/ui/view/drviewsa.cxx | 5 +- sd/source/ui/view/makefile.mk | 3 +- sd/source/ui/view/viewoverlaymanager.cxx | 568 +++++++++++++++++++++++++++ sd/source/ui/view/viewshel.cxx | 3 + 17 files changed, 810 insertions(+), 140 deletions(-) create mode 100644 sd/source/ui/inc/view/viewoverlaymanager.hxx create mode 100644 sd/source/ui/view/viewoverlaymanager.cxx (limited to 'sd') diff --git a/sd/inc/cusshow.hxx b/sd/inc/cusshow.hxx index 1bf8b5e724eb..ca3a44583f73 100644 --- a/sd/inc/cusshow.hxx +++ b/sd/inc/cusshow.hxx @@ -67,8 +67,8 @@ public: // @@@ copy ctor, but no copy assignment? @@@ SdCustomShow( const SdCustomShow& rShow ); - void SetName(const String& rName) { aName = rName; } - String GetName() const { return aName; } + void SetName(const String& rName); + String GetName() const; SdDrawDocument* GetDoc() const { return pDoc; } diff --git a/sd/inc/shapelist.hxx b/sd/inc/shapelist.hxx index 3e370f2d1220..7ccb4093f6fb 100644 --- a/sd/inc/shapelist.hxx +++ b/sd/inc/shapelist.hxx @@ -79,6 +79,8 @@ namespace sd */ bool hasMore() const; + const std::list< SdrObject* >& getList() const { return maShapeList; } + private: virtual void ObjectInDestruction(const SdrObject& rObject); diff --git a/sd/source/core/cusshow.cxx b/sd/source/core/cusshow.cxx index 78dc2192293a..25f0d47e9f8a 100644 --- a/sd/source/core/cusshow.cxx +++ b/sd/source/core/cusshow.cxx @@ -127,3 +127,13 @@ void SdCustomShow::RemovePage( const SdPage* pPage ) } } +void SdCustomShow::SetName(const String& rName) +{ + aName = rName; +} + +String SdCustomShow::GetName() const +{ + return aName; +} + diff --git a/sd/source/ui/app/strings.src b/sd/source/ui/app/strings.src index 696e92940b9f..13f3503b5d31 100644 --- a/sd/source/ui/app/strings.src +++ b/sd/source/ui/app/strings.src @@ -169,6 +169,7 @@ String STR_HANDOUT_MODE { Text [ en-US ] = "Handout" ; }; + String STR_AUTOLAYOUT_NONE { Text [ en-US ] = "Blank Slide" ; @@ -185,77 +186,41 @@ String STR_AUTOLAYOUT_TITLE { Text [ en-US ] = "Title Slide" ; }; -String STR_AUTOLAYOUT_OBJ -{ - Text [ en-US ] = "Title, Object" ; -}; -String STR_AUTOLAYOUT_ENUM -{ - Text [ en-US ] = "Title, Text" ; -}; -String STR_AUTOLAYOUT_CHART -{ - Text [ en-US ] = "Title, Chart" ; -}; -String STR_AUTOLAYOUT_TAB -{ - Text [ en-US ] = "Title, Spreadsheet" ; -}; -String STR_AUTOLAYOUT_CLIPTEXT -{ - Text [ en-US ] = "Title, Clipart, Text" ; -}; -String STR_AUTOLAYOUT_2TEXT +String STR_AUTOLAYOUT_CONTENT { - Text [ en-US ] = "Title, 2 Text Blocks" ; + Text [ en-US ] = "Title, Content" ; }; -String STR_AUTOLAYOUT_TEXTCHART +String STR_AUTOLAYOUT_2CONTENT { - Text [ en-US ] = "Title, Text, Chart" ; + Text [ en-US ] = "Title and 2 Content" ; }; -String STR_AUTOLAYOUT_TEXTCLIP +String STR_AUTOLAYOUT_CONTENT_2CONTENT { - Text [ en-US ] = "Title, Text, Clipart" ; + Text [ en-US ] = "Title, Content and 2 Content" ; }; -String STR_AUTOLAYOUT_CHARTTEXT +String STR_AUTOLAYOUT_2CONTENT_CONTENT { - Text [ en-US ] = "Title, Chart, Text" ; + Text [ en-US ] = "Title, 2 Content and Content" ; }; -String STR_AUTOLAYOUT_TEXTOBJ +String STR_AUTOLAYOUT_CONTENT_OVER_2CONTENT { - Text [ en-US ] = "Title, Text, Object" ; + Text [ en-US ] = "Title, Content over 2 Content" ; }; -String STR_AUTOLAYOUT_TEXT2OBJ +String STR_AUTOLAYOUT_2CONTENT_OVER_CONTENT { - Text [ en-US ] = "Title, Text, 2 Objects" ; + Text [ en-US ] = "Title, 2 Content over Content" ; }; -String STR_AUTOLAYOUT_OBJTEXT +String STR_AUTOLAYOUT_CONTENT_OVER_CONTENT { - Text [ en-US ] = "Title, Object, Text" ; + Text [ en-US ] = "Title, Content over Content" ; }; -String STR_AUTOLAYOUT_OBJOVERTEXT +String STR_AUTOLAYOUT_4CONTENT { - Text [ en-US ] = "Title, Object Above Text" ; + Text [ en-US ] = "Title, 4 Content" ; }; -String STR_AUTOLAYOUT_2OBJTEXT +String STR_AUTOLAYOUT_6CONTENT { - Text [ en-US ] = "Title, 2 Objects, Text" ; -}; -String STR_AUTOLAYOUT_2OBJOVERTEXT -{ - Text [ en-US ] = "Title, 2 Objects Above Text" ; -}; -String STR_AUTOLAYOUT_TEXTOVEROBJ -{ - Text [ en-US ] = "Title, Text Above Object" ; -}; -String STR_AUTOLAYOUT_4OBJ -{ - Text [ en-US ] = "Title, 4 Objects" ; -}; -String STR_AUTOLAYOUT_4CLIPART -{ - Text [ en-US ] = "Title, 4 Cliparts" ; + Text [ en-US ] = "Title, 6 Content" ; }; String STR_AL_TITLE_VERT_OUTLINE { @@ -273,10 +238,6 @@ String STR_AL_VERT_TITLE_VERT_OUTLINE { Text [ en-US ] = "Vertical Title, Vertical Text" ; }; -String STR_AUTOLAYOUT_6CLIPART -{ - Text [ en-US ] = "Title, 6 Cliparts" ; -}; String STR_AUTOLAYOUT_HANDOUT1 { diff --git a/sd/source/ui/dlg/custsdlg.cxx b/sd/source/ui/dlg/custsdlg.cxx index 631a3b8a23f2..9876e193ff38 100644 --- a/sd/source/ui/dlg/custsdlg.cxx +++ b/sd/source/ui/dlg/custsdlg.cxx @@ -45,7 +45,6 @@ #include "sdpage.hxx" #include "cusshow.hxx" #include "app.hxx" -#include "optsitem.hxx" #include diff --git a/sd/source/ui/dlg/ins_paste.cxx b/sd/source/ui/dlg/ins_paste.cxx index 9f2c3bf0b6b6..422acbec4a73 100644 --- a/sd/source/ui/dlg/ins_paste.cxx +++ b/sd/source/ui/dlg/ins_paste.cxx @@ -31,6 +31,10 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sd.hxx" +#ifdef SD_DLLIMPLEMENTATION +#undef SD_DLLIMPLEMENTATION +#endif + #include "ins_paste.hrc" #include "ins_paste.hxx" diff --git a/sd/source/ui/func/smarttag.cxx b/sd/source/ui/func/smarttag.cxx index ecd2c7a685f6..99212adc12f1 100644 --- a/sd/source/ui/func/smarttag.cxx +++ b/sd/source/ui/func/smarttag.cxx @@ -156,6 +156,18 @@ void SmartTag::CheckPossibilities() { } +// -------------------------------------------------------------------- + +void SmartTag::onMouseEnter(SmartHdl& rHdl) +{ +} + +// -------------------------------------------------------------------- + +void SmartTag::onMouseLeave() +{ +} + // ==================================================================== SmartTagSet::SmartTagSet( View& rView ) @@ -175,6 +187,12 @@ void SmartTagSet::add( const SmartTagReference& xTag ) { maSet.insert( xTag ); mrView.InvalidateAllWin(); + + if( xTag == mxMouseOverTag ) + mxMouseOverTag.clear(); + + if( xTag == mxSelectedTag ) + mxSelectedTag.clear(); } // -------------------------------------------------------------------- @@ -185,6 +203,12 @@ void SmartTagSet::remove( const SmartTagReference& xTag ) if( aIter != maSet.end() ) maSet.erase( aIter ); mrView.InvalidateAllWin(); + + if( xTag == mxMouseOverTag ) + mxMouseOverTag.clear(); + + if( xTag == mxSelectedTag ) + mxSelectedTag.clear(); } // -------------------------------------------------------------------- @@ -196,6 +220,8 @@ void SmartTagSet::Dispose() for( std::set< SmartTagReference >::iterator aIter( aSet.begin() ); aIter != aSet.end(); ) (*aIter++)->Dispose(); mrView.InvalidateAllWin(); + mxMouseOverTag.clear(); + mxSelectedTag.clear(); } // -------------------------------------------------------------------- @@ -258,6 +284,35 @@ bool SmartTagSet::MouseButtonDown( const MouseEvent& rMEvt ) // -------------------------------------------------------------------- +void SmartTagSet::MouseMove(const MouseEvent& rMEvt) +{ + SmartTagReference xTag; + + SmartHdl* pSmartHdl = 0; + if( !rMEvt.IsLeaveWindow() ) + { + Point aMDPos( mrView.GetViewShell()->GetActiveWindow()->PixelToLogic( rMEvt.GetPosPixel() ) ); + SdrHdl* pHdl = mrView.PickHandle(aMDPos); + + pSmartHdl = dynamic_cast< SmartHdl* >( pHdl ); + if( pSmartHdl ) + xTag = pSmartHdl->getTag(); + } + + if( xTag != mxMouseOverTag ) + { + if( mxMouseOverTag.is() ) + mxMouseOverTag->onMouseLeave(); + + mxMouseOverTag = xTag; + + if( mxMouseOverTag.is() ) + mxMouseOverTag->onMouseEnter(*pSmartHdl); + } +} + +// -------------------------------------------------------------------- + bool SmartTagSet::KeyInput( const KeyEvent& rKEvt ) { if( mxSelectedTag.is() ) 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 diff --git a/sd/source/ui/toolpanel/LayoutMenu.cxx b/sd/source/ui/toolpanel/LayoutMenu.cxx index d2faeb06eb00..f1a918d7e7e0 100644 --- a/sd/source/ui/toolpanel/LayoutMenu.cxx +++ b/sd/source/ui/toolpanel/LayoutMenu.cxx @@ -164,60 +164,37 @@ static snewfoil_value_info handout[] = static snewfoil_value_info standard[] = { - {BMP_FOIL_20, BMP_FOIL_20_H, STR_AUTOLAYOUT_NONE, WritingMode_LR_TB, - AUTOLAYOUT_NONE}, - {BMP_FOIL_00, BMP_FOIL_00_H, STR_AUTOLAYOUT_TITLE, WritingMode_LR_TB, - AUTOLAYOUT_TITLE}, - {BMP_FOIL_01, BMP_FOIL_01_H, STR_AUTOLAYOUT_ENUM, WritingMode_LR_TB, - AUTOLAYOUT_ENUM}, - {BMP_FOIL_03, BMP_FOIL_03_H, STR_AUTOLAYOUT_2TEXT, WritingMode_LR_TB, - AUTOLAYOUT_2TEXT}, - {BMP_FOIL_19, BMP_FOIL_19_H, STR_AUTOLAYOUT_ONLY_TITLE, WritingMode_LR_TB, - AUTOLAYOUT_ONLY_TITLE}, - {BMP_FOIL_25, BMP_FOIL_25_H, STR_AUTOLAYOUT_ONLY_TEXT, WritingMode_LR_TB, - AUTOLAYOUT_ONLY_TEXT}, - {BMP_FOIL_11, BMP_FOIL_11_H, STR_AUTOLAYOUT_OBJ, WritingMode_LR_TB, - AUTOLAYOUT_OBJ}, - {BMP_FOIL_02, BMP_FOIL_02_H, STR_AUTOLAYOUT_CHART, WritingMode_LR_TB, - AUTOLAYOUT_CHART}, - {BMP_FOIL_08, BMP_FOIL_08_H, STR_AUTOLAYOUT_TAB, WritingMode_LR_TB, - AUTOLAYOUT_TAB}, - {BMP_FOIL_09, BMP_FOIL_09_H, STR_AUTOLAYOUT_CLIPTEXT, WritingMode_LR_TB, - AUTOLAYOUT_CLIPTEXT}, - {BMP_FOIL_04, BMP_FOIL_04_H, STR_AUTOLAYOUT_TEXTCHART, WritingMode_LR_TB, - AUTOLAYOUT_TEXTCHART}, - {BMP_FOIL_06, BMP_FOIL_06_H, STR_AUTOLAYOUT_TEXTCLIP, WritingMode_LR_TB, - AUTOLAYOUT_TEXTCLIP}, - {BMP_FOIL_07, BMP_FOIL_07_H, STR_AUTOLAYOUT_CHARTTEXT, WritingMode_LR_TB, - AUTOLAYOUT_CHARTTEXT}, - {BMP_FOIL_10, BMP_FOIL_10_H, STR_AUTOLAYOUT_TEXTOBJ, WritingMode_LR_TB, - AUTOLAYOUT_TEXTOBJ}, - {BMP_FOIL_12, BMP_FOIL_12_H, STR_AUTOLAYOUT_TEXT2OBJ, WritingMode_LR_TB, - AUTOLAYOUT_TEXT2OBJ}, - {BMP_FOIL_13, BMP_FOIL_13_H, STR_AUTOLAYOUT_OBJTEXT, WritingMode_LR_TB, - AUTOLAYOUT_OBJTEXT}, - {BMP_FOIL_14, BMP_FOIL_14_H, STR_AUTOLAYOUT_OBJOVERTEXT, WritingMode_LR_TB, - AUTOLAYOUT_OBJOVERTEXT}, - {BMP_FOIL_15, BMP_FOIL_15_H, STR_AUTOLAYOUT_2OBJTEXT, WritingMode_LR_TB, - AUTOLAYOUT_2OBJTEXT}, - {BMP_FOIL_16, BMP_FOIL_16_H, STR_AUTOLAYOUT_2OBJOVERTEXT, - WritingMode_LR_TB, AUTOLAYOUT_2OBJOVERTEXT}, - {BMP_FOIL_17, BMP_FOIL_17_H, STR_AUTOLAYOUT_TEXTOVEROBJ, WritingMode_LR_TB, - AUTOLAYOUT_TEXTOVEROBJ}, - {BMP_FOIL_18, BMP_FOIL_18_H, STR_AUTOLAYOUT_4OBJ, WritingMode_LR_TB, - AUTOLAYOUT_4OBJ}, - {BMP_FOIL_26, BMP_FOIL_26_H, STR_AUTOLAYOUT_4CLIPART, WritingMode_LR_TB, AUTOLAYOUT_4CLIPART}, - {BMP_FOIL_27, BMP_FOIL_27_H, STR_AUTOLAYOUT_6CLIPART, WritingMode_LR_TB, AUTOLAYOUT_6CLIPART}, - + {BMP_FOIL_20, BMP_FOIL_20_H, STR_AUTOLAYOUT_NONE, WritingMode_LR_TB, AUTOLAYOUT_NONE}, + {BMP_FOIL_00, BMP_FOIL_00_H, STR_AUTOLAYOUT_TITLE, WritingMode_LR_TB, AUTOLAYOUT_TITLE}, + {BMP_FOIL_01, BMP_FOIL_01_H, STR_AUTOLAYOUT_CONTENT, WritingMode_LR_TB, AUTOLAYOUT_ENUM}, + {BMP_FOIL_03, BMP_FOIL_03_H, STR_AUTOLAYOUT_2CONTENT, WritingMode_LR_TB, AUTOLAYOUT_2TEXT}, + {BMP_FOIL_19, BMP_FOIL_19_H, STR_AUTOLAYOUT_ONLY_TITLE, WritingMode_LR_TB, AUTOLAYOUT_ONLY_TITLE}, + {BMP_FOIL_25, BMP_FOIL_25_H, STR_AUTOLAYOUT_ONLY_TEXT, WritingMode_LR_TB, AUTOLAYOUT_ONLY_TEXT}, + {BMP_FOIL_12, BMP_FOIL_12_H, STR_AUTOLAYOUT_CONTENT_2CONTENT, WritingMode_LR_TB, AUTOLAYOUT_TEXT2OBJ}, + {BMP_FOIL_15, BMP_FOIL_15_H, STR_AUTOLAYOUT_2CONTENT_CONTENT, WritingMode_LR_TB, AUTOLAYOUT_2OBJTEXT}, +//STR_AUTOLAYOUT_CONTENT_OVER_2CONTENT + {BMP_FOIL_16, BMP_FOIL_16_H, STR_AUTOLAYOUT_2CONTENT_OVER_CONTENT,WritingMode_LR_TB, AUTOLAYOUT_2OBJOVERTEXT}, + {BMP_FOIL_14, BMP_FOIL_14_H, STR_AUTOLAYOUT_CONTENT_OVER_CONTENT, WritingMode_LR_TB, AUTOLAYOUT_OBJOVERTEXT}, + {BMP_FOIL_18, BMP_FOIL_18_H, STR_AUTOLAYOUT_4CONTENT, WritingMode_LR_TB, AUTOLAYOUT_4OBJ}, + {BMP_FOIL_27, BMP_FOIL_27_H, STR_AUTOLAYOUT_6CONTENT, WritingMode_LR_TB, AUTOLAYOUT_6CLIPART}, +/* + {BMP_FOIL_11, BMP_FOIL_11_H, STR_AUTOLAYOUT_OBJ, WritingMode_LR_TB, AUTOLAYOUT_OBJ}, + {BMP_FOIL_02, BMP_FOIL_02_H, STR_AUTOLAYOUT_CHART, WritingMode_LR_TB, AUTOLAYOUT_CHART}, + {BMP_FOIL_08, BMP_FOIL_08_H, STR_AUTOLAYOUT_TAB, WritingMode_LR_TB, AUTOLAYOUT_TAB}, + {BMP_FOIL_09, BMP_FOIL_09_H, STR_AUTOLAYOUT_CLIPTEXT, WritingMode_LR_TB, AUTOLAYOUT_CLIPTEXT}, + {BMP_FOIL_04, BMP_FOIL_04_H, STR_AUTOLAYOUT_TEXTCHART, WritingMode_LR_TB, AUTOLAYOUT_TEXTCHART}, + {BMP_FOIL_06, BMP_FOIL_06_H, STR_AUTOLAYOUT_TEXTCLIP, WritingMode_LR_TB, AUTOLAYOUT_TEXTCLIP}, + {BMP_FOIL_07, BMP_FOIL_07_H, STR_AUTOLAYOUT_CHARTTEXT, WritingMode_LR_TB, AUTOLAYOUT_CHARTTEXT}, + {BMP_FOIL_10, BMP_FOIL_10_H, STR_AUTOLAYOUT_TEXTOBJ, WritingMode_LR_TB, AUTOLAYOUT_TEXTOBJ}, + {BMP_FOIL_13, BMP_FOIL_13_H, STR_AUTOLAYOUT_OBJTEXT, WritingMode_LR_TB, AUTOLAYOUT_OBJTEXT}, + {BMP_FOIL_17, BMP_FOIL_17_H, STR_AUTOLAYOUT_TEXTOVEROBJ, WritingMode_LR_TB, AUTOLAYOUT_TEXTOVEROBJ}, + {BMP_FOIL_26, BMP_FOIL_26_H, STR_AUTOLAYOUT_4CLIPART, WritingMode_LR_TB, AUTOLAYOUT_4CLIPART}, +*/ // vertical - {BMP_FOIL_21, BMP_FOIL_21_H, STR_AL_VERT_TITLE_TEXT_CHART, - WritingMode_TB_RL, AUTOLAYOUT_VERTICAL_TITLE_TEXT_CHART}, - {BMP_FOIL_22, BMP_FOIL_22_H, STR_AL_VERT_TITLE_VERT_OUTLINE, - WritingMode_TB_RL, AUTOLAYOUT_VERTICAL_TITLE_VERTICAL_OUTLINE}, - {BMP_FOIL_23, BMP_FOIL_23_H, STR_AL_TITLE_VERT_OUTLINE, WritingMode_TB_RL, - AUTOLAYOUT_TITLE_VERTICAL_OUTLINE}, - {BMP_FOIL_24, BMP_FOIL_24_H, STR_AL_TITLE_VERT_OUTLINE_CLIPART, - WritingMode_TB_RL, AUTOLAYOUT_TITLE_VERTICAL_OUTLINE_CLIPART}, + {BMP_FOIL_21, BMP_FOIL_21_H, STR_AL_VERT_TITLE_TEXT_CHART, WritingMode_TB_RL,AUTOLAYOUT_VERTICAL_TITLE_TEXT_CHART}, + {BMP_FOIL_22, BMP_FOIL_22_H, STR_AL_VERT_TITLE_VERT_OUTLINE, WritingMode_TB_RL, AUTOLAYOUT_VERTICAL_TITLE_VERTICAL_OUTLINE}, + {BMP_FOIL_23, BMP_FOIL_23_H, STR_AL_TITLE_VERT_OUTLINE, WritingMode_TB_RL, AUTOLAYOUT_TITLE_VERTICAL_OUTLINE}, + {BMP_FOIL_24, BMP_FOIL_24_H, STR_AL_TITLE_VERT_OUTLINE_CLIPART, WritingMode_TB_RL, AUTOLAYOUT_TITLE_VERTICAL_OUTLINE_CLIPART}, {0, 0, 0, WritingMode_LR_TB, AUTOLAYOUT_NONE} }; diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx index 2077a852f960..e870f706f810 100644 --- a/sd/source/ui/view/drviews1.cxx +++ b/sd/source/ui/view/drviews1.cxx @@ -71,6 +71,8 @@ #include +#include "view/viewoverlaymanager.hxx" + #include "glob.hrc" #include "app.hrc" #include "res_bmp.hrc" @@ -295,6 +297,7 @@ void DrawViewShell::SetZoom( long nZoom ) ViewShell::SetZoom( nZoom ); GetViewFrame()->GetBindings().Invalidate( SID_ATTR_ZOOM ); GetViewFrame()->GetBindings().Invalidate( SID_ATTR_ZOOMSLIDER ); + mpViewOverlayManager->onZoomChanged(); } /************************************************************************* @@ -308,6 +311,7 @@ void DrawViewShell::SetZoomRect( const Rectangle& rZoomRect ) ViewShell::SetZoomRect( rZoomRect ); GetViewFrame()->GetBindings().Invalidate( SID_ATTR_ZOOM ); GetViewFrame()->GetBindings().Invalidate( SID_ATTR_ZOOMSLIDER ); + mpViewOverlayManager->onZoomChanged(); } /************************************************************************* diff --git a/sd/source/ui/view/drviewsa.cxx b/sd/source/ui/view/drviewsa.cxx index 3c396db7207d..201a1018cf78 100644 --- a/sd/source/ui/view/drviewsa.cxx +++ b/sd/source/ui/view/drviewsa.cxx @@ -65,6 +65,7 @@ #include #include +#include "view/viewoverlaymanager.hxx" #include "app.hrc" #include "helpids.h" #include "strings.hrc" @@ -174,7 +175,8 @@ DrawViewShell::DrawViewShell( SfxViewFrame* pFrame, ::Window* pParentWindow, con DrawViewShell::~DrawViewShell() { - mpAnnotationManager.release(); + mpAnnotationManager.reset(); + mpViewOverlayManager.reset(); OSL_ASSERT (GetViewShell()!=NULL); @@ -419,6 +421,7 @@ void DrawViewShell::Construct(DrawDocShell* pDocSh, PageKind eInitialPageKind) } mpAnnotationManager.reset( new AnnotationManager( GetViewShellBase() ) ); + mpViewOverlayManager.reset( new ViewOverlayManager( GetViewShellBase() ) ); } diff --git a/sd/source/ui/view/makefile.mk b/sd/source/ui/view/makefile.mk index a65f3fd7c87f..89b6f3d232c4 100644 --- a/sd/source/ui/view/makefile.mk +++ b/sd/source/ui/view/makefile.mk @@ -113,7 +113,8 @@ SLOFILES = \ $(SLO)$/ViewShellManager.obj \ $(SLO)$/ViewShellHint.obj \ $(SLO)$/ViewTabBar.obj \ - $(SLO)$/WindowUpdater.obj + $(SLO)$/WindowUpdater.obj \ + $(SLO)$/ViewOverlayManager.obj diff --git a/sd/source/ui/view/viewoverlaymanager.cxx b/sd/source/ui/view/viewoverlaymanager.cxx new file mode 100644 index 000000000000..a6684fcdfd3e --- /dev/null +++ b/sd/source/ui/view/viewoverlaymanager.cxx @@ -0,0 +1,568 @@ +/************************************************************************* + * + * 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. + * + ************************************************************************/ + +// MARKER(update_precomp.py): autogen include statement, do not remove +#include "precompiled_sd.hxx" + +#include "sddll.hxx" + +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include + +#include "view/viewoverlaymanager.hxx" + +#include "DrawDocShell.hxx" +#include "DrawViewShell.hxx" +#include "DrawController.hxx" +#include "glob.hrc" +#include "sdresid.hxx" +#include "EventMultiplexer.hxx" +#include "ViewShellManager.hxx" +#include "helpids.h" +#include "sdpage.hxx" +#include "drawdoc.hxx" +#include "smarttag.hxx" + +using ::rtl::OUString; +using namespace ::com::sun::star::uno; +using namespace ::com::sun::star::frame; + +namespace sd { + +class ImageButtonHdl; + +const sal_uInt32 SMART_TAG_HDL_NUM = SAL_MAX_UINT32; + +class ChangePlaceholderTag : public SmartTag +{ + friend class ImageButtonHdl; +public: + ChangePlaceholderTag( ViewOverlayManager& rManager, ::sd::View& rView, SdrObject& rPlaceholderObj ); + virtual ~ChangePlaceholderTag(); + + /** returns true if the SmartTag handled the event. */ + virtual bool MouseButtonDown( const MouseEvent&, SmartHdl& ); + + /** returns true if the SmartTag consumes this event. */ + virtual bool KeyInput( const KeyEvent& rKEvt ); + + /** returns true if the SmartTag consumes this event. */ + virtual bool RequestHelp( const HelpEvent& rHEvt ); + + /** returns true if the SmartTag consumes this event. */ + virtual bool Command( const CommandEvent& rCEvt ); + + /** 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(); + +protected: + virtual void addCustomHandles( SdrHdlList& rHandlerList ); + virtual void disposing(); + virtual void select(); + virtual void deselect(); + +private: + ViewOverlayManager& mrManager; + SdrObjectWeakRef mxPlaceholderObj; + ImageButtonHdl* mpSelectedHdl; +}; + +class ImageButtonHdl : public SmartHdl +{ +public: + ImageButtonHdl( const SmartTagReference& xTag, const Image& rImage, const Point& rPnt ); + virtual ~ImageButtonHdl(); + virtual void CreateB2dIAObject(); + virtual BOOL IsFocusHdl() const; + virtual Pointer GetSdrDragPointer() const; + virtual bool isMarkable() const; + + void select( bool bSelect ); +private: + rtl::Reference< ChangePlaceholderTag > mxTag; + bool mbSelected; + Image maImage; +}; + +// -------------------------------------------------------------------- + +ImageButtonHdl::ImageButtonHdl( const SmartTagReference& xTag, const Image& rImage, const Point& rPnt ) +: SmartHdl( xTag, rPnt ) +, mxTag( dynamic_cast< ChangePlaceholderTag* >( xTag.get() ) ) +, mbSelected(false) +, maImage( rImage ) +{ +} + +// -------------------------------------------------------------------- + +ImageButtonHdl::~ImageButtonHdl() +{ + if( mxTag.is() && (mxTag->mpSelectedHdl == this) ) + mxTag->mpSelectedHdl = 0; +} + +// -------------------------------------------------------------------- + +void ImageButtonHdl::select( bool bSelect ) +{ + if( bSelect != mbSelected ) + { + mbSelected = bSelect; + Touch(); + } +} + +// -------------------------------------------------------------------- + +void ImageButtonHdl::CreateB2dIAObject() +{ + // first throw away old one + GetRidOfIAObject(); + + const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings(); + + const Point aTagPos( GetPos() ); + basegfx::B2DPoint aPosition( aTagPos.X(), aTagPos.Y() ); + + const bool bFocused = IsFocusHdl() && pHdlList && (pHdlList->GetFocusHdl() == this); + + BitmapEx aBitmapEx( maImage.GetBitmapEx() ); + + const double fAlpha = mbSelected ? 0.0 : 0.5; + + if(pHdlList) + { + SdrMarkView* pView = pHdlList->GetView(); + + if(pView && !pView->areMarkHandlesHidden()) + { + SdrPageView* pPageView = pView->GetSdrPageView(); + + if(pPageView) + { + for(sal_uInt32 b = 0; b < pPageView->PageWindowCount(); b++) + { + const SdrPageWindow& rPageWindow = *pPageView->GetPageWindow(b); + + SdrPaintWindow& rPaintWindow = rPageWindow.GetPaintWindow(); + if(rPaintWindow.OutputToWindow() && rPageWindow.GetOverlayManager() ) + { + ::sdr::overlay::OverlayObject* pOverlayObject = 0; + + // animate focused handles + pOverlayObject = new ::sdr::overlay::OverlayBitmapEx( aPosition, aBitmapEx, 0, 0, fAlpha ); + rPageWindow.GetOverlayManager()->add(*pOverlayObject); + maOverlayGroup.append(*pOverlayObject); + } + } + } + } + } +} + +// -------------------------------------------------------------------- + +BOOL ImageButtonHdl::IsFocusHdl() const +{ + return TRUE; +} + +// -------------------------------------------------------------------- + +bool ImageButtonHdl::isMarkable() const +{ + return false; +} + +// -------------------------------------------------------------------- + +Pointer ImageButtonHdl::GetSdrDragPointer() const +{ + return Pointer( POINTER_ARROW ); +} + +// ==================================================================== + +ChangePlaceholderTag::ChangePlaceholderTag( ViewOverlayManager& rManager, ::sd::View& rView, SdrObject& rPlaceholderObj ) +: SmartTag( rView ) +, mrManager( rManager ) +, mxPlaceholderObj( &rPlaceholderObj ) +{ +} + +// -------------------------------------------------------------------- + +ChangePlaceholderTag::~ChangePlaceholderTag() +{ +} + +// -------------------------------------------------------------------- + +/** returns true if the ChangePlaceholderTag handled the event. */ +bool ChangePlaceholderTag::MouseButtonDown( const MouseEvent& rMEvt, SmartHdl& /*rHdl*/ ) +{ + return false; +} + +// -------------------------------------------------------------------- + +/** returns true if the SmartTag consumes this event. */ +bool ChangePlaceholderTag::KeyInput( const KeyEvent& rKEvt ) +{ + USHORT nCode = rKEvt.GetKeyCode().GetCode(); + switch( nCode ) + { + case KEY_DOWN: + case KEY_UP: + case KEY_LEFT: + case KEY_RIGHT: + case KEY_ESCAPE: + case KEY_TAB: + case KEY_RETURN: + case KEY_SPACE: + default: + return false; + } +} + +/** returns true if the SmartTag consumes this event. */ +bool ChangePlaceholderTag::RequestHelp( const HelpEvent& /*rHEvt*/ ) +{ + return false; +} + +/** returns true if the SmartTag consumes this event. */ +bool ChangePlaceholderTag::Command( const CommandEvent& rCEvt ) +{ + return false; +} + +/** is called once if the mouse enters this tag */ +void ChangePlaceholderTag::onMouseEnter(SmartHdl& rHdl) +{ + ImageButtonHdl* pHdl = dynamic_cast< ImageButtonHdl* >( &rHdl ); + if( mpSelectedHdl != 0 ) + { + if( mpSelectedHdl == pHdl ) + return; + + mpSelectedHdl->select(false); + } + + mpSelectedHdl = pHdl; + + if( mpSelectedHdl ) + { + mpSelectedHdl->select( true ); + } +} + +/** is called once if the mouse leaves this tag */ +void ChangePlaceholderTag::onMouseLeave() +{ + if( mpSelectedHdl ) + { + mpSelectedHdl->select( false ); + mpSelectedHdl = 0; + } +} + +// -------------------------------------------------------------------- + +void ChangePlaceholderTag::addCustomHandles( SdrHdlList& rHandlerList ) +{ + if( mxPlaceholderObj.is() ) + { + SdrObject* pPlaceholder = mxPlaceholderObj.get(); + SmartTagReference xThis( this ); + const Rectangle& rSnapRect = pPlaceholder->GetSnapRect(); + const Point aPoint; + + OutputDevice* pDev = mrView.GetFirstOutputDevice(); + if( pDev == 0 ) + pDev = Application::GetDefaultDevice(); + + Size aShapeSizePix = pDev->LogicToPixel(rSnapRect.GetSize()); + long nShapeSizePix = std::min(aShapeSizePix.Width(),aShapeSizePix.Height()); + + Image* pImages = (nShapeSizePix > 300) ? &ViewOverlayManager::maLargeButtonImages[0] : &ViewOverlayManager::maSmallButtonImages[0]; + + Size aButtonSize( pDev->PixelToLogic(pImages[0].GetSizePixel()) ); + if( 200 > nShapeSizePix ) + { + aButtonSize.Width() >>= 1; aButtonSize.Height() >>= 1; + } + + const long nBorderPix = (nShapeSizePix > 300) ? 4 : (nShapeSizePix > 100) ? 2 : 1; + Size aBorder( pDev->PixelToLogic(Size(nBorderPix,nBorderPix)) ); + + const int nColumns = (ViewOverlayManager::ButtonCount+1) >> 1; + const int nRows = (ViewOverlayManager::ButtonCount + nColumns - 1) / nColumns; + + long all_width = (nColumns * aButtonSize.Width()) + ((nColumns-1) * aBorder.Width()); + long all_height = (nRows * aButtonSize.Height()) + ((nRows-1) * aBorder.Height()); + + Point aPos( rSnapRect.Center() ); + aPos.X() -= all_width >> 1; + aPos.Y() -= all_height >> 1; + + long nStartX = aPos.X(); + + for( int i = 0, c = 0; i < ViewOverlayManager::ButtonCount; i++ ) + { + Image aImg( pImages[i] ); + if( 200 > nShapeSizePix ) + { + BitmapEx b( aImg.GetBitmapEx() ); + const double scale = 0.5; + b.Scale( scale, scale ); + aImg = Image(b); + } + + ImageButtonHdl* pHdl = new ImageButtonHdl( xThis, aImg, aPoint ); + pHdl->SetObjHdlNum( SMART_TAG_HDL_NUM ); + pHdl->SetPageView( mrView.GetSdrPageView() ); + + pHdl->SetPos( aPos ); + + rHandlerList.AddHdl( pHdl ); + + if( ++c == nColumns ) + { + aPos.X() = nStartX; + aPos.Y() += aButtonSize.Height() + aBorder.Height(); + c = 0; + } + else + { + aPos.X() += aButtonSize.Width() + aBorder.Width(); + } + } + } +} + +// -------------------------------------------------------------------- + +void ChangePlaceholderTag::disposing() +{ + SmartTag::disposing(); +} + +// -------------------------------------------------------------------- + +void ChangePlaceholderTag::select() +{ + SmartTag::select(); +} + +// -------------------------------------------------------------------- + +void ChangePlaceholderTag::deselect() +{ + SmartTag::deselect(); +} + +// -------------------------------------------------------------------- + +Image ViewOverlayManager::maSmallButtonImages[ViewOverlayManager::ButtonCount]; +Image ViewOverlayManager::maLargeButtonImages[ViewOverlayManager::ButtonCount]; +USHORT ViewOverlayManager::mnButtonSlots[ViewOverlayManager::ButtonCount] = { SID_INSERT_TABLE, SID_INSERT_DIAGRAM, SID_INSERT_GRAPHIC, SID_INSERT_AVMEDIA }; + +// -------------------------------------------------------------------- + +static Image lcl_getslotimage( ::com::sun::star::uno::Reference& xFrame, USHORT nSID, BOOL b1, BOOL b2 ) +{ + rtl::OUString aSlotURL( RTL_CONSTASCII_USTRINGPARAM( "slot:" )); + aSlotURL += rtl::OUString::valueOf( sal_Int32( nSID )); + return ::GetImage( xFrame, aSlotURL, b1, b2 ); +} + +ViewOverlayManager::ViewOverlayManager( ViewShellBase& rViewShellBase ) +: mrBase( rViewShellBase ) +, mnUpdateTagsEvent( 0 ) +{ + Link aLink( LINK(this,ViewOverlayManager,EventMultiplexerListener) ); + mrBase.GetEventMultiplexer()->AddEventListener(aLink, tools::EventMultiplexerEvent::EID_CURRENT_PAGE); + + StartListening( *mrBase.GetDocShell() ); +} + +// -------------------------------------------------------------------- + +ViewOverlayManager::~ViewOverlayManager() +{ + Link aLink( LINK(this,ViewOverlayManager,EventMultiplexerListener) ); + mrBase.GetEventMultiplexer()->RemoveEventListener( aLink ); + + if( mnUpdateTagsEvent ) + { + Application::RemoveUserEvent( mnUpdateTagsEvent ); + mnUpdateTagsEvent = 0; + } + + DisposeTags(); +} + +// -------------------------------------------------------------------- + +void ViewOverlayManager::UpdateImages() +{ + try + { + Reference xFrame(mrBase.GetFrame()->GetTopFrame()->GetFrameInterface(), UNO_QUERY_THROW); + for( int i = 0; i < ButtonCount; i++ ) + { + maSmallButtonImages[i] = lcl_getslotimage( xFrame, mnButtonSlots[i], FALSE, FALSE ); + maLargeButtonImages[i] = lcl_getslotimage( xFrame, mnButtonSlots[i], TRUE, FALSE ); + } + } + catch( Exception& ) + { + DBG_ERROR( "ViewOverlayManager::ViewOverlayManager(), exception caught!" ); + } +} + +// -------------------------------------------------------------------- + +void ViewOverlayManager::Notify(SfxBroadcaster&, const SfxHint& rHint) +{ + const SfxSimpleHint* pSimpleHint = dynamic_cast(&rHint); + if (pSimpleHint != NULL) + { + if (pSimpleHint->GetId() == SFX_HINT_DOCCHANGED) + { + UpdateTags(); + } + } +} + +void ViewOverlayManager::onZoomChanged() +{ + if( !maTagVector.empty() ) + { + UpdateTags(); + } +} + +void ViewOverlayManager::UpdateTags() +{ + if( !mnUpdateTagsEvent ) + mnUpdateTagsEvent = Application::PostUserEvent( LINK( this, ViewOverlayManager, UpdateTagsHdl ) ); +} + +IMPL_LINK(ViewOverlayManager,UpdateTagsHdl, void *, EMPTYARG) +{ + mnUpdateTagsEvent = 0; + bool bChanges = DisposeTags(); + bChanges |= CreateTags(); + + if( bChanges && mrBase.GetDrawView() ) + static_cast< ::sd::View* >( mrBase.GetDrawView() )->updateHandles(); + return 0; +} + +bool ViewOverlayManager::CreateTags() +{ + bool bChanges = false; + + SdPage* pPage = mrBase.GetMainViewShell()->getCurrentPage(); + + if( pPage ) + { + if( !maSmallButtonImages[0] ) + UpdateImages(); + + const std::list< SdrObject* >& rShapes = pPage->GetPresentationShapeList().getList(); + + for( std::list< SdrObject* >::const_iterator iter( rShapes.begin() ); iter != rShapes.end(); iter++ ) + { + if( (*iter)->IsEmptyPresObj() && ((*iter)->GetObjIdentifier() == OBJ_OUTLINETEXT) ) + { + rtl::Reference< SmartTag > xTag( new ChangePlaceholderTag( *this, *mrBase.GetMainViewShell()->GetView(), *(*iter) ) ); + maTagVector.push_back(xTag); + } + } + } + + return bChanges; +} + +// -------------------------------------------------------------------- + +bool ViewOverlayManager::DisposeTags() +{ + if( !maTagVector.empty() ) + { + ViewTagVector vec; + vec.swap( maTagVector ); + + ViewTagVector::iterator iter = vec.begin(); + do + { + (*iter++)->Dispose(); + } + while( iter != vec.end() ); + return true; + } + + return false; +} + +// -------------------------------------------------------------------- + +IMPL_LINK(ViewOverlayManager,EventMultiplexerListener, + tools::EventMultiplexerEvent*,pEvent) +{ + switch (pEvent->meEventId) + { + case tools::EventMultiplexerEvent::EID_CURRENT_PAGE: + UpdateTags(); + break; + } + return 0; +} + +} diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx index 208d5426c8bd..98c425110c23 100644 --- a/sd/source/ui/view/viewshel.cxx +++ b/sd/source/ui/view/viewshel.cxx @@ -579,6 +579,9 @@ void ViewShell::MouseButtonDown(const MouseEvent& rMEvt, ::sd::Window* pWin) void ViewShell::MouseMove(const MouseEvent& rMEvt, ::sd::Window* pWin) { + if( GetView() ) + GetView()->getSmartTags().MouseMove( rMEvt ); + if (rMEvt.IsLeaveWindow()) { if ( ! mpImpl->mpUpdateLockForMouse.expired()) -- 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/inc/sdpage.hxx | 3 + sd/inc/shapelist.hxx | 2 + sd/sdi/sdraw.sdi | 2 +- sd/source/core/sdpage.cxx | 63 ++-- sd/source/core/shapelist.cxx | 38 +++ sd/source/ui/app/layoutctrl.cxx | 338 +++++++++++++++++++++ sd/source/ui/app/makefile.mk | 6 +- sd/source/ui/app/sddll2.cxx | 2 + sd/source/ui/func/fuinsert.cxx | 27 +- sd/source/ui/func/smarttag.cxx | 41 --- sd/source/ui/inc/View.hxx | 2 + sd/source/ui/inc/layoutctrl.hxx | 53 ++++ sd/source/ui/inc/smarttag.hxx | 8 - .../slidesorter/controller/SlsSelectionManager.cxx | 1 + sd/source/ui/view/drviews2.cxx | 26 +- sd/source/ui/view/drviews7.cxx | 20 ++ sd/source/ui/view/sdview4.cxx | 20 +- sd/source/ui/view/sdview5.cxx | 84 +++++ sd/source/ui/view/viewoverlaymanager.cxx | 115 +++---- sd/source/ui/view/viewshel.cxx | 3 - sd/uiconfig/simpress/toolbar/commontaskbar.xml | 2 +- 21 files changed, 675 insertions(+), 181 deletions(-) create mode 100644 sd/source/ui/app/layoutctrl.cxx create mode 100644 sd/source/ui/inc/layoutctrl.hxx (limited to 'sd') diff --git a/sd/inc/sdpage.hxx b/sd/inc/sdpage.hxx index 842c70d50fd3..698684dcc765 100644 --- a/sd/inc/sdpage.hxx +++ b/sd/inc/sdpage.hxx @@ -214,6 +214,9 @@ public: /** inserts the given SdrObject into the presentation object list */ void InsertPresObj(SdrObject* pObj, PresObjKind eKind ); + /** replace the given SdrObject with the new SdrObject in the presentation object list */ + void ReplacePresObj(SdrObject* pOldObj, SdrObject* pNewObj, PresObjKind eNewKind ); + void SetAutoLayout(AutoLayout eLayout, BOOL bInit=FALSE, BOOL bCreate=FALSE); AutoLayout GetAutoLayout() const { return meAutoLayout; } void CreateTitleAndLayout(BOOL bInit=FALSE, BOOL bCreate=FALSE); diff --git a/sd/inc/shapelist.hxx b/sd/inc/shapelist.hxx index 7ccb4093f6fb..977371008033 100644 --- a/sd/inc/shapelist.hxx +++ b/sd/inc/shapelist.hxx @@ -50,6 +50,8 @@ namespace sd a pointer to the next shape in list or 0*/ SdrObject* removeShape( SdrObject& rObject ); + void replaceShape( SdrObject& rOldObject, SdrObject& rNewObject ); + /** removes all shapes from this list */ void clear(); diff --git a/sd/sdi/sdraw.sdi b/sd/sdi/sdraw.sdi index 7c37e455276c..0e91fb2c9134 100644 --- a/sd/sdi/sdraw.sdi +++ b/sd/sdi/sdraw.sdi @@ -4391,7 +4391,7 @@ SfxVoidItem ModifyPage SID_MODIFYPAGE GroupId = GID_MODIFY; ] -SfxVoidItem AssignLayout SID_ASSIGN_LAYOUT +SfxUInt32Item AssignLayout SID_ASSIGN_LAYOUT (SfxUInt32Item WhatPage ID_VAL_WHATPAGE, SfxUInt32Item WhatLayout ID_VAL_WHATLAYOUT) [ /* flags: */ diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx index 7f80b5bd763a..60cc0a2c30de 100644 --- a/sd/source/core/sdpage.cxx +++ b/sd/source/core/sdpage.cxx @@ -1088,24 +1088,24 @@ static const LayoutDescriptor& GetLayoutDescriptor( AutoLayout eLayout ) { LayoutDescriptor( 0, PRESOBJ_TITLE, PRESOBJ_TEXT ), // AUTOLAYOUT_TITLE LayoutDescriptor( 0, PRESOBJ_TITLE, PRESOBJ_OUTLINE ), // AUTOLAYOUT_ENUM - LayoutDescriptor( 0, PRESOBJ_TITLE, PRESOBJ_CHART ), // AUTOLAYOUT_CHART + LayoutDescriptor( 0, PRESOBJ_TITLE, PRESOBJ_OUTLINE ), // AUTOLAYOUT_CHART LayoutDescriptor( 1, PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ), // AUTOLAYOUT_2TEXT - LayoutDescriptor( 1, PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_CHART ), // AUTOLAYOUT_TEXTCHART - LayoutDescriptor( 0, PRESOBJ_TITLE, PRESOBJ_ORGCHART ), // AUTOLAYOUT_ORG - LayoutDescriptor( 1, PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_GRAPHIC ), // AUTOLAYOUT_TEXTCLbIP - LayoutDescriptor( 1, PRESOBJ_TITLE, PRESOBJ_CHART, PRESOBJ_OUTLINE ), // AUTOLAYOUT_CHARTTEXT - LayoutDescriptor( 0, PRESOBJ_TITLE, PRESOBJ_TABLE ), // AUTOLAYOUT_TAB - LayoutDescriptor( 1, PRESOBJ_TITLE, PRESOBJ_GRAPHIC, PRESOBJ_OUTLINE ), // AUTOLAYOUT_CLIPTEXT - LayoutDescriptor( 1, PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OBJECT ), // AUTOLAYOUT_TEXTOBJ + LayoutDescriptor( 1, PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ), // AUTOLAYOUT_TEXTCHART + LayoutDescriptor( 0, PRESOBJ_TITLE, PRESOBJ_OUTLINE ), // AUTOLAYOUT_ORG + LayoutDescriptor( 1, PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ), // AUTOLAYOUT_TEXTCLbIP + LayoutDescriptor( 1, PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ), // AUTOLAYOUT_CHARTTEXT + LayoutDescriptor( 0, PRESOBJ_TITLE, PRESOBJ_OUTLINE ), // AUTOLAYOUT_TAB + LayoutDescriptor( 1, PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ), // AUTOLAYOUT_CLIPTEXT + LayoutDescriptor( 1, PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ), // AUTOLAYOUT_TEXTOBJ LayoutDescriptor( 0, PRESOBJ_TITLE, PRESOBJ_OBJECT ), // AUTOLAYOUT_OBJ - LayoutDescriptor( 2, PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OBJECT, PRESOBJ_OBJECT ), // AUTOLAYOUT_TEXT2OBJ - LayoutDescriptor( 1, PRESOBJ_TITLE, PRESOBJ_OBJECT, PRESOBJ_OUTLINE ), // AUTOLAYOUT_TEXTOBJ - LayoutDescriptor( 4, PRESOBJ_TITLE, PRESOBJ_OBJECT, PRESOBJ_OUTLINE ), // AUTOLAYOUT_OBJOVERTEXT - LayoutDescriptor( 3, PRESOBJ_TITLE, PRESOBJ_OBJECT, PRESOBJ_OBJECT, PRESOBJ_OUTLINE ), // AUTOLAYOUT_2OBJTEXT - LayoutDescriptor( 5, PRESOBJ_TITLE, PRESOBJ_OBJECT, PRESOBJ_OBJECT, PRESOBJ_OUTLINE ), // AUTOLAYOUT_2OBJOVERTEXT - LayoutDescriptor( 4, PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OBJECT ), // AUTOLAYOUT_TEXTOVEROBJ - LayoutDescriptor( 6, PRESOBJ_TITLE, PRESOBJ_OBJECT, PRESOBJ_OBJECT, // AUTOLAYOUT_4OBJ - PRESOBJ_OBJECT, PRESOBJ_OBJECT ), + LayoutDescriptor( 2, PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ), // AUTOLAYOUT_TEXT2OBJ + LayoutDescriptor( 1, PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ), // AUTOLAYOUT_TEXTOBJ + LayoutDescriptor( 4, PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ), // AUTOLAYOUT_OBJOVERTEXT + LayoutDescriptor( 3, PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ), // AUTOLAYOUT_2OBJTEXT + LayoutDescriptor( 5, PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ), // AUTOLAYOUT_2OBJOVERTEXT + LayoutDescriptor( 4, PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ), // AUTOLAYOUT_TEXTOVEROBJ + LayoutDescriptor( 6, PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE, // AUTOLAYOUT_4OBJ + PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ), LayoutDescriptor( 0, PRESOBJ_TITLE, PRESOBJ_NONE ), // AUTOLAYOUT_ONLY_TITLE LayoutDescriptor( 0, PRESOBJ_NONE ), // AUTOLAYOUT_NONE LayoutDescriptor( 0, PRESOBJ_PAGE, PRESOBJ_NOTES ), // AUTOLAYOUT_NOTES @@ -1114,16 +1114,16 @@ static const LayoutDescriptor& GetLayoutDescriptor( AutoLayout eLayout ) LayoutDescriptor( 0 ), // AUTOLAYOUT_HANDOUT3 LayoutDescriptor( 0 ), // AUTOLAYOUT_HANDOUT4 LayoutDescriptor( 0 ), // AUTOLAYOUT_HANDOUT6 - LayoutDescriptor( 7, PRESOBJ_TITLE|VERTICAL, PRESOBJ_OUTLINE|VERTICAL, PRESOBJ_CHART ),// AUTOLAYOUT_VERTICAL_TITLE_TEXT_CHART + LayoutDescriptor( 7, PRESOBJ_TITLE|VERTICAL, PRESOBJ_OUTLINE|VERTICAL, PRESOBJ_OUTLINE ),// AUTOLAYOUT_VERTICAL_TITLE_TEXT_CHART LayoutDescriptor( 8, PRESOBJ_TITLE|VERTICAL, PRESOBJ_OUTLINE|VERTICAL ), // AUTOLAYOUT_VERTICAL_TITLE_VERTICAL_OUTLINE LayoutDescriptor( 0, PRESOBJ_TITLE, PRESOBJ_OUTLINE|VERTICAL ), // AUTOLAYOUT_TITLE_VERTICAL_OUTLINE - LayoutDescriptor( 9, PRESOBJ_TITLE, PRESOBJ_GRAPHIC, PRESOBJ_OUTLINE|VERTICAL ), // AUTOLAYOUT_TITLE_VERTICAL_OUTLINE_CLIPART + LayoutDescriptor( 9, PRESOBJ_TITLE, PRESOBJ_OUTLINE|VERTICAL, PRESOBJ_OUTLINE|VERTICAL ), // AUTOLAYOUT_TITLE_VERTICAL_OUTLINE_CLIPART LayoutDescriptor( 0 ), // AUTOLAYOUT_HANDOUT9 LayoutDescriptor( 10, PRESOBJ_TEXT, PRESOBJ_NONE ), // AUTOLAYOUT_ONLY_TEXT - LayoutDescriptor( 6, PRESOBJ_TITLE, PRESOBJ_GRAPHIC, PRESOBJ_GRAPHIC, // AUTOLAYOUT_4CLIPART + LayoutDescriptor( 6, PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE, // AUTOLAYOUT_4CLIPART PRESOBJ_GRAPHIC, PRESOBJ_GRAPHIC ), - LayoutDescriptor( 11, PRESOBJ_TITLE, PRESOBJ_GRAPHIC, PRESOBJ_GRAPHIC, // AUTOLAYOUT_6CLIPART - PRESOBJ_GRAPHIC, PRESOBJ_GRAPHIC, PRESOBJ_GRAPHIC, PRESOBJ_GRAPHIC ) + LayoutDescriptor( 11, PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE, // AUTOLAYOUT_6CLIPART + PRESOBJ_OUTLINE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ) }; if( (eLayout < AUTOLAYOUT__START) || (eLayout >= AUTOLAYOUT__END) ) @@ -1407,7 +1407,7 @@ void findAutoLayoutShapesImpl( SdPage& rPage, const LayoutDescriptor& rDescripto bFound = eSdrObjKind == OBJ_TITLETEXT; break; case PRESOBJ_OUTLINE: - bFound = (eSdrObjKind == OBJ_OUTLINETEXT) || ((eSdrObjKind == OBJ_TEXT) && bPresStyle); + bFound = (eSdrObjKind == OBJ_OUTLINETEXT) || ((eSdrObjKind == OBJ_TEXT) || (eSdrObjKind == OBJ_GRAF) || (eSdrObjKind == OBJ_OLE2) || (eSdrObjKind == OBJ_MEDIA) && bPresStyle); break; case PRESOBJ_GRAPHIC: bFound = eSdrObjKind == OBJ_GRAF; @@ -2382,6 +2382,25 @@ void SdPage::InsertPresObj(SdrObject* pObj, PresObjKind eKind ) } } +void SdPage::ReplacePresObj(SdrObject* pOldObj, SdrObject* pNewObj, PresObjKind eNewKind ) +{ + if( !pNewObj ) + { + RemovePresObj( pOldObj ); + } + else if( pOldObj ) + { + SdAnimationInfo* pInfo = SdDrawDocument::GetShapeUserData(*pNewObj, true); + if( pInfo ) + pInfo->mePresObjKind = eNewKind; + maPresentationShapeList.replaceShape(*pOldObj, *pNewObj); + } + else + { + InsertPresObj( pNewObj, eNewKind ); + } +} + /************************************************************************* |* |* Text des Objektes setzen diff --git a/sd/source/core/shapelist.cxx b/sd/source/core/shapelist.cxx index 80c030646ee2..c1b97a0a4414 100644 --- a/sd/source/core/shapelist.cxx +++ b/sd/source/core/shapelist.cxx @@ -87,6 +87,44 @@ SdrObject* ShapeList::removeShape( SdrObject& rObject ) return 0; } +void ShapeList::replaceShape( SdrObject& rOldObject, SdrObject& rNewObject ) +{ + if( &rOldObject == &rNewObject ) + return; + + ListImpl::iterator aIter( std::find( maShapeList.begin(), maShapeList.end(), &rNewObject ) ); + if( aIter != maShapeList.end() ) + { + bool bIterErased = aIter == maIter; + (*aIter)->RemoveObjectUser(*this); + aIter = maShapeList.erase( aIter ); + + if( bIterErased ) + maIter = aIter; + } + + aIter = std::find( maShapeList.begin(), maShapeList.end(), &rOldObject ); + if( aIter != maShapeList.end() ) + { + bool bIterErased = aIter == maIter; + + ListImpl::iterator iNew( maShapeList.insert( aIter, &rNewObject ) ); + + (*aIter)->RemoveObjectUser(*this); + aIter = maShapeList.erase( aIter ); + + rNewObject.AddObjectUser( *this ); + + if( bIterErased ) + maIter = iNew; + } + else + { + DBG_ERROR("sd::ShapeList::replaceShape(), given shape not part of list!"); + addShape( rNewObject ); + } +} + /** removes all shapes from this list NOTE: iterators will become invalid */ void ShapeList::clear() diff --git a/sd/source/ui/app/layoutctrl.cxx b/sd/source/ui/app/layoutctrl.cxx new file mode 100644 index 000000000000..ce79068438c1 --- /dev/null +++ b/sd/source/ui/app/layoutctrl.cxx @@ -0,0 +1,338 @@ +/************************************************************************* + * + * 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.cxx,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. + * + ************************************************************************/ + +// MARKER(update_precomp.py): autogen include statement, do not remove +#include "precompiled_sd.hxx" + +#include +#include + +#include + +#include +#include +#include + +#include +#include +#include +#include +#include + +#include + +#include + +#include "sdresid.hxx" +#include "res_bmp.hrc" +#include "strings.hrc" +#include "layoutctrl.hxx" +#include "ViewShellBase.hxx" +#include "drawdoc.hxx" +#include "sdattr.hrc" +#include "app.hrc" +#include "glob.hrc" + +using ::rtl::OUString; +using namespace ::com::sun::star; +using namespace ::com::sun::star::text; +using namespace ::com::sun::star::uno; +using namespace ::com::sun::star::beans; + +SFX_IMPL_TOOLBOX_CONTROL( SdLayoutControl, SfxVoidItem ); + +class SdLayoutDockingWindow : public SfxPopupWindow +{ + using FloatingWindow::StateChanged; + +private: + boost::scoped_ptr mpToolbarMenu; + ToolBox* mpToolBox; + ValueSet* mpLayoutSet; + AutoLayout meCurrentLayout; + + /*boost::scoped_ptr mpTitle; + boost::scoped_ptr mpSeperator; + boost::scoped_ptr mpMenu;*/ + + ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > mxFrame; + + bool mbPopupMode; + + DECL_LINK( SelectHdl, void * ); + +protected: + virtual void PopupModeEnd(); + + /** This function is called when the window gets the focus. It grabs + the focus to the line ends value set so that it can be controlled with + the keyboard. + */ + virtual void GetFocus (void); + +public: + SdLayoutDockingWindow( USHORT nId, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, Window* pParentWindow = 0); + ~SdLayoutDockingWindow(); + + virtual SfxPopupWindow* Clone() const; + + virtual void Paint( const Rectangle& rRect ); + + virtual void StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState ); + virtual void DataChanged( const DataChangedEvent& rDCEvt ); +}; + +// class SdLayoutControl ------------------------------------------ + +SdLayoutControl::SdLayoutControl( USHORT _nSlotId, USHORT _nId, ToolBox& rTbx ) +: SfxToolBoxControl( _nSlotId, _nId, rTbx ) +{ +} + +// ----------------------------------------------------------------------- + +SdLayoutControl::~SdLayoutControl() +{ +} + +// ----------------------------------------------------------------------- + +void SdLayoutControl::Select( BOOL bMod1 ) +{ + (void)bMod1; +} + +// ----------------------------------------------------------------------- + +void SdLayoutControl::StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState ) +{ + SfxToolBoxControl::StateChanged( nSID, eState, pState ); +} + +// ----------------------------------------------------------------------- + +struct snewfoil_value_info +{ + USHORT mnBmpResId; + USHORT mnHCBmpResId; + USHORT mnStrResId; + WritingMode meWritingMode; + AutoLayout maAutoLayout; +}; +static snewfoil_value_info standard[] = +{ + {BMP_FOIL_20, BMP_FOIL_20_H, STR_AUTOLAYOUT_NONE, WritingMode_LR_TB, AUTOLAYOUT_NONE}, + {BMP_FOIL_00, BMP_FOIL_00_H, STR_AUTOLAYOUT_TITLE, WritingMode_LR_TB, AUTOLAYOUT_TITLE}, + {BMP_FOIL_01, BMP_FOIL_01_H, STR_AUTOLAYOUT_CONTENT, WritingMode_LR_TB, AUTOLAYOUT_ENUM}, + {BMP_FOIL_03, BMP_FOIL_03_H, STR_AUTOLAYOUT_2CONTENT, WritingMode_LR_TB, AUTOLAYOUT_2TEXT}, + {BMP_FOIL_19, BMP_FOIL_19_H, STR_AUTOLAYOUT_ONLY_TITLE, WritingMode_LR_TB, AUTOLAYOUT_ONLY_TITLE}, + {BMP_FOIL_25, BMP_FOIL_25_H, STR_AUTOLAYOUT_ONLY_TEXT, WritingMode_LR_TB, AUTOLAYOUT_ONLY_TEXT}, + {BMP_FOIL_12, BMP_FOIL_12_H, STR_AUTOLAYOUT_CONTENT_2CONTENT, WritingMode_LR_TB, AUTOLAYOUT_TEXT2OBJ}, + {BMP_FOIL_15, BMP_FOIL_15_H, STR_AUTOLAYOUT_2CONTENT_CONTENT, WritingMode_LR_TB, AUTOLAYOUT_2OBJTEXT}, + {BMP_FOIL_16, BMP_FOIL_16_H, STR_AUTOLAYOUT_2CONTENT_OVER_CONTENT,WritingMode_LR_TB, AUTOLAYOUT_2OBJOVERTEXT}, + {BMP_FOIL_14, BMP_FOIL_14_H, STR_AUTOLAYOUT_CONTENT_OVER_CONTENT, WritingMode_LR_TB, AUTOLAYOUT_OBJOVERTEXT}, + {BMP_FOIL_18, BMP_FOIL_18_H, STR_AUTOLAYOUT_4CONTENT, WritingMode_LR_TB, AUTOLAYOUT_4OBJ}, + {BMP_FOIL_27, BMP_FOIL_27_H, STR_AUTOLAYOUT_6CONTENT, WritingMode_LR_TB, AUTOLAYOUT_6CLIPART}, + + // vertical + {BMP_FOIL_21, BMP_FOIL_21_H, STR_AL_VERT_TITLE_TEXT_CHART, WritingMode_TB_RL,AUTOLAYOUT_VERTICAL_TITLE_TEXT_CHART}, + {BMP_FOIL_22, BMP_FOIL_22_H, STR_AL_VERT_TITLE_VERT_OUTLINE, WritingMode_TB_RL, AUTOLAYOUT_VERTICAL_TITLE_VERTICAL_OUTLINE}, + {BMP_FOIL_23, BMP_FOIL_23_H, STR_AL_TITLE_VERT_OUTLINE, WritingMode_TB_RL, AUTOLAYOUT_TITLE_VERTICAL_OUTLINE}, + {BMP_FOIL_24, BMP_FOIL_24_H, STR_AL_TITLE_VERT_OUTLINE_CLIPART, WritingMode_TB_RL, AUTOLAYOUT_TITLE_VERTICAL_OUTLINE_CLIPART}, + + {0, 0, 0, WritingMode_LR_TB, AUTOLAYOUT_NONE} +}; + +SfxPopupWindowType SdLayoutControl::GetPopupWindowType() const +{ + return SFX_POPUPWINDOW_ONCLICK; +} + +// ----------------------------------------------------------------------- + +SfxPopupWindow* SdLayoutControl::CreatePopupWindow() +{ + SdLayoutDockingWindow* pWin = new SdLayoutDockingWindow( GetId(), m_xFrame, &GetToolBox() ); + pWin->StartPopupMode( &GetToolBox(), TRUE ); + pWin->GrabFocus(); + SetPopupWindow( pWin ); + return pWin; +} + +// ----------------------------------------------------------------------- + +SdLayoutDockingWindow::SdLayoutDockingWindow( USHORT nId, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, Window* pParentWindow ) +: SfxPopupWindow( nId, rFrame, pParentWindow, WB_SYSTEMWINDOW|WB_BORDER|WB_NEEDSFOCUS ) +, mxFrame( rFrame ) +, mbPopupMode(true) +, meCurrentLayout( AUTOLAYOUT_NONE ) +{ +// SetHelpId( HID_POPUP_LAYOUT ); + + const Color aMenuColor( GetSettings().GetStyleSettings().GetMenuColor() ); + const Color aMenuBarColor( GetSettings().GetStyleSettings().GetMenuBarColor() ); + const Color aMenuTextColor( GetSettings().GetStyleSettings().GetMenuBarColor() ); + const Color aMenuBarTextColor( GetSettings().GetStyleSettings().GetMenuBarTextColor() ); + + const bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode(); + SvtLanguageOptions aLanguageOptions; + const bool bVerticalEnabled = aLanguageOptions.IsVerticalTextEnabled(); + + mpToolbarMenu.reset( new ToolbarMenu( this, WB_CLIPCHILDREN ) ); +// mpToolbarMenu->SetHelpId( HID_MENU_EXTRUSION_DIRECTION ); + mpToolbarMenu->SetSelectHdl( LINK( this, SdLayoutDockingWindow, SelectHdl ) ); + + + mpLayoutSet = new ValueSet( mpToolbarMenu.get(), WB_TABSTOP | WB_MENUSTYLEVALUESET | WB_FLATVALUESET | WB_NOBORDER | WB_NO_DIRECTSELECT ); +// mpLayoutSet->SetHelpId( HID_VALUESET_EXTRUSION_LIGHTING ); + + mpLayoutSet->SetSelectHdl( LINK( this, SdLayoutDockingWindow, SelectHdl ) ); + mpLayoutSet->SetColCount( 4 ); + mpLayoutSet->EnableFullItemMode( FALSE ); + + Size aLayoutItemSize; + + USHORT nItem = 1; + for( snewfoil_value_info* pInfo = &standard[0]; pInfo->mnBmpResId; pInfo++ ) + { + if( !bVerticalEnabled && (pInfo->meWritingMode == WritingMode_TB_RL) ) + continue; + + String aText( SdResId( pInfo->mnStrResId ) ); + BitmapEx aBmp( SdResId( bHighContrast ? pInfo->mnHCBmpResId : pInfo->mnBmpResId ) ); + mpLayoutSet->InsertItem( static_cast(pInfo->maAutoLayout)+1, aBmp, aText ); + + aLayoutItemSize.Width() = std::max( aLayoutItemSize.Width(), aBmp.GetSizePixel().Width() ); + aLayoutItemSize.Height() = std::max( aLayoutItemSize.Height(), aBmp.GetSizePixel().Height() ); + } + + aLayoutItemSize = mpLayoutSet->CalcItemSizePixel( aLayoutItemSize ); + Size aValueSize = mpLayoutSet->CalcWindowSizePixel( aLayoutItemSize ); + mpLayoutSet->SetSizePixel( aValueSize ); + + mpToolbarMenu->appendEntry( -1, String( SdResId( STR_UNDO_MODIFY_PAGE ) ) ); + mpToolbarMenu->appendEntry( 0, mpLayoutSet ); + mpToolbarMenu->appendSeparator(); + mpToolbarMenu->appendEntry( 1, String( RTL_CONSTASCII_USTRINGPARAM("Reset Slide Layout") )); + + SetOutputSizePixel( mpToolbarMenu->getMenuSize() ); + mpToolbarMenu->SetOutputSizePixel( GetOutputSizePixel() ); + + mpToolbarMenu->Show(); + + AddStatusListener( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:AssignLayout" ))); +} + +SfxPopupWindow* SdLayoutDockingWindow::Clone() const +{ + return new SdLayoutDockingWindow( GetId(), mxFrame ); +} + +void SdLayoutDockingWindow::Paint( const Rectangle& rRect ) +{ + SfxPopupWindow::Paint(rRect); +} + +void SdLayoutDockingWindow::DataChanged( const DataChangedEvent& rDCEvt ) +{ + SfxPopupWindow::DataChanged( rDCEvt ); + + if( ( rDCEvt.GetType() == DATACHANGED_SETTINGS ) && ( rDCEvt.GetFlags() & SETTINGS_STYLE ) ) + { + // const bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode(); + + // todo switch images + } +} + +// ----------------------------------------------------------------------- + +SdLayoutDockingWindow::~SdLayoutDockingWindow() +{ +} + +// ----------------------------------------------------------------------- + +void SdLayoutDockingWindow::StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState ) +{ + if( (nSID == SID_ASSIGN_LAYOUT) && (eState != SFX_ITEM_DISABLED) ) + { + const SfxUInt32Item* pStateItem = dynamic_cast< const SfxUInt32Item* >(pState); + if( pStateItem ) + { + meCurrentLayout = static_cast< AutoLayout >( pStateItem->GetValue() ); + mpLayoutSet->SelectItem( static_cast(meCurrentLayout)+1 ); + } + } +} + +// ----------------------------------------------------------------------- + +IMPL_LINK( SdLayoutDockingWindow, SelectHdl, void *, pControl ) +{ + if ( IsInPopupMode() ) + EndPopupMode(); + + AutoLayout eLayout = meCurrentLayout; + + if( pControl == mpLayoutSet ) + eLayout = static_cast< AutoLayout >(mpLayoutSet->GetSelectItemId()-1); + + const rtl::OUString aCommand( RTL_CONSTASCII_USTRINGPARAM( ".uno:AssignLayout" )); + + Sequence< PropertyValue > aArgs( 1 ); + aArgs[0].Name = OUString( RTL_CONSTASCII_USTRINGPARAM("WhatLayout") ); + aArgs[0].Value <<= static_cast(eLayout); + + SfxToolBoxControl::Dispatch( Reference< ::com::sun::star::frame::XDispatchProvider >( mxFrame->getController(), UNO_QUERY ), aCommand, aArgs ); + + return 0; +} + +// ----------------------------------------------------------------------- + +void SdLayoutDockingWindow::PopupModeEnd() +{ + if ( IsVisible() ) + mbPopupMode = FALSE; + SfxPopupWindow::PopupModeEnd(); +} + +// ----------------------------------------------------------------------- + +void SdLayoutDockingWindow::GetFocus (void) +{ + SfxPopupWindow::GetFocus(); + if( mpToolbarMenu ) + mpToolbarMenu->GrabFocus(); +} + + diff --git a/sd/source/ui/app/makefile.mk b/sd/source/ui/app/makefile.mk index 82a6177a9e95..9be951710db0 100644 --- a/sd/source/ui/app/makefile.mk +++ b/sd/source/ui/app/makefile.mk @@ -74,12 +74,14 @@ SLOFILES = \ $(SLO)$/sdresid.obj \ $(SLO)$/sdpopup.obj \ $(SLO)$/sdxfer.obj \ - $(SLO)$/tmplctrl.obj + $(SLO)$/tmplctrl.obj \ + $(SLO)$/layoutctrl.obj EXCEPTIONSFILES= \ $(SLO)$/sdxfer.obj \ $(SLO)$/sdmod1.obj \ - $(SLO)$/tmplctrl.obj + $(SLO)$/tmplctrl.obj \ + $(SLO)$/layoutctrl.obj .IF "$(GUI)" == "WNT" diff --git a/sd/source/ui/app/sddll2.cxx b/sd/source/ui/app/sddll2.cxx index c222e5f3cb44..b0906e278b33 100644 --- a/sd/source/ui/app/sddll2.cxx +++ b/sd/source/ui/app/sddll2.cxx @@ -92,6 +92,7 @@ #include "PaneChildWindows.hxx" #include "tmplctrl.hxx" +#include "layoutctrl.hxx" /************************************************************************* |* @@ -230,4 +231,5 @@ void SdDLL::RegisterControllers() SvxFrameLineColorToolBoxControl::RegisterControl(SID_FRAME_LINECOLOR, pMod ); SvxFrameToolBoxControl::RegisterControl(SID_ATTR_BORDER, pMod ); SvxSubToolBoxControl::RegisterControl(SID_OPTIMIZE_TABLE, pMod); + SdLayoutControl::RegisterControl( SID_ASSIGN_LAYOUT, pMod ); } diff --git a/sd/source/ui/func/fuinsert.cxx b/sd/source/ui/func/fuinsert.cxx index 12c94fbf9f8f..4486df11d6b7 100644 --- a/sd/source/ui/func/fuinsert.cxx +++ b/sd/source/ui/func/fuinsert.cxx @@ -147,34 +147,15 @@ void FuInsertGraphic::DoExecute( SfxRequest& ) if( mpViewShell && mpViewShell->ISA(DrawViewShell)) { sal_Int8 nAction = DND_ACTION_COPY; - SdrGrafObj* pEmptyGrafObj = NULL; - - if ( mpView->AreObjectsMarked() ) - { - /********************************************************** - * Is an empty graphic object available? - **********************************************************/ - const SdrMarkList& rMarkList = mpView->GetMarkedObjectList(); - - if (rMarkList.GetMarkCount() == 1) - { - SdrMark* pMark = rMarkList.GetMark(0); - SdrObject* pObj = pMark->GetMarkedSdrObj(); - - if (pObj->GetObjInventor() == SdrInventor && - pObj->GetObjIdentifier() == OBJ_GRAF) - { - nAction = DND_ACTION_LINK; - pEmptyGrafObj = (SdrGrafObj*) pObj; - } - } - } + SdrObject* pPickObj = mpView->GetEmptyPresentationObject( PRESOBJ_GRAPHIC ); + if( pPickObj ) + nAction = DND_ACTION_LINK; Point aPos; Rectangle aRect(aPos, mpWindow->GetOutputSizePixel() ); aPos = aRect.Center(); aPos = mpWindow->PixelToLogic(aPos); - SdrGrafObj* pGrafObj = mpView->InsertGraphic(aGraphic, nAction, aPos, pEmptyGrafObj, NULL); + SdrGrafObj* pGrafObj = mpView->InsertGraphic(aGraphic, nAction, aPos, pPickObj, NULL); if(pGrafObj && aDlg.IsAsLink()) { diff --git a/sd/source/ui/func/smarttag.cxx b/sd/source/ui/func/smarttag.cxx index 99212adc12f1..c07fabbfe962 100644 --- a/sd/source/ui/func/smarttag.cxx +++ b/sd/source/ui/func/smarttag.cxx @@ -156,18 +156,6 @@ void SmartTag::CheckPossibilities() { } -// -------------------------------------------------------------------- - -void SmartTag::onMouseEnter(SmartHdl& rHdl) -{ -} - -// -------------------------------------------------------------------- - -void SmartTag::onMouseLeave() -{ -} - // ==================================================================== SmartTagSet::SmartTagSet( View& rView ) @@ -284,35 +272,6 @@ bool SmartTagSet::MouseButtonDown( const MouseEvent& rMEvt ) // -------------------------------------------------------------------- -void SmartTagSet::MouseMove(const MouseEvent& rMEvt) -{ - SmartTagReference xTag; - - SmartHdl* pSmartHdl = 0; - if( !rMEvt.IsLeaveWindow() ) - { - Point aMDPos( mrView.GetViewShell()->GetActiveWindow()->PixelToLogic( rMEvt.GetPosPixel() ) ); - SdrHdl* pHdl = mrView.PickHandle(aMDPos); - - pSmartHdl = dynamic_cast< SmartHdl* >( pHdl ); - if( pSmartHdl ) - xTag = pSmartHdl->getTag(); - } - - if( xTag != mxMouseOverTag ) - { - if( mxMouseOverTag.is() ) - mxMouseOverTag->onMouseLeave(); - - mxMouseOverTag = xTag; - - if( mxMouseOverTag.is() ) - mxMouseOverTag->onMouseEnter(*pSmartHdl); - } -} - -// -------------------------------------------------------------------- - bool SmartTagSet::KeyInput( const KeyEvent& rKEvt ) { if( mxSelectedTag.is() ) 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; diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx index 2eac8b757780..8e9083aa092b 100644 --- a/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx @@ -294,6 +294,7 @@ void SelectionManager::SelectionHasChanged (const bool bMakeSelectionVisible) pViewShell->Invalidate(SID_HIDE_SLIDE); pViewShell->Invalidate(SID_DELETE_PAGE); pViewShell->Invalidate(SID_DELETE_MASTER_PAGE); + pViewShell->Invalidate(SID_ASSIGN_LAYOUT); // StatusBar pViewShell->Invalidate (SID_STATUS_PAGE); diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx index 27d5f6202369..7c814ff9d718 100644 --- a/sd/source/ui/view/drviews2.cxx +++ b/sd/source/ui/view/drviews2.cxx @@ -432,14 +432,26 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) || mePageKind==PK_NOTES || (mePageKind==PK_HANDOUT && meEditMode==EM_MASTERPAGE)) { - if ( mpDrawView->IsTextEdit() ) - mpDrawView->SdrEndTextEdit(); + const SfxUInt32Item* pWhatPage = static_cast< const SfxUInt32Item* > ( rReq.GetArg( ID_VAL_WHATPAGE, FALSE, TYPE(SfxUInt32Item) ) ); + const SfxUInt32Item* pWhatLayout = static_cast< const SfxUInt32Item* > ( rReq.GetArg( ID_VAL_WHATLAYOUT, FALSE, TYPE(SfxUInt32Item) ) ); + + if( pWhatLayout ) + { + if ( mpDrawView->IsTextEdit() ) + mpDrawView->SdrEndTextEdit(); - SFX_REQUEST_ARG (rReq, pWhatPage, SfxUInt32Item, ID_VAL_WHATPAGE, FALSE); - SFX_REQUEST_ARG (rReq, pWhatLayout, SfxUInt32Item, ID_VAL_WHATLAYOUT, FALSE); - ::sd::ViewShell::mpImpl->AssignLayout ( - GetDoc()->GetSdPage((USHORT)pWhatPage->GetValue(), mePageKind), - (AutoLayout)pWhatLayout->GetValue()); + USHORT nPage; + if( pWhatPage ) + { + nPage = pWhatPage->GetValue(); + } + else + { + nPage = maTabControl.GetCurPageId() - 1; + } + + ::sd::ViewShell::mpImpl->AssignLayout(GetDoc()->GetSdPage((USHORT)nPage, mePageKind),(AutoLayout)pWhatLayout->GetValue()); + } } Cancel(); rReq.Done (); diff --git a/sd/source/ui/view/drviews7.cxx b/sd/source/ui/view/drviews7.cxx index 983033be7b8c..ad966a40a18c 100644 --- a/sd/source/ui/view/drviews7.cxx +++ b/sd/source/ui/view/drviews7.cxx @@ -309,6 +309,26 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) GetMenuStateSel(rSet); + if (SFX_ITEM_AVAILABLE == rSet.GetItemState(SID_ASSIGN_LAYOUT)) + { + bool bDisable = true; + if( pPageView ) + { + SdPage* pPage = dynamic_cast< SdPage* >( pPageView->GetPage() ); + + if( pPage ) + { + rSet.Put( SfxUInt32Item( SID_ASSIGN_LAYOUT, static_cast< sal_uInt32 >(pPage->GetAutoLayout()) ) ); + bDisable = false; + } + } + + if(bDisable) + { + rSet.DisableItem(SID_EXPAND_PAGE); + } + } + if (SFX_ITEM_AVAILABLE == rSet.GetItemState(SID_EXPAND_PAGE)) { bool bDisable = true; diff --git a/sd/source/ui/view/sdview4.cxx b/sd/source/ui/view/sdview4.cxx index 72534b476a73..b4543d753605 100644 --- a/sd/source/ui/view/sdview4.cxx +++ b/sd/source/ui/view/sdview4.cxx @@ -120,11 +120,20 @@ SdrGrafObj* View::InsertGraphic( const Graphic& rGraphic, sal_Int8& rAction, if( mnAction == DND_ACTION_LINK && pPickObj && pPV ) { - if( pPickObj->ISA( SdrGrafObj ) ) + const bool bIsGraphic = pPickObj->ISA( SdrGrafObj ); + if( bIsGraphic || pObj->IsEmptyPresObj() ) { - // Das Objekt wird mit der Bitmap gefuellt - pNewGrafObj = (SdrGrafObj*) pPickObj->Clone(); - pNewGrafObj->SetGraphic(rGraphic); + if( bIsGraphic ) + { + // Das Objekt wird mit der Bitmap gefuellt + pNewGrafObj = (SdrGrafObj*) pPickObj->Clone(); + pNewGrafObj->SetGraphic(rGraphic); + } + else + { + pNewGrafObj = new SdrGrafObj( rGraphic, pPickObj->GetLogicRect() ); + pNewGrafObj->SetEmptyPresObj(TRUE); + } if ( pNewGrafObj->IsEmptyPresObj() ) { @@ -149,8 +158,7 @@ SdrGrafObj* View::InsertGraphic( const Graphic& rGraphic, sal_Int8& rAction, AddUndo( new sd::UndoObjectPresentationKind( *pPickObj ) ); AddUndo( new sd::UndoObjectPresentationKind( *pNewGrafObj ) ); } - pPage->RemovePresObj(pPickObj); - pPage->InsertPresObj(pNewGrafObj, PRESOBJ_GRAPHIC); + pPage->ReplacePresObj(pPickObj, pNewGrafObj, PRESOBJ_GRAPHIC); if( !bUndo ) { diff --git a/sd/source/ui/view/sdview5.cxx b/sd/source/ui/view/sdview5.cxx index 6fc8349dfb21..a459011b5f10 100644 --- a/sd/source/ui/view/sdview5.cxx +++ b/sd/source/ui/view/sdview5.cxx @@ -30,3 +30,87 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sd.hxx" + +#include "sdpage.hxx" +#include "View.hxx" +#include "pres.hxx" + +namespace sd { + +static bool implIsMultiPresObj( PresObjKind eKind ) +{ + switch( eKind ) + { + case PRESOBJ_OUTLINE: + case PRESOBJ_GRAPHIC: + case PRESOBJ_OBJECT: + case PRESOBJ_CHART: + case PRESOBJ_ORGCHART: + case PRESOBJ_TABLE: + case PRESOBJ_IMAGE: + return true; + default: + return false; + } +} + +SdrObject* View::GetEmptyPresentationObject( PresObjKind eKind ) +{ + SdrObject* pEmptyObj = 0; + + SdrPageView* pPV = GetSdrPageView(); + if( pPV ) + { + SdPage* pPage = static_cast< SdPage* >( pPV->GetPage() ); + if( pPage ) + { + // first try selected shape + if ( AreObjectsMarked() ) + { + /********************************************************** + * Is an empty graphic object available? + **********************************************************/ + const SdrMarkList& rMarkList = GetMarkedObjectList(); + + if (rMarkList.GetMarkCount() == 1) + { + SdrMark* pMark = rMarkList.GetMark(0); + SdrObject* pObj = pMark->GetMarkedSdrObj(); + + if( pObj->IsEmptyPresObj() && implIsMultiPresObj( pPage->GetPresObjKind(pObj) ) ) + pEmptyObj = pObj; + } + } + + // try to find empty pres obj of same type + if( !pEmptyObj ) + { + int nIndex = 1; + do + { + pEmptyObj = pPage->GetPresObj(eKind, nIndex++ ); + } + while( (pEmptyObj != 0) && (!pEmptyObj->IsEmptyPresObj()) ); + } + + // last try to find empty pres obj of multiple type + if( !pEmptyObj ) + { + const std::list< SdrObject* >& rShapes = pPage->GetPresentationShapeList().getList(); + + for( std::list< SdrObject* >::const_iterator iter( rShapes.begin() ); iter != rShapes.end(); iter++ ) + { + if( (*iter)->IsEmptyPresObj() && implIsMultiPresObj(pPage->GetPresObjKind(*iter)) ) + { + pEmptyObj = (*iter); + break; + } + } + } + } + } + + return pEmptyObj; +} + +} \ No newline at end of file diff --git a/sd/source/ui/view/viewoverlaymanager.cxx b/sd/source/ui/view/viewoverlaymanager.cxx index a6684fcdfd3e..802296322c35 100644 --- a/sd/source/ui/view/viewoverlaymanager.cxx +++ b/sd/source/ui/view/viewoverlaymanager.cxx @@ -41,6 +41,8 @@ #include #include +#include + #include #include #include @@ -88,15 +90,6 @@ public: /** returns true if the SmartTag consumes this event. */ virtual bool RequestHelp( const HelpEvent& rHEvt ); - /** returns true if the SmartTag consumes this event. */ - virtual bool Command( const CommandEvent& rCEvt ); - - /** 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(); - protected: virtual void addCustomHandles( SdrHdlList& rHandlerList ); virtual void disposing(); @@ -106,33 +99,36 @@ protected: private: ViewOverlayManager& mrManager; SdrObjectWeakRef mxPlaceholderObj; - ImageButtonHdl* mpSelectedHdl; }; class ImageButtonHdl : public SmartHdl { public: - ImageButtonHdl( const SmartTagReference& xTag, const Image& rImage, const Point& rPnt ); + ImageButtonHdl( const SmartTagReference& xTag, USHORT nSID, const Image& rImage, const Point& rPnt ); virtual ~ImageButtonHdl(); virtual void CreateB2dIAObject(); virtual BOOL IsFocusHdl() const; - virtual Pointer GetSdrDragPointer() const; + virtual Pointer GetPointer() const; virtual bool isMarkable() const; - void select( bool bSelect ); + virtual void onMouseEnter(); + virtual void onMouseLeave(); + + USHORT getSlotId() const { return mnSID; } + private: rtl::Reference< ChangePlaceholderTag > mxTag; - bool mbSelected; Image maImage; + USHORT mnSID; }; // -------------------------------------------------------------------- -ImageButtonHdl::ImageButtonHdl( const SmartTagReference& xTag, const Image& rImage, const Point& rPnt ) +ImageButtonHdl::ImageButtonHdl( const SmartTagReference& xTag, USHORT nSID, const Image& rImage, const Point& rPnt ) : SmartHdl( xTag, rPnt ) , mxTag( dynamic_cast< ChangePlaceholderTag* >( xTag.get() ) ) -, mbSelected(false) , maImage( rImage ) +, mnSID( nSID ) { } @@ -140,19 +136,20 @@ ImageButtonHdl::ImageButtonHdl( const SmartTagReference& xTag, const Image& rIma ImageButtonHdl::~ImageButtonHdl() { - if( mxTag.is() && (mxTag->mpSelectedHdl == this) ) - mxTag->mpSelectedHdl = 0; } // -------------------------------------------------------------------- -void ImageButtonHdl::select( bool bSelect ) +void ImageButtonHdl::onMouseEnter() { - if( bSelect != mbSelected ) - { - mbSelected = bSelect; - Touch(); - } + Touch(); +} + +// -------------------------------------------------------------------- + +void ImageButtonHdl::onMouseLeave() +{ + Touch(); } // -------------------------------------------------------------------- @@ -171,7 +168,7 @@ void ImageButtonHdl::CreateB2dIAObject() BitmapEx aBitmapEx( maImage.GetBitmapEx() ); - const double fAlpha = mbSelected ? 0.0 : 0.5; + const double fAlpha = isMouseOver() ? 0.0 : 0.6; if(pHdlList) { @@ -207,7 +204,7 @@ void ImageButtonHdl::CreateB2dIAObject() BOOL ImageButtonHdl::IsFocusHdl() const { - return TRUE; + return false; } // -------------------------------------------------------------------- @@ -219,7 +216,7 @@ bool ImageButtonHdl::isMarkable() const // -------------------------------------------------------------------- -Pointer ImageButtonHdl::GetSdrDragPointer() const +Pointer ImageButtonHdl::GetPointer() const { return Pointer( POINTER_ARROW ); } @@ -242,8 +239,18 @@ ChangePlaceholderTag::~ChangePlaceholderTag() // -------------------------------------------------------------------- /** returns true if the ChangePlaceholderTag handled the event. */ -bool ChangePlaceholderTag::MouseButtonDown( const MouseEvent& rMEvt, SmartHdl& /*rHdl*/ ) +bool ChangePlaceholderTag::MouseButtonDown( const MouseEvent& rMEvt, SmartHdl& rHdl ) { + USHORT nSID = static_cast< ImageButtonHdl& >(rHdl).getSlotId(); + + if( mxPlaceholderObj.get() ) + { + SdrPageView* pPV = mrView.GetSdrPageView(); + mrView.MarkObj(mxPlaceholderObj.get(), pPV, FALSE); + } + + mrView.GetViewShell()->GetViewFrame()->GetDispatcher()->Execute( nSID, SFX_CALLMODE_ASYNCHRON); + return false; } @@ -269,45 +276,16 @@ bool ChangePlaceholderTag::KeyInput( const KeyEvent& rKEvt ) } /** returns true if the SmartTag consumes this event. */ -bool ChangePlaceholderTag::RequestHelp( const HelpEvent& /*rHEvt*/ ) +bool ChangePlaceholderTag::RequestHelp( const HelpEvent& rHEvt ) { - return false; -} + Rectangle aItemRect( rHEvt.GetMousePosPixel(), Size(1,1) ); + String aHelpText(RTL_CONSTASCII_USTRINGPARAM("I'm a help text")); + if( rHEvt.GetMode() == HELPMODE_BALLOON ) + Help::ShowBalloon( static_cast< ::Window* >(mrView.GetFirstOutputDevice()), aItemRect.Center(), aItemRect, aHelpText); + else + Help::ShowQuickHelp( static_cast< ::Window* >(mrView.GetFirstOutputDevice()), aItemRect, aHelpText ); -/** returns true if the SmartTag consumes this event. */ -bool ChangePlaceholderTag::Command( const CommandEvent& rCEvt ) -{ - return false; -} - -/** is called once if the mouse enters this tag */ -void ChangePlaceholderTag::onMouseEnter(SmartHdl& rHdl) -{ - ImageButtonHdl* pHdl = dynamic_cast< ImageButtonHdl* >( &rHdl ); - if( mpSelectedHdl != 0 ) - { - if( mpSelectedHdl == pHdl ) - return; - - mpSelectedHdl->select(false); - } - - mpSelectedHdl = pHdl; - - if( mpSelectedHdl ) - { - mpSelectedHdl->select( true ); - } -} - -/** is called once if the mouse leaves this tag */ -void ChangePlaceholderTag::onMouseLeave() -{ - if( mpSelectedHdl ) - { - mpSelectedHdl->select( false ); - mpSelectedHdl = 0; - } + return true; } // -------------------------------------------------------------------- @@ -362,7 +340,7 @@ void ChangePlaceholderTag::addCustomHandles( SdrHdlList& rHandlerList ) aImg = Image(b); } - ImageButtonHdl* pHdl = new ImageButtonHdl( xThis, aImg, aPoint ); + ImageButtonHdl* pHdl = new ImageButtonHdl( xThis, ViewOverlayManager::mnButtonSlots[i], aImg, aPoint ); pHdl->SetObjHdlNum( SMART_TAG_HDL_NUM ); pHdl->SetPageView( mrView.GetSdrPageView() ); @@ -495,6 +473,8 @@ void ViewOverlayManager::UpdateTags() IMPL_LINK(ViewOverlayManager,UpdateTagsHdl, void *, EMPTYARG) { + OSL_TRACE("ViewOverlayManager::UpdateTagsHdl"); + mnUpdateTagsEvent = 0; bool bChanges = DisposeTags(); bChanges |= CreateTags(); @@ -519,10 +499,11 @@ bool ViewOverlayManager::CreateTags() for( std::list< SdrObject* >::const_iterator iter( rShapes.begin() ); iter != rShapes.end(); iter++ ) { - if( (*iter)->IsEmptyPresObj() && ((*iter)->GetObjIdentifier() == OBJ_OUTLINETEXT) ) + if( (*iter)->IsEmptyPresObj() && ((*iter)->GetObjIdentifier() == OBJ_OUTLINETEXT) && !static_cast((*iter))->HasEditText() ) { rtl::Reference< SmartTag > xTag( new ChangePlaceholderTag( *this, *mrBase.GetMainViewShell()->GetView(), *(*iter) ) ); maTagVector.push_back(xTag); + bChanges = true; } } } diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx index 98c425110c23..208d5426c8bd 100644 --- a/sd/source/ui/view/viewshel.cxx +++ b/sd/source/ui/view/viewshel.cxx @@ -579,9 +579,6 @@ void ViewShell::MouseButtonDown(const MouseEvent& rMEvt, ::sd::Window* pWin) void ViewShell::MouseMove(const MouseEvent& rMEvt, ::sd::Window* pWin) { - if( GetView() ) - GetView()->getSmartTags().MouseMove( rMEvt ); - if (rMEvt.IsLeaveWindow()) { if ( ! mpImpl->mpUpdateLockForMouse.expired()) diff --git a/sd/uiconfig/simpress/toolbar/commontaskbar.xml b/sd/uiconfig/simpress/toolbar/commontaskbar.xml index 5e4ce1cff6f0..8be9e7ae9450 100644 --- a/sd/uiconfig/simpress/toolbar/commontaskbar.xml +++ b/sd/uiconfig/simpress/toolbar/commontaskbar.xml @@ -2,7 +2,7 @@ - + -- 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/inc/app.hrc | 2 + sd/source/ui/app/layoutctrl.cxx | 85 ++++++++---- sd/source/ui/dlg/layoutdialog.cxx | 269 ++++++++++++++++++++++++++++++++++++++ sd/source/ui/dlg/layoutdialog.hrc | 31 +++++ sd/source/ui/dlg/layoutdialog.src | 48 +++++++ sd/source/ui/dlg/makefile.mk | 9 +- sd/source/ui/inc/layoutdialog.hxx | 50 +++++++ sd/source/ui/view/drviews6.cxx | 28 ++++ 8 files changed, 490 insertions(+), 32 deletions(-) create mode 100644 sd/source/ui/dlg/layoutdialog.cxx create mode 100644 sd/source/ui/dlg/layoutdialog.hrc create mode 100644 sd/source/ui/dlg/layoutdialog.src create mode 100644 sd/source/ui/inc/layoutdialog.hxx (limited to 'sd') diff --git a/sd/inc/app.hrc b/sd/inc/app.hrc index 0ccbbf921b6b..f78cf1c16716 100644 --- a/sd/inc/app.hrc +++ b/sd/inc/app.hrc @@ -443,6 +443,8 @@ #define SID_SELECT_BACKGROUND (SID_SD_START+422) #define SID_OBJECT_CROP (SID_SD_START+423) +#define SID_LAYOUT_DIALOG_WIN (SID_SD_START+424) + // Slots for the tool pane popup #define SID_TP_APPLY_TO_ALL_SLIDES (SID_SD_START+425) #define SID_TP_APPLY_TO_SELECTED_SLIDES (SID_SD_START+426) diff --git a/sd/source/ui/app/layoutctrl.cxx b/sd/source/ui/app/layoutctrl.cxx index ce79068438c1..41e71f3066ff 100644 --- a/sd/source/ui/app/layoutctrl.cxx +++ b/sd/source/ui/app/layoutctrl.cxx @@ -48,6 +48,7 @@ #include #include +#include #include @@ -69,12 +70,12 @@ using namespace ::com::sun::star::beans; SFX_IMPL_TOOLBOX_CONTROL( SdLayoutControl, SfxVoidItem ); -class SdLayoutDockingWindow : public SfxPopupWindow +#if 0 +class SdLayoutDialogContent : public SfxDockingWindow { - using FloatingWindow::StateChanged; + using DockingWindow::StateChanged; private: - boost::scoped_ptr mpToolbarMenu; ToolBox* mpToolBox; ValueSet* mpLayoutSet; AutoLayout meCurrentLayout; @@ -99,17 +100,17 @@ protected: virtual void GetFocus (void); public: - SdLayoutDockingWindow( USHORT nId, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, Window* pParentWindow = 0); - ~SdLayoutDockingWindow(); + SdLayoutDialogContent( SfxBindings* pBindings, SfxChildWindow *pCW, ::Window* pParent, const SdResId& rSdResId, ViewShellBase& rBase); + ~SdLayoutDialogContent(); - virtual SfxPopupWindow* Clone() const; + virtual SfxDockingWindow* Clone() const; virtual void Paint( const Rectangle& rRect ); virtual void StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState ); virtual void DataChanged( const DataChangedEvent& rDCEvt ); }; - +#endif // class SdLayoutControl ------------------------------------------ SdLayoutControl::SdLayoutControl( USHORT _nSlotId, USHORT _nId, ToolBox& rTbx ) @@ -137,6 +138,27 @@ void SdLayoutControl::StateChanged( USHORT nSID, SfxItemState eState, const SfxP SfxToolBoxControl::StateChanged( nSID, eState, pState ); } +SfxPopupWindowType SdLayoutControl::GetPopupWindowType() const +{ + return SFX_POPUPWINDOW_ONCLICK; +} + +// ----------------------------------------------------------------------- + +SfxPopupWindow* SdLayoutControl::CreatePopupWindow() +{ + ToolBox& rTbx = GetToolBox(); + SdLayoutDialogContent* pWin = new SdLayoutDialogContent( GetId(), m_xFrame, &rTbx ); +// pWin->StartPopupMode( &rTbx, FLOATWIN_POPUPMODE_GRABFOCUS|FLOATWIN_POPUPMODE_NOKEYCLOSE ); + pWin->EnableDocking(true); + + Window::GetDockingManager()->StartPopupMode( &rTbx, pWin ); +// SetPopupWindow( pWin ); +// return pWin; + return 0; +} + +#ifdef 0 // ----------------------------------------------------------------------- struct snewfoil_value_info @@ -180,17 +202,21 @@ SfxPopupWindowType SdLayoutControl::GetPopupWindowType() const SfxPopupWindow* SdLayoutControl::CreatePopupWindow() { - SdLayoutDockingWindow* pWin = new SdLayoutDockingWindow( GetId(), m_xFrame, &GetToolBox() ); - pWin->StartPopupMode( &GetToolBox(), TRUE ); - pWin->GrabFocus(); - SetPopupWindow( pWin ); - return pWin; + ToolBox& rTbx = GetToolBox(); + SdLayoutDialogContent* pWin = new SdLayoutDialogContent( GetId(), m_xFrame, &rTbx ); +// pWin->StartPopupMode( &rTbx, FLOATWIN_POPUPMODE_GRABFOCUS|FLOATWIN_POPUPMODE_NOKEYCLOSE ); + pWin->EnableDocking(true); + + Window::GetDockingManager()->StartPopupMode( &rTbx, pWin ); +// SetPopupWindow( pWin ); +// return pWin; + return 0; } // ----------------------------------------------------------------------- -SdLayoutDockingWindow::SdLayoutDockingWindow( USHORT nId, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, Window* pParentWindow ) -: SfxPopupWindow( nId, rFrame, pParentWindow, WB_SYSTEMWINDOW|WB_BORDER|WB_NEEDSFOCUS ) +SdLayoutDialogContent::SdLayoutDialogContent( USHORT nId, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, Window* pParentWindow ) +: SfxDockingWindow( nId, rFrame, pParentWindow, WB_SYSTEMWINDOW ) , mxFrame( rFrame ) , mbPopupMode(true) , meCurrentLayout( AUTOLAYOUT_NONE ) @@ -208,13 +234,13 @@ SdLayoutDockingWindow::SdLayoutDockingWindow( USHORT nId, const ::com::sun::star mpToolbarMenu.reset( new ToolbarMenu( this, WB_CLIPCHILDREN ) ); // mpToolbarMenu->SetHelpId( HID_MENU_EXTRUSION_DIRECTION ); - mpToolbarMenu->SetSelectHdl( LINK( this, SdLayoutDockingWindow, SelectHdl ) ); + mpToolbarMenu->SetSelectHdl( LINK( this, SdLayoutDialogContent, SelectHdl ) ); mpLayoutSet = new ValueSet( mpToolbarMenu.get(), WB_TABSTOP | WB_MENUSTYLEVALUESET | WB_FLATVALUESET | WB_NOBORDER | WB_NO_DIRECTSELECT ); // mpLayoutSet->SetHelpId( HID_VALUESET_EXTRUSION_LIGHTING ); - mpLayoutSet->SetSelectHdl( LINK( this, SdLayoutDockingWindow, SelectHdl ) ); + mpLayoutSet->SetSelectHdl( LINK( this, SdLayoutDialogContent, SelectHdl ) ); mpLayoutSet->SetColCount( 4 ); mpLayoutSet->EnableFullItemMode( FALSE ); @@ -251,19 +277,19 @@ SdLayoutDockingWindow::SdLayoutDockingWindow( USHORT nId, const ::com::sun::star AddStatusListener( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:AssignLayout" ))); } -SfxPopupWindow* SdLayoutDockingWindow::Clone() const +SfxDockingWindow* SdLayoutDialogContent::Clone() const { - return new SdLayoutDockingWindow( GetId(), mxFrame ); + return new SdLayoutDialogContent( GetId(), mxFrame ); } -void SdLayoutDockingWindow::Paint( const Rectangle& rRect ) +void SdLayoutDialogContent::Paint( const Rectangle& rRect ) { - SfxPopupWindow::Paint(rRect); + SfxDockingWindow::Paint(rRect); } -void SdLayoutDockingWindow::DataChanged( const DataChangedEvent& rDCEvt ) +void SdLayoutDialogContent::DataChanged( const DataChangedEvent& rDCEvt ) { - SfxPopupWindow::DataChanged( rDCEvt ); + SfxDockingWindow::DataChanged( rDCEvt ); if( ( rDCEvt.GetType() == DATACHANGED_SETTINGS ) && ( rDCEvt.GetFlags() & SETTINGS_STYLE ) ) { @@ -275,13 +301,13 @@ void SdLayoutDockingWindow::DataChanged( const DataChangedEvent& rDCEvt ) // ----------------------------------------------------------------------- -SdLayoutDockingWindow::~SdLayoutDockingWindow() +SdLayoutDialogContent::~SdLayoutDialogContent() { } // ----------------------------------------------------------------------- -void SdLayoutDockingWindow::StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState ) +void SdLayoutDialogContent::StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState ) { if( (nSID == SID_ASSIGN_LAYOUT) && (eState != SFX_ITEM_DISABLED) ) { @@ -296,7 +322,7 @@ void SdLayoutDockingWindow::StateChanged( USHORT nSID, SfxItemState eState, cons // ----------------------------------------------------------------------- -IMPL_LINK( SdLayoutDockingWindow, SelectHdl, void *, pControl ) +IMPL_LINK( SdLayoutDialogContent, SelectHdl, void *, pControl ) { if ( IsInPopupMode() ) EndPopupMode(); @@ -319,20 +345,21 @@ IMPL_LINK( SdLayoutDockingWindow, SelectHdl, void *, pControl ) // ----------------------------------------------------------------------- -void SdLayoutDockingWindow::PopupModeEnd() +void SdLayoutDialogContent::PopupModeEnd() { if ( IsVisible() ) mbPopupMode = FALSE; - SfxPopupWindow::PopupModeEnd(); + SfxDockingWindow::PopupModeEnd(); } // ----------------------------------------------------------------------- -void SdLayoutDockingWindow::GetFocus (void) +void SdLayoutDialogContent::GetFocus (void) { - SfxPopupWindow::GetFocus(); + SfxDockingWindow::GetFocus(); if( mpToolbarMenu ) mpToolbarMenu->GrabFocus(); } +#endif diff --git a/sd/source/ui/dlg/layoutdialog.cxx b/sd/source/ui/dlg/layoutdialog.cxx new file mode 100644 index 000000000000..6a1a4db12413 --- /dev/null +++ b/sd/source/ui/dlg/layoutdialog.cxx @@ -0,0 +1,269 @@ +/************************************************************************* + * + * 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.cxx,v $ + * $Revision: 1.7 $ + * + * 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. + * + ************************************************************************/ + +// MARKER(update_precomp.py): autogen include statement, do not remove +#include "precompiled_sd.hxx" + +#include "layoutdialog.hxx" +#include +#include "app.hrc" +#include + +// Instantiate the implementation of the docking window before files +// are included that define ::sd::Window. The ... macros are not really +// namespace proof. +namespace sd { +SFX_IMPL_DOCKINGWINDOW(LayoutDialogChildWindow, SID_LAYOUT_DIALOG_WIN) +} + +#include + +#include + +#include +#include + +#include + +#include + +#include "layoutdialog.hrc" +#include "glob.hrc" +#include "strings.hrc" +#include "res_bmp.hrc" +#include "sdresid.hxx" +#include "View.hxx" +#include "drawdoc.hxx" +#include "ViewShellBase.hxx" +#include "DrawViewShell.hxx" + +using ::rtl::OUString; +using namespace ::com::sun::star; +using namespace ::com::sun::star::text; +using namespace ::com::sun::star::uno; +using namespace ::com::sun::star::beans; + +namespace sd { + +/// +class SdLayoutDialogContent : public SfxDockingWindow +{ +public: + SdLayoutDialogContent( SfxBindings* pBindings, SfxChildWindow *pCW, ::Window* pParent, ViewShellBase& rBase); + virtual ~SdLayoutDialogContent(); + +protected: + virtual void Resize (void); + + DECL_LINK( SelectHdl, void * ); + +private: + boost::scoped_ptr mpToolbarMenu; + ValueSet* mpLayoutSet; + AutoLayout meCurrentLayout; + ViewShellBase& mrBase; +}; + +// ----------------------------------------------------------------------- + +LayoutDialogChildWindow::LayoutDialogChildWindow(::Window* _pParent, USHORT nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo) +: SfxChildWindow (_pParent, nId) +{ + ViewShellBase& rBase (*ViewShellBase::GetViewShellBase(pBindings->GetDispatcher()->GetFrame())); + SdLayoutDialogContent* pContent = new SdLayoutDialogContent (pBindings, this, _pParent, rBase); + pWindow = pContent; + eChildAlignment = SFX_ALIGN_NOALIGNMENT; + pContent->Initialize(pInfo); +} + +LayoutDialogChildWindow::~LayoutDialogChildWindow (void) +{ +} + +// ----------------------------------------------------------------------- + +struct snewfoil_value_info +{ + USHORT mnBmpResId; + USHORT mnHCBmpResId; + USHORT mnStrResId; + WritingMode meWritingMode; + AutoLayout maAutoLayout; +}; +static snewfoil_value_info standard[] = +{ + {BMP_FOIL_20, BMP_FOIL_20_H, STR_AUTOLAYOUT_NONE, WritingMode_LR_TB, AUTOLAYOUT_NONE}, + {BMP_FOIL_00, BMP_FOIL_00_H, STR_AUTOLAYOUT_TITLE, WritingMode_LR_TB, AUTOLAYOUT_TITLE}, + {BMP_FOIL_01, BMP_FOIL_01_H, STR_AUTOLAYOUT_CONTENT, WritingMode_LR_TB, AUTOLAYOUT_ENUM}, + {BMP_FOIL_03, BMP_FOIL_03_H, STR_AUTOLAYOUT_2CONTENT, WritingMode_LR_TB, AUTOLAYOUT_2TEXT}, + {BMP_FOIL_19, BMP_FOIL_19_H, STR_AUTOLAYOUT_ONLY_TITLE, WritingMode_LR_TB, AUTOLAYOUT_ONLY_TITLE}, + {BMP_FOIL_25, BMP_FOIL_25_H, STR_AUTOLAYOUT_ONLY_TEXT, WritingMode_LR_TB, AUTOLAYOUT_ONLY_TEXT}, + {BMP_FOIL_12, BMP_FOIL_12_H, STR_AUTOLAYOUT_CONTENT_2CONTENT, WritingMode_LR_TB, AUTOLAYOUT_TEXT2OBJ}, + {BMP_FOIL_15, BMP_FOIL_15_H, STR_AUTOLAYOUT_2CONTENT_CONTENT, WritingMode_LR_TB, AUTOLAYOUT_2OBJTEXT}, + {BMP_FOIL_16, BMP_FOIL_16_H, STR_AUTOLAYOUT_2CONTENT_OVER_CONTENT,WritingMode_LR_TB, AUTOLAYOUT_2OBJOVERTEXT}, + {BMP_FOIL_14, BMP_FOIL_14_H, STR_AUTOLAYOUT_CONTENT_OVER_CONTENT, WritingMode_LR_TB, AUTOLAYOUT_OBJOVERTEXT}, + {BMP_FOIL_18, BMP_FOIL_18_H, STR_AUTOLAYOUT_4CONTENT, WritingMode_LR_TB, AUTOLAYOUT_4OBJ}, + {BMP_FOIL_27, BMP_FOIL_27_H, STR_AUTOLAYOUT_6CONTENT, WritingMode_LR_TB, AUTOLAYOUT_6CLIPART}, + + // vertical + {BMP_FOIL_21, BMP_FOIL_21_H, STR_AL_VERT_TITLE_TEXT_CHART, WritingMode_TB_RL,AUTOLAYOUT_VERTICAL_TITLE_TEXT_CHART}, + {BMP_FOIL_22, BMP_FOIL_22_H, STR_AL_VERT_TITLE_VERT_OUTLINE, WritingMode_TB_RL, AUTOLAYOUT_VERTICAL_TITLE_VERTICAL_OUTLINE}, + {BMP_FOIL_23, BMP_FOIL_23_H, STR_AL_TITLE_VERT_OUTLINE, WritingMode_TB_RL, AUTOLAYOUT_TITLE_VERTICAL_OUTLINE}, + {BMP_FOIL_24, BMP_FOIL_24_H, STR_AL_TITLE_VERT_OUTLINE_CLIPART, WritingMode_TB_RL, AUTOLAYOUT_TITLE_VERTICAL_OUTLINE_CLIPART}, + + {0, 0, 0, WritingMode_LR_TB, AUTOLAYOUT_NONE} +}; + +// ----------------------------------------------------------------------- + +SdLayoutDialogContent::SdLayoutDialogContent( SfxBindings* pInBindings, SfxChildWindow *pCW, Window* pParent, ViewShellBase& rBase) +: SfxDockingWindow(pInBindings, pCW, pParent, SdResId( FLT_WIN_LAYOUT_DIALOG )) +, meCurrentLayout( AUTOLAYOUT_NONE ) +, mrBase(rBase) +{ +// SetHelpId( HID_POPUP_LAYOUT ); + + const Color aMenuColor( GetSettings().GetStyleSettings().GetMenuColor() ); + const Color aMenuBarColor( GetSettings().GetStyleSettings().GetMenuBarColor() ); + const Color aMenuTextColor( GetSettings().GetStyleSettings().GetMenuBarColor() ); + const Color aMenuBarTextColor( GetSettings().GetStyleSettings().GetMenuBarTextColor() ); + + const bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode(); + SvtLanguageOptions aLanguageOptions; + const bool bVerticalEnabled = aLanguageOptions.IsVerticalTextEnabled(); + + mpToolbarMenu.reset( new ToolbarMenu( this, WB_CLIPCHILDREN ) ); +// mpToolbarMenu->SetHelpId( HID_MENU_EXTRUSION_DIRECTION ); + mpToolbarMenu->SetSelectHdl( LINK( this, SdLayoutDialogContent, SelectHdl ) ); + + + mpLayoutSet = new ValueSet( mpToolbarMenu.get(), WB_TABSTOP | WB_MENUSTYLEVALUESET | WB_FLATVALUESET | WB_NOBORDER | WB_NO_DIRECTSELECT ); +// mpLayoutSet->SetHelpId( HID_VALUESET_EXTRUSION_LIGHTING ); + + mpLayoutSet->SetSelectHdl( LINK( this, SdLayoutDialogContent, SelectHdl ) ); + mpLayoutSet->SetColCount( 4 ); + mpLayoutSet->EnableFullItemMode( FALSE ); + + Size aLayoutItemSize; + + USHORT nItem = 1; + for( snewfoil_value_info* pInfo = &standard[0]; pInfo->mnBmpResId; pInfo++ ) + { + if( !bVerticalEnabled && (pInfo->meWritingMode == WritingMode_TB_RL) ) + continue; + + String aText( SdResId( pInfo->mnStrResId ) ); + BitmapEx aBmp( SdResId( bHighContrast ? pInfo->mnHCBmpResId : pInfo->mnBmpResId ) ); + mpLayoutSet->InsertItem( static_cast(pInfo->maAutoLayout)+1, aBmp, aText ); + + aLayoutItemSize.Width() = std::max( aLayoutItemSize.Width(), aBmp.GetSizePixel().Width() ); + aLayoutItemSize.Height() = std::max( aLayoutItemSize.Height(), aBmp.GetSizePixel().Height() ); + } + + aLayoutItemSize = mpLayoutSet->CalcItemSizePixel( aLayoutItemSize ); + Size aValueSize = mpLayoutSet->CalcWindowSizePixel( aLayoutItemSize ); + mpLayoutSet->SetSizePixel( aValueSize ); + + mpToolbarMenu->appendEntry( -1, String( SdResId( STR_UNDO_MODIFY_PAGE ) ) ); + mpToolbarMenu->appendEntry( 0, mpLayoutSet ); + mpToolbarMenu->appendSeparator(); + mpToolbarMenu->appendEntry( 1, String( RTL_CONSTASCII_USTRINGPARAM("Reset Slide Layout") )); + + SetOutputSizePixel( mpToolbarMenu->getMenuSize() ); + mpToolbarMenu->SetOutputSizePixel( GetOutputSizePixel() ); + + mpToolbarMenu->Show(); + +// AddStatusListener( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:AssignLayout" ))); + + FreeResource(); +} + +void SdLayoutDialogContent::Resize (void) +{ + SfxDockingWindow::Resize(); + mpToolbarMenu->SetPosSizePixel( Point(0,0), GetSizePixel() ); +} + +/* +void SdLayoutDialogContent::DataChanged( const DataChangedEvent& rDCEvt ) +{ + SfxDockingWindow::DataChanged( rDCEvt ); + + if( ( rDCEvt.GetType() == DATACHANGED_SETTINGS ) && ( rDCEvt.GetFlags() & SETTINGS_STYLE ) ) + { + // const bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode(); + + // todo switch images + } +} +*/ + +// ----------------------------------------------------------------------- + +/* +void SdLayoutDialogContent::StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState ) +{ + if( (nSID == SID_ASSIGN_LAYOUT) && (eState != SFX_ITEM_DISABLED) ) + { + const SfxUInt32Item* pStateItem = dynamic_cast< const SfxUInt32Item* >(pState); + if( pStateItem ) + { + meCurrentLayout = static_cast< AutoLayout >( pStateItem->GetValue() ); + mpLayoutSet->SelectItem( static_cast(meCurrentLayout)+1 ); + } + } +} +*/ + +// ----------------------------------------------------------------------- + +IMPL_LINK( SdLayoutDialogContent, SelectHdl, void *, pControl ) +{ +/* + if ( IsInPopupMode() ) + EndPopupMode(); + AutoLayout eLayout = meCurrentLayout; + + if( pControl == mpLayoutSet ) + eLayout = static_cast< AutoLayout >(mpLayoutSet->GetSelectItemId()-1); + + const rtl::OUString aCommand( RTL_CONSTASCII_USTRINGPARAM( ".uno:AssignLayout" )); + + Sequence< PropertyValue > aArgs( 1 ); + aArgs[0].Name = OUString( RTL_CONSTASCII_USTRINGPARAM("WhatLayout") ); + aArgs[0].Value <<= static_cast(eLayout); + + SfxToolBoxControl::Dispatch( Reference< ::com::sun::star::frame::XDispatchProvider >( mxFrame->getController(), UNO_QUERY ), aCommand, aArgs ); +*/ + return 0; +} + +} // end of namespace sd diff --git a/sd/source/ui/dlg/layoutdialog.hrc b/sd/source/ui/dlg/layoutdialog.hrc new file mode 100644 index 000000000000..6fd97b2d09cc --- /dev/null +++ b/sd/source/ui/dlg/layoutdialog.hrc @@ -0,0 +1,31 @@ +/************************************************************************* + * + * 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: LayerDialog.src,v $ + * $Revision: 1.5 $ + * + * 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_LAYOUT_DIALOG 795 diff --git a/sd/source/ui/dlg/layoutdialog.src b/sd/source/ui/dlg/layoutdialog.src new file mode 100644 index 000000000000..21477e8db993 --- /dev/null +++ b/sd/source/ui/dlg/layoutdialog.src @@ -0,0 +1,48 @@ +/************************************************************************* + * + * 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: LayerDialog.src,v $ + * $Revision: 1.5 $ + * + * 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. + * + ************************************************************************/ + +#include "app.hrc" +#include "layoutdialog.hrc" +#include "helpids.h" + +DockingWindow FLT_WIN_LAYOUT_DIALOG +{ + HelpId = HID_SD_SLIDE_LAYOUTS; + Border = TRUE ; + Hide = TRUE ; + SVLook = TRUE ; + Sizeable = TRUE ; + Moveable = TRUE ; + Closeable = TRUE ; + Zoomable = TRUE ; + Dockable = TRUE ; + EnableResizing = TRUE ; +}; + diff --git a/sd/source/ui/dlg/makefile.mk b/sd/source/ui/dlg/makefile.mk index ee62a9c29d7d..252950a73a5e 100644 --- a/sd/source/ui/dlg/makefile.mk +++ b/sd/source/ui/dlg/makefile.mk @@ -76,7 +76,8 @@ SRC1FILES =\ LayerDialog.src \ PaneDockingWindow.src \ layeroptionsdlg.src \ - printdialog.src + printdialog.src \ + layoutdialog.src SLOFILES = \ @@ -126,7 +127,8 @@ SLOFILES = \ $(SLO)$/PaneChildWindows.obj \ $(SLO)$/PaneDockingWindow.obj \ $(SLO)$/PaneShells.obj \ - $(SLO)$/printdialog.obj + $(SLO)$/printdialog.obj \ + $(SLO)$/layoutdialog.obj LIB1TARGET= $(SLB)$/$(TARGET).lib @@ -153,7 +155,8 @@ LIB1OBJFILES= \ $(SLO)$/PaneChildWindows.obj \ $(SLO)$/PaneDockingWindow.obj \ $(SLO)$/PaneShells.obj \ - $(SLO)$/printdialog.obj + $(SLO)$/printdialog.obj \ + $(SLO)$/layoutdialog.obj LIB2TARGET= $(SLB)$/sdui.lib 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 + diff --git a/sd/source/ui/view/drviews6.cxx b/sd/source/ui/view/drviews6.cxx index 8c10effa061b..5ad91703a8c9 100644 --- a/sd/source/ui/view/drviews6.cxx +++ b/sd/source/ui/view/drviews6.cxx @@ -73,6 +73,7 @@ #include "AnimationChildWindow.hxx" #include "NavigatorChildWindow.hxx" #include "LayerDialogChildWindow.hxx" +#include "layoutdialog.hxx" #include "sdresid.hxx" #include "fupoor.hxx" #include "fusldlg.hxx" @@ -375,6 +376,11 @@ void DrawViewShell::SetChildWindowState( SfxItemSet& rSet ) USHORT nId = ::avmedia::MediaPlayer::GetChildWindowId(); rSet.Put( SfxBoolItem( SID_AVMEDIA_PLAYER, GetViewFrame()->HasChildWindow( nId ) ) ); } + if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_LAYOUT_DIALOG_WIN ) ) + { + USHORT nId = LayoutDialogChildWindow::GetChildWindowId(); + rSet.Put( SfxBoolItem( SID_LAYOUT_DIALOG_WIN, GetViewFrame()->HasChildWindow( nId ) ) ); + } } @@ -768,6 +774,28 @@ void DrawViewShell::FuTemp04(SfxRequest& rReq) } break; + case SID_LAYOUT_DIALOG_WIN: + { + if ( rReq.GetArgs() ) + { + GetViewFrame()->SetChildWindow( + LayoutDialogChildWindow::GetChildWindowId(), + ((const SfxBoolItem&) (rReq.GetArgs()-> + Get(SID_LAYOUT_DIALOG_WIN))).GetValue()); + } + else + { + GetViewFrame()->ToggleChildWindow( + LayoutDialogChildWindow::GetChildWindowId()); + } + + GetViewFrame()->GetBindings().Invalidate(SID_LAYOUT_DIALOG_WIN); + Cancel(); + rReq.Ignore (); + } + break; + + case SID_DISPLAY_MASTER_BACKGROUND: case SID_DISPLAY_MASTER_OBJECTS: { -- 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/app/layoutctrl.cxx | 30 ++++++++++++++----- sd/source/ui/app/sddll2.cxx | 3 ++ sd/source/ui/dlg/layoutdialog.cxx | 61 ++++++++++++++++++++++++++++----------- sd/source/ui/dlg/layoutdialog.hrc | 2 ++ sd/source/ui/dlg/layoutdialog.src | 5 ++++ sd/source/ui/inc/layoutdialog.hxx | 6 ++++ sd/source/ui/view/drviews2.cxx | 45 +++++++++++++++++------------ 7 files changed, 108 insertions(+), 44 deletions(-) (limited to 'sd') diff --git a/sd/source/ui/app/layoutctrl.cxx b/sd/source/ui/app/layoutctrl.cxx index 41e71f3066ff..71069cadab8f 100644 --- a/sd/source/ui/app/layoutctrl.cxx +++ b/sd/source/ui/app/layoutctrl.cxx @@ -52,6 +52,7 @@ #include +#include "layoutdialog.hxx" #include "sdresid.hxx" #include "res_bmp.hrc" #include "strings.hrc" @@ -116,6 +117,8 @@ public: SdLayoutControl::SdLayoutControl( USHORT _nSlotId, USHORT _nId, ToolBox& rTbx ) : SfxToolBoxControl( _nSlotId, _nId, rTbx ) { + rTbx.SetItemBits( _nId, TIB_DROPDOWNONLY | rTbx.GetItemBits( _nId ) ); + rTbx.Invalidate(); } // ----------------------------------------------------------------------- @@ -147,18 +150,29 @@ SfxPopupWindowType SdLayoutControl::GetPopupWindowType() const SfxPopupWindow* SdLayoutControl::CreatePopupWindow() { - ToolBox& rTbx = GetToolBox(); - SdLayoutDialogContent* pWin = new SdLayoutDialogContent( GetId(), m_xFrame, &rTbx ); -// pWin->StartPopupMode( &rTbx, FLOATWIN_POPUPMODE_GRABFOCUS|FLOATWIN_POPUPMODE_NOKEYCLOSE ); - pWin->EnableDocking(true); + OUString sResourceName( RTL_CONSTASCII_USTRINGPARAM( "private:resource/dockingwindow/" ) ); + sResourceName += OUString::valueOf( static_cast(GetId()) ); + createAndPositionSubToolBar( sResourceName ); +/* + SfxPopupWindow* pWin = 0; - Window::GetDockingManager()->StartPopupMode( &rTbx, pWin ); -// SetPopupWindow( pWin ); -// return pWin; + ToolBox& rTbx = GetToolBox(); + SfxViewFrame* pViewFrame = SfxViewFrame::Current(); + if( pViewFrame ) + { + pWin = sd::LayoutDialogChildWindow::createChildWindow( *pViewFrame, &rTbx ); + if( pWin ) + { + pWin->EnableDocking(true); + Window::GetDockingManager()->StartPopupMode( &rTbx, pWin ); + } + } + SetPopupWindow( pWin ); + */ return 0; } -#ifdef 0 +#if 0 // ----------------------------------------------------------------------- struct snewfoil_value_info diff --git a/sd/source/ui/app/sddll2.cxx b/sd/source/ui/app/sddll2.cxx index b0906e278b33..3c56631aadf7 100644 --- a/sd/source/ui/app/sddll2.cxx +++ b/sd/source/ui/app/sddll2.cxx @@ -93,6 +93,7 @@ #include "tmplctrl.hxx" #include "layoutctrl.hxx" +#include "layoutdialog.hxx" /************************************************************************* |* @@ -231,5 +232,7 @@ void SdDLL::RegisterControllers() SvxFrameLineColorToolBoxControl::RegisterControl(SID_FRAME_LINECOLOR, pMod ); SvxFrameToolBoxControl::RegisterControl(SID_ATTR_BORDER, pMod ); SvxSubToolBoxControl::RegisterControl(SID_OPTIMIZE_TABLE, pMod); + SdLayoutControl::RegisterControl( SID_ASSIGN_LAYOUT, pMod ); + sd::LayoutDialogChildWindow::RegisterChildWindow( sal_False, pMod ); } diff --git a/sd/source/ui/dlg/layoutdialog.cxx b/sd/source/ui/dlg/layoutdialog.cxx index 6a1a4db12413..c431db29d651 100644 --- a/sd/source/ui/dlg/layoutdialog.cxx +++ b/sd/source/ui/dlg/layoutdialog.cxx @@ -31,6 +31,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sd.hxx" +#include #include "layoutdialog.hxx" #include #include "app.hrc" @@ -46,6 +47,8 @@ SFX_IMPL_DOCKINGWINDOW(LayoutDialogChildWindow, SID_LAYOUT_DIALOG_WIN) #include #include +#include +#include #include #include @@ -69,14 +72,15 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::text; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; +using namespace ::com::sun::star::frame; namespace sd { /// -class SdLayoutDialogContent : public SfxDockingWindow +class SdLayoutDialogContent : public SfxPopupWindow { public: - SdLayoutDialogContent( SfxBindings* pBindings, SfxChildWindow *pCW, ::Window* pParent, ViewShellBase& rBase); + SdLayoutDialogContent( ViewShellBase& rBase, Window* pParent); virtual ~SdLayoutDialogContent(); protected: @@ -97,14 +101,26 @@ LayoutDialogChildWindow::LayoutDialogChildWindow(::Window* _pParent, USHORT nId, : SfxChildWindow (_pParent, nId) { ViewShellBase& rBase (*ViewShellBase::GetViewShellBase(pBindings->GetDispatcher()->GetFrame())); - SdLayoutDialogContent* pContent = new SdLayoutDialogContent (pBindings, this, _pParent, rBase); + SdLayoutDialogContent* pContent = new SdLayoutDialogContent (rBase, _pParent); pWindow = pContent; eChildAlignment = SFX_ALIGN_NOALIGNMENT; - pContent->Initialize(pInfo); +// pContent->Initialize(pInfo); } LayoutDialogChildWindow::~LayoutDialogChildWindow (void) { + +} + +SfxPopupWindow* LayoutDialogChildWindow::createChildWindow(SfxViewFrame& rViewFrame, ::Window* pParent) +{ + SfxPopupWindow* pWin = 0; + sd::ViewShellBase* pViewShellBase = sd::ViewShellBase::GetViewShellBase( &rViewFrame ); + if( pViewShellBase ) + { + pWin = new SdLayoutDialogContent( *pViewShellBase, pParent ); + } + return pWin; } // ----------------------------------------------------------------------- @@ -143,11 +159,15 @@ static snewfoil_value_info standard[] = // ----------------------------------------------------------------------- -SdLayoutDialogContent::SdLayoutDialogContent( SfxBindings* pInBindings, SfxChildWindow *pCW, Window* pParent, ViewShellBase& rBase) -: SfxDockingWindow(pInBindings, pCW, pParent, SdResId( FLT_WIN_LAYOUT_DIALOG )) +SdLayoutDialogContent::SdLayoutDialogContent( ViewShellBase& rBase, Window* pParent ) +: SfxPopupWindow(SID_ASSIGN_LAYOUT, rBase.GetFrame()->GetTopFrame()->GetFrameInterface(), pParent, SdResId( FLT_WIN_LAYOUT_DIALOG )) , meCurrentLayout( AUTOLAYOUT_NONE ) , mrBase(rBase) { + String sResetSlideLayout( SdResId( STR_RESET_LAYOUT ) ); + + FreeResource(); + // SetHelpId( HID_POPUP_LAYOUT ); const Color aMenuColor( GetSettings().GetStyleSettings().GetMenuColor() ); @@ -194,7 +214,17 @@ SdLayoutDialogContent::SdLayoutDialogContent( SfxBindings* pInBindings, SfxChild mpToolbarMenu->appendEntry( -1, String( SdResId( STR_UNDO_MODIFY_PAGE ) ) ); mpToolbarMenu->appendEntry( 0, mpLayoutSet ); mpToolbarMenu->appendSeparator(); - mpToolbarMenu->appendEntry( 1, String( RTL_CONSTASCII_USTRINGPARAM("Reset Slide Layout") )); + + Reference< XFrame > xFrame( GetFrame(), UNO_QUERY ); + if( xFrame.is() ) + { + Image aImg( ::GetImage( xFrame, OUString( RTL_CONSTASCII_USTRINGPARAM(".uno:Undo") ), FALSE, FALSE ) ); + mpToolbarMenu->appendEntry( 1, sResetSlideLayout, aImg); + } + else + { + mpToolbarMenu->appendEntry( 1, sResetSlideLayout); + } SetOutputSizePixel( mpToolbarMenu->getMenuSize() ); mpToolbarMenu->SetOutputSizePixel( GetOutputSizePixel() ); @@ -202,13 +232,15 @@ SdLayoutDialogContent::SdLayoutDialogContent( SfxBindings* pInBindings, SfxChild mpToolbarMenu->Show(); // AddStatusListener( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:AssignLayout" ))); +} - FreeResource(); +SdLayoutDialogContent::~SdLayoutDialogContent() +{ } void SdLayoutDialogContent::Resize (void) { - SfxDockingWindow::Resize(); + SfxPopupWindow::Resize(); mpToolbarMenu->SetPosSizePixel( Point(0,0), GetSizePixel() ); } @@ -247,21 +279,16 @@ void SdLayoutDialogContent::StateChanged( USHORT nSID, SfxItemState eState, cons IMPL_LINK( SdLayoutDialogContent, SelectHdl, void *, pControl ) { -/* if ( IsInPopupMode() ) EndPopupMode(); +/* AutoLayout eLayout = meCurrentLayout; if( pControl == mpLayoutSet ) eLayout = static_cast< AutoLayout >(mpLayoutSet->GetSelectItemId()-1); - const rtl::OUString aCommand( RTL_CONSTASCII_USTRINGPARAM( ".uno:AssignLayout" )); - - Sequence< PropertyValue > aArgs( 1 ); - aArgs[0].Name = OUString( RTL_CONSTASCII_USTRINGPARAM("WhatLayout") ); - aArgs[0].Value <<= static_cast(eLayout); - - SfxToolBoxControl::Dispatch( Reference< ::com::sun::star::frame::XDispatchProvider >( mxFrame->getController(), UNO_QUERY ), aCommand, aArgs ); + const SfxUInt32Item aItem(ID_VAL_WHATLAYOUT, eLayout); + GetBindings().GetDispatcher()->Execute(SID_ASSIGN_LAYOUT,SFX_CALLMODE_ASYNCHRON,&aItem,0); */ return 0; } diff --git a/sd/source/ui/dlg/layoutdialog.hrc b/sd/source/ui/dlg/layoutdialog.hrc index 6fd97b2d09cc..c53f5342f2b5 100644 --- a/sd/source/ui/dlg/layoutdialog.hrc +++ b/sd/source/ui/dlg/layoutdialog.hrc @@ -29,3 +29,5 @@ ************************************************************************/ #define FLT_WIN_LAYOUT_DIALOG 795 + +#define STR_RESET_LAYOUT 1 diff --git a/sd/source/ui/dlg/layoutdialog.src b/sd/source/ui/dlg/layoutdialog.src index 21477e8db993..a9a3d315faf0 100644 --- a/sd/source/ui/dlg/layoutdialog.src +++ b/sd/source/ui/dlg/layoutdialog.src @@ -44,5 +44,10 @@ DockingWindow FLT_WIN_LAYOUT_DIALOG Zoomable = TRUE ; Dockable = TRUE ; EnableResizing = TRUE ; + + String STR_RESET_LAYOUT + { + Text[ en-US ] = "Reset Slide Layout"; + }; }; 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 diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx index 7c814ff9d718..865ca7bd21a6 100644 --- a/sd/source/ui/view/drviews2.cxx +++ b/sd/source/ui/view/drviews2.cxx @@ -101,6 +101,8 @@ #include +#include "layoutdialog.hxx" + using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -428,30 +430,35 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) case SID_ASSIGN_LAYOUT: { - if (mePageKind==PK_STANDARD - || mePageKind==PK_NOTES - || (mePageKind==PK_HANDOUT && meEditMode==EM_MASTERPAGE)) + if (mePageKind==PK_STANDARD || mePageKind==PK_NOTES || (mePageKind==PK_HANDOUT && meEditMode==EM_MASTERPAGE)) { - const SfxUInt32Item* pWhatPage = static_cast< const SfxUInt32Item* > ( rReq.GetArg( ID_VAL_WHATPAGE, FALSE, TYPE(SfxUInt32Item) ) ); - const SfxUInt32Item* pWhatLayout = static_cast< const SfxUInt32Item* > ( rReq.GetArg( ID_VAL_WHATLAYOUT, FALSE, TYPE(SfxUInt32Item) ) ); - - if( pWhatLayout ) + if( rReq.GetArgs() ) { - if ( mpDrawView->IsTextEdit() ) - mpDrawView->SdrEndTextEdit(); + const SfxUInt32Item* pWhatPage = static_cast< const SfxUInt32Item* > ( rReq.GetArg( ID_VAL_WHATPAGE, FALSE, TYPE(SfxUInt32Item) ) ); + const SfxUInt32Item* pWhatLayout = static_cast< const SfxUInt32Item* > ( rReq.GetArg( ID_VAL_WHATLAYOUT, FALSE, TYPE(SfxUInt32Item) ) ); - USHORT nPage; - if( pWhatPage ) + if( pWhatLayout ) { - nPage = pWhatPage->GetValue(); - } - else - { - nPage = maTabControl.GetCurPageId() - 1; - } + if ( mpDrawView->IsTextEdit() ) + mpDrawView->SdrEndTextEdit(); - ::sd::ViewShell::mpImpl->AssignLayout(GetDoc()->GetSdPage((USHORT)nPage, mePageKind),(AutoLayout)pWhatLayout->GetValue()); - } + USHORT nPage; + if( pWhatPage ) + { + nPage = pWhatPage->GetValue(); + } + else + { + nPage = maTabControl.GetCurPageId() - 1; + } + + ::sd::ViewShell::mpImpl->AssignLayout(GetDoc()->GetSdPage((USHORT)nPage, mePageKind),(AutoLayout)pWhatLayout->GetValue()); + } + } + else + { + GetViewFrame()->ToggleChildWindow( sd::LayoutDialogChildWindow::GetChildWindowId() ); + } } Cancel(); rReq.Done (); -- 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/inc/glob.hrc | 6 - sd/source/core/sdpage.cxx | 62 +----- sd/source/ui/app/layoutctrl.cxx | 11 +- sd/source/ui/app/res_bmp.src | 301 +++++++++++++-------------- sd/source/ui/dlg/layoutdialog.cxx | 50 +++-- sd/source/ui/dlg/layoutdialog.src | 6 +- sd/source/ui/inc/res_bmp.hrc | 139 +++++++------ sd/source/ui/inc/view/viewoverlaymanager.hxx | 8 +- sd/source/ui/toolpanel/LayoutMenu.cxx | 11 +- sd/source/ui/toolpanel/ToolPanel.cxx | 2 +- sd/source/ui/view/viewoverlaymanager.cxx | 48 ++++- 11 files changed, 301 insertions(+), 343 deletions(-) (limited to 'sd') diff --git a/sd/inc/glob.hrc b/sd/inc/glob.hrc index 7ef9ecad779c..0c4845048274 100644 --- a/sd/inc/glob.hrc +++ b/sd/inc/glob.hrc @@ -47,12 +47,6 @@ #define STR_PRESOBJ_ORGCHART RID_GLOB_START+11 #define STR_PRESOBJ_TABLE RID_GLOB_START+12 #define STR_PRESOBJ_IMAGE RID_GLOB_START+13 -#define BMP_PRESOBJ_GRAPHIC RID_GLOB_START+14 -#define BMP_PRESOBJ_OBJECT RID_GLOB_START+15 -#define BMP_PRESOBJ_CHART RID_GLOB_START+16 -#define BMP_PRESOBJ_ORGCHART RID_GLOB_START+17 -#define BMP_PRESOBJ_TABLE RID_GLOB_START+18 -#define BMP_PRESOBJ_IMAGE RID_GLOB_START+19 #define STR_OUTLINEVIEWSHELL RID_GLOB_START+21 #define STR_DRAWVIEWSHELL RID_GLOB_START+22 #define STR_TEXTOBJECTBARSHELL RID_GLOB_START+23 diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx index 0f58407a65b7..4a2b740a1e14 100644 --- a/sd/source/core/sdpage.cxx +++ b/sd/source/core/sdpage.cxx @@ -205,6 +205,11 @@ SdrObject* SdPage::CreatePresObj(PresObjKind eObjKind, BOOL bVertical, const Rec } break; + case PRESOBJ_GRAPHIC: + case PRESOBJ_OBJECT: + case PRESOBJ_CHART: + case PRESOBJ_ORGCHART: + case PRESOBJ_TABLE: case PRESOBJ_OUTLINE: { pSdrObj = new SdrRectObj(OBJ_OUTLINETEXT); @@ -233,63 +238,6 @@ SdrObject* SdPage::CreatePresObj(PresObjKind eObjKind, BOOL bVertical, const Rec } break; - case PRESOBJ_GRAPHIC: - { - BitmapEx aBmpEx( SdResId( BMP_PRESOBJ_GRAPHIC ) ); - Graphic aGraphic( aBmpEx ); - OutputDevice &aOutDev = *Application::GetDefaultDevice(); - aOutDev.Push(); - - aOutDev.SetMapMode( aGraphic.GetPrefMapMode() ); - Size aSizePix = aOutDev.LogicToPixel( aGraphic.GetPrefSize() ); - aOutDev.SetMapMode(MAP_100TH_MM); - - Size aSize = aOutDev.PixelToLogic(aSizePix); - Point aPnt (0, 0); - Rectangle aRect (aPnt, aSize); - pSdrObj = new SdrGrafObj(aGraphic, aRect); - aOutDev.Pop(); - } - break; - - case PRESOBJ_OBJECT: - { - pSdrObj = new SdrOle2Obj(); - BitmapEx aBmpEx( SdResId( BMP_PRESOBJ_OBJECT ) ); - Graphic aGraphic( aBmpEx ); - ( (SdrOle2Obj*) pSdrObj)->SetGraphic(&aGraphic); - } - break; - - case PRESOBJ_CHART: - { - pSdrObj = new SdrOle2Obj(); - ( (SdrOle2Obj*) pSdrObj)->SetProgName( String( RTL_CONSTASCII_USTRINGPARAM( "StarChart" ))); - BitmapEx aBmpEx( SdResId( BMP_PRESOBJ_CHART ) ); - Graphic aGraphic( aBmpEx ); - ( (SdrOle2Obj*) pSdrObj)->SetGraphic(&aGraphic); - } - break; - - case PRESOBJ_ORGCHART: - { - pSdrObj = new SdrOle2Obj(); - ( (SdrOle2Obj*) pSdrObj)->SetProgName( String( RTL_CONSTASCII_USTRINGPARAM( "StarOrg" ))); - BitmapEx aBmpEx( SdResId( BMP_PRESOBJ_ORGCHART ) ); - Graphic aGraphic( aBmpEx ); - ( (SdrOle2Obj*) pSdrObj)->SetGraphic(&aGraphic); - } - - case PRESOBJ_TABLE: - { - pSdrObj = new SdrOle2Obj(); - ( (SdrOle2Obj*) pSdrObj)->SetProgName( String( RTL_CONSTASCII_USTRINGPARAM( "StarCalc" ))); - BitmapEx aBmpEx( SdResId( BMP_PRESOBJ_TABLE ) ); - Graphic aGraphic( aBmpEx ); - ( (SdrOle2Obj*) pSdrObj)->SetGraphic(&aGraphic); - } - break; - case PRESOBJ_BACKGROUND: { pSdrObj = new SdrRectObj(); diff --git a/sd/source/ui/app/layoutctrl.cxx b/sd/source/ui/app/layoutctrl.cxx index 71069cadab8f..5f731d24d2ad 100644 --- a/sd/source/ui/app/layoutctrl.cxx +++ b/sd/source/ui/app/layoutctrl.cxx @@ -41,9 +41,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include #include @@ -150,10 +150,12 @@ SfxPopupWindowType SdLayoutControl::GetPopupWindowType() const SfxPopupWindow* SdLayoutControl::CreatePopupWindow() { + /* OUString sResourceName( RTL_CONSTASCII_USTRINGPARAM( "private:resource/dockingwindow/" ) ); sResourceName += OUString::valueOf( static_cast(GetId()) ); createAndPositionSubToolBar( sResourceName ); -/* + */ + SfxPopupWindow* pWin = 0; ToolBox& rTbx = GetToolBox(); @@ -168,7 +170,6 @@ SfxPopupWindow* SdLayoutControl::CreatePopupWindow() } } SetPopupWindow( pWin ); - */ return 0; } diff --git a/sd/source/ui/app/res_bmp.src b/sd/source/ui/app/res_bmp.src index 77ef817e4c44..ff9d4a63946e 100644 --- a/sd/source/ui/app/res_bmp.src +++ b/sd/source/ui/app/res_bmp.src @@ -33,286 +33,283 @@ #include "glob.hrc" #include "res_bmp.hrc" -Bitmap BMP_FOIL_00 +// preview bitmaps for layouts +Bitmap BMP_ADDEMPTY_57X71 { - File = "foil00.bmp" ; + File = "layout_addempty_57x71.png"; }; -Bitmap BMP_FOIL_00_H +Bitmap BMP_LAYOUT_ADDEMPTY_57X71_H { - File = "foil00_h.bmp" ; + File = "layout_addempty_57x71_h.png"; }; -Bitmap BMP_FOIL_01 +Bitmap BMP_LAYOUT_ADDHEAD01_57X71 { - File = "foil01.bmp" ; + File = "layout_addhead01_57x71.png"; }; -Bitmap BMP_FOIL_01_H +Bitmap BMP_LAYOUT_ADDHEAD01_57X71_H { - File = "foil01_h.bmp" ; + File = "layout_addhead01_57x71_h.png"; }; -Bitmap BMP_FOIL_02 +Bitmap BMP_LAYOUT_ADDHEAD02_57X71 { - File = "foil02.bmp" ; + File = "layout_addhead02_57x71.png"; }; -Bitmap BMP_FOIL_02_H +Bitmap BMP_LAYOUT_ADDHEAD02_57X71_H { - File = "foil02_h.bmp" ; + File = "layout_addhead02_57x71_h.png"; }; -Bitmap BMP_FOIL_03 +Bitmap BMP_LAYOUT_ADDHEAD02A_57X71 { - File = "foil03.bmp" ; + File = "layout_addhead02a_57x71.png"; }; -Bitmap BMP_FOIL_03_H +Bitmap BMP_LAYOUT_ADDHEAD02A_57X71_H { - File = "foil03_h.bmp" ; + File = "layout_addhead02a_57x71_h.png"; }; -Bitmap BMP_FOIL_04 +Bitmap BMP_LAYOUT_ADDHEAD02B_57X71 { - File = "foil04.bmp" ; + File = "layout_addhead02b_57x71.png"; }; -Bitmap BMP_FOIL_04_H +Bitmap BMP_LAYOUT_ADDHEAD02B_57X71_H { - File = "foil04_h.bmp" ; + File = "layout_addhead02b_57x71_h.png"; }; -Bitmap BMP_FOIL_05 +Bitmap BMP_LAYOUT_ADDHEAD03_57X71 { - File = "foil05.bmp" ; + File = "layout_addhead03_57x71.png"; }; -Bitmap BMP_FOIL_06 +Bitmap BMP_LAYOUT_ADDHEAD03_57X71_H { - File = "foil06.bmp" ; + File = "layout_addhead03_57x71_h.png"; }; -Bitmap BMP_FOIL_06_H +Bitmap BMP_LAYOUT_ADDHEAD03A_57X71 { - File = "foil06_h.bmp" ; + File = "layout_addhead03a_57x71.png"; }; -Bitmap BMP_FOIL_07 +Bitmap BMP_LAYOUT_ADDHEAD03A_57X71_H { - File = "foil07.bmp" ; + File = "layout_addhead03a_57x71_h.png"; }; -Bitmap BMP_FOIL_07_H +Bitmap BMP_LAYOUT_ADDHEAD04_57X71 { - File = "foil07_h.bmp" ; + File = "layout_addhead04_57x71.png"; }; -Bitmap BMP_FOIL_08 +Bitmap BMP_LAYOUT_ADDHEAD04_57X71_H { - File = "foil08.bmp" ; + File = "layout_addhead04_57x71_h.png"; }; -Bitmap BMP_FOIL_08_H +Bitmap BMP_LAYOUT_ADDHEAD06_57X71 { - File = "foil08_h.bmp" ; + File = "layout_addhead06_57x71.png"; }; -Bitmap BMP_FOIL_09 +Bitmap BMP_LAYOUT_ADDHEAD06_57X71_H { - File = "foil09.bmp" ; + File = "layout_addhead06_57x71_h.png"; }; -Bitmap BMP_FOIL_09_H +Bitmap BMP_LAYOUT_ADDTEXTONLY_57X71 { - File = "foil09_h.bmp" ; + File = "layout_addtextonly_57x71.png"; }; -Bitmap BMP_FOIL_10 +Bitmap BMP_LAYOUT_ADDTEXTONLY_57X71_H { - File = "foil10.bmp" ; + File = "layout_addtextonly_57x71_h.png"; }; -Bitmap BMP_FOIL_10_H +Bitmap BMP_LAYOUT_ADDVERTICAL01_57X71 { - File = "foil10_h.bmp" ; + File = "layout_addvertical01_57x71.png"; }; -Bitmap BMP_FOIL_11 +Bitmap BMP_LAYOUT_ADDVERTICAL01_57X71_H { - File = "foil11.bmp" ; + File = "layout_addvertical01_57x71_h.png"; }; -Bitmap BMP_FOIL_11_H +Bitmap BMP_LAYOUT_ADDVERTICAL02_57X71 { - File = "foil11_h.bmp" ; + File = "layout_addvertical02_57x71.png"; }; -Bitmap BMP_FOIL_12 +Bitmap BMP_LAYOUT_ADDVERTICAL02_57X71_H { - File = "foil12.bmp" ; + File = "layout_addvertical02_57x71_h.png"; }; -Bitmap BMP_FOIL_12_H +Bitmap BMP_LAYOUT_EMPTY_57X71 { - File = "foil12_h.bmp" ; + File = "layout_empty_57x71.png"; }; -Bitmap BMP_FOIL_13 +Bitmap BMP_LAYOUT_EMPTY_57X71_H { - File = "foil13.bmp" ; + File = "layout_empty_57x71_h.png"; }; -Bitmap BMP_FOIL_13_H +Bitmap BMP_LAYOUT_HEAD01_57X71 { - File = "foil13_h.bmp" ; + File = "layout_head01_57x71.png"; }; -Bitmap BMP_FOIL_14 +Bitmap BMP_LAYOUT_HEAD01_57X71_H { - File = "foil14.bmp" ; + File = "layout_head01_57x71_h.png"; }; -Bitmap BMP_FOIL_14_H +Bitmap BMP_LAYOUT_HEAD02_57X71 { - File = "foil14_h.bmp" ; + File = "layout_head02_57x71.png"; }; -Bitmap BMP_FOIL_15 +Bitmap BMP_LAYOUT_HEAD02_57X71_H { - File = "foil15.bmp" ; + File = "layout_head02_57x71_h.png"; }; -Bitmap BMP_FOIL_15_H +Bitmap BMP_LAYOUT_HEAD02A_57X71 { - File = "foil15_h.bmp" ; + File = "layout_head02a_57x71.png"; }; -Bitmap BMP_FOIL_16 +Bitmap BMP_LAYOUT_HEAD02A_57X71_H { - File = "foil16.bmp" ; + File = "layout_head02a_57x71_h.png"; }; -Bitmap BMP_FOIL_16_H +Bitmap BMP_LAYOUT_HEAD02B_57X71 { - File = "foil16_h.bmp" ; + File = "layout_head02b_57x71.png"; }; -Bitmap BMP_FOIL_17 +Bitmap BMP_LAYOUT_HEAD02B_57X71_H { - File = "foil17.bmp" ; + File = "layout_head02b_57x71_h.png"; }; -Bitmap BMP_FOIL_17_H +Bitmap BMP_LAYOUT_HEAD03_57X71 { - File = "foil17_h.bmp" ; + File = "layout_head03_57x71.png"; }; -Bitmap BMP_FOIL_18 +Bitmap BMP_LAYOUT_HEAD03_57X71_H { - File = "foil18.bmp" ; + File = "layout_head03_57x71_h.png"; }; -Bitmap BMP_FOIL_18_H +Bitmap BMP_LAYOUT_HEAD03A_57X71 { - File = "foil18_h.bmp" ; + File = "layout_head03a_57x71.png"; }; -Bitmap BMP_FOIL_19 +Bitmap BMP_LAYOUT_HEAD03A_57X71_H { - File = "foil19.bmp" ; + File = "layout_head03a_57x71_h.png"; }; -Bitmap BMP_FOIL_19_H +Bitmap BMP_LAYOUT_HEAD04_57X71 { - File = "foil19_h.bmp" ; + File = "layout_head04_57x71.png"; }; -Bitmap BMP_FOIL_20 +Bitmap BMP_LAYOUT_HEAD04_57X71_H { - File = "foil20.bmp" ; + File = "layout_head04_57x71_h.png"; }; -Bitmap BMP_FOIL_20_H +Bitmap BMP_LAYOUT_HEAD06_57X71 { - File = "foil20_h.bmp" ; + File = "layout_head06_57x71.png"; }; -Bitmap BMP_FOIL_21 +Bitmap BMP_LAYOUT_HEAD06_57X71_H { - File = "foil21.bmp" ; + File = "layout_head06_57x71_h.png"; }; -Bitmap BMP_FOIL_21_H +Bitmap BMP_LAYOUT_TEXTONLY_57X71 { - File = "foil21_h.bmp" ; + File = "layout_textonly_57x71.png"; }; -Bitmap BMP_FOIL_22 +Bitmap BMP_LAYOUT_TEXTONLY_57X71_H { - File = "foil22.bmp" ; + File = "layout_textonly_57x71_h.png"; }; -Bitmap BMP_FOIL_22_H +Bitmap BMP_LAYOUT_VERTICAL01_57X71 { - File = "foil22_h.bmp" ; + File = "layout_vertical01_57x71.png"; }; -Bitmap BMP_FOIL_23 +Bitmap BMP_LAYOUT_VERTICAL01_57X71_H { - File = "foil23.bmp" ; + File = "layout_vertical01_57x71_h.png"; }; -Bitmap BMP_FOIL_23_H +Bitmap BMP_LAYOUT_VERTICAL02_57X71 { - File = "foil23_h.bmp" ; + File = "layout_vertical02_57x71.png"; }; -Bitmap BMP_FOIL_24 +Bitmap BMP_LAYOUT_VERTICAL02_57X71_H { - File = "foil24.bmp" ; -}; -Bitmap BMP_FOIL_24_H -{ - File = "foil24_h.bmp" ; -}; -Bitmap BMP_FOIL_25 -{ - File = "foil25.bmp" ; -}; -Bitmap BMP_FOIL_25_H -{ - File = "foil25_h.bmp" ; -}; -Bitmap BMP_FOIL_26 -{ - File = "foil26.bmp" ; -}; -Bitmap BMP_FOIL_26_H -{ - File = "foil26_h.bmp" ; -}; -Bitmap BMP_FOIL_27 -{ - File = "foil27.bmp" ; -}; -Bitmap BMP_FOIL_27_H -{ - File = "foil27_h.bmp" ; + File = "layout_vertical02_57x71_h.png"; }; + Bitmap BMP_FOILH_01 { - File = "foilh01.bmp" ; + File = "foilh01.png"; }; Bitmap BMP_FOILH_01_H { - File = "foilh01_h.bmp" ; + File = "foilh01_h.png"; }; Bitmap BMP_FOILH_02 { - File = "foilh02.bmp" ; + File = "foilh02.png"; }; Bitmap BMP_FOILH_02_H { - File = "foilh02_h.bmp" ; + File = "foilh02_h.png"; }; Bitmap BMP_FOILH_03 { - File = "foilh03.bmp" ; + File = "foilh03.png"; }; Bitmap BMP_FOILH_03_H { - File = "foilh03_h.bmp" ; + File = "foilh03_h.png"; }; Bitmap BMP_FOILH_04 { - File = "foilh04.bmp" ; + File = "foilh04.png"; }; Bitmap BMP_FOILH_04_H { - File = "foilh04_h.bmp" ; + File = "foilh04_h.png"; }; Bitmap BMP_FOILH_06 { - File = "foilh06.bmp" ; + File = "foilh06.png"; }; Bitmap BMP_FOILH_06_H { - File = "foilh06_h.bmp" ; + File = "foilh06_h.png"; }; Bitmap BMP_FOILH_09 { - File = "foilh09.bmp" ; + File = "foilh09.png"; }; Bitmap BMP_FOILH_09_H { - File = "foilh09_h.bmp" ; + File = "foilh09_h.png"; +}; + + +Bitmap BMP_PLACEHOLDER_CHART_57X71 +{ + File = "placeholder_chart_57x71.png"; }; -Bitmap BMP_FOILN_01 +Bitmap BMP_PLACEHOLDER_CHART_57X71_H { - File = "foiln01.bmp" ; + File = "placeholder_chart_57x71_h.png"; }; -Bitmap BMP_FOILN_01_H +Bitmap BMP_PLACEHOLDER_IMAGE_57X71 { - File = "foiln01_h.bmp" ; + File = "placeholder_image_57x71.png"; }; -Bitmap BMP_FOIL_NONE +Bitmap BMP_PLACEHOLDER_IMAGE_57X71_H { - File = "foilnone.bmp" ; + File = "placeholder_image_57x71_h.png"; }; +Bitmap BMP_PLACEHOLDER_MOVIE_57X71 +{ + File = "placeholder_movie_57x71.png"; +}; +Bitmap BMP_PLACEHOLDER_MOVIE_57X71_H +{ + File = "placeholder_movie_57x71_h.png"; +}; +Bitmap BMP_PLACEHOLDER_TABLE_57X71 +{ + File = "placeholder_table_57x71.png"; +}; +Bitmap BMP_PLACEHOLDER_TABLE_57X71_H +{ + File = "placeholder_table_57x71_h.png"; +}; + Bitmap BMP_PAGE { File = "page.bmp" ; @@ -495,26 +492,6 @@ SfxStyleFamilies DLG_STYLE_DESIGNER #undef STYLE_IMAGE_LISTEF }; -Bitmap BMP_PRESOBJ_GRAPHIC -{ - File = "image.bmp" ; -}; -Bitmap BMP_PRESOBJ_OBJECT -{ - File = "object.bmp" ; -}; -Bitmap BMP_PRESOBJ_CHART -{ - File = "chart.bmp" ; -}; -Bitmap BMP_PRESOBJ_ORGCHART -{ - File = "orgchart.bmp" ; -}; -Bitmap BMP_PRESOBJ_TABLE -{ - File = "table.bmp" ; -}; Bitmap BMP_WAIT_ICON { File = "waiticon.bmp"; diff --git a/sd/source/ui/dlg/layoutdialog.cxx b/sd/source/ui/dlg/layoutdialog.cxx index c431db29d651..5c8cd4c1aa66 100644 --- a/sd/source/ui/dlg/layoutdialog.cxx +++ b/sd/source/ui/dlg/layoutdialog.cxx @@ -50,7 +50,7 @@ SFX_IMPL_DOCKINGWINDOW(LayoutDialogChildWindow, SID_LAYOUT_DIALOG_WIN) #include #include -#include +#include #include #include @@ -135,38 +135,41 @@ struct snewfoil_value_info }; static snewfoil_value_info standard[] = { - {BMP_FOIL_20, BMP_FOIL_20_H, STR_AUTOLAYOUT_NONE, WritingMode_LR_TB, AUTOLAYOUT_NONE}, - {BMP_FOIL_00, BMP_FOIL_00_H, STR_AUTOLAYOUT_TITLE, WritingMode_LR_TB, AUTOLAYOUT_TITLE}, - {BMP_FOIL_01, BMP_FOIL_01_H, STR_AUTOLAYOUT_CONTENT, WritingMode_LR_TB, AUTOLAYOUT_ENUM}, - {BMP_FOIL_03, BMP_FOIL_03_H, STR_AUTOLAYOUT_2CONTENT, WritingMode_LR_TB, AUTOLAYOUT_2TEXT}, - {BMP_FOIL_19, BMP_FOIL_19_H, STR_AUTOLAYOUT_ONLY_TITLE, WritingMode_LR_TB, AUTOLAYOUT_ONLY_TITLE}, - {BMP_FOIL_25, BMP_FOIL_25_H, STR_AUTOLAYOUT_ONLY_TEXT, WritingMode_LR_TB, AUTOLAYOUT_ONLY_TEXT}, - {BMP_FOIL_12, BMP_FOIL_12_H, STR_AUTOLAYOUT_CONTENT_2CONTENT, WritingMode_LR_TB, AUTOLAYOUT_TEXT2OBJ}, - {BMP_FOIL_15, BMP_FOIL_15_H, STR_AUTOLAYOUT_2CONTENT_CONTENT, WritingMode_LR_TB, AUTOLAYOUT_2OBJTEXT}, - {BMP_FOIL_16, BMP_FOIL_16_H, STR_AUTOLAYOUT_2CONTENT_OVER_CONTENT,WritingMode_LR_TB, AUTOLAYOUT_2OBJOVERTEXT}, - {BMP_FOIL_14, BMP_FOIL_14_H, STR_AUTOLAYOUT_CONTENT_OVER_CONTENT, WritingMode_LR_TB, AUTOLAYOUT_OBJOVERTEXT}, - {BMP_FOIL_18, BMP_FOIL_18_H, STR_AUTOLAYOUT_4CONTENT, WritingMode_LR_TB, AUTOLAYOUT_4OBJ}, - {BMP_FOIL_27, BMP_FOIL_27_H, STR_AUTOLAYOUT_6CONTENT, WritingMode_LR_TB, AUTOLAYOUT_6CLIPART}, + {BMP_LAYOUT_EMPTY_57X71, BMP_LAYOUT_EMPTY_57X71_H, STR_AUTOLAYOUT_NONE, WritingMode_LR_TB, AUTOLAYOUT_NONE}, + {BMP_LAYOUT_HEAD03_57X71, BMP_LAYOUT_HEAD03_57X71_H, STR_AUTOLAYOUT_TITLE, WritingMode_LR_TB, AUTOLAYOUT_TITLE}, + {BMP_LAYOUT_HEAD02_57X71, BMP_LAYOUT_HEAD02_57X71_H, STR_AUTOLAYOUT_CONTENT, WritingMode_LR_TB, AUTOLAYOUT_ENUM}, + {BMP_LAYOUT_HEAD02A_57X71, BMP_LAYOUT_HEAD02A_57X71_H, STR_AUTOLAYOUT_2CONTENT, WritingMode_LR_TB, AUTOLAYOUT_2TEXT}, + {BMP_LAYOUT_HEAD01_57X71, BMP_LAYOUT_HEAD01_57X71_H, STR_AUTOLAYOUT_ONLY_TITLE, WritingMode_LR_TB, AUTOLAYOUT_ONLY_TITLE}, + {BMP_LAYOUT_TEXTONLY_57X71, BMP_LAYOUT_TEXTONLY_57X71_H, STR_AUTOLAYOUT_ONLY_TEXT, WritingMode_LR_TB, AUTOLAYOUT_ONLY_TEXT}, +// {BMP_FOIL_12, BMP_FOIL_12_H, STR_AUTOLAYOUT_CONTENT_2CONTENT, WritingMode_LR_TB, AUTOLAYOUT_TEXT2OBJ}, +// {BMP_FOIL_15, BMP_FOIL_15_H, STR_AUTOLAYOUT_2CONTENT_CONTENT, WritingMode_LR_TB, AUTOLAYOUT_2OBJTEXT}, + {BMP_LAYOUT_HEAD03A_57X71, BMP_LAYOUT_HEAD03A_57X71_H, STR_AUTOLAYOUT_2CONTENT_OVER_CONTENT,WritingMode_LR_TB, AUTOLAYOUT_2OBJOVERTEXT}, + {BMP_LAYOUT_HEAD02B_57X71, BMP_LAYOUT_HEAD02B_57X71_H, STR_AUTOLAYOUT_CONTENT_OVER_CONTENT, WritingMode_LR_TB, AUTOLAYOUT_OBJOVERTEXT}, + {BMP_LAYOUT_HEAD04_57X71, BMP_LAYOUT_HEAD04_57X71_H, STR_AUTOLAYOUT_4CONTENT, WritingMode_LR_TB, AUTOLAYOUT_4OBJ}, + {BMP_LAYOUT_HEAD06_57X71, BMP_LAYOUT_HEAD06_57X71_H, STR_AUTOLAYOUT_6CONTENT, WritingMode_LR_TB, AUTOLAYOUT_6CLIPART}, // vertical - {BMP_FOIL_21, BMP_FOIL_21_H, STR_AL_VERT_TITLE_TEXT_CHART, WritingMode_TB_RL,AUTOLAYOUT_VERTICAL_TITLE_TEXT_CHART}, - {BMP_FOIL_22, BMP_FOIL_22_H, STR_AL_VERT_TITLE_VERT_OUTLINE, WritingMode_TB_RL, AUTOLAYOUT_VERTICAL_TITLE_VERTICAL_OUTLINE}, - {BMP_FOIL_23, BMP_FOIL_23_H, STR_AL_TITLE_VERT_OUTLINE, WritingMode_TB_RL, AUTOLAYOUT_TITLE_VERTICAL_OUTLINE}, - {BMP_FOIL_24, BMP_FOIL_24_H, STR_AL_TITLE_VERT_OUTLINE_CLIPART, WritingMode_TB_RL, AUTOLAYOUT_TITLE_VERTICAL_OUTLINE_CLIPART}, + {BMP_LAYOUT_VERTICAL02_57X71, BMP_LAYOUT_VERTICAL02_57X71_H, STR_AL_VERT_TITLE_TEXT_CHART, WritingMode_TB_RL,AUTOLAYOUT_VERTICAL_TITLE_TEXT_CHART}, + {BMP_LAYOUT_VERTICAL01_57X71, BMP_LAYOUT_VERTICAL01_57X71_H, STR_AL_VERT_TITLE_VERT_OUTLINE, WritingMode_TB_RL, AUTOLAYOUT_VERTICAL_TITLE_VERTICAL_OUTLINE}, + {BMP_LAYOUT_HEAD02_57X71, BMP_LAYOUT_HEAD02_57X71_H, STR_AL_TITLE_VERT_OUTLINE, WritingMode_TB_RL, AUTOLAYOUT_TITLE_VERTICAL_OUTLINE}, + {BMP_LAYOUT_HEAD02A_57X71, BMP_LAYOUT_HEAD02A_57X71_H, STR_AL_TITLE_VERT_OUTLINE_CLIPART, WritingMode_TB_RL, AUTOLAYOUT_TITLE_VERTICAL_OUTLINE_CLIPART}, {0, 0, 0, WritingMode_LR_TB, AUTOLAYOUT_NONE} }; // ----------------------------------------------------------------------- + SdLayoutDialogContent::SdLayoutDialogContent( ViewShellBase& rBase, Window* pParent ) -: SfxPopupWindow(SID_ASSIGN_LAYOUT, rBase.GetFrame()->GetTopFrame()->GetFrameInterface(), pParent, SdResId( FLT_WIN_LAYOUT_DIALOG )) +: SfxPopupWindow(SID_ASSIGN_LAYOUT, rBase.GetFrame()->GetTopFrame()->GetFrameInterface(), pParent, WB_CLIPCHILDREN|WB_DIALOGCONTROL|WB_SYSTEMWINDOW/*SdResId( FLT_WIN_LAYOUT_DIALOG )*/) , meCurrentLayout( AUTOLAYOUT_NONE ) , mrBase(rBase) { String sResetSlideLayout( SdResId( STR_RESET_LAYOUT ) ); - FreeResource(); +// FreeResource(); + + //SetStyle( 2 ); // SetHelpId( HID_POPUP_LAYOUT ); @@ -281,15 +284,18 @@ IMPL_LINK( SdLayoutDialogContent, SelectHdl, void *, pControl ) { if ( IsInPopupMode() ) EndPopupMode(); -/* + AutoLayout eLayout = meCurrentLayout; if( pControl == mpLayoutSet ) eLayout = static_cast< AutoLayout >(mpLayoutSet->GetSelectItemId()-1); const SfxUInt32Item aItem(ID_VAL_WHATLAYOUT, eLayout); - GetBindings().GetDispatcher()->Execute(SID_ASSIGN_LAYOUT,SFX_CALLMODE_ASYNCHRON,&aItem,0); -*/ + if( mrBase.GetMainViewShell().get() && mrBase.GetMainViewShell()->GetViewFrame() ) + { + mrBase.GetMainViewShell()->GetViewFrame()->GetBindings().GetDispatcher()->Execute(SID_ASSIGN_LAYOUT,SFX_CALLMODE_ASYNCHRON,&aItem,0); + } + return 0; } diff --git a/sd/source/ui/dlg/layoutdialog.src b/sd/source/ui/dlg/layoutdialog.src index a9a3d315faf0..c890ca3d5b4d 100644 --- a/sd/source/ui/dlg/layoutdialog.src +++ b/sd/source/ui/dlg/layoutdialog.src @@ -32,7 +32,7 @@ #include "layoutdialog.hrc" #include "helpids.h" -DockingWindow FLT_WIN_LAYOUT_DIALOG +FloatingWindow FLT_WIN_LAYOUT_DIALOG { HelpId = HID_SD_SLIDE_LAYOUTS; Border = TRUE ; @@ -42,12 +42,14 @@ DockingWindow FLT_WIN_LAYOUT_DIALOG Moveable = TRUE ; Closeable = TRUE ; Zoomable = TRUE ; - Dockable = TRUE ; + ClipChildren = TRUE ; EnableResizing = TRUE ; String STR_RESET_LAYOUT { Text[ en-US ] = "Reset Slide Layout"; }; + + Text [en-US] = "Slide Layout"; }; 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; }; } diff --git a/sd/source/ui/toolpanel/LayoutMenu.cxx b/sd/source/ui/toolpanel/LayoutMenu.cxx index 5f9dbf0f6e74..afa5bb886f53 100644 --- a/sd/source/ui/toolpanel/LayoutMenu.cxx +++ b/sd/source/ui/toolpanel/LayoutMenu.cxx @@ -140,13 +140,16 @@ struct snewfoil_value_info static snewfoil_value_info notes[] = { +/* {BMP_FOILN_01, BMP_FOILN_01_H, STR_AUTOLAYOUT_NOTES, WritingMode_LR_TB, AUTOLAYOUT_NOTES}, +*/ {0, 0, 0, WritingMode_LR_TB, AUTOLAYOUT_NONE}, }; static snewfoil_value_info handout[] = { +/* {BMP_FOILH_01, BMP_FOILH_01_H, STR_AUTOLAYOUT_HANDOUT1, WritingMode_LR_TB, AUTOLAYOUT_HANDOUT1}, {BMP_FOILH_02, BMP_FOILH_02_H, STR_AUTOLAYOUT_HANDOUT2, WritingMode_LR_TB, @@ -159,11 +162,13 @@ static snewfoil_value_info handout[] = AUTOLAYOUT_HANDOUT6}, {BMP_FOILH_09, BMP_FOILH_09_H, STR_AUTOLAYOUT_HANDOUT9, WritingMode_LR_TB, AUTOLAYOUT_HANDOUT9}, +*/ {0, 0, 0, WritingMode_LR_TB, AUTOLAYOUT_NONE}, }; static snewfoil_value_info standard[] = { +/* {BMP_FOIL_20, BMP_FOIL_20_H, STR_AUTOLAYOUT_NONE, WritingMode_LR_TB, AUTOLAYOUT_NONE}, {BMP_FOIL_00, BMP_FOIL_00_H, STR_AUTOLAYOUT_TITLE, WritingMode_LR_TB, AUTOLAYOUT_TITLE}, {BMP_FOIL_01, BMP_FOIL_01_H, STR_AUTOLAYOUT_CONTENT, WritingMode_LR_TB, AUTOLAYOUT_ENUM}, @@ -177,7 +182,7 @@ static snewfoil_value_info standard[] = {BMP_FOIL_14, BMP_FOIL_14_H, STR_AUTOLAYOUT_CONTENT_OVER_CONTENT, WritingMode_LR_TB, AUTOLAYOUT_OBJOVERTEXT}, {BMP_FOIL_18, BMP_FOIL_18_H, STR_AUTOLAYOUT_4CONTENT, WritingMode_LR_TB, AUTOLAYOUT_4OBJ}, {BMP_FOIL_27, BMP_FOIL_27_H, STR_AUTOLAYOUT_6CONTENT, WritingMode_LR_TB, AUTOLAYOUT_6CLIPART}, -/* +/ * {BMP_FOIL_11, BMP_FOIL_11_H, STR_AUTOLAYOUT_OBJ, WritingMode_LR_TB, AUTOLAYOUT_OBJ}, {BMP_FOIL_02, BMP_FOIL_02_H, STR_AUTOLAYOUT_CHART, WritingMode_LR_TB, AUTOLAYOUT_CHART}, {BMP_FOIL_08, BMP_FOIL_08_H, STR_AUTOLAYOUT_TAB, WritingMode_LR_TB, AUTOLAYOUT_TAB}, @@ -189,13 +194,13 @@ static snewfoil_value_info standard[] = {BMP_FOIL_13, BMP_FOIL_13_H, STR_AUTOLAYOUT_OBJTEXT, WritingMode_LR_TB, AUTOLAYOUT_OBJTEXT}, {BMP_FOIL_17, BMP_FOIL_17_H, STR_AUTOLAYOUT_TEXTOVEROBJ, WritingMode_LR_TB, AUTOLAYOUT_TEXTOVEROBJ}, {BMP_FOIL_26, BMP_FOIL_26_H, STR_AUTOLAYOUT_4CLIPART, WritingMode_LR_TB, AUTOLAYOUT_4CLIPART}, -*/ +* / // vertical {BMP_FOIL_21, BMP_FOIL_21_H, STR_AL_VERT_TITLE_TEXT_CHART, WritingMode_TB_RL,AUTOLAYOUT_VERTICAL_TITLE_TEXT_CHART}, {BMP_FOIL_22, BMP_FOIL_22_H, STR_AL_VERT_TITLE_VERT_OUTLINE, WritingMode_TB_RL, AUTOLAYOUT_VERTICAL_TITLE_VERTICAL_OUTLINE}, {BMP_FOIL_23, BMP_FOIL_23_H, STR_AL_TITLE_VERT_OUTLINE, WritingMode_TB_RL, AUTOLAYOUT_TITLE_VERTICAL_OUTLINE}, {BMP_FOIL_24, BMP_FOIL_24_H, STR_AL_TITLE_VERT_OUTLINE_CLIPART, WritingMode_TB_RL, AUTOLAYOUT_TITLE_VERTICAL_OUTLINE_CLIPART}, - +*/ {0, 0, 0, WritingMode_LR_TB, AUTOLAYOUT_NONE} }; diff --git a/sd/source/ui/toolpanel/ToolPanel.cxx b/sd/source/ui/toolpanel/ToolPanel.cxx index d9fe0cb8ac65..8d6cb76dd7e9 100644 --- a/sd/source/ui/toolpanel/ToolPanel.cxx +++ b/sd/source/ui/toolpanel/ToolPanel.cxx @@ -108,7 +108,7 @@ sal_uInt32 ToolPanel::AddControl ( } // Replace the old links for cycling between first and last child by - // current ones. + // current onems. if (nControlCount > 0) { ::Window* pFirst = mpControlContainer->GetControl(0)->GetWindow(); diff --git a/sd/source/ui/view/viewoverlaymanager.cxx b/sd/source/ui/view/viewoverlaymanager.cxx index 802296322c35..bc4debb1afb3 100644 --- a/sd/source/ui/view/viewoverlaymanager.cxx +++ b/sd/source/ui/view/viewoverlaymanager.cxx @@ -41,7 +41,10 @@ #include #include +#include + #include +#include #include #include @@ -52,6 +55,7 @@ #include "view/viewoverlaymanager.hxx" +#include "res_bmp.hrc" #include "DrawDocShell.hxx" #include "DrawViewShell.hxx" #include "DrawController.hxx" @@ -72,6 +76,36 @@ namespace sd { class ImageButtonHdl; +// -------------------------------------------------------------------- + +Image ViewOverlayManager::maSmallButtonImages[ViewOverlayManager::ButtonCount]; +Image ViewOverlayManager::maLargeButtonImages[ViewOverlayManager::ButtonCount]; + +static USHORT gButtonSlots[ViewOverlayManager::ButtonCount] = { SID_INSERT_TABLE, SID_INSERT_DIAGRAM, SID_INSERT_GRAPHIC, SID_INSERT_AVMEDIA }; +static USHORT gButtonResId[ViewOverlayManager::ButtonCount] = { BMP_PLACEHOLDER_TABLE_57X71, BMP_PLACEHOLDER_CHART_57X71, BMP_PLACEHOLDER_IMAGE_57X71, BMP_PLACEHOLDER_MOVIE_57X71 }; +static USHORT gButtonResIdHc[ViewOverlayManager::ButtonCount] = { BMP_PLACEHOLDER_TABLE_57X71_H, BMP_PLACEHOLDER_CHART_57X71_H, BMP_PLACEHOLDER_IMAGE_57X71_H, BMP_PLACEHOLDER_MOVIE_57X71_H }; + +// -------------------------------------------------------------------- + +static Image loadImageResource( USHORT nId ) +{ + /* + OUString sURL( OUString( RTL_CONSTASCII_USTRINGPARAM( "private:resource/sd/bitmap/" ) ) ); + sURL += OUString::valueOf( (sal_Int32)nId ); + + BitmapEx aBmpEx; + vcl::ImageRepository::loadImage( sURL, aBmpEx, false ); + return Image( aBmpEx ); + */ + + SdResId aResId( nId ); + aResId.SetRT( RSC_BITMAP ); + + return Image( BitmapEx( aResId ) ); +} + +// -------------------------------------------------------------------- + const sal_uInt32 SMART_TAG_HDL_NUM = SAL_MAX_UINT32; class ChangePlaceholderTag : public SmartTag @@ -306,7 +340,7 @@ void ChangePlaceholderTag::addCustomHandles( SdrHdlList& rHandlerList ) Size aShapeSizePix = pDev->LogicToPixel(rSnapRect.GetSize()); long nShapeSizePix = std::min(aShapeSizePix.Width(),aShapeSizePix.Height()); - Image* pImages = (nShapeSizePix > 300) ? &ViewOverlayManager::maLargeButtonImages[0] : &ViewOverlayManager::maSmallButtonImages[0]; + Image* pImages = &ViewOverlayManager::maLargeButtonImages[0]; //(nShapeSizePix > 300) ? &ViewOverlayManager::maLargeButtonImages[0] : &ViewOverlayManager::maSmallButtonImages[0]; Size aButtonSize( pDev->PixelToLogic(pImages[0].GetSizePixel()) ); if( 200 > nShapeSizePix ) @@ -340,7 +374,7 @@ void ChangePlaceholderTag::addCustomHandles( SdrHdlList& rHandlerList ) aImg = Image(b); } - ImageButtonHdl* pHdl = new ImageButtonHdl( xThis, ViewOverlayManager::mnButtonSlots[i], aImg, aPoint ); + ImageButtonHdl* pHdl = new ImageButtonHdl( xThis, gButtonSlots[i], aImg, aPoint ); pHdl->SetObjHdlNum( SMART_TAG_HDL_NUM ); pHdl->SetPageView( mrView.GetSdrPageView() ); @@ -385,12 +419,6 @@ void ChangePlaceholderTag::deselect() // -------------------------------------------------------------------- -Image ViewOverlayManager::maSmallButtonImages[ViewOverlayManager::ButtonCount]; -Image ViewOverlayManager::maLargeButtonImages[ViewOverlayManager::ButtonCount]; -USHORT ViewOverlayManager::mnButtonSlots[ViewOverlayManager::ButtonCount] = { SID_INSERT_TABLE, SID_INSERT_DIAGRAM, SID_INSERT_GRAPHIC, SID_INSERT_AVMEDIA }; - -// -------------------------------------------------------------------- - static Image lcl_getslotimage( ::com::sun::star::uno::Reference& xFrame, USHORT nSID, BOOL b1, BOOL b2 ) { rtl::OUString aSlotURL( RTL_CONSTASCII_USTRINGPARAM( "slot:" )); @@ -433,8 +461,8 @@ void ViewOverlayManager::UpdateImages() Reference xFrame(mrBase.GetFrame()->GetTopFrame()->GetFrameInterface(), UNO_QUERY_THROW); for( int i = 0; i < ButtonCount; i++ ) { - maSmallButtonImages[i] = lcl_getslotimage( xFrame, mnButtonSlots[i], FALSE, FALSE ); - maLargeButtonImages[i] = lcl_getslotimage( xFrame, mnButtonSlots[i], TRUE, FALSE ); + maSmallButtonImages[i] = loadImageResource( gButtonResId[i] ); +// maLargeButtonImages[i] = lcl_getslotimage( xFrame, mnButtonSlots[i], TRUE, FALSE ); } } catch( Exception& ) -- cgit From ab98df64183f82536da9a36e36de1534c33bcd8f Mon Sep 17 00:00:00 2001 From: Christian Lippka Date: Mon, 11 Jan 2010 16:56:45 +0100 Subject: removed unused file --- sd/source/ui/dlg/layoutdialog.src | 55 --------------------------------------- 1 file changed, 55 deletions(-) delete mode 100644 sd/source/ui/dlg/layoutdialog.src (limited to 'sd') diff --git a/sd/source/ui/dlg/layoutdialog.src b/sd/source/ui/dlg/layoutdialog.src deleted file mode 100644 index c890ca3d5b4d..000000000000 --- a/sd/source/ui/dlg/layoutdialog.src +++ /dev/null @@ -1,55 +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: LayerDialog.src,v $ - * $Revision: 1.5 $ - * - * 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. - * - ************************************************************************/ - -#include "app.hrc" -#include "layoutdialog.hrc" -#include "helpids.h" - -FloatingWindow FLT_WIN_LAYOUT_DIALOG -{ - HelpId = HID_SD_SLIDE_LAYOUTS; - Border = TRUE ; - Hide = TRUE ; - SVLook = TRUE ; - Sizeable = TRUE ; - Moveable = TRUE ; - Closeable = TRUE ; - Zoomable = TRUE ; - ClipChildren = TRUE ; - EnableResizing = TRUE ; - - String STR_RESET_LAYOUT - { - Text[ en-US ] = "Reset Slide Layout"; - }; - - Text [en-US] = "Slide Layout"; -}; - -- 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/inc/app.hrc | 2 - sd/source/ui/app/layoutctrl.cxx | 273 +-------------------- sd/source/ui/app/sddll2.cxx | 19 +- sd/source/ui/app/strings.src | 4 + sd/source/ui/dlg/layoutdialog.cxx | 143 ++++------- sd/source/ui/dlg/layoutdialog.hrc | 33 --- sd/source/ui/dlg/makefile.mk | 3 +- sd/source/ui/inc/ViewShellImplementation.hxx | 4 +- sd/source/ui/inc/layoutdialog.hxx | 25 +- sd/source/ui/inc/strings.hrc | 2 + .../ui/slidesorter/controller/SlsSlotManager.cxx | 7 +- sd/source/ui/view/ViewShellImplementation.cxx | 56 +++-- sd/source/ui/view/drviews2.cxx | 29 +-- sd/source/ui/view/drviews6.cxx | 27 -- sd/source/ui/view/viewoverlaymanager.cxx | 10 +- 15 files changed, 133 insertions(+), 504 deletions(-) delete mode 100644 sd/source/ui/dlg/layoutdialog.hrc (limited to 'sd') diff --git a/sd/inc/app.hrc b/sd/inc/app.hrc index f78cf1c16716..0ccbbf921b6b 100644 --- a/sd/inc/app.hrc +++ b/sd/inc/app.hrc @@ -443,8 +443,6 @@ #define SID_SELECT_BACKGROUND (SID_SD_START+422) #define SID_OBJECT_CROP (SID_SD_START+423) -#define SID_LAYOUT_DIALOG_WIN (SID_SD_START+424) - // Slots for the tool pane popup #define SID_TP_APPLY_TO_ALL_SLIDES (SID_SD_START+425) #define SID_TP_APPLY_TO_SELECTED_SLIDES (SID_SD_START+426) diff --git a/sd/source/ui/app/layoutctrl.cxx b/sd/source/ui/app/layoutctrl.cxx index 5f731d24d2ad..aab54577c9bf 100644 --- a/sd/source/ui/app/layoutctrl.cxx +++ b/sd/source/ui/app/layoutctrl.cxx @@ -35,8 +35,6 @@ #include #include -#include - #include #include #include @@ -45,10 +43,8 @@ #include #include #include -#include #include -#include #include @@ -71,47 +67,6 @@ using namespace ::com::sun::star::beans; SFX_IMPL_TOOLBOX_CONTROL( SdLayoutControl, SfxVoidItem ); -#if 0 -class SdLayoutDialogContent : public SfxDockingWindow -{ - using DockingWindow::StateChanged; - -private: - ToolBox* mpToolBox; - ValueSet* mpLayoutSet; - AutoLayout meCurrentLayout; - - /*boost::scoped_ptr mpTitle; - boost::scoped_ptr mpSeperator; - boost::scoped_ptr mpMenu;*/ - - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > mxFrame; - - bool mbPopupMode; - - DECL_LINK( SelectHdl, void * ); - -protected: - virtual void PopupModeEnd(); - - /** This function is called when the window gets the focus. It grabs - the focus to the line ends value set so that it can be controlled with - the keyboard. - */ - virtual void GetFocus (void); - -public: - SdLayoutDialogContent( SfxBindings* pBindings, SfxChildWindow *pCW, ::Window* pParent, const SdResId& rSdResId, ViewShellBase& rBase); - ~SdLayoutDialogContent(); - - virtual SfxDockingWindow* Clone() const; - - virtual void Paint( const Rectangle& rRect ); - - virtual void StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); -}; -#endif // class SdLayoutControl ------------------------------------------ SdLayoutControl::SdLayoutControl( USHORT _nSlotId, USHORT _nId, ToolBox& rTbx ) @@ -141,6 +96,8 @@ void SdLayoutControl::StateChanged( USHORT nSID, SfxItemState eState, const SfxP SfxToolBoxControl::StateChanged( nSID, eState, pState ); } +// ----------------------------------------------------------------------- + SfxPopupWindowType SdLayoutControl::GetPopupWindowType() const { return SFX_POPUPWINDOW_ONCLICK; @@ -150,231 +107,23 @@ SfxPopupWindowType SdLayoutControl::GetPopupWindowType() const SfxPopupWindow* SdLayoutControl::CreatePopupWindow() { - /* - OUString sResourceName( RTL_CONSTASCII_USTRINGPARAM( "private:resource/dockingwindow/" ) ); - sResourceName += OUString::valueOf( static_cast(GetId()) ); - createAndPositionSubToolBar( sResourceName ); - */ - SfxPopupWindow* pWin = 0; ToolBox& rTbx = GetToolBox(); - SfxViewFrame* pViewFrame = SfxViewFrame::Current(); - if( pViewFrame ) + sd::ViewShellBase* pViewShellBase = sd::ViewShellBase::GetViewShellBase( SfxViewFrame::Current() ); + if( pViewShellBase ) { - pWin = sd::LayoutDialogChildWindow::createChildWindow( *pViewFrame, &rTbx ); - if( pWin ) + pWin = pWin = new sd::SdLayoutDialogContent( *pViewShellBase, &rTbx ); + pWin->StartPopupMode( &rTbx, TRUE ); + +/* if( pWin ) { pWin->EnableDocking(true); Window::GetDockingManager()->StartPopupMode( &rTbx, pWin ); } +*/ } - SetPopupWindow( pWin ); - return 0; -} - -#if 0 -// ----------------------------------------------------------------------- - -struct snewfoil_value_info -{ - USHORT mnBmpResId; - USHORT mnHCBmpResId; - USHORT mnStrResId; - WritingMode meWritingMode; - AutoLayout maAutoLayout; -}; -static snewfoil_value_info standard[] = -{ - {BMP_FOIL_20, BMP_FOIL_20_H, STR_AUTOLAYOUT_NONE, WritingMode_LR_TB, AUTOLAYOUT_NONE}, - {BMP_FOIL_00, BMP_FOIL_00_H, STR_AUTOLAYOUT_TITLE, WritingMode_LR_TB, AUTOLAYOUT_TITLE}, - {BMP_FOIL_01, BMP_FOIL_01_H, STR_AUTOLAYOUT_CONTENT, WritingMode_LR_TB, AUTOLAYOUT_ENUM}, - {BMP_FOIL_03, BMP_FOIL_03_H, STR_AUTOLAYOUT_2CONTENT, WritingMode_LR_TB, AUTOLAYOUT_2TEXT}, - {BMP_FOIL_19, BMP_FOIL_19_H, STR_AUTOLAYOUT_ONLY_TITLE, WritingMode_LR_TB, AUTOLAYOUT_ONLY_TITLE}, - {BMP_FOIL_25, BMP_FOIL_25_H, STR_AUTOLAYOUT_ONLY_TEXT, WritingMode_LR_TB, AUTOLAYOUT_ONLY_TEXT}, - {BMP_FOIL_12, BMP_FOIL_12_H, STR_AUTOLAYOUT_CONTENT_2CONTENT, WritingMode_LR_TB, AUTOLAYOUT_TEXT2OBJ}, - {BMP_FOIL_15, BMP_FOIL_15_H, STR_AUTOLAYOUT_2CONTENT_CONTENT, WritingMode_LR_TB, AUTOLAYOUT_2OBJTEXT}, - {BMP_FOIL_16, BMP_FOIL_16_H, STR_AUTOLAYOUT_2CONTENT_OVER_CONTENT,WritingMode_LR_TB, AUTOLAYOUT_2OBJOVERTEXT}, - {BMP_FOIL_14, BMP_FOIL_14_H, STR_AUTOLAYOUT_CONTENT_OVER_CONTENT, WritingMode_LR_TB, AUTOLAYOUT_OBJOVERTEXT}, - {BMP_FOIL_18, BMP_FOIL_18_H, STR_AUTOLAYOUT_4CONTENT, WritingMode_LR_TB, AUTOLAYOUT_4OBJ}, - {BMP_FOIL_27, BMP_FOIL_27_H, STR_AUTOLAYOUT_6CONTENT, WritingMode_LR_TB, AUTOLAYOUT_6CLIPART}, - - // vertical - {BMP_FOIL_21, BMP_FOIL_21_H, STR_AL_VERT_TITLE_TEXT_CHART, WritingMode_TB_RL,AUTOLAYOUT_VERTICAL_TITLE_TEXT_CHART}, - {BMP_FOIL_22, BMP_FOIL_22_H, STR_AL_VERT_TITLE_VERT_OUTLINE, WritingMode_TB_RL, AUTOLAYOUT_VERTICAL_TITLE_VERTICAL_OUTLINE}, - {BMP_FOIL_23, BMP_FOIL_23_H, STR_AL_TITLE_VERT_OUTLINE, WritingMode_TB_RL, AUTOLAYOUT_TITLE_VERTICAL_OUTLINE}, - {BMP_FOIL_24, BMP_FOIL_24_H, STR_AL_TITLE_VERT_OUTLINE_CLIPART, WritingMode_TB_RL, AUTOLAYOUT_TITLE_VERTICAL_OUTLINE_CLIPART}, - - {0, 0, 0, WritingMode_LR_TB, AUTOLAYOUT_NONE} -}; - -SfxPopupWindowType SdLayoutControl::GetPopupWindowType() const -{ - return SFX_POPUPWINDOW_ONCLICK; -} - -// ----------------------------------------------------------------------- - -SfxPopupWindow* SdLayoutControl::CreatePopupWindow() -{ - ToolBox& rTbx = GetToolBox(); - SdLayoutDialogContent* pWin = new SdLayoutDialogContent( GetId(), m_xFrame, &rTbx ); -// pWin->StartPopupMode( &rTbx, FLOATWIN_POPUPMODE_GRABFOCUS|FLOATWIN_POPUPMODE_NOKEYCLOSE ); - pWin->EnableDocking(true); - - Window::GetDockingManager()->StartPopupMode( &rTbx, pWin ); -// SetPopupWindow( pWin ); -// return pWin; - return 0; -} - -// ----------------------------------------------------------------------- - -SdLayoutDialogContent::SdLayoutDialogContent( USHORT nId, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, Window* pParentWindow ) -: SfxDockingWindow( nId, rFrame, pParentWindow, WB_SYSTEMWINDOW ) -, mxFrame( rFrame ) -, mbPopupMode(true) -, meCurrentLayout( AUTOLAYOUT_NONE ) -{ -// SetHelpId( HID_POPUP_LAYOUT ); - - const Color aMenuColor( GetSettings().GetStyleSettings().GetMenuColor() ); - const Color aMenuBarColor( GetSettings().GetStyleSettings().GetMenuBarColor() ); - const Color aMenuTextColor( GetSettings().GetStyleSettings().GetMenuBarColor() ); - const Color aMenuBarTextColor( GetSettings().GetStyleSettings().GetMenuBarTextColor() ); - - const bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode(); - SvtLanguageOptions aLanguageOptions; - const bool bVerticalEnabled = aLanguageOptions.IsVerticalTextEnabled(); - - mpToolbarMenu.reset( new ToolbarMenu( this, WB_CLIPCHILDREN ) ); -// mpToolbarMenu->SetHelpId( HID_MENU_EXTRUSION_DIRECTION ); - mpToolbarMenu->SetSelectHdl( LINK( this, SdLayoutDialogContent, SelectHdl ) ); - - - mpLayoutSet = new ValueSet( mpToolbarMenu.get(), WB_TABSTOP | WB_MENUSTYLEVALUESET | WB_FLATVALUESET | WB_NOBORDER | WB_NO_DIRECTSELECT ); -// mpLayoutSet->SetHelpId( HID_VALUESET_EXTRUSION_LIGHTING ); - - mpLayoutSet->SetSelectHdl( LINK( this, SdLayoutDialogContent, SelectHdl ) ); - mpLayoutSet->SetColCount( 4 ); - mpLayoutSet->EnableFullItemMode( FALSE ); - - Size aLayoutItemSize; - - USHORT nItem = 1; - for( snewfoil_value_info* pInfo = &standard[0]; pInfo->mnBmpResId; pInfo++ ) - { - if( !bVerticalEnabled && (pInfo->meWritingMode == WritingMode_TB_RL) ) - continue; - - String aText( SdResId( pInfo->mnStrResId ) ); - BitmapEx aBmp( SdResId( bHighContrast ? pInfo->mnHCBmpResId : pInfo->mnBmpResId ) ); - mpLayoutSet->InsertItem( static_cast(pInfo->maAutoLayout)+1, aBmp, aText ); - - aLayoutItemSize.Width() = std::max( aLayoutItemSize.Width(), aBmp.GetSizePixel().Width() ); - aLayoutItemSize.Height() = std::max( aLayoutItemSize.Height(), aBmp.GetSizePixel().Height() ); - } - aLayoutItemSize = mpLayoutSet->CalcItemSizePixel( aLayoutItemSize ); - Size aValueSize = mpLayoutSet->CalcWindowSizePixel( aLayoutItemSize ); - mpLayoutSet->SetSizePixel( aValueSize ); - - mpToolbarMenu->appendEntry( -1, String( SdResId( STR_UNDO_MODIFY_PAGE ) ) ); - mpToolbarMenu->appendEntry( 0, mpLayoutSet ); - mpToolbarMenu->appendSeparator(); - mpToolbarMenu->appendEntry( 1, String( RTL_CONSTASCII_USTRINGPARAM("Reset Slide Layout") )); - - SetOutputSizePixel( mpToolbarMenu->getMenuSize() ); - mpToolbarMenu->SetOutputSizePixel( GetOutputSizePixel() ); - - mpToolbarMenu->Show(); - - AddStatusListener( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:AssignLayout" ))); -} - -SfxDockingWindow* SdLayoutDialogContent::Clone() const -{ - return new SdLayoutDialogContent( GetId(), mxFrame ); -} - -void SdLayoutDialogContent::Paint( const Rectangle& rRect ) -{ - SfxDockingWindow::Paint(rRect); -} - -void SdLayoutDialogContent::DataChanged( const DataChangedEvent& rDCEvt ) -{ - SfxDockingWindow::DataChanged( rDCEvt ); - - if( ( rDCEvt.GetType() == DATACHANGED_SETTINGS ) && ( rDCEvt.GetFlags() & SETTINGS_STYLE ) ) - { - // const bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode(); - - // todo switch images - } -} - -// ----------------------------------------------------------------------- - -SdLayoutDialogContent::~SdLayoutDialogContent() -{ -} - -// ----------------------------------------------------------------------- - -void SdLayoutDialogContent::StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState ) -{ - if( (nSID == SID_ASSIGN_LAYOUT) && (eState != SFX_ITEM_DISABLED) ) - { - const SfxUInt32Item* pStateItem = dynamic_cast< const SfxUInt32Item* >(pState); - if( pStateItem ) - { - meCurrentLayout = static_cast< AutoLayout >( pStateItem->GetValue() ); - mpLayoutSet->SelectItem( static_cast(meCurrentLayout)+1 ); - } - } -} - -// ----------------------------------------------------------------------- - -IMPL_LINK( SdLayoutDialogContent, SelectHdl, void *, pControl ) -{ - if ( IsInPopupMode() ) - EndPopupMode(); - - AutoLayout eLayout = meCurrentLayout; - - if( pControl == mpLayoutSet ) - eLayout = static_cast< AutoLayout >(mpLayoutSet->GetSelectItemId()-1); - - const rtl::OUString aCommand( RTL_CONSTASCII_USTRINGPARAM( ".uno:AssignLayout" )); - - Sequence< PropertyValue > aArgs( 1 ); - aArgs[0].Name = OUString( RTL_CONSTASCII_USTRINGPARAM("WhatLayout") ); - aArgs[0].Value <<= static_cast(eLayout); - - SfxToolBoxControl::Dispatch( Reference< ::com::sun::star::frame::XDispatchProvider >( mxFrame->getController(), UNO_QUERY ), aCommand, aArgs ); - - return 0; -} - -// ----------------------------------------------------------------------- - -void SdLayoutDialogContent::PopupModeEnd() -{ - if ( IsVisible() ) - mbPopupMode = FALSE; - SfxDockingWindow::PopupModeEnd(); -} - -// ----------------------------------------------------------------------- - -void SdLayoutDialogContent::GetFocus (void) -{ - SfxDockingWindow::GetFocus(); - if( mpToolbarMenu ) - mpToolbarMenu->GrabFocus(); + SetPopupWindow( pWin ); + return pWin; } -#endif - - diff --git a/sd/source/ui/app/sddll2.cxx b/sd/source/ui/app/sddll2.cxx index 3c56631aadf7..4cd293c0061c 100644 --- a/sd/source/ui/app/sddll2.cxx +++ b/sd/source/ui/app/sddll2.cxx @@ -79,10 +79,7 @@ #include "AnimationChildWindow.hxx" #include "animobjs.hxx" #include "NavigatorChildWindow.hxx" -#ifndef SD_LAZER_DIALOG_CHILD_WINDOW_HXX #include "LayerDialogChildWindow.hxx" -#endif -//#include "3dchld.hxx" #include "app.hrc" #include "SpellDialogChildWindow.hxx" #include "DrawViewShell.hxx" @@ -93,7 +90,6 @@ #include "tmplctrl.hxx" #include "layoutctrl.hxx" -#include "layoutdialog.hxx" /************************************************************************* |* @@ -126,10 +122,6 @@ void SdDLL::RegisterControllers() SvxTbxCtlCustomShapes::RegisterControl( SID_DRAWTBX_CS_FLOWCHART, pMod ); SvxTbxCtlCustomShapes::RegisterControl( SID_DRAWTBX_CS_CALLOUT, pMod ); SvxTbxCtlCustomShapes::RegisterControl( SID_DRAWTBX_CS_STAR, pMod ); -// SdTbxCtlDiaEffect::RegisterControl(0, pMod); -// SdTbxCtlDiaSpeed::RegisterControl(0, pMod); -// SdTbxCtlDiaAuto::RegisterControl(0, pMod); -// SdTbxCtlDiaTime::RegisterControl(0, pMod); SdTbxCtlDiaPages::RegisterControl( SID_PAGES_PER_ROW, pMod ); SdTbxCtlGlueEscDir::RegisterControl( SID_GLUE_ESCDIR, pMod ); @@ -138,15 +130,7 @@ void SdDLL::RegisterControllers() ::sd::NavigatorChildWindow::RegisterChildWindowContext( (sal_uInt16) ::sd::DrawViewShell::GetInterfaceId(), pMod ); ::sd::NavigatorChildWindow::RegisterChildWindowContext( (sal_uInt16) ::sd::GraphicViewShell::GetInterfaceId(), pMod ); ::sd::LayerDialogChildWindow::RegisterChildWindow(0, pMod); - //Sd3DChildWindow::RegisterChildWindow(0, pMod); -/* - SvxChildWinCustomShapesBasic::RegisterChildWindow( 0, pMod ); - SvxChildWinCustomShapesSymbol::RegisterChildWindow( 0, pMod ); - SvxChildWinCustomShapesArrow::RegisterChildWindow( 0, pMod ); - SvxChildWinCustomShapesFlowChart::RegisterChildWindow( 0, pMod ); - SvxChildWinCustomShapesCallout::RegisterChildWindow( 0, pMod ); - SvxChildWinCustomShapesStar::RegisterChildWindow( 0, pMod ); -*/ + Svx3DChildWindow::RegisterChildWindow(0, pMod); SvxFontWorkChildWindow::RegisterChildWindow(0, pMod); SvxColorChildWindow::RegisterChildWindow(0, pMod, SFX_CHILDWIN_TASK); @@ -234,5 +218,4 @@ void SdDLL::RegisterControllers() SvxSubToolBoxControl::RegisterControl(SID_OPTIMIZE_TABLE, pMod); SdLayoutControl::RegisterControl( SID_ASSIGN_LAYOUT, pMod ); - sd::LayoutDialogChildWindow::RegisterChildWindow( sal_False, pMod ); } diff --git a/sd/source/ui/app/strings.src b/sd/source/ui/app/strings.src index 13f3503b5d31..99e019b4e400 100644 --- a/sd/source/ui/app/strings.src +++ b/sd/source/ui/app/strings.src @@ -1234,3 +1234,7 @@ String RID_ANNOTATIONS_START { Text [ en-US ] = "Comments"; }; +String STR_RESET_LAYOUT +{ + Text[ en-US ] = "Reset Slide Layout"; +}; diff --git a/sd/source/ui/dlg/layoutdialog.cxx b/sd/source/ui/dlg/layoutdialog.cxx index 5c8cd4c1aa66..af158e0b5527 100644 --- a/sd/source/ui/dlg/layoutdialog.cxx +++ b/sd/source/ui/dlg/layoutdialog.cxx @@ -32,32 +32,24 @@ #include "precompiled_sd.hxx" #include -#include "layoutdialog.hxx" -#include -#include "app.hrc" -#include - -// Instantiate the implementation of the docking window before files -// are included that define ::sd::Window. The ... macros are not really -// namespace proof. -namespace sd { -SFX_IMPL_DOCKINGWINDOW(LayoutDialogChildWindow, SID_LAYOUT_DIALOG_WIN) -} +#include #include +#include +#include #include #include #include #include + #include #include -#include - -#include "layoutdialog.hrc" +#include "app.hrc" +#include "layoutdialog.hxx" #include "glob.hrc" #include "strings.hrc" #include "res_bmp.hrc" @@ -76,53 +68,8 @@ using namespace ::com::sun::star::frame; namespace sd { -/// -class SdLayoutDialogContent : public SfxPopupWindow -{ -public: - SdLayoutDialogContent( ViewShellBase& rBase, Window* pParent); - virtual ~SdLayoutDialogContent(); - -protected: - virtual void Resize (void); - - DECL_LINK( SelectHdl, void * ); - -private: - boost::scoped_ptr mpToolbarMenu; - ValueSet* mpLayoutSet; - AutoLayout meCurrentLayout; - ViewShellBase& mrBase; -}; - // ----------------------------------------------------------------------- -LayoutDialogChildWindow::LayoutDialogChildWindow(::Window* _pParent, USHORT nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo) -: SfxChildWindow (_pParent, nId) -{ - ViewShellBase& rBase (*ViewShellBase::GetViewShellBase(pBindings->GetDispatcher()->GetFrame())); - SdLayoutDialogContent* pContent = new SdLayoutDialogContent (rBase, _pParent); - pWindow = pContent; - eChildAlignment = SFX_ALIGN_NOALIGNMENT; -// pContent->Initialize(pInfo); -} - -LayoutDialogChildWindow::~LayoutDialogChildWindow (void) -{ - -} - -SfxPopupWindow* LayoutDialogChildWindow::createChildWindow(SfxViewFrame& rViewFrame, ::Window* pParent) -{ - SfxPopupWindow* pWin = 0; - sd::ViewShellBase* pViewShellBase = sd::ViewShellBase::GetViewShellBase( &rViewFrame ); - if( pViewShellBase ) - { - pWin = new SdLayoutDialogContent( *pViewShellBase, pParent ); - } - return pWin; -} - // ----------------------------------------------------------------------- struct snewfoil_value_info @@ -141,28 +88,29 @@ static snewfoil_value_info standard[] = {BMP_LAYOUT_HEAD02A_57X71, BMP_LAYOUT_HEAD02A_57X71_H, STR_AUTOLAYOUT_2CONTENT, WritingMode_LR_TB, AUTOLAYOUT_2TEXT}, {BMP_LAYOUT_HEAD01_57X71, BMP_LAYOUT_HEAD01_57X71_H, STR_AUTOLAYOUT_ONLY_TITLE, WritingMode_LR_TB, AUTOLAYOUT_ONLY_TITLE}, {BMP_LAYOUT_TEXTONLY_57X71, BMP_LAYOUT_TEXTONLY_57X71_H, STR_AUTOLAYOUT_ONLY_TEXT, WritingMode_LR_TB, AUTOLAYOUT_ONLY_TEXT}, -// {BMP_FOIL_12, BMP_FOIL_12_H, STR_AUTOLAYOUT_CONTENT_2CONTENT, WritingMode_LR_TB, AUTOLAYOUT_TEXT2OBJ}, -// {BMP_FOIL_15, BMP_FOIL_15_H, STR_AUTOLAYOUT_2CONTENT_CONTENT, WritingMode_LR_TB, AUTOLAYOUT_2OBJTEXT}, +//-- + {BMP_LAYOUT_HEAD02B_57X71, BMP_LAYOUT_HEAD02B_57X71_H, STR_AUTOLAYOUT_CONTENT_2CONTENT, WritingMode_LR_TB, AUTOLAYOUT_TEXT2OBJ}, + {BMP_LAYOUT_HEAD02B_57X71, BMP_LAYOUT_HEAD02B_57X71_H, STR_AUTOLAYOUT_2CONTENT_CONTENT, WritingMode_LR_TB, AUTOLAYOUT_2OBJTEXT}, +//-- {BMP_LAYOUT_HEAD03A_57X71, BMP_LAYOUT_HEAD03A_57X71_H, STR_AUTOLAYOUT_2CONTENT_OVER_CONTENT,WritingMode_LR_TB, AUTOLAYOUT_2OBJOVERTEXT}, {BMP_LAYOUT_HEAD02B_57X71, BMP_LAYOUT_HEAD02B_57X71_H, STR_AUTOLAYOUT_CONTENT_OVER_CONTENT, WritingMode_LR_TB, AUTOLAYOUT_OBJOVERTEXT}, {BMP_LAYOUT_HEAD04_57X71, BMP_LAYOUT_HEAD04_57X71_H, STR_AUTOLAYOUT_4CONTENT, WritingMode_LR_TB, AUTOLAYOUT_4OBJ}, {BMP_LAYOUT_HEAD06_57X71, BMP_LAYOUT_HEAD06_57X71_H, STR_AUTOLAYOUT_6CONTENT, WritingMode_LR_TB, AUTOLAYOUT_6CLIPART}, - +/* // vertical {BMP_LAYOUT_VERTICAL02_57X71, BMP_LAYOUT_VERTICAL02_57X71_H, STR_AL_VERT_TITLE_TEXT_CHART, WritingMode_TB_RL,AUTOLAYOUT_VERTICAL_TITLE_TEXT_CHART}, {BMP_LAYOUT_VERTICAL01_57X71, BMP_LAYOUT_VERTICAL01_57X71_H, STR_AL_VERT_TITLE_VERT_OUTLINE, WritingMode_TB_RL, AUTOLAYOUT_VERTICAL_TITLE_VERTICAL_OUTLINE}, {BMP_LAYOUT_HEAD02_57X71, BMP_LAYOUT_HEAD02_57X71_H, STR_AL_TITLE_VERT_OUTLINE, WritingMode_TB_RL, AUTOLAYOUT_TITLE_VERTICAL_OUTLINE}, {BMP_LAYOUT_HEAD02A_57X71, BMP_LAYOUT_HEAD02A_57X71_H, STR_AL_TITLE_VERT_OUTLINE_CLIPART, WritingMode_TB_RL, AUTOLAYOUT_TITLE_VERTICAL_OUTLINE_CLIPART}, - +*/ {0, 0, 0, WritingMode_LR_TB, AUTOLAYOUT_NONE} }; // ----------------------------------------------------------------------- -SdLayoutDialogContent::SdLayoutDialogContent( ViewShellBase& rBase, Window* pParent ) -: SfxPopupWindow(SID_ASSIGN_LAYOUT, rBase.GetFrame()->GetTopFrame()->GetFrameInterface(), pParent, WB_CLIPCHILDREN|WB_DIALOGCONTROL|WB_SYSTEMWINDOW/*SdResId( FLT_WIN_LAYOUT_DIALOG )*/) -, meCurrentLayout( AUTOLAYOUT_NONE ) +SdLayoutDialogContent::SdLayoutDialogContent( ViewShellBase& rBase, ::Window* pParent ) +: ToolbarMenu(SID_ASSIGN_LAYOUT, rBase.GetFrame()->GetTopFrame()->GetFrameInterface(), pParent, WB_NOBORDER|WB_CLIPCHILDREN|WB_DIALOGCONTROL|WB_NOSHADOW|WB_SYSTEMWINDOW) , mrBase(rBase) { String sResetSlideLayout( SdResId( STR_RESET_LAYOUT ) ); @@ -182,17 +130,18 @@ SdLayoutDialogContent::SdLayoutDialogContent( ViewShellBase& rBase, Window* pPar SvtLanguageOptions aLanguageOptions; const bool bVerticalEnabled = aLanguageOptions.IsVerticalTextEnabled(); - mpToolbarMenu.reset( new ToolbarMenu( this, WB_CLIPCHILDREN ) ); +// mpToolbarMenu.reset( new ToolbarMenu( this, WB_CLIPCHILDREN ) ); // mpToolbarMenu->SetHelpId( HID_MENU_EXTRUSION_DIRECTION ); - mpToolbarMenu->SetSelectHdl( LINK( this, SdLayoutDialogContent, SelectHdl ) ); + /* mpToolbarMenu->*/ SetSelectHdl( LINK( this, SdLayoutDialogContent, SelectHdl ) ); - mpLayoutSet = new ValueSet( mpToolbarMenu.get(), WB_TABSTOP | WB_MENUSTYLEVALUESET | WB_FLATVALUESET | WB_NOBORDER | WB_NO_DIRECTSELECT ); + mpLayoutSet = new ValueSet( /* mpToolbarMenu->.get()*/ this, WB_TABSTOP | WB_MENUSTYLEVALUESET | WB_FLATVALUESET | WB_NOBORDER | WB_NO_DIRECTSELECT ); // mpLayoutSet->SetHelpId( HID_VALUESET_EXTRUSION_LIGHTING ); mpLayoutSet->SetSelectHdl( LINK( this, SdLayoutDialogContent, SelectHdl ) ); mpLayoutSet->SetColCount( 4 ); mpLayoutSet->EnableFullItemMode( FALSE ); + mpLayoutSet->SetColor( GetControlBackground() ); Size aLayoutItemSize; @@ -204,6 +153,7 @@ SdLayoutDialogContent::SdLayoutDialogContent( ViewShellBase& rBase, Window* pPar String aText( SdResId( pInfo->mnStrResId ) ); BitmapEx aBmp( SdResId( bHighContrast ? pInfo->mnHCBmpResId : pInfo->mnBmpResId ) ); + aBmp.Expand( 4, 4, 0, TRUE ); mpLayoutSet->InsertItem( static_cast(pInfo->maAutoLayout)+1, aBmp, aText ); aLayoutItemSize.Width() = std::max( aLayoutItemSize.Width(), aBmp.GetSizePixel().Width() ); @@ -211,41 +161,45 @@ SdLayoutDialogContent::SdLayoutDialogContent( ViewShellBase& rBase, Window* pPar } aLayoutItemSize = mpLayoutSet->CalcItemSizePixel( aLayoutItemSize ); - Size aValueSize = mpLayoutSet->CalcWindowSizePixel( aLayoutItemSize ); - mpLayoutSet->SetSizePixel( aValueSize ); + mpLayoutSet->SetSizePixel( mpLayoutSet->CalcWindowSizePixel( aLayoutItemSize ) ); - mpToolbarMenu->appendEntry( -1, String( SdResId( STR_UNDO_MODIFY_PAGE ) ) ); - mpToolbarMenu->appendEntry( 0, mpLayoutSet ); - mpToolbarMenu->appendSeparator(); + SetText( String( SdResId( STR_UNDO_MODIFY_PAGE ) ) ); + //mpToolbarMenu->appendEntry( -1, ); + /*mpToolbarMenu->*/appendEntry( 0, mpLayoutSet ); + /*mpToolbarMenu->*/appendSeparator(); Reference< XFrame > xFrame( GetFrame(), UNO_QUERY ); if( xFrame.is() ) { Image aImg( ::GetImage( xFrame, OUString( RTL_CONSTASCII_USTRINGPARAM(".uno:Undo") ), FALSE, FALSE ) ); - mpToolbarMenu->appendEntry( 1, sResetSlideLayout, aImg); + /*mpToolbarMenu->*/appendEntry( 1, sResetSlideLayout, aImg); } else { - mpToolbarMenu->appendEntry( 1, sResetSlideLayout); + /*mpToolbarMenu->*/appendEntry( 1, sResetSlideLayout); } - SetOutputSizePixel( mpToolbarMenu->getMenuSize() ); - mpToolbarMenu->SetOutputSizePixel( GetOutputSizePixel() ); +/* + Size aSize( mpToolbarMenu->getMenuSize() ); + mpToolbarMenu->SetPosSizePixel( Point( 1,1 ), aSize ); - mpToolbarMenu->Show(); + aSize.Width() += 2; + aSize.Height() += 2; +*/ + SetOutputSizePixel( getMenuSize() ); -// AddStatusListener( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:AssignLayout" ))); +// mpToolbarMenu->Show(); } +// ----------------------------------------------------------------------- + SdLayoutDialogContent::~SdLayoutDialogContent() { } -void SdLayoutDialogContent::Resize (void) -{ - SfxPopupWindow::Resize(); - mpToolbarMenu->SetPosSizePixel( Point(0,0), GetSizePixel() ); -} + +// ----------------------------------------------------------------------- + /* void SdLayoutDialogContent::DataChanged( const DataChangedEvent& rDCEvt ) @@ -285,15 +239,20 @@ IMPL_LINK( SdLayoutDialogContent, SelectHdl, void *, pControl ) if ( IsInPopupMode() ) EndPopupMode(); - AutoLayout eLayout = meCurrentLayout; - - if( pControl == mpLayoutSet ) - eLayout = static_cast< AutoLayout >(mpLayoutSet->GetSelectItemId()-1); - - const SfxUInt32Item aItem(ID_VAL_WHATLAYOUT, eLayout); if( mrBase.GetMainViewShell().get() && mrBase.GetMainViewShell()->GetViewFrame() ) { - mrBase.GetMainViewShell()->GetViewFrame()->GetBindings().GetDispatcher()->Execute(SID_ASSIGN_LAYOUT,SFX_CALLMODE_ASYNCHRON,&aItem,0); + if( pControl == mpLayoutSet ) + { + AutoLayout eLayout = static_cast< AutoLayout >(mpLayoutSet->GetSelectItemId()-1); + + const SfxUInt32Item aItem(ID_VAL_WHATLAYOUT, eLayout); + mrBase.GetMainViewShell()->GetViewFrame()->GetBindings().GetDispatcher()->Execute(SID_ASSIGN_LAYOUT,SFX_CALLMODE_ASYNCHRON,&aItem,0); + } + else + { + // reset autolayout + mrBase.GetMainViewShell()->GetViewFrame()->GetBindings().GetDispatcher()->Execute(SID_ASSIGN_LAYOUT,SFX_CALLMODE_ASYNCHRON); + } } return 0; diff --git a/sd/source/ui/dlg/layoutdialog.hrc b/sd/source/ui/dlg/layoutdialog.hrc deleted file mode 100644 index c53f5342f2b5..000000000000 --- a/sd/source/ui/dlg/layoutdialog.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: LayerDialog.src,v $ - * $Revision: 1.5 $ - * - * 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_LAYOUT_DIALOG 795 - -#define STR_RESET_LAYOUT 1 diff --git a/sd/source/ui/dlg/makefile.mk b/sd/source/ui/dlg/makefile.mk index 252950a73a5e..27156c7b285a 100644 --- a/sd/source/ui/dlg/makefile.mk +++ b/sd/source/ui/dlg/makefile.mk @@ -76,8 +76,7 @@ SRC1FILES =\ LayerDialog.src \ PaneDockingWindow.src \ layeroptionsdlg.src \ - printdialog.src \ - layoutdialog.src + printdialog.src SLOFILES = \ 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! ******************************************************************************/ diff --git a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx index 4aa35f91292f..16b1ac78a9cb 100644 --- a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx @@ -243,12 +243,7 @@ void SlotManager::FuTemporary (SfxRequest& rRequest) case SID_ASSIGN_LAYOUT: { - SFX_REQUEST_ARG (rRequest, pWhatPage, SfxUInt32Item, ID_VAL_WHATPAGE, FALSE); - SFX_REQUEST_ARG (rRequest, pWhatLayout, SfxUInt32Item, ID_VAL_WHATLAYOUT, FALSE); - pShell->mpImpl->AssignLayout( - pDocument->GetSdPage((USHORT)pWhatPage->GetValue(), - mrSlideSorter.GetModel().GetPageType()), - (AutoLayout)pWhatLayout->GetValue()); + pShell->mpImpl->AssignLayout( rRequest, mrSlideSorter.GetModel().GetPageType() ); rRequest.Done (); } break; diff --git a/sd/source/ui/view/ViewShellImplementation.cxx b/sd/source/ui/view/ViewShellImplementation.cxx index 75b728c7849b..6795c37bb2e8 100644 --- a/sd/source/ui/view/ViewShellImplementation.cxx +++ b/sd/source/ui/view/ViewShellImplementation.cxx @@ -322,30 +322,44 @@ void ViewShell::Implementation::ProcessModifyPageSlot ( rRequest.Done (); } +void ViewShell::Implementation::AssignLayout ( SfxRequest& rRequest, PageKind ePageKind ) +{ + const SfxUInt32Item* pWhatPage = static_cast< const SfxUInt32Item* > ( rRequest.GetArg( ID_VAL_WHATPAGE, FALSE, TYPE(SfxUInt32Item) ) ); + const SfxUInt32Item* pWhatLayout = static_cast< const SfxUInt32Item* > ( rRequest.GetArg( ID_VAL_WHATLAYOUT, FALSE, TYPE(SfxUInt32Item) ) ); + SdPage* pPage = 0; + if( pWhatPage ) + { + SdDrawDocument* pDocument = mrViewShell.GetDoc(); + if( pDocument ) + pPage = pDocument->GetSdPage(static_cast(pWhatPage->GetValue()), ePageKind); + } + if( pPage == 0 ) + pPage = mrViewShell.getCurrentPage(); -void ViewShell::Implementation::AssignLayout ( - SdPage* pPage, - AutoLayout aLayout) -{ - // Transform the given request into the four argument form that is - // understood by ProcessModifyPageSlot(). - SdrLayerAdmin& rLayerAdmin (mrViewShell.GetViewShellBase().GetDocument()->GetLayerAdmin()); - BYTE aBackground (rLayerAdmin.GetLayerID(String(SdResId(STR_LAYER_BCKGRND)), FALSE)); - BYTE aBackgroundObject (rLayerAdmin.GetLayerID(String(SdResId(STR_LAYER_BCKGRNDOBJ)), FALSE)); - SetOfByte aVisibleLayers (pPage->TRG_GetMasterPageVisibleLayers()); - SfxRequest aRequest (mrViewShell.GetViewShellBase().GetViewFrame(), SID_MODIFYPAGE); - aRequest.AppendItem(SfxStringItem (ID_VAL_PAGENAME, pPage->GetName())); - aRequest.AppendItem(SfxUInt32Item (ID_VAL_WHATLAYOUT, aLayout)); - aRequest.AppendItem(SfxBoolItem(ID_VAL_ISPAGEBACK, aVisibleLayers.IsSet(aBackground))); - aRequest.AppendItem(SfxBoolItem(ID_VAL_ISPAGEOBJ, aVisibleLayers.IsSet(aBackgroundObject))); - - // Forward the call with the new arguments. - ProcessModifyPageSlot ( - aRequest, - pPage, - pPage->GetPageKind()); + if( pPage ) + { + AutoLayout eLayout = pPage->GetAutoLayout(); + + if( pWhatLayout ) + eLayout = static_cast< AutoLayout >( pWhatLayout->GetValue() ); + + // Transform the given request into the four argument form that is + // understood by ProcessModifyPageSlot(). + SdrLayerAdmin& rLayerAdmin (mrViewShell.GetViewShellBase().GetDocument()->GetLayerAdmin()); + BYTE aBackground (rLayerAdmin.GetLayerID(String(SdResId(STR_LAYER_BCKGRND)), FALSE)); + BYTE aBackgroundObject (rLayerAdmin.GetLayerID(String(SdResId(STR_LAYER_BCKGRNDOBJ)), FALSE)); + SetOfByte aVisibleLayers (pPage->TRG_GetMasterPageVisibleLayers()); + SfxRequest aRequest (mrViewShell.GetViewShellBase().GetViewFrame(), SID_MODIFYPAGE); + aRequest.AppendItem(SfxStringItem (ID_VAL_PAGENAME, pPage->GetName())); + aRequest.AppendItem(SfxUInt32Item (ID_VAL_WHATLAYOUT, eLayout)); + aRequest.AppendItem(SfxBoolItem(ID_VAL_ISPAGEBACK, aVisibleLayers.IsSet(aBackground))); + aRequest.AppendItem(SfxBoolItem(ID_VAL_ISPAGEOBJ, aVisibleLayers.IsSet(aBackgroundObject))); + + // Forward the call with the new arguments. + ProcessModifyPageSlot( aRequest, pPage, pPage->GetPageKind()); + } } diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx index bf8407383909..f1bebd83da83 100644 --- a/sd/source/ui/view/drviews2.cxx +++ b/sd/source/ui/view/drviews2.cxx @@ -432,33 +432,10 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) { if (mePageKind==PK_STANDARD || mePageKind==PK_NOTES || (mePageKind==PK_HANDOUT && meEditMode==EM_MASTERPAGE)) { - if( rReq.GetArgs() ) - { - const SfxUInt32Item* pWhatPage = static_cast< const SfxUInt32Item* > ( rReq.GetArg( ID_VAL_WHATPAGE, FALSE, TYPE(SfxUInt32Item) ) ); - const SfxUInt32Item* pWhatLayout = static_cast< const SfxUInt32Item* > ( rReq.GetArg( ID_VAL_WHATLAYOUT, FALSE, TYPE(SfxUInt32Item) ) ); - - if( pWhatLayout ) - { - if ( mpDrawView->IsTextEdit() ) - mpDrawView->SdrEndTextEdit(); - - USHORT nPage; - if( pWhatPage ) - { - nPage = pWhatPage->GetValue(); - } - else - { - nPage = maTabControl.GetCurPageId() - 1; - } + if ( mpDrawView->IsTextEdit() ) + mpDrawView->SdrEndTextEdit(); - ::sd::ViewShell::mpImpl->AssignLayout(GetDoc()->GetSdPage((USHORT)nPage, mePageKind),(AutoLayout)pWhatLayout->GetValue()); - } - } - else - { - GetViewFrame()->ToggleChildWindow( sd::LayoutDialogChildWindow::GetChildWindowId() ); - } + ::sd::ViewShell::mpImpl->AssignLayout(rReq, mePageKind); } Cancel(); rReq.Done (); diff --git a/sd/source/ui/view/drviews6.cxx b/sd/source/ui/view/drviews6.cxx index 7dd139e88067..bb5aa18d81c5 100644 --- a/sd/source/ui/view/drviews6.cxx +++ b/sd/source/ui/view/drviews6.cxx @@ -372,11 +372,6 @@ void DrawViewShell::SetChildWindowState( SfxItemSet& rSet ) USHORT nId = ::avmedia::MediaPlayer::GetChildWindowId(); rSet.Put( SfxBoolItem( SID_AVMEDIA_PLAYER, GetViewFrame()->HasChildWindow( nId ) ) ); } - if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_LAYOUT_DIALOG_WIN ) ) - { - USHORT nId = LayoutDialogChildWindow::GetChildWindowId(); - rSet.Put( SfxBoolItem( SID_LAYOUT_DIALOG_WIN, GetViewFrame()->HasChildWindow( nId ) ) ); - } } @@ -741,28 +736,6 @@ void DrawViewShell::FuTemp04(SfxRequest& rReq) } break; - case SID_LAYOUT_DIALOG_WIN: - { - if ( rReq.GetArgs() ) - { - GetViewFrame()->SetChildWindow( - LayoutDialogChildWindow::GetChildWindowId(), - ((const SfxBoolItem&) (rReq.GetArgs()-> - Get(SID_LAYOUT_DIALOG_WIN))).GetValue()); - } - else - { - GetViewFrame()->ToggleChildWindow( - LayoutDialogChildWindow::GetChildWindowId()); - } - - GetViewFrame()->GetBindings().Invalidate(SID_LAYOUT_DIALOG_WIN); - Cancel(); - rReq.Ignore (); - } - break; - - case SID_DISPLAY_MASTER_BACKGROUND: case SID_DISPLAY_MASTER_OBJECTS: { diff --git a/sd/source/ui/view/viewoverlaymanager.cxx b/sd/source/ui/view/viewoverlaymanager.cxx index bc4debb1afb3..74515a7cfc64 100644 --- a/sd/source/ui/view/viewoverlaymanager.cxx +++ b/sd/source/ui/view/viewoverlaymanager.cxx @@ -339,16 +339,18 @@ void ChangePlaceholderTag::addCustomHandles( SdrHdlList& rHandlerList ) Size aShapeSizePix = pDev->LogicToPixel(rSnapRect.GetSize()); long nShapeSizePix = std::min(aShapeSizePix.Width(),aShapeSizePix.Height()); + if( 50 > nShapeSizePix ) + return; - Image* pImages = &ViewOverlayManager::maLargeButtonImages[0]; //(nShapeSizePix > 300) ? &ViewOverlayManager::maLargeButtonImages[0] : &ViewOverlayManager::maSmallButtonImages[0]; + Image* pImages = &ViewOverlayManager::maSmallButtonImages[0]; //(nShapeSizePix > 300) ? &ViewOverlayManager::maLargeButtonImages[0] : &ViewOverlayManager::maSmallButtonImages[0]; Size aButtonSize( pDev->PixelToLogic(pImages[0].GetSizePixel()) ); - if( 200 > nShapeSizePix ) + if( 100 > nShapeSizePix ) { aButtonSize.Width() >>= 1; aButtonSize.Height() >>= 1; } - const long nBorderPix = (nShapeSizePix > 300) ? 4 : (nShapeSizePix > 100) ? 2 : 1; + const long nBorderPix = (nShapeSizePix > 100) ? 4 : (nShapeSizePix > 50) ? 2 : 1; Size aBorder( pDev->PixelToLogic(Size(nBorderPix,nBorderPix)) ); const int nColumns = (ViewOverlayManager::ButtonCount+1) >> 1; @@ -366,7 +368,7 @@ void ChangePlaceholderTag::addCustomHandles( SdrHdlList& rHandlerList ) for( int i = 0, c = 0; i < ViewOverlayManager::ButtonCount; i++ ) { Image aImg( pImages[i] ); - if( 200 > nShapeSizePix ) + if( 100 > nShapeSizePix ) { BitmapEx b( aImg.GetBitmapEx() ); const double scale = 0.5; -- 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/app/layoutctrl.cxx | 47 +++++++++++++++++++++++++++++++++------ sd/source/ui/dlg/layoutdialog.cxx | 9 ++++---- sd/source/ui/dlg/layoutdialog.hrc | 31 ++++++++++++++++++++++++++ sd/source/ui/dlg/layoutdialog.src | 44 ++++++++++++++++++++++++++++++++++++ sd/source/ui/dlg/makefile.mk | 3 ++- sd/source/ui/inc/layoutctrl.hxx | 3 +++ 6 files changed, 125 insertions(+), 12 deletions(-) create mode 100644 sd/source/ui/dlg/layoutdialog.hrc create mode 100644 sd/source/ui/dlg/layoutdialog.src (limited to 'sd') diff --git a/sd/source/ui/app/layoutctrl.cxx b/sd/source/ui/app/layoutctrl.cxx index aab54577c9bf..9c23e0d09346 100644 --- a/sd/source/ui/app/layoutctrl.cxx +++ b/sd/source/ui/app/layoutctrl.cxx @@ -107,23 +107,56 @@ SfxPopupWindowType SdLayoutControl::GetPopupWindowType() const SfxPopupWindow* SdLayoutControl::CreatePopupWindow() { - SfxPopupWindow* pWin = 0; + Window* pWin = 0; ToolBox& rTbx = GetToolBox(); sd::ViewShellBase* pViewShellBase = sd::ViewShellBase::GetViewShellBase( SfxViewFrame::Current() ); if( pViewShellBase ) { pWin = pWin = new sd::SdLayoutDialogContent( *pViewShellBase, &rTbx ); - pWin->StartPopupMode( &rTbx, TRUE ); - -/* if( pWin ) +// pWin->StartPopupMode( &rTbx, TRUE ); + if( pWin ) { + StartPopupMode( pWin ); +/* pWin->EnableDocking(true); Window::GetDockingManager()->StartPopupMode( &rTbx, pWin ); - } + + pWin->AddEventListener( LINK( this, SdLayoutControl, WindowEventListener ) ); */ + } } - SetPopupWindow( pWin ); - return pWin; +// SetPopupWindow( pWin ); + return 0; +} + +// ----------------------------------------------------------------------- + +IMPL_LINK( SdLayoutControl, WindowEventListener, VclSimpleEvent*, pEvent ) +{ + VclWindowEvent* pWindowEvent = dynamic_cast< VclWindowEvent* >( pEvent ); + if ( pWindowEvent && pWindowEvent->GetWindow() ) + { + Window* pWindow = pWindowEvent->GetWindow(); + switch( pWindowEvent->GetId() ) + { + case VCLEVENT_WINDOW_ENDPOPUPMODE: + { + EndPopupModeData *pData = static_cast(pWindowEvent->GetData()); + if( pData && pData->mbTearoff ); + { + pWindow->SetPosPixel( Point( pData->maFloatingPos.X(), pData->maFloatingPos.Y() ) ); + pWindow->Show(); + } + } + // fall through! + case VCLEVENT_WINDOW_CLOSE: + case VCLEVENT_OBJECT_DYING: + pWindow->RemoveEventListener( LINK( this, SdLayoutControl, WindowEventListener ) ); +// static_cast(pWindow)->PopupModeEnd(); + break; + } + } + return 0; } diff --git a/sd/source/ui/dlg/layoutdialog.cxx b/sd/source/ui/dlg/layoutdialog.cxx index af158e0b5527..5d50cb7d4c83 100644 --- a/sd/source/ui/dlg/layoutdialog.cxx +++ b/sd/source/ui/dlg/layoutdialog.cxx @@ -58,6 +58,7 @@ #include "drawdoc.hxx" #include "ViewShellBase.hxx" #include "DrawViewShell.hxx" +#include "layoutdialog.hrc" using ::rtl::OUString; using namespace ::com::sun::star; @@ -110,13 +111,13 @@ static snewfoil_value_info standard[] = SdLayoutDialogContent::SdLayoutDialogContent( ViewShellBase& rBase, ::Window* pParent ) -: ToolbarMenu(SID_ASSIGN_LAYOUT, rBase.GetFrame()->GetTopFrame()->GetFrameInterface(), pParent, WB_NOBORDER|WB_CLIPCHILDREN|WB_DIALOGCONTROL|WB_NOSHADOW|WB_SYSTEMWINDOW) +: ToolbarMenu(rBase.GetFrame()->GetTopFrame()->GetFrameInterface(), pParent, SdResId( DLG_LAYOUTDIALOG ) /*WB_CLIPCHILDREN|WB_DIALOGCONTROL|WB_SYSTEMWINDOW|WB_MOVEABLE|WB_SIZEABLE|WB_CLOSEABLE*/) , mrBase(rBase) { - String sResetSlideLayout( SdResId( STR_RESET_LAYOUT ) ); - // FreeResource(); + String sResetSlideLayout( SdResId( STR_RESET_LAYOUT ) ); + //SetStyle( 2 ); // SetHelpId( HID_POPUP_LAYOUT ); @@ -153,7 +154,7 @@ SdLayoutDialogContent::SdLayoutDialogContent( ViewShellBase& rBase, ::Window* pP String aText( SdResId( pInfo->mnStrResId ) ); BitmapEx aBmp( SdResId( bHighContrast ? pInfo->mnHCBmpResId : pInfo->mnBmpResId ) ); - aBmp.Expand( 4, 4, 0, TRUE ); + aBmp.Expand( 3, 3, 0, TRUE ); mpLayoutSet->InsertItem( static_cast(pInfo->maAutoLayout)+1, aBmp, aText ); aLayoutItemSize.Width() = std::max( aLayoutItemSize.Width(), aBmp.GetSizePixel().Width() ); diff --git a/sd/source/ui/dlg/layoutdialog.hrc b/sd/source/ui/dlg/layoutdialog.hrc new file mode 100644 index 000000000000..399bae81819c --- /dev/null +++ b/sd/source/ui/dlg/layoutdialog.hrc @@ -0,0 +1,31 @@ +/************************************************************************* + * + * 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: printdialog.hrc,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. + * + ************************************************************************/ + +#define DLG_LAYOUTDIALOG 1347 diff --git a/sd/source/ui/dlg/layoutdialog.src b/sd/source/ui/dlg/layoutdialog.src new file mode 100644 index 000000000000..db198cb863b5 --- /dev/null +++ b/sd/source/ui/dlg/layoutdialog.src @@ -0,0 +1,44 @@ +/************************************************************************* + * + * 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: animobjs.src,v $ + * $Revision: 1.36 $ + * + * 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. + * + ************************************************************************/ + +#include "layoutdialog.hrc" + +DockingWindow DLG_LAYOUTDIALOG +{ + Border = FALSE; + Hide = TRUE ; + SVLook = TRUE ; + Sizeable = FALSE ; + Moveable = TRUE ; + Closeable = TRUE ; + Zoomable = TRUE ; + + Text [ en-US ] = "Slide Layout" ; +}; diff --git a/sd/source/ui/dlg/makefile.mk b/sd/source/ui/dlg/makefile.mk index 27156c7b285a..252950a73a5e 100644 --- a/sd/source/ui/dlg/makefile.mk +++ b/sd/source/ui/dlg/makefile.mk @@ -76,7 +76,8 @@ SRC1FILES =\ LayerDialog.src \ PaneDockingWindow.src \ layeroptionsdlg.src \ - printdialog.src + printdialog.src \ + layoutdialog.src SLOFILES = \ 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/dlg/layoutdialog.cxx | 93 ++++++++++++++++++++++++++------------- sd/source/ui/inc/layoutdialog.hxx | 3 +- 2 files changed, 64 insertions(+), 32 deletions(-) (limited to 'sd') diff --git a/sd/source/ui/dlg/layoutdialog.cxx b/sd/source/ui/dlg/layoutdialog.cxx index 5d50cb7d4c83..188a8d246952 100644 --- a/sd/source/ui/dlg/layoutdialog.cxx +++ b/sd/source/ui/dlg/layoutdialog.cxx @@ -97,18 +97,44 @@ static snewfoil_value_info standard[] = {BMP_LAYOUT_HEAD02B_57X71, BMP_LAYOUT_HEAD02B_57X71_H, STR_AUTOLAYOUT_CONTENT_OVER_CONTENT, WritingMode_LR_TB, AUTOLAYOUT_OBJOVERTEXT}, {BMP_LAYOUT_HEAD04_57X71, BMP_LAYOUT_HEAD04_57X71_H, STR_AUTOLAYOUT_4CONTENT, WritingMode_LR_TB, AUTOLAYOUT_4OBJ}, {BMP_LAYOUT_HEAD06_57X71, BMP_LAYOUT_HEAD06_57X71_H, STR_AUTOLAYOUT_6CONTENT, WritingMode_LR_TB, AUTOLAYOUT_6CLIPART}, -/* + {0, 0, 0, WritingMode_LR_TB, AUTOLAYOUT_NONE} +}; + +static snewfoil_value_info v_standard[] = +{ // vertical {BMP_LAYOUT_VERTICAL02_57X71, BMP_LAYOUT_VERTICAL02_57X71_H, STR_AL_VERT_TITLE_TEXT_CHART, WritingMode_TB_RL,AUTOLAYOUT_VERTICAL_TITLE_TEXT_CHART}, {BMP_LAYOUT_VERTICAL01_57X71, BMP_LAYOUT_VERTICAL01_57X71_H, STR_AL_VERT_TITLE_VERT_OUTLINE, WritingMode_TB_RL, AUTOLAYOUT_VERTICAL_TITLE_VERTICAL_OUTLINE}, {BMP_LAYOUT_HEAD02_57X71, BMP_LAYOUT_HEAD02_57X71_H, STR_AL_TITLE_VERT_OUTLINE, WritingMode_TB_RL, AUTOLAYOUT_TITLE_VERTICAL_OUTLINE}, {BMP_LAYOUT_HEAD02A_57X71, BMP_LAYOUT_HEAD02A_57X71_H, STR_AL_TITLE_VERT_OUTLINE_CLIPART, WritingMode_TB_RL, AUTOLAYOUT_TITLE_VERTICAL_OUTLINE_CLIPART}, -*/ {0, 0, 0, WritingMode_LR_TB, AUTOLAYOUT_NONE} }; // ----------------------------------------------------------------------- +static void fillLayoutValueSet( ValueSet* pValue, snewfoil_value_info* pInfo, const bool bHighContrast ) +{ + Size aLayoutItemSize; + for( ; pInfo->mnBmpResId; pInfo++ ) + { +// if( !bVerticalEnabled && (pInfo->meWritingMode == WritingMode_TB_RL) ) +// continue; + + String aText( SdResId( pInfo->mnStrResId ) ); + BitmapEx aBmp( SdResId( bHighContrast ? pInfo->mnHCBmpResId : pInfo->mnBmpResId ) ); + aBmp.Expand( 3, 3, 0, TRUE ); + pValue->InsertItem( static_cast(pInfo->maAutoLayout)+1, aBmp, aText ); + + aLayoutItemSize.Width() = std::max( aLayoutItemSize.Width(), aBmp.GetSizePixel().Width() ); + aLayoutItemSize.Height() = std::max( aLayoutItemSize.Height(), aBmp.GetSizePixel().Height() ); + } + + aLayoutItemSize = pValue->CalcItemSizePixel( aLayoutItemSize ); + pValue->SetSizePixel( pValue->CalcWindowSizePixel( aLayoutItemSize ) ); +} + +// ----------------------------------------------------------------------- + SdLayoutDialogContent::SdLayoutDialogContent( ViewShellBase& rBase, ::Window* pParent ) : ToolbarMenu(rBase.GetFrame()->GetTopFrame()->GetFrameInterface(), pParent, SdResId( DLG_LAYOUTDIALOG ) /*WB_CLIPCHILDREN|WB_DIALOGCONTROL|WB_SYSTEMWINDOW|WB_MOVEABLE|WB_SIZEABLE|WB_CLOSEABLE*/) @@ -136,48 +162,46 @@ SdLayoutDialogContent::SdLayoutDialogContent( ViewShellBase& rBase, ::Window* pP /* mpToolbarMenu->*/ SetSelectHdl( LINK( this, SdLayoutDialogContent, SelectHdl ) ); - mpLayoutSet = new ValueSet( /* mpToolbarMenu->.get()*/ this, WB_TABSTOP | WB_MENUSTYLEVALUESET | WB_FLATVALUESET | WB_NOBORDER | WB_NO_DIRECTSELECT ); -// mpLayoutSet->SetHelpId( HID_VALUESET_EXTRUSION_LIGHTING ); + mpLayoutSet1.reset( new ValueSet( this, WB_TABSTOP | WB_MENUSTYLEVALUESET | WB_FLATVALUESET | WB_NOBORDER | WB_NO_DIRECTSELECT ) ); +// mpLayoutSet1->SetHelpId( HID_VALUESET_EXTRUSION_LIGHTING ); - mpLayoutSet->SetSelectHdl( LINK( this, SdLayoutDialogContent, SelectHdl ) ); - mpLayoutSet->SetColCount( 4 ); - mpLayoutSet->EnableFullItemMode( FALSE ); - mpLayoutSet->SetColor( GetControlBackground() ); + mpLayoutSet1->SetSelectHdl( LINK( this, SdLayoutDialogContent, SelectHdl ) ); + mpLayoutSet1->SetColCount( 4 ); + mpLayoutSet1->EnableFullItemMode( FALSE ); + mpLayoutSet1->SetColor( GetControlBackground() ); - Size aLayoutItemSize; + fillLayoutValueSet( mpLayoutSet1.get(), &standard[0], bHighContrast ); - USHORT nItem = 1; - for( snewfoil_value_info* pInfo = &standard[0]; pInfo->mnBmpResId; pInfo++ ) - { - if( !bVerticalEnabled && (pInfo->meWritingMode == WritingMode_TB_RL) ) - continue; + mpLayoutSet2.reset( new ValueSet( this, WB_TABSTOP | WB_MENUSTYLEVALUESET | WB_FLATVALUESET | WB_NOBORDER | WB_NO_DIRECTSELECT ) ); +// mpLayoutSet2->SetHelpId( HID_VALUESET_EXTRUSION_LIGHTING ); - String aText( SdResId( pInfo->mnStrResId ) ); - BitmapEx aBmp( SdResId( bHighContrast ? pInfo->mnHCBmpResId : pInfo->mnBmpResId ) ); - aBmp.Expand( 3, 3, 0, TRUE ); - mpLayoutSet->InsertItem( static_cast(pInfo->maAutoLayout)+1, aBmp, aText ); + mpLayoutSet2->SetSelectHdl( LINK( this, SdLayoutDialogContent, SelectHdl ) ); + mpLayoutSet2->SetColCount( 4 ); + mpLayoutSet2->EnableFullItemMode( FALSE ); + mpLayoutSet2->SetColor( GetControlBackground() ); - aLayoutItemSize.Width() = std::max( aLayoutItemSize.Width(), aBmp.GetSizePixel().Width() ); - aLayoutItemSize.Height() = std::max( aLayoutItemSize.Height(), aBmp.GetSizePixel().Height() ); - } + fillLayoutValueSet( mpLayoutSet2.get(), &v_standard[0], bHighContrast ); - aLayoutItemSize = mpLayoutSet->CalcItemSizePixel( aLayoutItemSize ); - mpLayoutSet->SetSizePixel( mpLayoutSet->CalcWindowSizePixel( aLayoutItemSize ) ); + String aTitle( SdResId( STR_UNDO_MODIFY_PAGE ) ); + SetText( aTitle ); + /*mpToolbarMenu->*/appendEntry( -1, aTitle ); + /*mpToolbarMenu->*/appendEntry( 0, mpLayoutSet1.get() ); + + String aTitle2( RTL_CONSTASCII_USTRINGPARAM( "Horizontal Layouts" ) ); + appendEntry( -1, aTitle2 ); + appendEntry( 1, mpLayoutSet2.get() ); - SetText( String( SdResId( STR_UNDO_MODIFY_PAGE ) ) ); - //mpToolbarMenu->appendEntry( -1, ); - /*mpToolbarMenu->*/appendEntry( 0, mpLayoutSet ); /*mpToolbarMenu->*/appendSeparator(); Reference< XFrame > xFrame( GetFrame(), UNO_QUERY ); if( xFrame.is() ) { Image aImg( ::GetImage( xFrame, OUString( RTL_CONSTASCII_USTRINGPARAM(".uno:Undo") ), FALSE, FALSE ) ); - /*mpToolbarMenu->*/appendEntry( 1, sResetSlideLayout, aImg); + /*mpToolbarMenu->*/appendEntry( 2, sResetSlideLayout, aImg); } else { - /*mpToolbarMenu->*/appendEntry( 1, sResetSlideLayout); + /*mpToolbarMenu->*/appendEntry( 2, sResetSlideLayout); } /* @@ -227,7 +251,7 @@ void SdLayoutDialogContent::StateChanged( USHORT nSID, SfxItemState eState, cons if( pStateItem ) { meCurrentLayout = static_cast< AutoLayout >( pStateItem->GetValue() ); - mpLayoutSet->SelectItem( static_cast(meCurrentLayout)+1 ); + mpLayoutSet1->SelectItem( static_cast(meCurrentLayout)+1 ); } } } @@ -242,9 +266,16 @@ IMPL_LINK( SdLayoutDialogContent, SelectHdl, void *, pControl ) if( mrBase.GetMainViewShell().get() && mrBase.GetMainViewShell()->GetViewFrame() ) { - if( pControl == mpLayoutSet ) + if( pControl == mpLayoutSet1.get() ) + { + AutoLayout eLayout = static_cast< AutoLayout >(mpLayoutSet1->GetSelectItemId()-1); + + const SfxUInt32Item aItem(ID_VAL_WHATLAYOUT, eLayout); + mrBase.GetMainViewShell()->GetViewFrame()->GetBindings().GetDispatcher()->Execute(SID_ASSIGN_LAYOUT,SFX_CALLMODE_ASYNCHRON,&aItem,0); + } + else if( pControl == mpLayoutSet2.get() ) { - AutoLayout eLayout = static_cast< AutoLayout >(mpLayoutSet->GetSelectItemId()-1); + AutoLayout eLayout = static_cast< AutoLayout >(mpLayoutSet2->GetSelectItemId()-1); const SfxUInt32Item aItem(ID_VAL_WHATLAYOUT, eLayout); mrBase.GetMainViewShell()->GetViewFrame()->GetBindings().GetDispatcher()->Execute(SID_ASSIGN_LAYOUT,SFX_CALLMODE_ASYNCHRON,&aItem,0); 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/app/layoutctrl.cxx | 49 ++--------- sd/source/ui/app/res_bmp.src | 11 ++- sd/source/ui/app/sddll2.cxx | 1 + sd/source/ui/dlg/layoutdialog.cxx | 111 +++++++++++++------------ sd/source/ui/dlg/layoutdialog.hrc | 3 + sd/source/ui/dlg/layoutdialog.src | 13 ++- sd/source/ui/inc/ViewShellBase.hxx | 4 +- sd/source/ui/inc/layoutdialog.hxx | 9 +- sd/source/ui/inc/res_bmp.hrc | 100 +++++++++++----------- sd/source/ui/toolpanel/LayoutMenu.cxx | 61 +++++--------- sd/source/ui/view/drviews1.cxx | 1 + sd/source/ui/view/drviews7.cxx | 20 +++++ sd/source/ui/view/viewshe3.cxx | 39 ++++++--- sd/uiconfig/simpress/toolbar/commontaskbar.xml | 2 +- sd/uiconfig/simpress/toolbar/insertbar.xml | 2 +- 15 files changed, 222 insertions(+), 204 deletions(-) (limited to 'sd') diff --git a/sd/source/ui/app/layoutctrl.cxx b/sd/source/ui/app/layoutctrl.cxx index 9c23e0d09346..236f32c46b71 100644 --- a/sd/source/ui/app/layoutctrl.cxx +++ b/sd/source/ui/app/layoutctrl.cxx @@ -72,7 +72,9 @@ SFX_IMPL_TOOLBOX_CONTROL( SdLayoutControl, SfxVoidItem ); SdLayoutControl::SdLayoutControl( USHORT _nSlotId, USHORT _nId, ToolBox& rTbx ) : SfxToolBoxControl( _nSlotId, _nId, rTbx ) { - rTbx.SetItemBits( _nId, TIB_DROPDOWNONLY | rTbx.GetItemBits( _nId ) ); + if( SID_INSERTPAGE != _nSlotId ) + rTbx.SetItemBits( _nId, TIB_DROPDOWNONLY | rTbx.GetItemBits( _nId ) ); + rTbx.Invalidate(); } @@ -86,7 +88,7 @@ SdLayoutControl::~SdLayoutControl() void SdLayoutControl::Select( BOOL bMod1 ) { - (void)bMod1; + SfxToolBoxControl::Select( bMod1 ); } // ----------------------------------------------------------------------- @@ -113,50 +115,9 @@ SfxPopupWindow* SdLayoutControl::CreatePopupWindow() sd::ViewShellBase* pViewShellBase = sd::ViewShellBase::GetViewShellBase( SfxViewFrame::Current() ); if( pViewShellBase ) { - pWin = pWin = new sd::SdLayoutDialogContent( *pViewShellBase, &rTbx ); -// pWin->StartPopupMode( &rTbx, TRUE ); + pWin = pWin = new sd::SdLayoutDialogContent( *pViewShellBase, &rTbx, GetSlotId() == SID_INSERTPAGE ); if( pWin ) - { StartPopupMode( pWin ); -/* - pWin->EnableDocking(true); - Window::GetDockingManager()->StartPopupMode( &rTbx, pWin ); - - pWin->AddEventListener( LINK( this, SdLayoutControl, WindowEventListener ) ); -*/ - } } - -// SetPopupWindow( pWin ); - return 0; -} - -// ----------------------------------------------------------------------- - -IMPL_LINK( SdLayoutControl, WindowEventListener, VclSimpleEvent*, pEvent ) -{ - VclWindowEvent* pWindowEvent = dynamic_cast< VclWindowEvent* >( pEvent ); - if ( pWindowEvent && pWindowEvent->GetWindow() ) - { - Window* pWindow = pWindowEvent->GetWindow(); - switch( pWindowEvent->GetId() ) - { - case VCLEVENT_WINDOW_ENDPOPUPMODE: - { - EndPopupModeData *pData = static_cast(pWindowEvent->GetData()); - if( pData && pData->mbTearoff ); - { - pWindow->SetPosPixel( Point( pData->maFloatingPos.X(), pData->maFloatingPos.Y() ) ); - pWindow->Show(); - } - } - // fall through! - case VCLEVENT_WINDOW_CLOSE: - case VCLEVENT_OBJECT_DYING: - pWindow->RemoveEventListener( LINK( this, SdLayoutControl, WindowEventListener ) ); -// static_cast(pWindow)->PopupModeEnd(); - break; - } - } return 0; } diff --git a/sd/source/ui/app/res_bmp.src b/sd/source/ui/app/res_bmp.src index ff9d4a63946e..9257a52c3dd3 100644 --- a/sd/source/ui/app/res_bmp.src +++ b/sd/source/ui/app/res_bmp.src @@ -34,7 +34,7 @@ #include "res_bmp.hrc" // preview bitmaps for layouts -Bitmap BMP_ADDEMPTY_57X71 +Bitmap BMP_LAYOUT_ADDEMPTY_57X71 { File = "layout_addempty_57x71.png"; }; @@ -309,7 +309,14 @@ Bitmap BMP_PLACEHOLDER_TABLE_57X71_H { File = "placeholder_table_57x71_h.png"; }; - +Bitmap BMP_FOILN_01 +{ + File = "foiln01.bmp" ; +}; +Bitmap BMP_FOILN_01_H +{ + File = "foiln01_h.bmp" ; +}; Bitmap BMP_PAGE { File = "page.bmp" ; diff --git a/sd/source/ui/app/sddll2.cxx b/sd/source/ui/app/sddll2.cxx index 4cd293c0061c..606789ef84a9 100644 --- a/sd/source/ui/app/sddll2.cxx +++ b/sd/source/ui/app/sddll2.cxx @@ -218,4 +218,5 @@ void SdDLL::RegisterControllers() SvxSubToolBoxControl::RegisterControl(SID_OPTIMIZE_TABLE, pMod); SdLayoutControl::RegisterControl( SID_ASSIGN_LAYOUT, pMod ); + SdLayoutControl::RegisterControl( SID_INSERTPAGE, pMod ); } diff --git a/sd/source/ui/dlg/layoutdialog.cxx b/sd/source/ui/dlg/layoutdialog.cxx index 188a8d246952..a7ddfe48f55c 100644 --- a/sd/source/ui/dlg/layoutdialog.cxx +++ b/sd/source/ui/dlg/layoutdialog.cxx @@ -112,16 +112,15 @@ static snewfoil_value_info v_standard[] = // ----------------------------------------------------------------------- -static void fillLayoutValueSet( ValueSet* pValue, snewfoil_value_info* pInfo, const bool bHighContrast ) +static void fillLayoutValueSet( ValueSet* pValue, snewfoil_value_info* pInfo, const bool bHighContrast, const bool bInsertPage ) { + USHORT nResOffset = bInsertPage ? (BMP_LAYOUT_ADDEMPTY_57X71) - (BMP_LAYOUT_EMPTY_57X71) : 0; + Size aLayoutItemSize; for( ; pInfo->mnBmpResId; pInfo++ ) { -// if( !bVerticalEnabled && (pInfo->meWritingMode == WritingMode_TB_RL) ) -// continue; - String aText( SdResId( pInfo->mnStrResId ) ); - BitmapEx aBmp( SdResId( bHighContrast ? pInfo->mnHCBmpResId : pInfo->mnBmpResId ) ); + BitmapEx aBmp( SdResId( (bHighContrast ? pInfo->mnHCBmpResId : pInfo->mnBmpResId) + nResOffset ) ); aBmp.Expand( 3, 3, 0, TRUE ); pValue->InsertItem( static_cast(pInfo->maAutoLayout)+1, aBmp, aText ); @@ -136,17 +135,18 @@ static void fillLayoutValueSet( ValueSet* pValue, snewfoil_value_info* pInfo, co // ----------------------------------------------------------------------- -SdLayoutDialogContent::SdLayoutDialogContent( ViewShellBase& rBase, ::Window* pParent ) +SdLayoutDialogContent::SdLayoutDialogContent( ViewShellBase& rBase, ::Window* pParent, const bool bInsertPage ) : ToolbarMenu(rBase.GetFrame()->GetTopFrame()->GetFrameInterface(), pParent, SdResId( DLG_LAYOUTDIALOG ) /*WB_CLIPCHILDREN|WB_DIALOGCONTROL|WB_SYSTEMWINDOW|WB_MOVEABLE|WB_SIZEABLE|WB_CLOSEABLE*/) , mrBase(rBase) +, mbInsertPage( bInsertPage ) +, mpLayoutSet1( 0 ) +, mpLayoutSet2( 0 ) +, msAssignLayout( RTL_CONSTASCII_USTRINGPARAM( ".uno:AssignLayout" ) ) { -// FreeResource(); - - String sResetSlideLayout( SdResId( STR_RESET_LAYOUT ) ); + String aTitle1( SdResId( STR_HORIZONTAL_LAYOUTS ) ); + String aTitle2( SdResId( STR_VERTICAL_LAYOUTS ) ); - //SetStyle( 2 ); - -// SetHelpId( HID_POPUP_LAYOUT ); + FreeResource(); const Color aMenuColor( GetSettings().GetStyleSettings().GetMenuColor() ); const Color aMenuBarColor( GetSettings().GetStyleSettings().GetMenuBarColor() ); @@ -157,12 +157,9 @@ SdLayoutDialogContent::SdLayoutDialogContent( ViewShellBase& rBase, ::Window* pP SvtLanguageOptions aLanguageOptions; const bool bVerticalEnabled = aLanguageOptions.IsVerticalTextEnabled(); -// mpToolbarMenu.reset( new ToolbarMenu( this, WB_CLIPCHILDREN ) ); -// mpToolbarMenu->SetHelpId( HID_MENU_EXTRUSION_DIRECTION ); - /* mpToolbarMenu->*/ SetSelectHdl( LINK( this, SdLayoutDialogContent, SelectHdl ) ); - + SetSelectHdl( LINK( this, SdLayoutDialogContent, SelectHdl ) ); - mpLayoutSet1.reset( new ValueSet( this, WB_TABSTOP | WB_MENUSTYLEVALUESET | WB_FLATVALUESET | WB_NOBORDER | WB_NO_DIRECTSELECT ) ); + mpLayoutSet1 = new ValueSet( this, WB_TABSTOP | WB_MENUSTYLEVALUESET | WB_FLATVALUESET | WB_NOBORDER | WB_NO_DIRECTSELECT ); // mpLayoutSet1->SetHelpId( HID_VALUESET_EXTRUSION_LIGHTING ); mpLayoutSet1->SetSelectHdl( LINK( this, SdLayoutDialogContent, SelectHdl ) ); @@ -170,50 +167,52 @@ SdLayoutDialogContent::SdLayoutDialogContent( ViewShellBase& rBase, ::Window* pP mpLayoutSet1->EnableFullItemMode( FALSE ); mpLayoutSet1->SetColor( GetControlBackground() ); - fillLayoutValueSet( mpLayoutSet1.get(), &standard[0], bHighContrast ); + fillLayoutValueSet( mpLayoutSet1, &standard[0], bHighContrast, bInsertPage ); - mpLayoutSet2.reset( new ValueSet( this, WB_TABSTOP | WB_MENUSTYLEVALUESET | WB_FLATVALUESET | WB_NOBORDER | WB_NO_DIRECTSELECT ) ); -// mpLayoutSet2->SetHelpId( HID_VALUESET_EXTRUSION_LIGHTING ); + if( bVerticalEnabled ) + appendEntry( -1, aTitle1 ); + appendEntry( 0, mpLayoutSet1 ); - mpLayoutSet2->SetSelectHdl( LINK( this, SdLayoutDialogContent, SelectHdl ) ); - mpLayoutSet2->SetColCount( 4 ); - mpLayoutSet2->EnableFullItemMode( FALSE ); - mpLayoutSet2->SetColor( GetControlBackground() ); + if( bVerticalEnabled ) + { + mpLayoutSet2 = new ValueSet( this, WB_TABSTOP | WB_MENUSTYLEVALUESET | WB_FLATVALUESET | WB_NOBORDER | WB_NO_DIRECTSELECT ); + // mpLayoutSet2->SetHelpId( HID_VALUESET_EXTRUSION_LIGHTING ); - fillLayoutValueSet( mpLayoutSet2.get(), &v_standard[0], bHighContrast ); + mpLayoutSet2->SetSelectHdl( LINK( this, SdLayoutDialogContent, SelectHdl ) ); + mpLayoutSet2->SetColCount( 4 ); + mpLayoutSet2->EnableFullItemMode( FALSE ); + mpLayoutSet2->SetColor( GetControlBackground() ); - String aTitle( SdResId( STR_UNDO_MODIFY_PAGE ) ); - SetText( aTitle ); - /*mpToolbarMenu->*/appendEntry( -1, aTitle ); - /*mpToolbarMenu->*/appendEntry( 0, mpLayoutSet1.get() ); + fillLayoutValueSet( mpLayoutSet2, &v_standard[0], bHighContrast, bInsertPage ); - String aTitle2( RTL_CONSTASCII_USTRINGPARAM( "Horizontal Layouts" ) ); - appendEntry( -1, aTitle2 ); - appendEntry( 1, mpLayoutSet2.get() ); + appendEntry( -1, aTitle2 ); + appendEntry( 1, mpLayoutSet2 ); + } - /*mpToolbarMenu->*/appendSeparator(); + //appendSeparator(); + OUString sSlotStr; + Image aSlotImage; Reference< XFrame > xFrame( GetFrame(), UNO_QUERY ); if( xFrame.is() ) { - Image aImg( ::GetImage( xFrame, OUString( RTL_CONSTASCII_USTRINGPARAM(".uno:Undo") ), FALSE, FALSE ) ); - /*mpToolbarMenu->*/appendEntry( 2, sResetSlideLayout, aImg); - } - else - { - /*mpToolbarMenu->*/appendEntry( 2, sResetSlideLayout); + if( bInsertPage ) + sSlotStr = OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:DuplicatePage" ) ); + else + sSlotStr = OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:Undo" ) ); + aSlotImage = ::GetImage( xFrame, sSlotStr, FALSE, FALSE ); } -/* - Size aSize( mpToolbarMenu->getMenuSize() ); - mpToolbarMenu->SetPosSizePixel( Point( 1,1 ), aSize ); + String sSlotTitle; + if( bInsertPage ) + sSlotTitle = mrBase.RetrieveLabelFromCommand( sSlotStr ); + else + sSlotTitle = String( SdResId( STR_RESET_LAYOUT ) ); + appendEntry( 2, sSlotTitle, aSlotImage); - aSize.Width() += 2; - aSize.Height() += 2; -*/ SetOutputSizePixel( getMenuSize() ); -// mpToolbarMenu->Show(); + AddStatusListener( msAssignLayout ); } // ----------------------------------------------------------------------- @@ -266,28 +265,38 @@ IMPL_LINK( SdLayoutDialogContent, SelectHdl, void *, pControl ) if( mrBase.GetMainViewShell().get() && mrBase.GetMainViewShell()->GetViewFrame() ) { - if( pControl == mpLayoutSet1.get() ) + if( pControl == mpLayoutSet1 ) { AutoLayout eLayout = static_cast< AutoLayout >(mpLayoutSet1->GetSelectItemId()-1); const SfxUInt32Item aItem(ID_VAL_WHATLAYOUT, eLayout); - mrBase.GetMainViewShell()->GetViewFrame()->GetBindings().GetDispatcher()->Execute(SID_ASSIGN_LAYOUT,SFX_CALLMODE_ASYNCHRON,&aItem,0); + mrBase.GetMainViewShell()->GetViewFrame()->GetBindings().GetDispatcher()->Execute(mbInsertPage ? SID_INSERTPAGE : SID_ASSIGN_LAYOUT,SFX_CALLMODE_ASYNCHRON,&aItem,0); } - else if( pControl == mpLayoutSet2.get() ) + else if( pControl == mpLayoutSet2 ) { AutoLayout eLayout = static_cast< AutoLayout >(mpLayoutSet2->GetSelectItemId()-1); const SfxUInt32Item aItem(ID_VAL_WHATLAYOUT, eLayout); - mrBase.GetMainViewShell()->GetViewFrame()->GetBindings().GetDispatcher()->Execute(SID_ASSIGN_LAYOUT,SFX_CALLMODE_ASYNCHRON,&aItem,0); + mrBase.GetMainViewShell()->GetViewFrame()->GetBindings().GetDispatcher()->Execute(mbInsertPage ? SID_INSERTPAGE : SID_ASSIGN_LAYOUT,SFX_CALLMODE_ASYNCHRON,&aItem,0); } else { // reset autolayout - mrBase.GetMainViewShell()->GetViewFrame()->GetBindings().GetDispatcher()->Execute(SID_ASSIGN_LAYOUT,SFX_CALLMODE_ASYNCHRON); + mrBase.GetMainViewShell()->GetViewFrame()->GetBindings().GetDispatcher()->Execute( mbInsertPage ? SID_DUPLICATE_PAGE : SID_ASSIGN_LAYOUT,SFX_CALLMODE_ASYNCHRON); } } return 0; } +void SAL_CALL SdLayoutDialogContent::statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException ) +{ + if( Event.FeatureURL.Main.equals( msAssignLayout ) ) + { + sal_Int32 nLayout = 0; + Event.State >>= nLayout; + OSL_TRACE("SdLayoutDialogContent::statusChanged(%ld)", nLayout ); + } +} + } // end of namespace sd diff --git a/sd/source/ui/dlg/layoutdialog.hrc b/sd/source/ui/dlg/layoutdialog.hrc index 399bae81819c..a0a29c577831 100644 --- a/sd/source/ui/dlg/layoutdialog.hrc +++ b/sd/source/ui/dlg/layoutdialog.hrc @@ -29,3 +29,6 @@ ************************************************************************/ #define DLG_LAYOUTDIALOG 1347 + +#define STR_HORIZONTAL_LAYOUTS 1 +#define STR_VERTICAL_LAYOUTS 2 diff --git a/sd/source/ui/dlg/layoutdialog.src b/sd/source/ui/dlg/layoutdialog.src index db198cb863b5..ffadd7412565 100644 --- a/sd/source/ui/dlg/layoutdialog.src +++ b/sd/source/ui/dlg/layoutdialog.src @@ -39,6 +39,17 @@ DockingWindow DLG_LAYOUTDIALOG Moveable = TRUE ; Closeable = TRUE ; Zoomable = TRUE ; + Dockable = TRUE; - Text [ en-US ] = "Slide Layout" ; + Text [ en-US ] = "Slide Layouts" ; + + String STR_HORIZONTAL_LAYOUTS + { + Text [ en-US ] = "Horizontal" ; + }; + + String STR_VERTICAL_LAYOUTS + { + Text [ en-US ] = "Vertical" ; + }; }; 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 diff --git a/sd/source/ui/toolpanel/LayoutMenu.cxx b/sd/source/ui/toolpanel/LayoutMenu.cxx index afa5bb886f53..c07049b86baf 100644 --- a/sd/source/ui/toolpanel/LayoutMenu.cxx +++ b/sd/source/ui/toolpanel/LayoutMenu.cxx @@ -140,16 +140,13 @@ struct snewfoil_value_info static snewfoil_value_info notes[] = { -/* {BMP_FOILN_01, BMP_FOILN_01_H, STR_AUTOLAYOUT_NOTES, WritingMode_LR_TB, AUTOLAYOUT_NOTES}, -*/ {0, 0, 0, WritingMode_LR_TB, AUTOLAYOUT_NONE}, }; static snewfoil_value_info handout[] = { -/* {BMP_FOILH_01, BMP_FOILH_01_H, STR_AUTOLAYOUT_HANDOUT1, WritingMode_LR_TB, AUTOLAYOUT_HANDOUT1}, {BMP_FOILH_02, BMP_FOILH_02_H, STR_AUTOLAYOUT_HANDOUT2, WritingMode_LR_TB, @@ -162,51 +159,34 @@ static snewfoil_value_info handout[] = AUTOLAYOUT_HANDOUT6}, {BMP_FOILH_09, BMP_FOILH_09_H, STR_AUTOLAYOUT_HANDOUT9, WritingMode_LR_TB, AUTOLAYOUT_HANDOUT9}, -*/ {0, 0, 0, WritingMode_LR_TB, AUTOLAYOUT_NONE}, }; static snewfoil_value_info standard[] = { -/* - {BMP_FOIL_20, BMP_FOIL_20_H, STR_AUTOLAYOUT_NONE, WritingMode_LR_TB, AUTOLAYOUT_NONE}, - {BMP_FOIL_00, BMP_FOIL_00_H, STR_AUTOLAYOUT_TITLE, WritingMode_LR_TB, AUTOLAYOUT_TITLE}, - {BMP_FOIL_01, BMP_FOIL_01_H, STR_AUTOLAYOUT_CONTENT, WritingMode_LR_TB, AUTOLAYOUT_ENUM}, - {BMP_FOIL_03, BMP_FOIL_03_H, STR_AUTOLAYOUT_2CONTENT, WritingMode_LR_TB, AUTOLAYOUT_2TEXT}, - {BMP_FOIL_19, BMP_FOIL_19_H, STR_AUTOLAYOUT_ONLY_TITLE, WritingMode_LR_TB, AUTOLAYOUT_ONLY_TITLE}, - {BMP_FOIL_25, BMP_FOIL_25_H, STR_AUTOLAYOUT_ONLY_TEXT, WritingMode_LR_TB, AUTOLAYOUT_ONLY_TEXT}, - {BMP_FOIL_12, BMP_FOIL_12_H, STR_AUTOLAYOUT_CONTENT_2CONTENT, WritingMode_LR_TB, AUTOLAYOUT_TEXT2OBJ}, - {BMP_FOIL_15, BMP_FOIL_15_H, STR_AUTOLAYOUT_2CONTENT_CONTENT, WritingMode_LR_TB, AUTOLAYOUT_2OBJTEXT}, -//STR_AUTOLAYOUT_CONTENT_OVER_2CONTENT - {BMP_FOIL_16, BMP_FOIL_16_H, STR_AUTOLAYOUT_2CONTENT_OVER_CONTENT,WritingMode_LR_TB, AUTOLAYOUT_2OBJOVERTEXT}, - {BMP_FOIL_14, BMP_FOIL_14_H, STR_AUTOLAYOUT_CONTENT_OVER_CONTENT, WritingMode_LR_TB, AUTOLAYOUT_OBJOVERTEXT}, - {BMP_FOIL_18, BMP_FOIL_18_H, STR_AUTOLAYOUT_4CONTENT, WritingMode_LR_TB, AUTOLAYOUT_4OBJ}, - {BMP_FOIL_27, BMP_FOIL_27_H, STR_AUTOLAYOUT_6CONTENT, WritingMode_LR_TB, AUTOLAYOUT_6CLIPART}, -/ * - {BMP_FOIL_11, BMP_FOIL_11_H, STR_AUTOLAYOUT_OBJ, WritingMode_LR_TB, AUTOLAYOUT_OBJ}, - {BMP_FOIL_02, BMP_FOIL_02_H, STR_AUTOLAYOUT_CHART, WritingMode_LR_TB, AUTOLAYOUT_CHART}, - {BMP_FOIL_08, BMP_FOIL_08_H, STR_AUTOLAYOUT_TAB, WritingMode_LR_TB, AUTOLAYOUT_TAB}, - {BMP_FOIL_09, BMP_FOIL_09_H, STR_AUTOLAYOUT_CLIPTEXT, WritingMode_LR_TB, AUTOLAYOUT_CLIPTEXT}, - {BMP_FOIL_04, BMP_FOIL_04_H, STR_AUTOLAYOUT_TEXTCHART, WritingMode_LR_TB, AUTOLAYOUT_TEXTCHART}, - {BMP_FOIL_06, BMP_FOIL_06_H, STR_AUTOLAYOUT_TEXTCLIP, WritingMode_LR_TB, AUTOLAYOUT_TEXTCLIP}, - {BMP_FOIL_07, BMP_FOIL_07_H, STR_AUTOLAYOUT_CHARTTEXT, WritingMode_LR_TB, AUTOLAYOUT_CHARTTEXT}, - {BMP_FOIL_10, BMP_FOIL_10_H, STR_AUTOLAYOUT_TEXTOBJ, WritingMode_LR_TB, AUTOLAYOUT_TEXTOBJ}, - {BMP_FOIL_13, BMP_FOIL_13_H, STR_AUTOLAYOUT_OBJTEXT, WritingMode_LR_TB, AUTOLAYOUT_OBJTEXT}, - {BMP_FOIL_17, BMP_FOIL_17_H, STR_AUTOLAYOUT_TEXTOVEROBJ, WritingMode_LR_TB, AUTOLAYOUT_TEXTOVEROBJ}, - {BMP_FOIL_26, BMP_FOIL_26_H, STR_AUTOLAYOUT_4CLIPART, WritingMode_LR_TB, AUTOLAYOUT_4CLIPART}, -* / + {BMP_LAYOUT_EMPTY_57X71, BMP_LAYOUT_EMPTY_57X71_H, STR_AUTOLAYOUT_NONE, WritingMode_LR_TB, AUTOLAYOUT_NONE}, + {BMP_LAYOUT_HEAD03_57X71, BMP_LAYOUT_HEAD03_57X71_H, STR_AUTOLAYOUT_TITLE, WritingMode_LR_TB, AUTOLAYOUT_TITLE}, + {BMP_LAYOUT_HEAD02_57X71, BMP_LAYOUT_HEAD02_57X71_H, STR_AUTOLAYOUT_CONTENT, WritingMode_LR_TB, AUTOLAYOUT_ENUM}, + {BMP_LAYOUT_HEAD02A_57X71, BMP_LAYOUT_HEAD02A_57X71_H, STR_AUTOLAYOUT_2CONTENT, WritingMode_LR_TB, AUTOLAYOUT_2TEXT}, + {BMP_LAYOUT_HEAD01_57X71, BMP_LAYOUT_HEAD01_57X71_H, STR_AUTOLAYOUT_ONLY_TITLE, WritingMode_LR_TB, AUTOLAYOUT_ONLY_TITLE}, + {BMP_LAYOUT_TEXTONLY_57X71, BMP_LAYOUT_TEXTONLY_57X71_H, STR_AUTOLAYOUT_ONLY_TEXT, WritingMode_LR_TB, AUTOLAYOUT_ONLY_TEXT}, +//-- + {BMP_LAYOUT_HEAD02B_57X71, BMP_LAYOUT_HEAD02B_57X71_H, STR_AUTOLAYOUT_CONTENT_2CONTENT, WritingMode_LR_TB, AUTOLAYOUT_TEXT2OBJ}, + {BMP_LAYOUT_HEAD02B_57X71, BMP_LAYOUT_HEAD02B_57X71_H, STR_AUTOLAYOUT_2CONTENT_CONTENT, WritingMode_LR_TB, AUTOLAYOUT_2OBJTEXT}, +//-- + {BMP_LAYOUT_HEAD03A_57X71, BMP_LAYOUT_HEAD03A_57X71_H, STR_AUTOLAYOUT_2CONTENT_OVER_CONTENT,WritingMode_LR_TB, AUTOLAYOUT_2OBJOVERTEXT}, + {BMP_LAYOUT_HEAD02B_57X71, BMP_LAYOUT_HEAD02B_57X71_H, STR_AUTOLAYOUT_CONTENT_OVER_CONTENT, WritingMode_LR_TB, AUTOLAYOUT_OBJOVERTEXT}, + {BMP_LAYOUT_HEAD04_57X71, BMP_LAYOUT_HEAD04_57X71_H, STR_AUTOLAYOUT_4CONTENT, WritingMode_LR_TB, AUTOLAYOUT_4OBJ}, + {BMP_LAYOUT_HEAD06_57X71, BMP_LAYOUT_HEAD06_57X71_H, STR_AUTOLAYOUT_6CONTENT, WritingMode_LR_TB, AUTOLAYOUT_6CLIPART}, + // vertical - {BMP_FOIL_21, BMP_FOIL_21_H, STR_AL_VERT_TITLE_TEXT_CHART, WritingMode_TB_RL,AUTOLAYOUT_VERTICAL_TITLE_TEXT_CHART}, - {BMP_FOIL_22, BMP_FOIL_22_H, STR_AL_VERT_TITLE_VERT_OUTLINE, WritingMode_TB_RL, AUTOLAYOUT_VERTICAL_TITLE_VERTICAL_OUTLINE}, - {BMP_FOIL_23, BMP_FOIL_23_H, STR_AL_TITLE_VERT_OUTLINE, WritingMode_TB_RL, AUTOLAYOUT_TITLE_VERTICAL_OUTLINE}, - {BMP_FOIL_24, BMP_FOIL_24_H, STR_AL_TITLE_VERT_OUTLINE_CLIPART, WritingMode_TB_RL, AUTOLAYOUT_TITLE_VERTICAL_OUTLINE_CLIPART}, -*/ + {BMP_LAYOUT_VERTICAL02_57X71, BMP_LAYOUT_VERTICAL02_57X71_H, STR_AL_VERT_TITLE_TEXT_CHART, WritingMode_TB_RL,AUTOLAYOUT_VERTICAL_TITLE_TEXT_CHART}, + {BMP_LAYOUT_VERTICAL01_57X71, BMP_LAYOUT_VERTICAL01_57X71_H, STR_AL_VERT_TITLE_VERT_OUTLINE, WritingMode_TB_RL, AUTOLAYOUT_VERTICAL_TITLE_VERTICAL_OUTLINE}, + {BMP_LAYOUT_HEAD02_57X71, BMP_LAYOUT_HEAD02_57X71_H, STR_AL_TITLE_VERT_OUTLINE, WritingMode_TB_RL, AUTOLAYOUT_TITLE_VERTICAL_OUTLINE}, + {BMP_LAYOUT_HEAD02A_57X71, BMP_LAYOUT_HEAD02A_57X71_H, STR_AL_TITLE_VERT_OUTLINE_CLIPART, WritingMode_TB_RL, AUTOLAYOUT_TITLE_VERTICAL_OUTLINE_CLIPART}, {0, 0, 0, WritingMode_LR_TB, AUTOLAYOUT_NONE} }; - - - LayoutMenu::LayoutMenu ( TreeNode* pParent, DrawDocShell& rDocumentShell, @@ -717,7 +697,8 @@ void LayoutMenu::AssignLayoutToSelectedSlides (AutoLayout aLayout) // There is a slide sorter visible so get the list of selected pages from it. pPageSelection = pSlideSorter->GetPageSelection(); } - else + + if( (pSlideSorter == NULL) || (pPageSelection.get() == 0) || pPageSelection->empty() ) { // No valid slide sorter available. Ask the main view shell for // its current page. diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx index e870f706f810..d34a36388fbf 100644 --- a/sd/source/ui/view/drviews1.cxx +++ b/sd/source/ui/view/drviews1.cxx @@ -1235,6 +1235,7 @@ BOOL DrawViewShell::SwitchPage(USHORT nSelectedPage) rBindings.Invalidate(SID_STATUS_PAGE, TRUE, FALSE); rBindings.Invalidate(SID_DELETE_MASTER_PAGE, TRUE, FALSE); rBindings.Invalidate(SID_DELETE_PAGE, TRUE, FALSE); + rBindings.Invalidate(SID_ASSIGN_LAYOUT,TRUE,FALSE); UpdatePreview( mpActualPage ); mpDrawView->AdjustMarkHdl(); diff --git a/sd/source/ui/view/drviews7.cxx b/sd/source/ui/view/drviews7.cxx index 0ba354fbe8d8..e8d5146faa86 100644 --- a/sd/source/ui/view/drviews7.cxx +++ b/sd/source/ui/view/drviews7.cxx @@ -365,6 +365,26 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) } } + if (SFX_ITEM_AVAILABLE == rSet.GetItemState(SID_ASSIGN_LAYOUT)) + { + bool bDisable = true; + if( pPageView ) + { + SdPage* pPage = dynamic_cast< SdPage* >( pPageView->GetPage() ); + + if( pPage && !pPage->IsMasterPage() ) + { + rSet.Put( SfxUInt32Item(SID_ASSIGN_LAYOUT, pPage->GetAutoLayout()) ); + bDisable = false; + } + } + + if(bDisable) + { + rSet.DisableItem(SID_ASSIGN_LAYOUT); + } + } + // Starten der Praesentation moeglich? if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_PRESENTATION ) || SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_REHEARSE_TIMINGS ) ) diff --git a/sd/source/ui/view/viewshe3.cxx b/sd/source/ui/view/viewshe3.cxx index 86e441939b0e..4f441f03cde7 100644 --- a/sd/source/ui/view/viewshe3.cxx +++ b/sd/source/ui/view/viewshe3.cxx @@ -266,23 +266,31 @@ SdPage* ViewShell::CreateOrDuplicatePage ( if (pTemplatePage != NULL) { eStandardLayout = pTemplatePage->GetAutoLayout(); + if( eStandardLayout == AUTOLAYOUT_TITLE ) + eStandardLayout = AUTOLAYOUT_ENUM; + SdPage* pNotesTemplatePage = static_cast(pDocument->GetPage(pTemplatePage->GetPageNum()+1)); if (pNotesTemplatePage != NULL) eNotesLayout = pNotesTemplatePage->GetAutoLayout(); } } - else if (pArgs->Count () != 4) + else if (pArgs->Count() == 1) { - Cancel(); - - if(HasCurrentFunction(SID_BEZIER_EDIT) ) - GetViewFrame()->GetDispatcher()->Execute(SID_OBJECT_SELECT, SFX_CALLMODE_ASYNCHRON); - - StarBASIC::FatalError (SbERR_WRONG_ARGS); - rRequest.Ignore (); - return NULL; + pDocument->StopWorkStartupDelay(); + SFX_REQUEST_ARG (rRequest, pLayout, SfxUInt32Item, ID_VAL_WHATLAYOUT, FALSE); + if( pLayout ) + { + if (ePageKind == PK_NOTES) + { + eNotesLayout = (AutoLayout) pLayout->GetValue (); + } + else + { + eStandardLayout = (AutoLayout) pLayout->GetValue (); + } + } } - else + else if (pArgs->Count() == 4) { // AutoLayouts muessen fertig sein pDocument->StopWorkStartupDelay(); @@ -320,6 +328,17 @@ SdPage* ViewShell::CreateOrDuplicatePage ( return NULL; } } + else + { + Cancel(); + + if(HasCurrentFunction(SID_BEZIER_EDIT) ) + GetViewFrame()->GetDispatcher()->Execute(SID_OBJECT_SELECT, SFX_CALLMODE_ASYNCHRON); + + StarBASIC::FatalError (SbERR_WRONG_ARGS); + rRequest.Ignore (); + return NULL; + } // 2. Create a new page or duplicate an existing one. View* pDrView = GetView(); diff --git a/sd/uiconfig/simpress/toolbar/commontaskbar.xml b/sd/uiconfig/simpress/toolbar/commontaskbar.xml index 8be9e7ae9450..794f55af134b 100644 --- a/sd/uiconfig/simpress/toolbar/commontaskbar.xml +++ b/sd/uiconfig/simpress/toolbar/commontaskbar.xml @@ -1,7 +1,7 @@ - + diff --git a/sd/uiconfig/simpress/toolbar/insertbar.xml b/sd/uiconfig/simpress/toolbar/insertbar.xml index 2efa9c7d49c1..4ba1344cf2fc 100644 --- a/sd/uiconfig/simpress/toolbar/insertbar.xml +++ b/sd/uiconfig/simpress/toolbar/insertbar.xml @@ -1,7 +1,7 @@ - + -- cgit From 33b29ea23007cbed30abe1c5ae1a2573ad96148b Mon Sep 17 00:00:00 2001 From: Christian Lippka Date: Tue, 26 Jan 2010 18:39:33 +0100 Subject: re added removed placeholder images --- sd/inc/glob.hrc | 6 +++++ sd/source/core/sdpage.cxx | 62 ++++++++++++++++++++++++++++++++++++++++---- sd/source/ui/app/res_bmp.src | 20 ++++++++++++++ 3 files changed, 83 insertions(+), 5 deletions(-) (limited to 'sd') diff --git a/sd/inc/glob.hrc b/sd/inc/glob.hrc index 0c4845048274..7ef9ecad779c 100644 --- a/sd/inc/glob.hrc +++ b/sd/inc/glob.hrc @@ -47,6 +47,12 @@ #define STR_PRESOBJ_ORGCHART RID_GLOB_START+11 #define STR_PRESOBJ_TABLE RID_GLOB_START+12 #define STR_PRESOBJ_IMAGE RID_GLOB_START+13 +#define BMP_PRESOBJ_GRAPHIC RID_GLOB_START+14 +#define BMP_PRESOBJ_OBJECT RID_GLOB_START+15 +#define BMP_PRESOBJ_CHART RID_GLOB_START+16 +#define BMP_PRESOBJ_ORGCHART RID_GLOB_START+17 +#define BMP_PRESOBJ_TABLE RID_GLOB_START+18 +#define BMP_PRESOBJ_IMAGE RID_GLOB_START+19 #define STR_OUTLINEVIEWSHELL RID_GLOB_START+21 #define STR_DRAWVIEWSHELL RID_GLOB_START+22 #define STR_TEXTOBJECTBARSHELL RID_GLOB_START+23 diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx index 4a2b740a1e14..0f58407a65b7 100644 --- a/sd/source/core/sdpage.cxx +++ b/sd/source/core/sdpage.cxx @@ -205,11 +205,6 @@ SdrObject* SdPage::CreatePresObj(PresObjKind eObjKind, BOOL bVertical, const Rec } break; - case PRESOBJ_GRAPHIC: - case PRESOBJ_OBJECT: - case PRESOBJ_CHART: - case PRESOBJ_ORGCHART: - case PRESOBJ_TABLE: case PRESOBJ_OUTLINE: { pSdrObj = new SdrRectObj(OBJ_OUTLINETEXT); @@ -238,6 +233,63 @@ SdrObject* SdPage::CreatePresObj(PresObjKind eObjKind, BOOL bVertical, const Rec } break; + case PRESOBJ_GRAPHIC: + { + BitmapEx aBmpEx( SdResId( BMP_PRESOBJ_GRAPHIC ) ); + Graphic aGraphic( aBmpEx ); + OutputDevice &aOutDev = *Application::GetDefaultDevice(); + aOutDev.Push(); + + aOutDev.SetMapMode( aGraphic.GetPrefMapMode() ); + Size aSizePix = aOutDev.LogicToPixel( aGraphic.GetPrefSize() ); + aOutDev.SetMapMode(MAP_100TH_MM); + + Size aSize = aOutDev.PixelToLogic(aSizePix); + Point aPnt (0, 0); + Rectangle aRect (aPnt, aSize); + pSdrObj = new SdrGrafObj(aGraphic, aRect); + aOutDev.Pop(); + } + break; + + case PRESOBJ_OBJECT: + { + pSdrObj = new SdrOle2Obj(); + BitmapEx aBmpEx( SdResId( BMP_PRESOBJ_OBJECT ) ); + Graphic aGraphic( aBmpEx ); + ( (SdrOle2Obj*) pSdrObj)->SetGraphic(&aGraphic); + } + break; + + case PRESOBJ_CHART: + { + pSdrObj = new SdrOle2Obj(); + ( (SdrOle2Obj*) pSdrObj)->SetProgName( String( RTL_CONSTASCII_USTRINGPARAM( "StarChart" ))); + BitmapEx aBmpEx( SdResId( BMP_PRESOBJ_CHART ) ); + Graphic aGraphic( aBmpEx ); + ( (SdrOle2Obj*) pSdrObj)->SetGraphic(&aGraphic); + } + break; + + case PRESOBJ_ORGCHART: + { + pSdrObj = new SdrOle2Obj(); + ( (SdrOle2Obj*) pSdrObj)->SetProgName( String( RTL_CONSTASCII_USTRINGPARAM( "StarOrg" ))); + BitmapEx aBmpEx( SdResId( BMP_PRESOBJ_ORGCHART ) ); + Graphic aGraphic( aBmpEx ); + ( (SdrOle2Obj*) pSdrObj)->SetGraphic(&aGraphic); + } + + case PRESOBJ_TABLE: + { + pSdrObj = new SdrOle2Obj(); + ( (SdrOle2Obj*) pSdrObj)->SetProgName( String( RTL_CONSTASCII_USTRINGPARAM( "StarCalc" ))); + BitmapEx aBmpEx( SdResId( BMP_PRESOBJ_TABLE ) ); + Graphic aGraphic( aBmpEx ); + ( (SdrOle2Obj*) pSdrObj)->SetGraphic(&aGraphic); + } + break; + case PRESOBJ_BACKGROUND: { pSdrObj = new SdrRectObj(); diff --git a/sd/source/ui/app/res_bmp.src b/sd/source/ui/app/res_bmp.src index 9257a52c3dd3..f17bec667bfa 100644 --- a/sd/source/ui/app/res_bmp.src +++ b/sd/source/ui/app/res_bmp.src @@ -499,6 +499,26 @@ SfxStyleFamilies DLG_STYLE_DESIGNER #undef STYLE_IMAGE_LISTEF }; +Bitmap BMP_PRESOBJ_GRAPHIC +{ + File = "image.bmp" ; +}; +Bitmap BMP_PRESOBJ_OBJECT +{ + File = "object.bmp" ; +}; +Bitmap BMP_PRESOBJ_CHART +{ + File = "chart.bmp" ; +}; +Bitmap BMP_PRESOBJ_ORGCHART +{ + File = "orgchart.bmp" ; +}; +Bitmap BMP_PRESOBJ_TABLE +{ + File = "table.bmp" ; +}; Bitmap BMP_WAIT_ICON { File = "waiticon.bmp"; -- cgit From a17734674e635d26082dc682c6fe63405b53bbb4 Mon Sep 17 00:00:00 2001 From: Christian Lippka Date: Thu, 28 Jan 2010 18:27:19 +0100 Subject: adding new layout enums --- sd/inc/pres.hxx | 88 ++++++++++++++++++++++++++++++++++----------------------- 1 file changed, 52 insertions(+), 36 deletions(-) (limited to 'sd') diff --git a/sd/inc/pres.hxx b/sd/inc/pres.hxx index bd1d5015e5f4..32146fb6f46c 100644 --- a/sd/inc/pres.hxx +++ b/sd/inc/pres.hxx @@ -56,42 +56,58 @@ enum PresObjKind enum AutoLayout { - AUTOLAYOUT__START, - AUTOLAYOUT_TITLE = AUTOLAYOUT__START, - AUTOLAYOUT_ENUM, - AUTOLAYOUT_CHART, - AUTOLAYOUT_2TEXT, - AUTOLAYOUT_TEXTCHART, - AUTOLAYOUT_ORG, - AUTOLAYOUT_TEXTCLIP, - AUTOLAYOUT_CHARTTEXT, - AUTOLAYOUT_TAB, - AUTOLAYOUT_CLIPTEXT, - AUTOLAYOUT_TEXTOBJ, - AUTOLAYOUT_OBJ, - AUTOLAYOUT_TEXT2OBJ, - AUTOLAYOUT_OBJTEXT, - AUTOLAYOUT_OBJOVERTEXT, - AUTOLAYOUT_2OBJTEXT, - AUTOLAYOUT_2OBJOVERTEXT, - AUTOLAYOUT_TEXTOVEROBJ, - AUTOLAYOUT_4OBJ, - AUTOLAYOUT_ONLY_TITLE, - AUTOLAYOUT_NONE, - AUTOLAYOUT_NOTES, - AUTOLAYOUT_HANDOUT1, - AUTOLAYOUT_HANDOUT2, - AUTOLAYOUT_HANDOUT3, - AUTOLAYOUT_HANDOUT4, - AUTOLAYOUT_HANDOUT6, - AUTOLAYOUT_VERTICAL_TITLE_TEXT_CHART, - AUTOLAYOUT_VERTICAL_TITLE_VERTICAL_OUTLINE, - AUTOLAYOUT_TITLE_VERTICAL_OUTLINE, - AUTOLAYOUT_TITLE_VERTICAL_OUTLINE_CLIPART, - AUTOLAYOUT_HANDOUT9, - AUTOLAYOUT_ONLY_TEXT, - AUTOLAYOUT_4CLIPART, - AUTOLAYOUT_6CLIPART, + // new layouts with enum/text/chart/org/clip merged to content + AUTOLAYOUT__START = 0, + AUTOLAYOUT_TITLE = 0, // Title Slide + AUTOLAYOUT_TITLE_CONTENT = 1, // Title, Content + AUTOLAYOUT_TITLE_2CONTENT = 3, // Title and 2 Content + AUTOLAYOUT_TITLE_ONLY = 19, // Title Only + AUTOLAYOUT_NONE = 20, // Blank Slide + AUTOLAYOUT_ONLY_TEXT = 32, // Centered Text + AUTOLAYOUT_TITLE_CONTENT_2CONTENT = 12, // Title, Content and 2 Content + AUTOLAYOUT_TITLE_2CONTENT_CONTENT = 15, // Title, 2 Content and Content + AUTOLAYOUT_TITLE_2CONTENT_OVER_CONTENT = 16,// Title, 2 Content over Content + AUTOLAYOUT_TITLE_CONTENT_OVER_CONTENT = 14, // Title, Content over Content + AUTOLAYOUT_TITLE_4CONTENT = 18, // Title, 4 Content + AUTOLAYOUT_TITLE_6CONTENT = 34, // Title, 6 Content + AUTOLAYOUT_VTITLE_VCONTENT_OVER_VCONTENT = 27, // Vertical Title, Vertical Content over Vertical Content + AUTOLAYOUT_VTITLE_VCONTENT = 28, // Vertical Title, Vertical Content over Vertical Content + AUTOLAYOUT_TITLE_VCONTENT = 29, // Title, Vertical Content + AUTOLAYOUT_TITLE_2VTEXT = 30, // Title, 2 Vertical Content + + // deprecated + AUTOLAYOUT_ENUM = 1, + AUTOLAYOUT_CHART = 2, + AUTOLAYOUT_2TEXT = 3, + AUTOLAYOUT_TEXTCHART = 4, + AUTOLAYOUT_ORG = 5, + AUTOLAYOUT_TEXTCLIP = 6, + AUTOLAYOUT_CHARTTEXT = 7, + AUTOLAYOUT_TAB = 8, + AUTOLAYOUT_CLIPTEXT = 9, + AUTOLAYOUT_TEXTOBJ = 10, + AUTOLAYOUT_OBJ = 11, + AUTOLAYOUT_TEXT2OBJ = 12, + AUTOLAYOUT_OBJTEXT = 13, + AUTOLAYOUT_OBJOVERTEXT = 14, + AUTOLAYOUT_2OBJTEXT = 15, + AUTOLAYOUT_2OBJOVERTEXT = 16, + AUTOLAYOUT_TEXTOVEROBJ = 17, + AUTOLAYOUT_4OBJ = 18, + AUTOLAYOUT_ONLY_TITLE = 19, + AUTOLAYOUT_NOTES = 21, + AUTOLAYOUT_HANDOUT1 = 22, + AUTOLAYOUT_HANDOUT2 = 23, + AUTOLAYOUT_HANDOUT3 = 24, + AUTOLAYOUT_HANDOUT4 = 25, + AUTOLAYOUT_HANDOUT6 = 26, + AUTOLAYOUT_VERTICAL_TITLE_TEXT_CHART = 27, + AUTOLAYOUT_VERTICAL_TITLE_VERTICAL_OUTLINE = 28, + AUTOLAYOUT_TITLE_VERTICAL_OUTLINE = 29, + AUTOLAYOUT_TITLE_VERTICAL_OUTLINE_CLIPART = 30, + AUTOLAYOUT_HANDOUT9 = 31, + AUTOLAYOUT_4CLIPART = 33, + AUTOLAYOUT_6CLIPART = 34, AUTOLAYOUT__END }; -- cgit From 1729ed6a9a1617a5821913501513beec86921a7e Mon Sep 17 00:00:00 2001 From: Christian Lippka Date: Thu, 28 Jan 2010 18:27:41 +0100 Subject: fix size difference for newly created presentation objects --- sd/source/core/sdpage.cxx | 3 +++ 1 file changed, 3 insertions(+) (limited to 'sd') diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx index 0f58407a65b7..762e8ad2f649 100644 --- a/sd/source/core/sdpage.cxx +++ b/sd/source/core/sdpage.cxx @@ -2296,6 +2296,9 @@ SdrObject* SdPage::InsertAutoLayoutShape( SdrObject* pObj, PresObjKind eObjKind, } } + if( pObj ) + pObj->SetLogicRect(aRect); + return pObj; } -- cgit From 3db2c83185b723d08af72b93f33d5d84594531d6 Mon Sep 17 00:00:00 2001 From: "Frank Schoenheit [fs]" Date: Thu, 11 Mar 2010 10:01:29 +0100 Subject: slidecopy: OSL_TRACE doesn't need a trainling line feed nowadays, this just adds noise to the debug output. Removed. --- .../configuration/ConfigurationTracer.cxx | 8 +++---- .../configuration/ConfigurationUpdater.cxx | 28 +++++++++++----------- 2 files changed, 18 insertions(+), 18 deletions(-) (limited to 'sd') diff --git a/sd/source/ui/framework/configuration/ConfigurationTracer.cxx b/sd/source/ui/framework/configuration/ConfigurationTracer.cxx index c0a0cea02205..4478e01f2168 100644 --- a/sd/source/ui/framework/configuration/ConfigurationTracer.cxx +++ b/sd/source/ui/framework/configuration/ConfigurationTracer.cxx @@ -44,16 +44,16 @@ void ConfigurationTracer::TraceConfiguration ( const char* pMessage) { #ifdef DEBUG - OSL_TRACE("%s at %p {\n", pMessage, rxConfiguration.get()); + OSL_TRACE("%s at %p {", pMessage, rxConfiguration.get()); if (rxConfiguration.is()) { TraceBoundResources(rxConfiguration, NULL, 0); } else { - OSL_TRACE(" empty\n"); + OSL_TRACE(" empty"); } - OSL_TRACE("}\n"); + OSL_TRACE("}"); #else (void)rxConfiguration; (void)pMessage; @@ -77,7 +77,7 @@ void ConfigurationTracer::TraceBoundResources ( ::rtl::OUString sLine (aResourceList[nIndex]->getResourceURL()); for (int i=0; i=1 - OSL_TRACE("UpdateConfiguration start\n"); + OSL_TRACE("UpdateConfiguration start"); #endif // Call UpdateConfiguration while that is possible and while someone @@ -149,7 +149,7 @@ void ConfigurationUpdater::RequestUpdate ( { mbUpdatePending = true; #if defined VERBOSE && VERBOSE>=1 - OSL_TRACE("scheduling update for later\n"); + OSL_TRACE("scheduling update for later"); #endif } } @@ -188,7 +188,7 @@ bool ConfigurationUpdater::IsUpdatePossible (void) void ConfigurationUpdater::UpdateConfiguration (void) { #if defined VERBOSE && VERBOSE>=1 - OSL_TRACE("UpdateConfiguration update\n"); + OSL_TRACE("UpdateConfiguration update"); #endif SetUpdateBeingProcessed(true); comphelper::ScopeGuard aScopeGuard ( @@ -203,7 +203,7 @@ void ConfigurationUpdater::UpdateConfiguration (void) if (aClassifier.Partition()) { #if defined VERBOSE && VERBOSE>=2 - OSL_TRACE("ConfigurationUpdater::UpdateConfiguration(\n"); + OSL_TRACE("ConfigurationUpdater::UpdateConfiguration("); ConfigurationTracer::TraceConfiguration( mxRequestedConfiguration, "requested configuration"); ConfigurationTracer::TraceConfiguration( @@ -235,7 +235,7 @@ void ConfigurationUpdater::UpdateConfiguration (void) else { #if defined VERBOSE && VERBOSE>0 - OSL_TRACE("nothing to do\n"); + OSL_TRACE("nothing to do"); #if defined VERBOSE && VERBOSE>=2 ConfigurationTracer::TraceConfiguration( mxRequestedConfiguration, "requested configuration"); @@ -313,11 +313,11 @@ void ConfigurationUpdater::UpdateCore (const ConfigurationClassifier& rClassifie { #if defined VERBOSE && VERBOSE>=2 rClassifier.TraceResourceIdVector( - "requested but not current resources:\n", rClassifier.GetC1minusC2()); + "requested but not current resources:", rClassifier.GetC1minusC2()); rClassifier.TraceResourceIdVector( - "current but not requested resources:\n", rClassifier.GetC2minusC1()); + "current but not requested resources:", rClassifier.GetC2minusC1()); rClassifier.TraceResourceIdVector( - "requested and current resources:\n", rClassifier.GetC1andC2()); + "requested and current resources:", rClassifier.GetC1andC2()); #endif // Updating of the sub controllers is done in two steps. In the @@ -328,11 +328,11 @@ void ConfigurationUpdater::UpdateCore (const ConfigurationClassifier& rClassifie mpResourceManager->ActivateResources(rClassifier.GetC1minusC2(), mxCurrentConfiguration); #if defined VERBOSE && VERBOSE>=2 - OSL_TRACE("ConfigurationController::UpdateConfiguration)\n"); + OSL_TRACE("ConfigurationController::UpdateConfiguration)"); ConfigurationTracer::TraceConfiguration( - mxRequestedConfiguration, "requested configuration\n"); + mxRequestedConfiguration, "requested configuration"); ConfigurationTracer::TraceConfiguration( - mxCurrentConfiguration, "current configuration\n"); + mxCurrentConfiguration, "current configuration"); #endif // Deactivate pure anchors that have no child. @@ -404,7 +404,7 @@ void ConfigurationUpdater::CheckPureAnchors ( if (bDeactiveCurrentResource) { #if defined VERBOSE && VERBOSE>=2 - OSL_TRACE("deactiving pure anchor %s because it has no children\n", + OSL_TRACE("deactiving pure anchor %s because it has no children", OUStringToOString( FrameworkHelper::ResourceIdToString(xResourceId), RTL_TEXTENCODING_UTF8).getStr()); @@ -461,14 +461,14 @@ void ConfigurationUpdater::SetUpdateBeingProcessed (bool bValue) IMPL_LINK(ConfigurationUpdater, TimeoutHandler, Timer*, EMPTYARG) { - OSL_TRACE("configuration update timer\n"); + OSL_TRACE("configuration update timer"); if ( ! mbUpdateBeingProcessed && mxCurrentConfiguration.is() && mxRequestedConfiguration.is()) { if ( ! AreConfigurationsEquivalent(mxCurrentConfiguration, mxRequestedConfiguration)) { - OSL_TRACE("configurations differ, requesting update\n"); + OSL_TRACE("configurations differ, requesting update"); RequestUpdate(mxRequestedConfiguration); } } -- cgit From d9f875f2a1a888805e84267a62c422266f24fb53 Mon Sep 17 00:00:00 2001 From: "Frank Schoenheit [fs]" Date: Thu, 11 Mar 2010 10:15:31 +0100 Subject: slidecopy: unused file, just adding noise to my grep results. Removed. --- sd/source/ui/toolpanel/LayoutableWindow.hxx | 82 ----------------------------- 1 file changed, 82 deletions(-) delete mode 100644 sd/source/ui/toolpanel/LayoutableWindow.hxx (limited to 'sd') diff --git a/sd/source/ui/toolpanel/LayoutableWindow.hxx b/sd/source/ui/toolpanel/LayoutableWindow.hxx deleted file mode 100644 index 028c776ebfab..000000000000 --- a/sd/source/ui/toolpanel/LayoutableWindow.hxx +++ /dev/null @@ -1,82 +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: LayoutableWindow.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_TOOLPANEL_I_LAYOUTABLE_WINDOW_HXX -#define SD_TOOLPANEL_I_LAYOUTABLE_WINDOW_HXX - -#include - -class Window; - -namespace sd { namespace toolpanel { - - -/** This interface has to be implemented by windows that want to be - layouted by a ToolPanel, SubToolPanel, or ScrollablePanel object. -*/ -class LayoutableWindow -{ -public: - /** Return the preferred size without constraints on either the - height or the width. - The size the window will later be set to may but does not have - to be equal to this size. - */ - virtual Size GetPreferredSize (void) = 0; - - /** Return the preferred width with the constraint, that the - window will be set to the given height. - The width the window will later be set to may but does not have - to be equal to this width. - */ - virtual int GetPreferredWidth (int nHeight) = 0; - - /** Return the preferred height with the constraint, that the - window will be set to the given width. - The height the window will later be set to may but does not have - to be equal to this height. - */ - virtual int GetPreferredHeight (int nWidth) = 0; - - /** Return wether the window is generally resizable. When used by - a VerticalLayouter then the width will always be resized and - the return value of this method determines whether the height - may be modified as well. - */ - virtual bool IsResizable (void) = 0; - - /** Return the window so that its size and position can be set. - */ - virtual ::Window& GetWindow (void) = 0; -}; - -} } // end of namespace ::sd::toolpanel - -#endif -- 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/app/menuids2_tmpl.src | 35 ------------ sd/source/ui/inc/ToolPanelChildWindow.hrc | 33 ------------ sd/source/ui/inc/ToolPanelChildWindow.hxx | 58 -------------------- sd/source/ui/toolpanel/ToolPanelChildWindow.cxx | 71 ------------------------- sd/source/ui/toolpanel/ToolPanelChildWindow.src | 55 ------------------- 5 files changed, 252 deletions(-) delete mode 100644 sd/source/ui/inc/ToolPanelChildWindow.hrc delete mode 100644 sd/source/ui/inc/ToolPanelChildWindow.hxx delete mode 100644 sd/source/ui/toolpanel/ToolPanelChildWindow.cxx delete mode 100644 sd/source/ui/toolpanel/ToolPanelChildWindow.src (limited to 'sd') diff --git a/sd/source/ui/app/menuids2_tmpl.src b/sd/source/ui/app/menuids2_tmpl.src index 8d1d2686a120..d2583f9793be 100644 --- a/sd/source/ui/app/menuids2_tmpl.src +++ b/sd/source/ui/app/menuids2_tmpl.src @@ -986,40 +986,5 @@ Text [ en-US ] = "Pre~view Mode" ; \ }; -#define MN_MULTI_PANE_GUI \ - MenuItem\ - {\ - Identifier = SID_MULTI_PANE_GUI ; \ - HelpID = SID_MULTI_PANE_GUI ; \ - Text = "Multi Pane GUI" ; \ - SubMenu = Menu \ - {\ - ItemList =\ - {\ - MenuItem\ - {\ - Identifier = SID_TOOLPANEL ; \ - HelpID = SID_TOOLPANEL ; \ - Check = TRUE ; \ - Text = "Tool Panel" ; \ - };\ - MenuItem\ - {\ - Identifier = SID_SLIDE_BROWSER ; \ - HelpID = SID_SLIDE_BROWSER ; \ - Check = TRUE ; \ - Text = "Slide Browser" ; \ - };\ - MenuItem\ - {\ - Identifier = SID_NOTES_WINDOW ; \ - HelpID = SID_NOTES_WINDOW ; \ - Check = TRUE ; \ - Text = "Notes Window" ; \ - };\ - };\ - };\ - }; - #endif // _MENUIDS2_SRC 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 diff --git a/sd/source/ui/toolpanel/ToolPanelChildWindow.cxx b/sd/source/ui/toolpanel/ToolPanelChildWindow.cxx deleted file mode 100644 index c983dee4da28..000000000000 --- a/sd/source/ui/toolpanel/ToolPanelChildWindow.cxx +++ /dev/null @@ -1,71 +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.cxx,v $ - * $Revision: 1.5 $ - * - * 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. - * - ************************************************************************/ - -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_sd.hxx" - -#include "ToolPanelChildWindow.hxx" -#include "ToolPanelDockingWindow.hxx" - -#include "sdresid.hxx" -#include "app.hrc" -#include "sfx2/app.hxx" - - -namespace sd { namespace toolpanel { - - - -ToolPanelChildWindow::ToolPanelChildWindow ( - ::Window* pParentWindow, - USHORT nId, - SfxBindings* pBindings, - SfxChildWinInfo* pInfo) - : SfxChildWindow (pParentWindow, nId) -{ - pWindow = new ToolPanelDockingWindow (pBindings, this, pParentWindow); - eChildAlignment = SFX_ALIGN_RIGHT; - static_cast(pWindow)->Initialize (pInfo); - // SetHideNotDelete (TRUE); -}; - - - - -ToolPanelChildWindow::~ToolPanelChildWindow() -{} - - -SFX_IMPL_DOCKINGWINDOW(ToolPanelChildWindow, SID_TOOLPANEL) - - - - -} } // end of namespace ::sd::toolpanel diff --git a/sd/source/ui/toolpanel/ToolPanelChildWindow.src b/sd/source/ui/toolpanel/ToolPanelChildWindow.src deleted file mode 100644 index 4d30b6a368ff..000000000000 --- a/sd/source/ui/toolpanel/ToolPanelChildWindow.src +++ /dev/null @@ -1,55 +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.src,v $ - * $Revision: 1.5 $ - * - * 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. - * - ************************************************************************/ - -#include "app.hrc" -#include "ToolPanelChildWindow.hrc" - -DockingWindow FLT_WIN_TOOLPANEL -{ - HelpID = SID_TOOLPANEL ; - Border = TRUE ; - Hide = FALSE ; - SVLook = TRUE ; - Sizeable = TRUE ; - Moveable = TRUE ; - Closeable = TRUE ; - Zoomable = TRUE ; - Dockable = TRUE ; - EnableResizing = TRUE ; - Size = MAP_APPFONT ( 140 , 120 ) ; - Text = "Tool Panel" ; - - Control TOOLPANEL - { - Pos = MAP_APPFONT ( 0 , 0 ) ; - Size = MAP_APPFONT ( 69, 150 ) ; - Border = FALSE; - }; -}; -- cgit From d045a9760d4dbd6eb2ae8f45c3e40bed4806bd3e Mon Sep 17 00:00:00 2001 From: "Frank Schoenheit [fs]" Date: Fri, 12 Mar 2010 11:07:18 +0100 Subject: slidecopy: oops, missed those occurrences of ToolPanelChildWindow (which is dead by now) in the previous commit --- sd/source/ui/toolpanel/TaskPaneViewShell.cxx | 2 -- 1 file changed, 2 deletions(-) (limited to 'sd') diff --git a/sd/source/ui/toolpanel/TaskPaneViewShell.cxx b/sd/source/ui/toolpanel/TaskPaneViewShell.cxx index 2d1475ca980c..7580d4104766 100644 --- a/sd/source/ui/toolpanel/TaskPaneViewShell.cxx +++ b/sd/source/ui/toolpanel/TaskPaneViewShell.cxx @@ -34,8 +34,6 @@ #include "TaskPaneViewShell.hxx" #include "TaskPaneShellManager.hxx" -#include "ToolPanelChildWindow.hrc" -#include "ToolPanelChildWindow.hxx" #include "taskpane/SlideSorterCacheDisplay.hxx" #include "taskpane/ToolPanel.hxx" #include "taskpane/TitledControl.hxx" -- cgit From e3642c3f42dcbbcb64c47cfa4ae3ce9182f911a3 Mon Sep 17 00:00:00 2001 From: Christian Lippka Date: Tue, 2 Feb 2010 16:46:05 +0100 Subject: work on setautolayout --- sd/inc/sdpage.hxx | 2 +- sd/source/core/sdpage.cxx | 34 ++++++++++++++++++++++++++++------ sd/source/ui/view/sdview4.cxx | 6 +++--- 3 files changed, 32 insertions(+), 10 deletions(-) (limited to 'sd') diff --git a/sd/inc/sdpage.hxx b/sd/inc/sdpage.hxx index 698684dcc765..34010fc6198b 100644 --- a/sd/inc/sdpage.hxx +++ b/sd/inc/sdpage.hxx @@ -199,7 +199,7 @@ public: SdrObject* CreatePresObj(PresObjKind eObjKind, BOOL bVertical, const Rectangle& rRect, BOOL bInsert=FALSE); SdrObject* CreateDefaultPresObj(PresObjKind eObjKind, bool bInsert); - SdrObject* GetPresObj(PresObjKind eObjKind, int nIndex = 1 ); + SdrObject* GetPresObj(PresObjKind eObjKind, int nIndex = 1, bool bFuzzySearch = false ); PresObjKind GetPresObjKind(SdrObject* pObj) const; String GetPresObjText(PresObjKind eObjKind) const; SfxStyleSheet* GetStyleSheetForPresObj(PresObjKind eObjKind) const; diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx index 762e8ad2f649..b0afb816dcc3 100644 --- a/sd/source/core/sdpage.cxx +++ b/sd/source/core/sdpage.cxx @@ -162,18 +162,40 @@ SdPage::~SdPage() } /** returns the nIndex'th object from the given PresObjKind, index starts with 1 */ -SdrObject* SdPage::GetPresObj(PresObjKind eObjKind, int nIndex ) +SdrObject* SdPage::GetPresObj(PresObjKind eObjKind, int nIndex, bool bFuzzySearch /* = false */ ) { int nObjFound = 0; // index of the searched object SdrObject* pObj = 0; while( (pObj = maPresentationShapeList.getNextShape(pObj)) != 0 ) { SdAnimationInfo* pInfo = SdDrawDocument::GetShapeUserData(*pObj); - if( pInfo && (pInfo->mePresObjKind == eObjKind) ) + if( pInfo ) { - nObjFound++; // found one - if( nObjFound == nIndex ) - return pObj; + bool bFound = false; + if( pInfo->mePresObjKind == eObjKind ) + { + bFound = true; + } + else if( bFuzzySearch && (eObjKind == PRESOBJ_OUTLINE) ) + { + switch( pInfo->mePresObjKind ) + { + case PRESOBJ_GRAPHIC: + case PRESOBJ_OBJECT: + case PRESOBJ_CHART: + case PRESOBJ_ORGCHART: + case PRESOBJ_TABLE: + case PRESOBJ_IMAGE: + bFound = TRUE; + break; + } + } + if( bFound ) + { + nObjFound++; // found one + if( nObjFound == nIndex ) + return pObj; + } } } @@ -1357,7 +1379,7 @@ void findAutoLayoutShapesImpl( SdPage& rPage, const LayoutDescriptor& rDescripto for( i = 0; (i < PRESOBJ_MAX) && (rDescriptor.meKind[i] != PRESOBJ_NONE); i++ ) { PresObjKind eKind = rDescriptor.meKind[i]; - SdrObject* pObj = rPage.GetPresObj( eKind, PresObjIndex[eKind] ); + SdrObject* pObj = rPage.GetPresObj( eKind, PresObjIndex[eKind], true ); if( pObj ) { PresObjIndex[eKind]++; // on next search for eKind, find next shape with same eKind diff --git a/sd/source/ui/view/sdview4.cxx b/sd/source/ui/view/sdview4.cxx index e75f1e981ea9..06db26cc317e 100644 --- a/sd/source/ui/view/sdview4.cxx +++ b/sd/source/ui/view/sdview4.cxx @@ -123,6 +123,8 @@ SdrGrafObj* View::InsertGraphic( const Graphic& rGraphic, sal_Int8& rAction, const bool bIsGraphic = pPickObj->ISA( SdrGrafObj ); if( bIsGraphic || pObj->IsEmptyPresObj() ) { + SdPage* pPage = (SdPage*) pPickObj->GetPage(); + if( bIsGraphic ) { // Das Objekt wird mit der Bitmap gefuellt @@ -147,9 +149,7 @@ SdrGrafObj* View::InsertGraphic( const Graphic& rGraphic, sal_Int8& rAction, if( bUndo ) BegUndo(String(SdResId(STR_UNDO_DRAGDROP))); - SdPage* pPage = (SdPage*) pPickObj->GetPage(); - - if (pPage && pPage->GetPresObjKind(pPickObj) == PRESOBJ_GRAPHIC) + if (pPage && pPage->IsPresObj(pPickObj)) { // Neues PresObj in die Liste eintragen pNewGrafObj->SetUserCall(pPickObj->GetUserCall()); -- cgit From 9cdf1ed1847514b6d215c61ea3e16d5090341896 Mon Sep 17 00:00:00 2001 From: Christian Lippka Date: Mon, 8 Feb 2010 13:05:08 +0100 Subject: fixed build errors on unix systems --- sd/source/core/sdpage.cxx | 2 ++ sd/source/ui/app/layoutctrl.cxx | 2 +- sd/source/ui/view/makefile.mk | 2 +- sd/source/ui/view/sdview5.cxx | 2 +- sd/source/ui/view/viewoverlaymanager.cxx | 12 ++++++------ 5 files changed, 11 insertions(+), 9 deletions(-) (limited to 'sd') diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx index bab348244c55..d4ccd0b85db0 100644 --- a/sd/source/core/sdpage.cxx +++ b/sd/source/core/sdpage.cxx @@ -188,6 +188,8 @@ SdrObject* SdPage::GetPresObj(PresObjKind eObjKind, int nIndex, bool bFuzzySearc case PRESOBJ_IMAGE: bFound = TRUE; break; + default: + break; } } if( bFound ) diff --git a/sd/source/ui/app/layoutctrl.cxx b/sd/source/ui/app/layoutctrl.cxx index 236f32c46b71..d2ca5f09d46e 100644 --- a/sd/source/ui/app/layoutctrl.cxx +++ b/sd/source/ui/app/layoutctrl.cxx @@ -115,7 +115,7 @@ SfxPopupWindow* SdLayoutControl::CreatePopupWindow() sd::ViewShellBase* pViewShellBase = sd::ViewShellBase::GetViewShellBase( SfxViewFrame::Current() ); if( pViewShellBase ) { - pWin = pWin = new sd::SdLayoutDialogContent( *pViewShellBase, &rTbx, GetSlotId() == SID_INSERTPAGE ); + pWin = new sd::SdLayoutDialogContent( *pViewShellBase, &rTbx, GetSlotId() == SID_INSERTPAGE ); if( pWin ) StartPopupMode( pWin ); } diff --git a/sd/source/ui/view/makefile.mk b/sd/source/ui/view/makefile.mk index 33ee23c5dd7e..b58af7518a16 100644 --- a/sd/source/ui/view/makefile.mk +++ b/sd/source/ui/view/makefile.mk @@ -119,7 +119,7 @@ SLOFILES = \ $(SLO)$/ViewShellHint.obj \ $(SLO)$/ViewTabBar.obj \ $(SLO)$/WindowUpdater.obj \ - $(SLO)$/ViewOverlayManager.obj + $(SLO)$/viewoverlaymanager.obj # --- Tagets ------------------------------------------------------- diff --git a/sd/source/ui/view/sdview5.cxx b/sd/source/ui/view/sdview5.cxx index a459011b5f10..c86b8f191b9c 100644 --- a/sd/source/ui/view/sdview5.cxx +++ b/sd/source/ui/view/sdview5.cxx @@ -113,4 +113,4 @@ SdrObject* View::GetEmptyPresentationObject( PresObjKind eKind ) return pEmptyObj; } -} \ No newline at end of file +} diff --git a/sd/source/ui/view/viewoverlaymanager.cxx b/sd/source/ui/view/viewoverlaymanager.cxx index 74515a7cfc64..172594adc2e8 100644 --- a/sd/source/ui/view/viewoverlaymanager.cxx +++ b/sd/source/ui/view/viewoverlaymanager.cxx @@ -83,7 +83,7 @@ Image ViewOverlayManager::maLargeButtonImages[ViewOverlayManager::ButtonCount]; static USHORT gButtonSlots[ViewOverlayManager::ButtonCount] = { SID_INSERT_TABLE, SID_INSERT_DIAGRAM, SID_INSERT_GRAPHIC, SID_INSERT_AVMEDIA }; static USHORT gButtonResId[ViewOverlayManager::ButtonCount] = { BMP_PLACEHOLDER_TABLE_57X71, BMP_PLACEHOLDER_CHART_57X71, BMP_PLACEHOLDER_IMAGE_57X71, BMP_PLACEHOLDER_MOVIE_57X71 }; -static USHORT gButtonResIdHc[ViewOverlayManager::ButtonCount] = { BMP_PLACEHOLDER_TABLE_57X71_H, BMP_PLACEHOLDER_CHART_57X71_H, BMP_PLACEHOLDER_IMAGE_57X71_H, BMP_PLACEHOLDER_MOVIE_57X71_H }; +//static USHORT gButtonResIdHc[ViewOverlayManager::ButtonCount] = { BMP_PLACEHOLDER_TABLE_57X71_H, BMP_PLACEHOLDER_CHART_57X71_H, BMP_PLACEHOLDER_IMAGE_57X71_H, BMP_PLACEHOLDER_MOVIE_57X71_H }; // -------------------------------------------------------------------- @@ -193,12 +193,12 @@ void ImageButtonHdl::CreateB2dIAObject() // first throw away old one GetRidOfIAObject(); - const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings(); +// const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings(); const Point aTagPos( GetPos() ); basegfx::B2DPoint aPosition( aTagPos.X(), aTagPos.Y() ); - const bool bFocused = IsFocusHdl() && pHdlList && (pHdlList->GetFocusHdl() == this); +// const bool bFocused = IsFocusHdl() && pHdlList && (pHdlList->GetFocusHdl() == this); BitmapEx aBitmapEx( maImage.GetBitmapEx() ); @@ -273,7 +273,7 @@ ChangePlaceholderTag::~ChangePlaceholderTag() // -------------------------------------------------------------------- /** returns true if the ChangePlaceholderTag handled the event. */ -bool ChangePlaceholderTag::MouseButtonDown( const MouseEvent& rMEvt, SmartHdl& rHdl ) +bool ChangePlaceholderTag::MouseButtonDown( const MouseEvent& /*rMEvt*/, SmartHdl& rHdl ) { USHORT nSID = static_cast< ImageButtonHdl& >(rHdl).getSlotId(); @@ -420,14 +420,14 @@ void ChangePlaceholderTag::deselect() } // -------------------------------------------------------------------- - +/* static Image lcl_getslotimage( ::com::sun::star::uno::Reference& xFrame, USHORT nSID, BOOL b1, BOOL b2 ) { rtl::OUString aSlotURL( RTL_CONSTASCII_USTRINGPARAM( "slot:" )); aSlotURL += rtl::OUString::valueOf( sal_Int32( nSID )); return ::GetImage( xFrame, aSlotURL, b1, b2 ); } - +*/ ViewOverlayManager::ViewOverlayManager( ViewShellBase& rViewShellBase ) : mrBase( rViewShellBase ) , mnUpdateTagsEvent( 0 ) -- cgit From 01bde4a686a34a3b70cc45bb6ee5332c2034aab3 Mon Sep 17 00:00:00 2001 From: Christian Lippka Date: Mon, 8 Feb 2010 18:01:46 +0100 Subject: fixed replacing of presentation images --- sd/source/core/sdpage.cxx | 6 +++--- sd/source/ui/view/drawview.cxx | 49 +++++++++++++++++++++++++++++++----------- 2 files changed, 39 insertions(+), 16 deletions(-) (limited to 'sd') diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx index d4ccd0b85db0..f7158b2bff9e 100644 --- a/sd/source/core/sdpage.cxx +++ b/sd/source/core/sdpage.cxx @@ -2081,7 +2081,7 @@ SdrObject* convertPresentationObjectImpl( SdPage& rPage, SdrObject* pSourceObj, const bool bUndo = pUndoManager && pUndoManager->isInListAction() && rPage.IsInserted(); SdrObject* pNewObj = pSourceObj; - if((eObjKind == PRESOBJ_OUTLINE) && (pSourceObj->GetObjIdentifier() != OBJ_OUTLINETEXT) ) + if((eObjKind == PRESOBJ_OUTLINE) && (pSourceObj->GetObjIdentifier() == OBJ_TEXT) ) { pNewObj = rPage.CreatePresObj(PRESOBJ_OUTLINE, bVertical, aRect); @@ -2140,7 +2140,7 @@ SdrObject* convertPresentationObjectImpl( SdPage& rPage, SdrObject* pSourceObj, SdrObject::Free( pSourceObj ); } } - else if((eObjKind == PRESOBJ_TEXT) && (pSourceObj->GetObjIdentifier() != OBJ_TEXT) ) + else if((eObjKind == PRESOBJ_TEXT) && (pSourceObj->GetObjIdentifier() == OBJ_OUTLINETEXT) ) { // is there an outline shape we can use to replace empty subtitle shape? pNewObj = rPage.CreatePresObj(PRESOBJ_TEXT, bVertical, aRect); @@ -2310,7 +2310,7 @@ SdrObject* SdPage::InsertAutoLayoutShape( SdrObject* pObj, PresObjKind eObjKind, } } - if( pObj ) + if ( pObj && ( pObj->IsEmptyPresObj() || !pObj->ISA(SdrGrafObj) ) ) pObj->SetLogicRect(aRect); return pObj; diff --git a/sd/source/ui/view/drawview.cxx b/sd/source/ui/view/drawview.cxx index dfbd76e4a3b6..c96417d04640 100644 --- a/sd/source/ui/view/drawview.cxx +++ b/sd/source/ui/view/drawview.cxx @@ -605,29 +605,52 @@ void DrawView::DeleteMarked() } SdPage* pPage = 0; + bool bResetLayout = false; - const SdrMarkList& rList = GetMarkedObjectList(); - ULONG nMarkCount = rList.GetMarkCount(); - for (ULONG nMark = 0; nMark < nMarkCount; nMark++) + const ULONG nMarkCount = GetMarkedObjectList().GetMarkCount(); + if( nMarkCount ) { - SdrObject* pObj = rList.GetMark(nMark)->GetMarkedSdrObj(); - if( pObj && !pObj->IsEmptyPresObj() && pObj->GetUserCall() ) + SdrMarkList aList( GetMarkedObjectList() ); + for (ULONG nMark = 0; nMark < nMarkCount; nMark++) { - pPage = dynamic_cast< SdPage* >( pObj->GetPage() ); - PresObjKind ePresObjKind; - if( pPage && ((ePresObjKind = pPage->GetPresObjKind(pObj)) != PRESOBJ_NONE)) + SdrObject* pObj = aList.GetMark(nMark)->GetMarkedSdrObj(); + if( pObj && !pObj->IsEmptyPresObj() && pObj->GetUserCall() ) { - SdrTextObj* pTextObj = dynamic_cast< SdrTextObj* >( pObj ); - bool bVertical = pTextObj && pTextObj->IsVerticalWriting(); - Rectangle aRect( pObj->GetLogicRect() ); - pPage->InsertAutoLayoutShape( 0, ePresObjKind, bVertical, aRect, true ); + pPage = static_cast< SdPage* >( pObj->GetPage() ); + PresObjKind ePresObjKind; + if( pPage && ((ePresObjKind = pPage->GetPresObjKind(pObj)) != PRESOBJ_NONE)) + { + switch( ePresObjKind ) + { + case PRESOBJ_GRAPHIC: + case PRESOBJ_OBJECT: + case PRESOBJ_CHART: + case PRESOBJ_ORGCHART: + case PRESOBJ_TABLE: + case PRESOBJ_IMAGE: + ePresObjKind = PRESOBJ_OUTLINE; + break; + default: + break; + } + SdrTextObj* pTextObj = dynamic_cast< SdrTextObj* >( pObj ); + bool bVertical = pTextObj && pTextObj->IsVerticalWriting(); + Rectangle aRect( pObj->GetLogicRect() ); + SdrObject* pNewObj = pPage->InsertAutoLayoutShape( 0, ePresObjKind, bVertical, aRect, true ); + + pPage->SetObjectOrdNum( pNewObj->GetOrdNum(), pObj->GetOrdNum() ); + + pPage->ReplacePresObj( pObj, pNewObj, ePresObjKind ); + + bResetLayout = true; + } } } } ::sd::View::DeleteMarked(); - if( pPage ) + if( pPage &&& bResetLayout ) pPage->SetAutoLayout( pPage->GetAutoLayout() ); if( pUndoManager ) -- cgit From 65bbc166f98e9c3949addc17d9cb17fdff8a6a7d Mon Sep 17 00:00:00 2001 From: Christian Lippka Date: Tue, 9 Feb 2010 18:14:49 +0100 Subject: fixing tables&diagram as placeholders --- sd/source/core/sdpage.cxx | 47 ++++++++++--- sd/source/ui/func/fuinsert.cxx | 126 ++++++++++++++++++++++++++--------- sd/source/ui/table/tablefunction.cxx | 68 ++++++++++++++++--- sd/source/ui/view/sdview4.cxx | 11 +-- 4 files changed, 197 insertions(+), 55 deletions(-) (limited to 'sd') diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx index f7158b2bff9e..1983205d1fe9 100644 --- a/sd/source/core/sdpage.cxx +++ b/sd/source/core/sdpage.cxx @@ -1371,16 +1371,20 @@ void findAutoLayoutShapesImpl( SdPage& rPage, const LayoutDescriptor& rDescripto for( i = 0; (i < PRESOBJ_MAX) && (rDescriptor.meKind[i] != PRESOBJ_NONE); i++ ) { PresObjKind eKind = rDescriptor.meKind[i]; - SdrObject* pObj = rPage.GetPresObj( eKind, PresObjIndex[eKind], true ); - if( pObj ) + SdrObject* pObj = 0; + while( (pObj = rPage.GetPresObj( eKind, PresObjIndex[eKind], true )) != 0 ) { PresObjIndex[eKind]++; // on next search for eKind, find next shape with same eKind - rShapes[i] = pObj; + + if( !pObj->IsEmptyPresObj() ) + { + rShapes[i] = pObj; + break; + } } - else - { + + if( !pObj ) bMissing = true; - } } if( bMissing && bInit ) @@ -1421,7 +1425,9 @@ void findAutoLayoutShapesImpl( SdPage& rPage, const LayoutDescriptor& rDescripto bFound = eSdrObjKind == OBJ_TITLETEXT; break; case PRESOBJ_OUTLINE: - bFound = (eSdrObjKind == OBJ_OUTLINETEXT) || ((eSdrObjKind == OBJ_TEXT) || (eSdrObjKind == OBJ_GRAF) || (eSdrObjKind == OBJ_OLE2) || (eSdrObjKind == OBJ_MEDIA) && bPresStyle); + bFound = (eSdrObjKind == OBJ_OUTLINETEXT) || + ((eSdrObjKind == OBJ_TEXT) && bPresStyle) || + (eSdrObjKind == OBJ_TABLE) || (eSdrObjKind == OBJ_MEDIA) || (eSdrObjKind == OBJ_GRAF) || (eSdrObjKind == OBJ_OLE2); break; case PRESOBJ_GRAPHIC: bFound = eSdrObjKind == OBJ_GRAF; @@ -1481,6 +1487,10 @@ void findAutoLayoutShapesImpl( SdPage& rPage, const LayoutDescriptor& rDescripto } break; } + else if( eSdrObjKind == OBJ_TABLE ) + { + bFound = true; + } break; case PRESOBJ_PAGE: case PRESOBJ_HANDOUT: @@ -2189,6 +2199,23 @@ SdrObject* convertPresentationObjectImpl( SdPage& rPage, SdrObject* pSourceObj, return pNewObj; } +static void SetLogicRect( SdrObject* pObj, Rectangle& rLogicRect ) +{ + if( pObj ) + { + if( (pObj->GetObjInventor() == SdrInventor) && (pObj->GetObjIdentifier() == OBJ_TABLE) ) + { + Rectangle aRect( rLogicRect ); + aRect.setHeight( pObj->GetLogicRect().getHeight() ); + pObj->SetLogicRect( aRect ); + } + else + { + pObj->SetLogicRect( rLogicRect ); + } + } +} + /** reuses or creates a presentation shape for an auto layout that fits the given parameter @param eObjKind @@ -2230,7 +2257,7 @@ SdrObject* SdPage::InsertAutoLayoutShape( SdrObject* pObj, PresObjKind eObjKind, if ( pObj->ISA(SdrGrafObj) && !pObj->IsEmptyPresObj() ) ( (SdrGrafObj*) pObj)->AdjustToMaxRect( aRect, FALSE ); else - pObj->SetLogicRect(aRect); + SetLogicRect( pObj, aRect ); pObj->SetUserCall(this); @@ -2247,7 +2274,7 @@ SdrObject* SdPage::InsertAutoLayoutShape( SdrObject* pObj, PresObjKind eObjKind, pTextObject->SetMergedItem(SdrTextHorzAdjustItem( bVertical ? SDRTEXTHORZADJUST_RIGHT : SDRTEXTHORZADJUST_BLOCK )); } - if( !mbMaster ) + if( !mbMaster && (pTextObject->GetObjIdentifier() != OBJ_TABLE) ) { if ( pTextObject->IsAutoGrowHeight() ) { @@ -2311,7 +2338,7 @@ SdrObject* SdPage::InsertAutoLayoutShape( SdrObject* pObj, PresObjKind eObjKind, } if ( pObj && ( pObj->IsEmptyPresObj() || !pObj->ISA(SdrGrafObj) ) ) - pObj->SetLogicRect(aRect); + SetLogicRect( pObj, aRect ); return pObj; } diff --git a/sd/source/ui/func/fuinsert.cxx b/sd/source/ui/func/fuinsert.cxx index b6f368d09052..daae9f37b49f 100644 --- a/sd/source/ui/func/fuinsert.cxx +++ b/sd/source/ui/func/fuinsert.cxx @@ -97,6 +97,7 @@ #include "sdgrffilter.hxx" #include "sdxfer.hxx" #include +#include "undo/undoobjects.hxx" using namespace com::sun::star; @@ -284,6 +285,10 @@ void FuInsertOLE::DoExecute( SfxRequest& rReq ) nSlotId == SID_INSERT_DIAGRAM || nSlotId == SID_INSERT_MATH ) { + PresObjKind ePresObjKind = (nSlotId == SID_INSERT_DIAGRAM) ? PRESOBJ_CHART : PRESOBJ_OBJECT; + + SdrObject* pPickObj = mpView->GetEmptyPresentationObject( ePresObjKind ); + /********************************************************************** * Diagramm oder StarCalc-Tabelle einfuegen **********************************************************************/ @@ -302,42 +307,90 @@ void FuInsertOLE::DoExecute( SfxRequest& rReq ) if ( xObj.is() ) { sal_Int64 nAspect = embed::Aspects::MSOLE_CONTENT; - awt::Size aSz; - try + + MapUnit aUnit = VCLUnoHelper::UnoEmbed2VCLMapUnit( xObj->getMapUnit( nAspect ) ); + + Rectangle aRect; + if( pPickObj ) { - aSz = xObj->getVisualAreaSize( nAspect ); + aRect = pPickObj->GetLogicRect(); + + awt::Size aSz; + aSz.Width = aRect.GetWidth(); + aSz.Height = aRect.GetHeight(); + xObj->setVisualAreaSize( nAspect, aSz ); } - catch ( embed::NoVisualAreaSizeException& ) + else { - // the default size will be set later + awt::Size aSz; + try + { + aSz = xObj->getVisualAreaSize( nAspect ); + } + catch ( embed::NoVisualAreaSizeException& ) + { + // the default size will be set later + } + + Size aSize( aSz.Width, aSz.Height ); + + if (aSize.Height() == 0 || aSize.Width() == 0) + { + // Rechteck mit ausgewogenem Kantenverhaeltnis + aSize.Width() = 14100; + aSize.Height() = 10000; + Size aTmp = OutputDevice::LogicToLogic( aSize, MAP_100TH_MM, aUnit ); + aSz.Width = aTmp.Width(); + aSz.Height = aTmp.Height(); + xObj->setVisualAreaSize( nAspect, aSz ); + } + else + { + aSize = OutputDevice::LogicToLogic(aSize, aUnit, MAP_100TH_MM); + } + + Point aPos; + Rectangle aWinRect(aPos, mpWindow->GetOutputSizePixel() ); + aPos = aWinRect.Center(); + aPos = mpWindow->PixelToLogic(aPos); + aPos.X() -= aSize.Width() / 2; + aPos.Y() -= aSize.Height() / 2; + aRect = Rectangle(aPos, aSize); } - Size aSize( aSz.Width, aSz.Height ); + SdrOle2Obj* pOleObj = new SdrOle2Obj( svt::EmbeddedObjectRef( xObj, nAspect ), aObjName, aRect ); + SdrPageView* pPV = mpView->GetSdrPageView(); - MapUnit aUnit = VCLUnoHelper::UnoEmbed2VCLMapUnit( xObj->getMapUnit( nAspect ) ); - if (aSize.Height() == 0 || aSize.Width() == 0) + bool bUndo = false; + // if we have a pick obj we need to make this new ole a pres obj replacing the current pick obj + if( pPickObj ) { - // Rechteck mit ausgewogenem Kantenverhaeltnis - aSize.Width() = 14100; - aSize.Height() = 10000; - Size aTmp = OutputDevice::LogicToLogic( aSize, MAP_100TH_MM, aUnit ); - aSz.Width = aTmp.Width(); - aSz.Height = aTmp.Height(); - xObj->setVisualAreaSize( nAspect, aSz ); + SdPage* pPage = static_cast< SdPage* >(pPickObj->GetPage()); + if(pPage && pPage->IsPresObj(pPickObj)) + { + bUndo = mpView->IsUndoEnabled(); + + if( bUndo ) + mpView->BegUndo( SdrUndoNewObj::GetComment(*pOleObj) ); + + // add new PresObj to the list + pOleObj->SetUserCall(pPickObj->GetUserCall()); + if( bUndo ) + { + mpView->AddUndo( new sd::UndoObjectPresentationKind( *pPickObj ) ); + mpView->AddUndo( new sd::UndoObjectPresentationKind( *pOleObj ) ); + } + pPage->ReplacePresObj(pPickObj, pOleObj, ePresObjKind); + } } + + bool bRet = true; + if( pPickObj ) + mpView->ReplaceObjectAtView(pPickObj, *pPV, pOleObj, TRUE ); else - aSize = OutputDevice::LogicToLogic(aSize, aUnit, MAP_100TH_MM); - - Point aPos; - Rectangle aWinRect(aPos, mpWindow->GetOutputSizePixel() ); - aPos = aWinRect.Center(); - aPos = mpWindow->PixelToLogic(aPos); - aPos.X() -= aSize.Width() / 2; - aPos.Y() -= aSize.Height() / 2; - Rectangle aRect (aPos, aSize); - SdrOle2Obj* pOleObj = new SdrOle2Obj( svt::EmbeddedObjectRef( xObj, nAspect ), aObjName, aRect ); - SdrPageView* pPV = mpView->GetSdrPageView(); - if( mpView->InsertObjectAtView(pOleObj, *pPV, SDRINSERT_SETDEFLAYER) ) + bRet = mpView->InsertObjectAtView(pOleObj, *pPV, SDRINSERT_SETDEFLAYER); + + if( bRet ) { if (nSlotId == SID_INSERT_DIAGRAM) { @@ -354,10 +407,11 @@ void FuInsertOLE::DoExecute( SfxRequest& rReq ) //HMHmpView->HideMarkHdl(); pOleObj->SetLogicRect(aRect); - Size aTmp = OutputDevice::LogicToLogic( aRect.GetSize(), MAP_100TH_MM, aUnit ); - aSz.Width = aTmp.Width(); - aSz.Height = aTmp.Height(); - xObj->setVisualAreaSize( nAspect, aSz ); + Size aTmp( OutputDevice::LogicToLogic( aRect.GetSize(), MAP_100TH_MM, aUnit ) ); + awt::Size aVisualSize; + aVisualSize.Width = aTmp.Width(); + aVisualSize.Height = aTmp.Height(); + xObj->setVisualAreaSize( nAspect, aVisualSize ); mpViewShell->ActivateObject(pOleObj, SVVERB_SHOW); if (nSlotId == SID_INSERT_DIAGRAM) @@ -368,6 +422,16 @@ void FuInsertOLE::DoExecute( SfxRequest& rReq ) mpViewShell->AdaptDefaultsForChart( xObj ); } } + + if( bUndo ) + { + mpView->EndUndo(); + } + else if( pPickObj ) + { + // replaced object must be freed if there is no undo action owning it + SdrObject::Free( pPickObj ); + } } else { diff --git a/sd/source/ui/table/tablefunction.cxx b/sd/source/ui/table/tablefunction.cxx index 1d1d38df82bf..dc5f999ff601 100644 --- a/sd/source/ui/table/tablefunction.cxx +++ b/sd/source/ui/table/tablefunction.cxx @@ -73,6 +73,7 @@ #include "Window.hxx" #include "drawview.hxx" #include "sdresid.hxx" +#include "undo/undoobjects.hxx" using ::rtl::OUString; using namespace ::sd; @@ -150,21 +151,70 @@ void DrawViewShell::FuTable(SfxRequest& rReq) nRows = pDlg->getRows(); } - Size aSize( 14100, 200 ); + Rectangle aRect; - Point aPos; - Rectangle aWinRect(aPos, GetActiveWindow()->GetOutputSizePixel() ); - aPos = aWinRect.Center(); - aPos = GetActiveWindow()->PixelToLogic(aPos); - aPos.X() -= aSize.Width() / 2; - aPos.Y() -= aSize.Height() / 2; - Rectangle aRect (aPos, aSize); + SdrObject* pPickObj = mpView->GetEmptyPresentationObject( PRESOBJ_TABLE ); + if( pPickObj ) + { + aRect = pPickObj->GetLogicRect(); + aRect.setHeight( 200 ); + } + else + { + Size aSize( 14100, 200 ); + + Point aPos; + Rectangle aWinRect(aPos, GetActiveWindow()->GetOutputSizePixel() ); + aPos = aWinRect.Center(); + aPos = GetActiveWindow()->PixelToLogic(aPos); + aPos.X() -= aSize.Width() / 2; + aPos.Y() -= aSize.Height() / 2; + aRect = Rectangle(aPos, aSize); + } ::sdr::table::SdrTableObj* pObj = new ::sdr::table::SdrTableObj( GetDoc(), aRect, nColumns, nRows ); pObj->NbcSetStyleSheet( GetDoc()->GetDefaultStyleSheet(), sal_True ); apply_table_style( pObj, GetDoc(), sTableStyle ); SdrPageView* pPV = mpView->GetSdrPageView(); - mpView->InsertObjectAtView(pObj, *pPV, SDRINSERT_SETDEFLAYER); + + bool bUndo = false; + // if we have a pick obj we need to make this new ole a pres obj replacing the current pick obj + if( pPickObj ) + { + SdPage* pPage = static_cast< SdPage* >(pPickObj->GetPage()); + if(pPage && pPage->IsPresObj(pPickObj)) + { + bUndo = mpView->IsUndoEnabled(); + + if( bUndo ) + mpView->BegUndo( SdrUndoNewObj::GetComment(*pObj) ); + + // add new PresObj to the list + pObj->SetUserCall(pPickObj->GetUserCall()); + if( bUndo ) + { + mpView->AddUndo( new sd::UndoObjectPresentationKind( *pPickObj ) ); + mpView->AddUndo( new sd::UndoObjectPresentationKind( *pObj ) ); + } + pPage->ReplacePresObj(pPickObj, pObj, PRESOBJ_TABLE); + } + } + + if( pPickObj ) + mpView->ReplaceObjectAtView(pPickObj, *pPV, pObj, TRUE ); + else + mpView->InsertObjectAtView(pObj, *pPV, SDRINSERT_SETDEFLAYER); + + if( bUndo ) + { + mpView->EndUndo(); + } + else if( pPickObj ) + { + // replaced object must be freed if there is no undo action owning it + SdrObject::Free( pPickObj ); + } + Invalidate(SID_DRAWTBX_INSERT); rReq.Ignore(); break; diff --git a/sd/source/ui/view/sdview4.cxx b/sd/source/ui/view/sdview4.cxx index 06db26cc317e..25d1b22dc633 100644 --- a/sd/source/ui/view/sdview4.cxx +++ b/sd/source/ui/view/sdview4.cxx @@ -159,11 +159,6 @@ SdrGrafObj* View::InsertGraphic( const Graphic& rGraphic, sal_Int8& rAction, AddUndo( new sd::UndoObjectPresentationKind( *pNewGrafObj ) ); } pPage->ReplacePresObj(pPickObj, pNewGrafObj, PRESOBJ_GRAPHIC); - - if( !bUndo ) - { - SdrObject::Free( pPickObj ); - } } if (pImageMap) @@ -172,7 +167,13 @@ SdrGrafObj* View::InsertGraphic( const Graphic& rGraphic, sal_Int8& rAction, ReplaceObjectAtView(pPickObj, *pPV, pNewGrafObj); // maybe ReplaceObjectAtView if( bUndo ) + { EndUndo(); + } + else + { + SdrObject::Free( pPickObj ); + } } else if (pPickObj->IsClosedObj() && !pPickObj->ISA(SdrOle2Obj)) { -- 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/app/res_bmp.src | 192 ++++++++++------------------------ sd/source/ui/dlg/layoutdialog.cxx | 46 ++++---- sd/source/ui/inc/res_bmp.hrc | 76 +++++--------- sd/source/ui/toolpanel/LayoutMenu.cxx | 34 +++--- 4 files changed, 121 insertions(+), 227 deletions(-) (limited to 'sd') diff --git a/sd/source/ui/app/res_bmp.src b/sd/source/ui/app/res_bmp.src index f17bec667bfa..b0adfebdde7e 100644 --- a/sd/source/ui/app/res_bmp.src +++ b/sd/source/ui/app/res_bmp.src @@ -34,197 +34,117 @@ #include "res_bmp.hrc" // preview bitmaps for layouts -Bitmap BMP_LAYOUT_ADDEMPTY_57X71 +Bitmap BMP_LAYOUT_EMPTY { - File = "layout_addempty_57x71.png"; + File = "layout_empty.png"; }; -Bitmap BMP_LAYOUT_ADDEMPTY_57X71_H +Bitmap BMP_LAYOUT_EMPTY_H { - File = "layout_addempty_57x71_h.png"; + File = "layout_empty_h.png"; }; -Bitmap BMP_LAYOUT_ADDHEAD01_57X71 +Bitmap BMP_LAYOUT_HEAD01 { - File = "layout_addhead01_57x71.png"; + File = "layout_head01.png"; }; -Bitmap BMP_LAYOUT_ADDHEAD01_57X71_H +Bitmap BMP_LAYOUT_HEAD01_H { - File = "layout_addhead01_57x71_h.png"; + File = "layout_head01_h.png"; }; -Bitmap BMP_LAYOUT_ADDHEAD02_57X71 +Bitmap BMP_LAYOUT_HEAD02 { - File = "layout_addhead02_57x71.png"; + File = "layout_head02.png"; }; -Bitmap BMP_LAYOUT_ADDHEAD02_57X71_H +Bitmap BMP_LAYOUT_HEAD02_H { - File = "layout_addhead02_57x71_h.png"; + File = "layout_head02_h.png"; }; -Bitmap BMP_LAYOUT_ADDHEAD02A_57X71 +Bitmap BMP_LAYOUT_HEAD02A { - File = "layout_addhead02a_57x71.png"; + File = "layout_head02a.png"; }; -Bitmap BMP_LAYOUT_ADDHEAD02A_57X71_H +Bitmap BMP_LAYOUT_HEAD02A_H { - File = "layout_addhead02a_57x71_h.png"; + File = "layout_head02a_h.png"; }; -Bitmap BMP_LAYOUT_ADDHEAD02B_57X71 +Bitmap BMP_LAYOUT_HEAD02B { - File = "layout_addhead02b_57x71.png"; + File = "layout_head02b.png"; }; -Bitmap BMP_LAYOUT_ADDHEAD02B_57X71_H +Bitmap BMP_LAYOUT_HEAD02B_H { - File = "layout_addhead02b_57x71_h.png"; + File = "layout_head02b_h.png"; }; -Bitmap BMP_LAYOUT_ADDHEAD03_57X71 +Bitmap BMP_LAYOUT_HEAD03 { - File = "layout_addhead03_57x71.png"; + File = "layout_head03.png"; }; -Bitmap BMP_LAYOUT_ADDHEAD03_57X71_H +Bitmap BMP_LAYOUT_HEAD03_H { - File = "layout_addhead03_57x71_h.png"; + File = "layout_head03_h.png"; }; -Bitmap BMP_LAYOUT_ADDHEAD03A_57X71 +Bitmap BMP_LAYOUT_HEAD03A { - File = "layout_addhead03a_57x71.png"; + File = "layout_head03a.png"; }; -Bitmap BMP_LAYOUT_ADDHEAD03A_57X71_H +Bitmap BMP_LAYOUT_HEAD03A_H { - File = "layout_addhead03a_57x71_h.png"; + File = "layout_head03a_h.png"; }; -Bitmap BMP_LAYOUT_ADDHEAD04_57X71 +Bitmap BMP_LAYOUT_HEAD03B { - File = "layout_addhead04_57x71.png"; + File = "layout_head03b.png"; }; -Bitmap BMP_LAYOUT_ADDHEAD04_57X71_H +Bitmap BMP_LAYOUT_HEAD03B_H { - File = "layout_addhead04_57x71_h.png"; + File = "layout_head03b_h.png"; }; -Bitmap BMP_LAYOUT_ADDHEAD06_57X71 +Bitmap BMP_LAYOUT_HEAD03C { - File = "layout_addhead06_57x71.png"; + File = "layout_head03c.png"; }; -Bitmap BMP_LAYOUT_ADDHEAD06_57X71_H +Bitmap BMP_LAYOUT_HEAD03C_H { - File = "layout_addhead06_57x71_h.png"; + File = "layout_head03c_h.png"; }; -Bitmap BMP_LAYOUT_ADDTEXTONLY_57X71 +Bitmap BMP_LAYOUT_HEAD04 { - File = "layout_addtextonly_57x71.png"; + File = "layout_head04.png"; }; -Bitmap BMP_LAYOUT_ADDTEXTONLY_57X71_H +Bitmap BMP_LAYOUT_HEAD04_H { - File = "layout_addtextonly_57x71_h.png"; + File = "layout_head04_h.png"; }; -Bitmap BMP_LAYOUT_ADDVERTICAL01_57X71 +Bitmap BMP_LAYOUT_HEAD06 { - File = "layout_addvertical01_57x71.png"; + File = "layout_head06.png"; }; -Bitmap BMP_LAYOUT_ADDVERTICAL01_57X71_H +Bitmap BMP_LAYOUT_HEAD06_H { - File = "layout_addvertical01_57x71_h.png"; + File = "layout_head06_h.png"; }; -Bitmap BMP_LAYOUT_ADDVERTICAL02_57X71 +Bitmap BMP_LAYOUT_TEXTONLY { - File = "layout_addvertical02_57x71.png"; + File = "layout_textonly.png"; }; -Bitmap BMP_LAYOUT_ADDVERTICAL02_57X71_H +Bitmap BMP_LAYOUT_TEXTONLY_H { - File = "layout_addvertical02_57x71_h.png"; + File = "layout_textonly_h.png"; }; -Bitmap BMP_LAYOUT_EMPTY_57X71 +Bitmap BMP_LAYOUT_VERTICAL01 { - File = "layout_empty_57x71.png"; + File = "layout_vertical01.png"; }; -Bitmap BMP_LAYOUT_EMPTY_57X71_H +Bitmap BMP_LAYOUT_VERTICAL01_H { - File = "layout_empty_57x71_h.png"; + File = "layout_vertical01_h.png"; }; -Bitmap BMP_LAYOUT_HEAD01_57X71 +Bitmap BMP_LAYOUT_VERTICAL02 { - File = "layout_head01_57x71.png"; + File = "layout_vertical02.png"; }; -Bitmap BMP_LAYOUT_HEAD01_57X71_H +Bitmap BMP_LAYOUT_VERTICAL02_H { - File = "layout_head01_57x71_h.png"; -}; -Bitmap BMP_LAYOUT_HEAD02_57X71 -{ - File = "layout_head02_57x71.png"; -}; -Bitmap BMP_LAYOUT_HEAD02_57X71_H -{ - File = "layout_head02_57x71_h.png"; -}; -Bitmap BMP_LAYOUT_HEAD02A_57X71 -{ - File = "layout_head02a_57x71.png"; -}; -Bitmap BMP_LAYOUT_HEAD02A_57X71_H -{ - File = "layout_head02a_57x71_h.png"; -}; -Bitmap BMP_LAYOUT_HEAD02B_57X71 -{ - File = "layout_head02b_57x71.png"; -}; -Bitmap BMP_LAYOUT_HEAD02B_57X71_H -{ - File = "layout_head02b_57x71_h.png"; -}; -Bitmap BMP_LAYOUT_HEAD03_57X71 -{ - File = "layout_head03_57x71.png"; -}; -Bitmap BMP_LAYOUT_HEAD03_57X71_H -{ - File = "layout_head03_57x71_h.png"; -}; -Bitmap BMP_LAYOUT_HEAD03A_57X71 -{ - File = "layout_head03a_57x71.png"; -}; -Bitmap BMP_LAYOUT_HEAD03A_57X71_H -{ - File = "layout_head03a_57x71_h.png"; -}; -Bitmap BMP_LAYOUT_HEAD04_57X71 -{ - File = "layout_head04_57x71.png"; -}; -Bitmap BMP_LAYOUT_HEAD04_57X71_H -{ - File = "layout_head04_57x71_h.png"; -}; -Bitmap BMP_LAYOUT_HEAD06_57X71 -{ - File = "layout_head06_57x71.png"; -}; -Bitmap BMP_LAYOUT_HEAD06_57X71_H -{ - File = "layout_head06_57x71_h.png"; -}; -Bitmap BMP_LAYOUT_TEXTONLY_57X71 -{ - File = "layout_textonly_57x71.png"; -}; -Bitmap BMP_LAYOUT_TEXTONLY_57X71_H -{ - File = "layout_textonly_57x71_h.png"; -}; -Bitmap BMP_LAYOUT_VERTICAL01_57X71 -{ - File = "layout_vertical01_57x71.png"; -}; -Bitmap BMP_LAYOUT_VERTICAL01_57X71_H -{ - File = "layout_vertical01_57x71_h.png"; -}; -Bitmap BMP_LAYOUT_VERTICAL02_57X71 -{ - File = "layout_vertical02_57x71.png"; -}; -Bitmap BMP_LAYOUT_VERTICAL02_57X71_H -{ - File = "layout_vertical02_57x71_h.png"; + File = "layout_vertical02_h.png"; }; Bitmap BMP_FOILH_01 diff --git a/sd/source/ui/dlg/layoutdialog.cxx b/sd/source/ui/dlg/layoutdialog.cxx index a7ddfe48f55c..613fd46fdfca 100644 --- a/sd/source/ui/dlg/layoutdialog.cxx +++ b/sd/source/ui/dlg/layoutdialog.cxx @@ -83,45 +83,41 @@ struct snewfoil_value_info }; static snewfoil_value_info standard[] = { - {BMP_LAYOUT_EMPTY_57X71, BMP_LAYOUT_EMPTY_57X71_H, STR_AUTOLAYOUT_NONE, WritingMode_LR_TB, AUTOLAYOUT_NONE}, - {BMP_LAYOUT_HEAD03_57X71, BMP_LAYOUT_HEAD03_57X71_H, STR_AUTOLAYOUT_TITLE, WritingMode_LR_TB, AUTOLAYOUT_TITLE}, - {BMP_LAYOUT_HEAD02_57X71, BMP_LAYOUT_HEAD02_57X71_H, STR_AUTOLAYOUT_CONTENT, WritingMode_LR_TB, AUTOLAYOUT_ENUM}, - {BMP_LAYOUT_HEAD02A_57X71, BMP_LAYOUT_HEAD02A_57X71_H, STR_AUTOLAYOUT_2CONTENT, WritingMode_LR_TB, AUTOLAYOUT_2TEXT}, - {BMP_LAYOUT_HEAD01_57X71, BMP_LAYOUT_HEAD01_57X71_H, STR_AUTOLAYOUT_ONLY_TITLE, WritingMode_LR_TB, AUTOLAYOUT_ONLY_TITLE}, - {BMP_LAYOUT_TEXTONLY_57X71, BMP_LAYOUT_TEXTONLY_57X71_H, STR_AUTOLAYOUT_ONLY_TEXT, WritingMode_LR_TB, AUTOLAYOUT_ONLY_TEXT}, -//-- - {BMP_LAYOUT_HEAD02B_57X71, BMP_LAYOUT_HEAD02B_57X71_H, STR_AUTOLAYOUT_CONTENT_2CONTENT, WritingMode_LR_TB, AUTOLAYOUT_TEXT2OBJ}, - {BMP_LAYOUT_HEAD02B_57X71, BMP_LAYOUT_HEAD02B_57X71_H, STR_AUTOLAYOUT_2CONTENT_CONTENT, WritingMode_LR_TB, AUTOLAYOUT_2OBJTEXT}, -//-- - {BMP_LAYOUT_HEAD03A_57X71, BMP_LAYOUT_HEAD03A_57X71_H, STR_AUTOLAYOUT_2CONTENT_OVER_CONTENT,WritingMode_LR_TB, AUTOLAYOUT_2OBJOVERTEXT}, - {BMP_LAYOUT_HEAD02B_57X71, BMP_LAYOUT_HEAD02B_57X71_H, STR_AUTOLAYOUT_CONTENT_OVER_CONTENT, WritingMode_LR_TB, AUTOLAYOUT_OBJOVERTEXT}, - {BMP_LAYOUT_HEAD04_57X71, BMP_LAYOUT_HEAD04_57X71_H, STR_AUTOLAYOUT_4CONTENT, WritingMode_LR_TB, AUTOLAYOUT_4OBJ}, - {BMP_LAYOUT_HEAD06_57X71, BMP_LAYOUT_HEAD06_57X71_H, STR_AUTOLAYOUT_6CONTENT, WritingMode_LR_TB, AUTOLAYOUT_6CLIPART}, + {BMP_LAYOUT_EMPTY, BMP_LAYOUT_EMPTY_H, STR_AUTOLAYOUT_NONE, WritingMode_LR_TB, AUTOLAYOUT_NONE}, + {BMP_LAYOUT_HEAD03, BMP_LAYOUT_HEAD03_H, STR_AUTOLAYOUT_TITLE, WritingMode_LR_TB, AUTOLAYOUT_TITLE}, + {BMP_LAYOUT_HEAD02, BMP_LAYOUT_HEAD02_H, STR_AUTOLAYOUT_CONTENT, WritingMode_LR_TB, AUTOLAYOUT_ENUM}, + {BMP_LAYOUT_HEAD02A, BMP_LAYOUT_HEAD02A_H, STR_AUTOLAYOUT_2CONTENT, WritingMode_LR_TB, AUTOLAYOUT_2TEXT}, + {BMP_LAYOUT_HEAD01, BMP_LAYOUT_HEAD01_H, STR_AUTOLAYOUT_ONLY_TITLE, WritingMode_LR_TB, AUTOLAYOUT_ONLY_TITLE}, + {BMP_LAYOUT_TEXTONLY, BMP_LAYOUT_TEXTONLY_H, STR_AUTOLAYOUT_ONLY_TEXT, WritingMode_LR_TB, AUTOLAYOUT_ONLY_TEXT}, + {BMP_LAYOUT_HEAD03B, BMP_LAYOUT_HEAD03B_H, STR_AUTOLAYOUT_2CONTENT_CONTENT, WritingMode_LR_TB, AUTOLAYOUT_2OBJTEXT}, + {BMP_LAYOUT_HEAD03C, BMP_LAYOUT_HEAD03C_H, STR_AUTOLAYOUT_CONTENT_2CONTENT, WritingMode_LR_TB, AUTOLAYOUT_TEXT2OBJ}, + {BMP_LAYOUT_HEAD03A, BMP_LAYOUT_HEAD03A_H, STR_AUTOLAYOUT_2CONTENT_OVER_CONTENT,WritingMode_LR_TB, AUTOLAYOUT_2OBJOVERTEXT}, + {BMP_LAYOUT_HEAD02B, BMP_LAYOUT_HEAD02B_H, STR_AUTOLAYOUT_CONTENT_OVER_CONTENT, WritingMode_LR_TB, AUTOLAYOUT_OBJOVERTEXT}, + {BMP_LAYOUT_HEAD04, BMP_LAYOUT_HEAD04_H, STR_AUTOLAYOUT_4CONTENT, WritingMode_LR_TB, AUTOLAYOUT_4OBJ}, + {BMP_LAYOUT_HEAD06, BMP_LAYOUT_HEAD06_H, STR_AUTOLAYOUT_6CONTENT, WritingMode_LR_TB, AUTOLAYOUT_6CLIPART}, {0, 0, 0, WritingMode_LR_TB, AUTOLAYOUT_NONE} }; static snewfoil_value_info v_standard[] = { // vertical - {BMP_LAYOUT_VERTICAL02_57X71, BMP_LAYOUT_VERTICAL02_57X71_H, STR_AL_VERT_TITLE_TEXT_CHART, WritingMode_TB_RL,AUTOLAYOUT_VERTICAL_TITLE_TEXT_CHART}, - {BMP_LAYOUT_VERTICAL01_57X71, BMP_LAYOUT_VERTICAL01_57X71_H, STR_AL_VERT_TITLE_VERT_OUTLINE, WritingMode_TB_RL, AUTOLAYOUT_VERTICAL_TITLE_VERTICAL_OUTLINE}, - {BMP_LAYOUT_HEAD02_57X71, BMP_LAYOUT_HEAD02_57X71_H, STR_AL_TITLE_VERT_OUTLINE, WritingMode_TB_RL, AUTOLAYOUT_TITLE_VERTICAL_OUTLINE}, - {BMP_LAYOUT_HEAD02A_57X71, BMP_LAYOUT_HEAD02A_57X71_H, STR_AL_TITLE_VERT_OUTLINE_CLIPART, WritingMode_TB_RL, AUTOLAYOUT_TITLE_VERTICAL_OUTLINE_CLIPART}, + {BMP_LAYOUT_VERTICAL02, BMP_LAYOUT_VERTICAL02_H, STR_AL_VERT_TITLE_TEXT_CHART, WritingMode_TB_RL,AUTOLAYOUT_VERTICAL_TITLE_TEXT_CHART}, + {BMP_LAYOUT_VERTICAL01, BMP_LAYOUT_VERTICAL01_H, STR_AL_VERT_TITLE_VERT_OUTLINE, WritingMode_TB_RL, AUTOLAYOUT_VERTICAL_TITLE_VERTICAL_OUTLINE}, + {BMP_LAYOUT_HEAD02, BMP_LAYOUT_HEAD02_H, STR_AL_TITLE_VERT_OUTLINE, WritingMode_TB_RL, AUTOLAYOUT_TITLE_VERTICAL_OUTLINE}, + {BMP_LAYOUT_HEAD02A, BMP_LAYOUT_HEAD02A_H, STR_AL_TITLE_VERT_OUTLINE_CLIPART, WritingMode_TB_RL, AUTOLAYOUT_TITLE_VERTICAL_OUTLINE_CLIPART}, {0, 0, 0, WritingMode_LR_TB, AUTOLAYOUT_NONE} }; // ----------------------------------------------------------------------- -static void fillLayoutValueSet( ValueSet* pValue, snewfoil_value_info* pInfo, const bool bHighContrast, const bool bInsertPage ) +static void fillLayoutValueSet( ValueSet* pValue, snewfoil_value_info* pInfo, const bool bHighContrast ) { - USHORT nResOffset = bInsertPage ? (BMP_LAYOUT_ADDEMPTY_57X71) - (BMP_LAYOUT_EMPTY_57X71) : 0; - Size aLayoutItemSize; for( ; pInfo->mnBmpResId; pInfo++ ) { String aText( SdResId( pInfo->mnStrResId ) ); - BitmapEx aBmp( SdResId( (bHighContrast ? pInfo->mnHCBmpResId : pInfo->mnBmpResId) + nResOffset ) ); - aBmp.Expand( 3, 3, 0, TRUE ); + BitmapEx aBmp( SdResId( (bHighContrast ? pInfo->mnHCBmpResId : pInfo->mnBmpResId) ) ); + pValue->InsertItem( static_cast(pInfo->maAutoLayout)+1, aBmp, aText ); aLayoutItemSize.Width() = std::max( aLayoutItemSize.Width(), aBmp.GetSizePixel().Width() ); @@ -167,7 +163,7 @@ SdLayoutDialogContent::SdLayoutDialogContent( ViewShellBase& rBase, ::Window* pP mpLayoutSet1->EnableFullItemMode( FALSE ); mpLayoutSet1->SetColor( GetControlBackground() ); - fillLayoutValueSet( mpLayoutSet1, &standard[0], bHighContrast, bInsertPage ); + fillLayoutValueSet( mpLayoutSet1, &standard[0], bHighContrast ); if( bVerticalEnabled ) appendEntry( -1, aTitle1 ); @@ -183,7 +179,7 @@ SdLayoutDialogContent::SdLayoutDialogContent( ViewShellBase& rBase, ::Window* pP mpLayoutSet2->EnableFullItemMode( FALSE ); mpLayoutSet2->SetColor( GetControlBackground() ); - fillLayoutValueSet( mpLayoutSet2, &v_standard[0], bHighContrast, bInsertPage ); + fillLayoutValueSet( mpLayoutSet2, &v_standard[0], bHighContrast ); appendEntry( -1, aTitle2 ); appendEntry( 1, mpLayoutSet2 ); 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 diff --git a/sd/source/ui/toolpanel/LayoutMenu.cxx b/sd/source/ui/toolpanel/LayoutMenu.cxx index c07049b86baf..a69f91683282 100644 --- a/sd/source/ui/toolpanel/LayoutMenu.cxx +++ b/sd/source/ui/toolpanel/LayoutMenu.cxx @@ -164,26 +164,24 @@ static snewfoil_value_info handout[] = static snewfoil_value_info standard[] = { - {BMP_LAYOUT_EMPTY_57X71, BMP_LAYOUT_EMPTY_57X71_H, STR_AUTOLAYOUT_NONE, WritingMode_LR_TB, AUTOLAYOUT_NONE}, - {BMP_LAYOUT_HEAD03_57X71, BMP_LAYOUT_HEAD03_57X71_H, STR_AUTOLAYOUT_TITLE, WritingMode_LR_TB, AUTOLAYOUT_TITLE}, - {BMP_LAYOUT_HEAD02_57X71, BMP_LAYOUT_HEAD02_57X71_H, STR_AUTOLAYOUT_CONTENT, WritingMode_LR_TB, AUTOLAYOUT_ENUM}, - {BMP_LAYOUT_HEAD02A_57X71, BMP_LAYOUT_HEAD02A_57X71_H, STR_AUTOLAYOUT_2CONTENT, WritingMode_LR_TB, AUTOLAYOUT_2TEXT}, - {BMP_LAYOUT_HEAD01_57X71, BMP_LAYOUT_HEAD01_57X71_H, STR_AUTOLAYOUT_ONLY_TITLE, WritingMode_LR_TB, AUTOLAYOUT_ONLY_TITLE}, - {BMP_LAYOUT_TEXTONLY_57X71, BMP_LAYOUT_TEXTONLY_57X71_H, STR_AUTOLAYOUT_ONLY_TEXT, WritingMode_LR_TB, AUTOLAYOUT_ONLY_TEXT}, -//-- - {BMP_LAYOUT_HEAD02B_57X71, BMP_LAYOUT_HEAD02B_57X71_H, STR_AUTOLAYOUT_CONTENT_2CONTENT, WritingMode_LR_TB, AUTOLAYOUT_TEXT2OBJ}, - {BMP_LAYOUT_HEAD02B_57X71, BMP_LAYOUT_HEAD02B_57X71_H, STR_AUTOLAYOUT_2CONTENT_CONTENT, WritingMode_LR_TB, AUTOLAYOUT_2OBJTEXT}, -//-- - {BMP_LAYOUT_HEAD03A_57X71, BMP_LAYOUT_HEAD03A_57X71_H, STR_AUTOLAYOUT_2CONTENT_OVER_CONTENT,WritingMode_LR_TB, AUTOLAYOUT_2OBJOVERTEXT}, - {BMP_LAYOUT_HEAD02B_57X71, BMP_LAYOUT_HEAD02B_57X71_H, STR_AUTOLAYOUT_CONTENT_OVER_CONTENT, WritingMode_LR_TB, AUTOLAYOUT_OBJOVERTEXT}, - {BMP_LAYOUT_HEAD04_57X71, BMP_LAYOUT_HEAD04_57X71_H, STR_AUTOLAYOUT_4CONTENT, WritingMode_LR_TB, AUTOLAYOUT_4OBJ}, - {BMP_LAYOUT_HEAD06_57X71, BMP_LAYOUT_HEAD06_57X71_H, STR_AUTOLAYOUT_6CONTENT, WritingMode_LR_TB, AUTOLAYOUT_6CLIPART}, + {BMP_LAYOUT_EMPTY, BMP_LAYOUT_EMPTY_H, STR_AUTOLAYOUT_NONE, WritingMode_LR_TB, AUTOLAYOUT_NONE}, + {BMP_LAYOUT_HEAD03, BMP_LAYOUT_HEAD03_H, STR_AUTOLAYOUT_TITLE, WritingMode_LR_TB, AUTOLAYOUT_TITLE}, + {BMP_LAYOUT_HEAD02, BMP_LAYOUT_HEAD02_H, STR_AUTOLAYOUT_CONTENT, WritingMode_LR_TB, AUTOLAYOUT_ENUM}, + {BMP_LAYOUT_HEAD02A, BMP_LAYOUT_HEAD02A_H, STR_AUTOLAYOUT_2CONTENT, WritingMode_LR_TB, AUTOLAYOUT_2TEXT}, + {BMP_LAYOUT_HEAD01, BMP_LAYOUT_HEAD01_H, STR_AUTOLAYOUT_ONLY_TITLE, WritingMode_LR_TB, AUTOLAYOUT_ONLY_TITLE}, + {BMP_LAYOUT_TEXTONLY, BMP_LAYOUT_TEXTONLY_H, STR_AUTOLAYOUT_ONLY_TEXT, WritingMode_LR_TB, AUTOLAYOUT_ONLY_TEXT}, + {BMP_LAYOUT_HEAD03B, BMP_LAYOUT_HEAD03B_H, STR_AUTOLAYOUT_2CONTENT_CONTENT, WritingMode_LR_TB, AUTOLAYOUT_2OBJTEXT}, + {BMP_LAYOUT_HEAD03C, BMP_LAYOUT_HEAD03C_H, STR_AUTOLAYOUT_CONTENT_2CONTENT, WritingMode_LR_TB, AUTOLAYOUT_TEXT2OBJ}, + {BMP_LAYOUT_HEAD03A, BMP_LAYOUT_HEAD03A_H, STR_AUTOLAYOUT_2CONTENT_OVER_CONTENT,WritingMode_LR_TB, AUTOLAYOUT_2OBJOVERTEXT}, + {BMP_LAYOUT_HEAD02B, BMP_LAYOUT_HEAD02B_H, STR_AUTOLAYOUT_CONTENT_OVER_CONTENT, WritingMode_LR_TB, AUTOLAYOUT_OBJOVERTEXT}, + {BMP_LAYOUT_HEAD04, BMP_LAYOUT_HEAD04_H, STR_AUTOLAYOUT_4CONTENT, WritingMode_LR_TB, AUTOLAYOUT_4OBJ}, + {BMP_LAYOUT_HEAD06, BMP_LAYOUT_HEAD06_H, STR_AUTOLAYOUT_6CONTENT, WritingMode_LR_TB, AUTOLAYOUT_6CLIPART}, // vertical - {BMP_LAYOUT_VERTICAL02_57X71, BMP_LAYOUT_VERTICAL02_57X71_H, STR_AL_VERT_TITLE_TEXT_CHART, WritingMode_TB_RL,AUTOLAYOUT_VERTICAL_TITLE_TEXT_CHART}, - {BMP_LAYOUT_VERTICAL01_57X71, BMP_LAYOUT_VERTICAL01_57X71_H, STR_AL_VERT_TITLE_VERT_OUTLINE, WritingMode_TB_RL, AUTOLAYOUT_VERTICAL_TITLE_VERTICAL_OUTLINE}, - {BMP_LAYOUT_HEAD02_57X71, BMP_LAYOUT_HEAD02_57X71_H, STR_AL_TITLE_VERT_OUTLINE, WritingMode_TB_RL, AUTOLAYOUT_TITLE_VERTICAL_OUTLINE}, - {BMP_LAYOUT_HEAD02A_57X71, BMP_LAYOUT_HEAD02A_57X71_H, STR_AL_TITLE_VERT_OUTLINE_CLIPART, WritingMode_TB_RL, AUTOLAYOUT_TITLE_VERTICAL_OUTLINE_CLIPART}, + {BMP_LAYOUT_VERTICAL02, BMP_LAYOUT_VERTICAL02_H, STR_AL_VERT_TITLE_TEXT_CHART, WritingMode_TB_RL,AUTOLAYOUT_VERTICAL_TITLE_TEXT_CHART}, + {BMP_LAYOUT_VERTICAL01, BMP_LAYOUT_VERTICAL01_H, STR_AL_VERT_TITLE_VERT_OUTLINE, WritingMode_TB_RL, AUTOLAYOUT_VERTICAL_TITLE_VERTICAL_OUTLINE}, + {BMP_LAYOUT_HEAD02, BMP_LAYOUT_HEAD02_H, STR_AL_TITLE_VERT_OUTLINE, WritingMode_TB_RL, AUTOLAYOUT_TITLE_VERTICAL_OUTLINE}, + {BMP_LAYOUT_HEAD02A, BMP_LAYOUT_HEAD02A_H, STR_AL_TITLE_VERT_OUTLINE_CLIPART, WritingMode_TB_RL, AUTOLAYOUT_TITLE_VERTICAL_OUTLINE_CLIPART}, {0, 0, 0, WritingMode_LR_TB, AUTOLAYOUT_NONE} }; -- cgit From 1294294cc6db6560140b3ebc7aed82f77e58dd44 Mon Sep 17 00:00:00 2001 From: Christian Lippka Date: Tue, 23 Feb 2010 00:23:09 +0100 Subject: presentation placeholder rework --- sd/inc/pres.hxx | 2 + sd/inc/sdpage.hxx | 3 -- sd/source/core/sdpage.cxx | 92 +++++++++++++++++------------------- sd/source/filter/ppt/pptin.cxx | 2 +- sd/source/ui/func/fuinsert.cxx | 19 +------- sd/source/ui/table/tablefunction.cxx | 22 ++------- sd/source/ui/unoidl/unomodel.cxx | 14 ++++-- sd/source/ui/unoidl/unopage.cxx | 33 ++++++++++++- sd/source/ui/view/drawview.cxx | 4 +- sd/source/ui/view/sdview4.cxx | 50 ++++++++++++-------- sd/source/ui/view/sdview5.cxx | 1 + 11 files changed, 126 insertions(+), 116 deletions(-) (limited to 'sd') diff --git a/sd/inc/pres.hxx b/sd/inc/pres.hxx index 32146fb6f46c..d34429afaa7d 100644 --- a/sd/inc/pres.hxx +++ b/sd/inc/pres.hxx @@ -50,6 +50,8 @@ enum PresObjKind PRESOBJ_FOOTER, PRESOBJ_DATETIME, PRESOBJ_SLIDENUMBER, + PRESOBJ_CALC, + PRESOBJ_MEDIA, PRESOBJ_MAX }; diff --git a/sd/inc/sdpage.hxx b/sd/inc/sdpage.hxx index 34010fc6198b..5d358eb99ba9 100644 --- a/sd/inc/sdpage.hxx +++ b/sd/inc/sdpage.hxx @@ -214,9 +214,6 @@ public: /** inserts the given SdrObject into the presentation object list */ void InsertPresObj(SdrObject* pObj, PresObjKind eKind ); - /** replace the given SdrObject with the new SdrObject in the presentation object list */ - void ReplacePresObj(SdrObject* pOldObj, SdrObject* pNewObj, PresObjKind eNewKind ); - void SetAutoLayout(AutoLayout eLayout, BOOL bInit=FALSE, BOOL bCreate=FALSE); AutoLayout GetAutoLayout() const { return meAutoLayout; } void CreateTitleAndLayout(BOOL bInit=FALSE, BOOL bCreate=FALSE); diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx index 1983205d1fe9..360ac670de6c 100644 --- a/sd/source/core/sdpage.cxx +++ b/sd/source/core/sdpage.cxx @@ -161,10 +161,20 @@ SdPage::~SdPage() delete mpItems; } +struct OrdNumSorter +{ + bool operator()( SdrObject* p1, SdrObject* p2 ) + { + return p1->GetOrdNum() < p2->GetOrdNum(); + } +}; + /** returns the nIndex'th object from the given PresObjKind, index starts with 1 */ SdrObject* SdPage::GetPresObj(PresObjKind eObjKind, int nIndex, bool bFuzzySearch /* = false */ ) { - int nObjFound = 0; // index of the searched object + // first sort all matching shapes with z-order + std::vector< SdrObject* > aMatches; + SdrObject* pObj = 0; while( (pObj = maPresentationShapeList.getNextShape(pObj)) != 0 ) { @@ -185,7 +195,9 @@ SdrObject* SdPage::GetPresObj(PresObjKind eObjKind, int nIndex, bool bFuzzySearc case PRESOBJ_CHART: case PRESOBJ_ORGCHART: case PRESOBJ_TABLE: + case PRESOBJ_CALC: case PRESOBJ_IMAGE: + case PRESOBJ_MEDIA: bFound = TRUE; break; default: @@ -194,13 +206,23 @@ SdrObject* SdPage::GetPresObj(PresObjKind eObjKind, int nIndex, bool bFuzzySearc } if( bFound ) { - nObjFound++; // found one - if( nObjFound == nIndex ) - return pObj; + aMatches.push_back( pObj ); } } } + if( aMatches.size() > 1 ) + { + OrdNumSorter aSortHelper; + std::sort( aMatches.begin(), aMatches.end(), aSortHelper ); + } + + if( nIndex > 0 ) + nIndex--; + + if( aMatches.size() > nIndex ) + return aMatches[nIndex]; + return 0; } @@ -276,6 +298,7 @@ SdrObject* SdPage::CreatePresObj(PresObjKind eObjKind, BOOL bVertical, const Rec } break; + case PRESOBJ_MEDIA: case PRESOBJ_OBJECT: { pSdrObj = new SdrOle2Obj(); @@ -305,6 +328,7 @@ SdrObject* SdPage::CreatePresObj(PresObjKind eObjKind, BOOL bVertical, const Rec } case PRESOBJ_TABLE: + case PRESOBJ_CALC: { pSdrObj = new SdrOle2Obj(); ( (SdrOle2Obj*) pSdrObj)->SetProgName( String( RTL_CONSTASCII_USTRINGPARAM( "StarCalc" ))); @@ -514,7 +538,7 @@ SdrObject* SdPage::CreatePresObj(PresObjKind eObjKind, BOOL bVertical, const Rec if ( eObjKind == PRESOBJ_OBJECT || eObjKind == PRESOBJ_CHART || eObjKind == PRESOBJ_ORGCHART || - eObjKind == PRESOBJ_TABLE || + eObjKind == PRESOBJ_CALC || eObjKind == PRESOBJ_GRAPHIC ) { SfxItemSet aSet( ((SdDrawDocument*) pModel)->GetPool() ); @@ -1424,6 +1448,12 @@ void findAutoLayoutShapesImpl( SdPage& rPage, const LayoutDescriptor& rDescripto case PRESOBJ_TITLE: bFound = eSdrObjKind == OBJ_TITLETEXT; break; + case PRESOBJ_TABLE: + bFound = eSdrObjKind == OBJ_TABLE; + break; + case PRESOBJ_MEDIA: + bFound = eSdrObjKind == OBJ_MEDIA; + break; case PRESOBJ_OUTLINE: bFound = (eSdrObjKind == OBJ_OUTLINETEXT) || ((eSdrObjKind == OBJ_TEXT) && bPresStyle) || @@ -1469,7 +1499,7 @@ void findAutoLayoutShapesImpl( SdPage& rPage, const LayoutDescriptor& rDescripto } break; case PRESOBJ_CHART: - case PRESOBJ_TABLE: + case PRESOBJ_CALC: if( eSdrObjKind == OBJ_OLE2 ) { SdrOle2Obj* pOle2 = dynamic_cast< SdrOle2Obj* >( pObj ); @@ -1479,7 +1509,7 @@ void findAutoLayoutShapesImpl( SdPage& rPage, const LayoutDescriptor& rDescripto ((eKind == PRESOBJ_CHART) && ( pOle2->GetProgName().EqualsAscii( "StarChart" ) || pOle2->IsChart() ) ) || - ((eKind == PRESOBJ_TABLE) && + ((eKind == PRESOBJ_CALC) && ( pOle2->GetProgName().EqualsAscii( "StarCalc" ) || pOle2->IsCalc() ) ) ) { bFound = true; @@ -2199,23 +2229,6 @@ SdrObject* convertPresentationObjectImpl( SdPage& rPage, SdrObject* pSourceObj, return pNewObj; } -static void SetLogicRect( SdrObject* pObj, Rectangle& rLogicRect ) -{ - if( pObj ) - { - if( (pObj->GetObjInventor() == SdrInventor) && (pObj->GetObjIdentifier() == OBJ_TABLE) ) - { - Rectangle aRect( rLogicRect ); - aRect.setHeight( pObj->GetLogicRect().getHeight() ); - pObj->SetLogicRect( aRect ); - } - else - { - pObj->SetLogicRect( rLogicRect ); - } - } -} - /** reuses or creates a presentation shape for an auto layout that fits the given parameter @param eObjKind @@ -2254,10 +2267,10 @@ SdrObject* SdPage::InsertAutoLayoutShape( SdrObject* pObj, PresObjKind eObjKind, pUndoManager->AddUndoAction( new UndoObjectUserCall( *pObj ) ); } - if ( pObj->ISA(SdrGrafObj) && !pObj->IsEmptyPresObj() ) - ( (SdrGrafObj*) pObj)->AdjustToMaxRect( aRect, FALSE ); - else - SetLogicRect( pObj, aRect ); +// if ( pObj->ISA(SdrGrafObj) && !pObj->IsEmptyPresObj() ) + ( /*(SdrGrafObj*)*/ pObj)->AdjustToMaxRect( aRect ); +// else +// SetLogicRect( pObj, aRect ); pObj->SetUserCall(this); @@ -2338,7 +2351,7 @@ SdrObject* SdPage::InsertAutoLayoutShape( SdrObject* pObj, PresObjKind eObjKind, } if ( pObj && ( pObj->IsEmptyPresObj() || !pObj->ISA(SdrGrafObj) ) ) - SetLogicRect( pObj, aRect ); + pObj->AdjustToMaxRect( aRect ); return pObj; } @@ -2392,25 +2405,6 @@ void SdPage::InsertPresObj(SdrObject* pObj, PresObjKind eKind ) } } -void SdPage::ReplacePresObj(SdrObject* pOldObj, SdrObject* pNewObj, PresObjKind eNewKind ) -{ - if( !pNewObj ) - { - RemovePresObj( pOldObj ); - } - else if( pOldObj ) - { - SdAnimationInfo* pInfo = SdDrawDocument::GetShapeUserData(*pNewObj, true); - if( pInfo ) - pInfo->mePresObjKind = eNewKind; - maPresentationShapeList.replaceShape(*pOldObj, *pNewObj); - } - else - { - InsertPresObj( pNewObj, eNewKind ); - } -} - /************************************************************************* |* |* Text des Objektes setzen @@ -2775,7 +2769,7 @@ String SdPage::GetPresObjText(PresObjKind eObjKind) const { aString = String ( SdResId( STR_PRESOBJ_ORGCHART ) ); } - else if (eObjKind == PRESOBJ_TABLE) + else if (eObjKind == PRESOBJ_CALC) { aString = String ( SdResId( STR_PRESOBJ_TABLE ) ); } diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx index 37277a17c97b..ce06753f11b0 100644 --- a/sd/source/filter/ppt/pptin.cxx +++ b/sd/source/filter/ppt/pptin.cxx @@ -2437,7 +2437,7 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pObj case PPT_PLACEHOLDER_MEDIACLIP : case PPT_PLACEHOLDER_OBJECT : ePresObjKind = PRESOBJ_OBJECT; break; case PPT_PLACEHOLDER_GRAPH : ePresObjKind = PRESOBJ_CHART; break; - case PPT_PLACEHOLDER_TABLE : ePresObjKind = PRESOBJ_TABLE; break; + case PPT_PLACEHOLDER_TABLE : ePresObjKind = PRESOBJ_CALC; break; case PPT_PLACEHOLDER_CLIPART : ePresObjKind = PRESOBJ_GRAPHIC; break; case PPT_PLACEHOLDER_ORGANISZATIONCHART : ePresObjKind = PRESOBJ_ORGCHART; break; } diff --git a/sd/source/ui/func/fuinsert.cxx b/sd/source/ui/func/fuinsert.cxx index daae9f37b49f..ce0dc8f67a58 100644 --- a/sd/source/ui/func/fuinsert.cxx +++ b/sd/source/ui/func/fuinsert.cxx @@ -368,19 +368,8 @@ void FuInsertOLE::DoExecute( SfxRequest& rReq ) SdPage* pPage = static_cast< SdPage* >(pPickObj->GetPage()); if(pPage && pPage->IsPresObj(pPickObj)) { - bUndo = mpView->IsUndoEnabled(); - - if( bUndo ) - mpView->BegUndo( SdrUndoNewObj::GetComment(*pOleObj) ); - - // add new PresObj to the list + pPage->InsertPresObj( pOleObj, ePresObjKind ); pOleObj->SetUserCall(pPickObj->GetUserCall()); - if( bUndo ) - { - mpView->AddUndo( new sd::UndoObjectPresentationKind( *pPickObj ) ); - mpView->AddUndo( new sd::UndoObjectPresentationKind( *pOleObj ) ); - } - pPage->ReplacePresObj(pPickObj, pOleObj, ePresObjKind); } } @@ -423,11 +412,7 @@ void FuInsertOLE::DoExecute( SfxRequest& rReq ) } } - if( bUndo ) - { - mpView->EndUndo(); - } - else if( pPickObj ) + if( !mpView->IsUndoEnabled() && pPickObj ) { // replaced object must be freed if there is no undo action owning it SdrObject::Free( pPickObj ); diff --git a/sd/source/ui/table/tablefunction.cxx b/sd/source/ui/table/tablefunction.cxx index dc5f999ff601..4c12445a513f 100644 --- a/sd/source/ui/table/tablefunction.cxx +++ b/sd/source/ui/table/tablefunction.cxx @@ -177,26 +177,14 @@ void DrawViewShell::FuTable(SfxRequest& rReq) apply_table_style( pObj, GetDoc(), sTableStyle ); SdrPageView* pPV = mpView->GetSdrPageView(); - bool bUndo = false; // if we have a pick obj we need to make this new ole a pres obj replacing the current pick obj if( pPickObj ) { SdPage* pPage = static_cast< SdPage* >(pPickObj->GetPage()); if(pPage && pPage->IsPresObj(pPickObj)) { - bUndo = mpView->IsUndoEnabled(); - - if( bUndo ) - mpView->BegUndo( SdrUndoNewObj::GetComment(*pObj) ); - - // add new PresObj to the list - pObj->SetUserCall(pPickObj->GetUserCall()); - if( bUndo ) - { - mpView->AddUndo( new sd::UndoObjectPresentationKind( *pPickObj ) ); - mpView->AddUndo( new sd::UndoObjectPresentationKind( *pObj ) ); - } - pPage->ReplacePresObj(pPickObj, pObj, PRESOBJ_TABLE); + pObj->SetUserCall( pPickObj->GetUserCall() ); + pPage->InsertPresObj( pObj, PRESOBJ_TABLE ); } } @@ -205,11 +193,7 @@ void DrawViewShell::FuTable(SfxRequest& rReq) else mpView->InsertObjectAtView(pObj, *pPV, SDRINSERT_SETDEFLAYER); - if( bUndo ) - { - mpView->EndUndo(); - } - else if( pPickObj ) + if( !mpView->IsUndoEnabled() && pPickObj ) { // replaced object must be freed if there is no undo action owning it SdrObject::Free( pPickObj ); diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx index 2e753fd859d1..32c86305941c 100644 --- a/sd/source/ui/unoidl/unomodel.cxx +++ b/sd/source/ui/unoidl/unomodel.cxx @@ -1083,10 +1083,14 @@ uno::Reference< uno::XInterface > SAL_CALL SdXImpressDocument::createInstance( c { nType = OBJ_OLE2; } - else if( aType.EqualsAscii( "TableShape", 26, 10 ) ) + else if( aType.EqualsAscii( "CalcShape", 26, 9 ) ) { nType = OBJ_OLE2; } + else if( aType.EqualsAscii( "TableShape", 26, 10 ) ) + { + nType = OBJ_TABLE; + } else if( aType.EqualsAscii( "OrgChartShape", 26, 13 ) ) { nType = OBJ_OLE2; @@ -1115,9 +1119,9 @@ uno::Reference< uno::XInterface > SAL_CALL SdXImpressDocument::createInstance( c { nType = OBJ_TEXT; } - else if( aType.EqualsAscii( "TableShape", 26, 10 ) ) + else if( aType.EqualsAscii( "MediaShape", 26, 10 ) ) { - nType = OBJ_TABLE; + nType = OBJ_MEDIA; } else { @@ -1168,7 +1172,7 @@ uno::Sequence< OUString > SAL_CALL SdXImpressDocument::getAvailableServiceNames( const uno::Sequence< OUString > aSNS_ORG( SvxFmMSFactory::getAvailableServiceNames() ); - uno::Sequence< OUString > aSNS( mbImpressDoc ? (34) : (19) ); + uno::Sequence< OUString > aSNS( mbImpressDoc ? (36) : (19) ); sal_uInt16 i(0); @@ -1211,6 +1215,8 @@ uno::Sequence< OUString > SAL_CALL SdXImpressDocument::getAvailableServiceNames( aSNS[i++] = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.presentation.HeaderShape")); aSNS[i++] = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.presentation.SlideNumberShape")); aSNS[i++] = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.presentation.DateTimeShape")); + aSNS[i++] = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.presentation.CalcShape")); + aSNS[i++] = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.presentation.MediaShape")); } else { diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx index 685bb4a48144..dd455e5557bb 100644 --- a/sd/source/ui/unoidl/unopage.cxx +++ b/sd/source/ui/unoidl/unopage.cxx @@ -412,7 +412,7 @@ SdrObject * SdGenericDrawPage::_CreateSdrObject( const Reference< drawing::XShap String aType( xShape->getShapeType() ); const String aPrefix( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.presentation.") ); - if(aType.CompareTo( aPrefix, aPrefix.Len() ) != 0) + if( aType.CompareTo( aPrefix, aPrefix.Len() ) != 0 ) { SdrObject* pObj = SvxFmDrawPage::_CreateSdrObject( xShape ); if( pObj && ( (pObj->GetObjInventor() != SdrInventor) || (pObj->GetObjIdentifier() != OBJ_PAGE) ) ) @@ -448,6 +448,10 @@ SdrObject * SdGenericDrawPage::_CreateSdrObject( const Reference< drawing::XShap { eObjKind = PRESOBJ_CHART; } + else if( aType.EqualsAscii( "CalcShape" ) ) + { + eObjKind = PRESOBJ_CALC; + } else if( aType.EqualsAscii( "TableShape" ) ) { eObjKind = PRESOBJ_TABLE; @@ -495,6 +499,10 @@ SdrObject * SdGenericDrawPage::_CreateSdrObject( const Reference< drawing::XShap { eObjKind = PRESOBJ_DATETIME; } + else if( aType.EqualsAscii( "MediaShape" ) ) + { + eObjKind = PRESOBJ_MEDIA; + } Rectangle aRect( eObjKind == PRESOBJ_TITLE ? GetPage()->GetTitleRect() : GetPage()->GetLayoutRect() ); @@ -504,7 +512,22 @@ SdrObject * SdGenericDrawPage::_CreateSdrObject( const Reference< drawing::XShap const awt::Size aSize( aRect.GetWidth(), aRect.GetHeight() ); xShape->setSize( aSize ); - SdrObject *pPresObj = GetPage()->CreatePresObj( eObjKind, FALSE, aRect, sal_True ); + SdrObject *pPresObj = 0; + if( (eObjKind == PRESOBJ_TABLE) || (eObjKind == PRESOBJ_MEDIA) ) + { + pPresObj = SvxFmDrawPage::_CreateSdrObject( xShape ); + if( pPresObj ) + { + SdDrawDocument* pDoc = (SdDrawDocument*)GetPage()->GetModel(); + if( pDoc ) + pPresObj->NbcSetStyleSheet( pDoc->GetDefaultStyleSheet(), sal_True ); + GetPage()->InsertPresObj( pPresObj, eObjKind ); + } + } + else + { + pPresObj = GetPage()->CreatePresObj( eObjKind, FALSE, aRect, sal_True ); + } if( pPresObj ) pPresObj->SetUserCall( GetPage() ); @@ -1389,9 +1412,15 @@ Reference< drawing::XShape > SdGenericDrawPage::_CreateShape( SdrObject *pObj ) case PRESOBJ_ORGCHART: aShapeType += String( RTL_CONSTASCII_USTRINGPARAM("OrgChartShape") ); break; + case PRESOBJ_CALC: + aShapeType += String( RTL_CONSTASCII_USTRINGPARAM("CalcShape") ); + break; case PRESOBJ_TABLE: aShapeType += String( RTL_CONSTASCII_USTRINGPARAM("TableShape") ); break; + case PRESOBJ_MEDIA: + aShapeType += String( RTL_CONSTASCII_USTRINGPARAM("MediaShape") ); + break; case PRESOBJ_BACKGROUND: DBG_ASSERT( sal_False, "Danger! Someone got hold of the horrible background shape!" ); break; diff --git a/sd/source/ui/view/drawview.cxx b/sd/source/ui/view/drawview.cxx index c96417d04640..e6fb02a06c3d 100644 --- a/sd/source/ui/view/drawview.cxx +++ b/sd/source/ui/view/drawview.cxx @@ -627,7 +627,9 @@ void DrawView::DeleteMarked() case PRESOBJ_CHART: case PRESOBJ_ORGCHART: case PRESOBJ_TABLE: + case PRESOBJ_CALC: case PRESOBJ_IMAGE: + case PRESOBJ_MEDIA: ePresObjKind = PRESOBJ_OUTLINE; break; default: @@ -640,8 +642,6 @@ void DrawView::DeleteMarked() pPage->SetObjectOrdNum( pNewObj->GetOrdNum(), pObj->GetOrdNum() ); - pPage->ReplacePresObj( pObj, pNewObj, ePresObjKind ); - bResetLayout = true; } } diff --git a/sd/source/ui/view/sdview4.cxx b/sd/source/ui/view/sdview4.cxx index 25d1b22dc633..49496086e084 100644 --- a/sd/source/ui/view/sdview4.cxx +++ b/sd/source/ui/view/sdview4.cxx @@ -145,20 +145,11 @@ SdrGrafObj* View::InsertGraphic( const Graphic& rGraphic, sal_Int8& rAction, pNewGrafObj->SetEmptyPresObj(FALSE); } - const bool bUndo = IsUndoEnabled(); - if( bUndo ) - BegUndo(String(SdResId(STR_UNDO_DRAGDROP))); - if (pPage && pPage->IsPresObj(pPickObj)) { // Neues PresObj in die Liste eintragen + pPage->InsertPresObj( pNewGrafObj, PRESOBJ_GRAPHIC ); pNewGrafObj->SetUserCall(pPickObj->GetUserCall()); - if( bUndo ) - { - AddUndo( new sd::UndoObjectPresentationKind( *pPickObj ) ); - AddUndo( new sd::UndoObjectPresentationKind( *pNewGrafObj ) ); - } - pPage->ReplacePresObj(pPickObj, pNewGrafObj, PRESOBJ_GRAPHIC); } if (pImageMap) @@ -166,11 +157,7 @@ SdrGrafObj* View::InsertGraphic( const Graphic& rGraphic, sal_Int8& rAction, ReplaceObjectAtView(pPickObj, *pPV, pNewGrafObj); // maybe ReplaceObjectAtView - if( bUndo ) - { - EndUndo(); - } - else + if( !IsUndoEnabled() && pPickObj ) { SdrObject::Free( pPickObj ); } @@ -310,7 +297,7 @@ SdrMediaObj* View::InsertMediaURL( const rtl::OUString& rMediaURL, sal_Int8& rAc SdrMediaObj* pNewMediaObj = NULL; SdrPageView* pPV = GetSdrPageView(); - SdrObject* pPickObj = NULL; + SdrObject* pPickObj = GetEmptyPresentationObject( PRESOBJ_MEDIA ); if(pPV && this->ISA(::sd::slidesorter::view::SlideSorterView )) { @@ -335,10 +322,35 @@ SdrMediaObj* View::InsertMediaURL( const rtl::OUString& rMediaURL, sal_Int8& rAc } else if( pPV ) { - pNewMediaObj = new SdrMediaObj( Rectangle( rPos, rSize ) ); + Rectangle aRect( rPos, rSize ); + if( pPickObj ) + aRect = pPickObj->GetLogicRect(); + + + pNewMediaObj = new SdrMediaObj( aRect ); + + if( pPickObj ) + { + SdPage* pPage = static_cast< SdPage* >(pPickObj->GetPage()); + if(pPage && pPage->IsPresObj(pPickObj)) + { + pPage->InsertPresObj( pNewMediaObj, PRESOBJ_MEDIA ); + pNewMediaObj->SetUserCall(pPickObj->GetUserCall()); + } + } + + if( pPickObj ) + ReplaceObjectAtView(pPickObj, *pPV, pNewMediaObj); + else + InsertObjectAtView( pNewMediaObj, *pPV, SDRINSERT_SETDEFLAYER ); + + pNewMediaObj->setURL( rMediaURL ); + + if( pPickObj ) + pNewMediaObj->AdjustToMaxRect( pPickObj->GetLogicRect() ); - if( pPV && InsertObjectAtView( pNewMediaObj, *pPV, SDRINSERT_SETDEFLAYER ) ) - pNewMediaObj->setURL( rMediaURL ); + if( !IsUndoEnabled() ) + SdrObject::Free( pPickObj ); } rAction = mnAction; diff --git a/sd/source/ui/view/sdview5.cxx b/sd/source/ui/view/sdview5.cxx index c86b8f191b9c..18a58b8cd2cf 100644 --- a/sd/source/ui/view/sdview5.cxx +++ b/sd/source/ui/view/sdview5.cxx @@ -48,6 +48,7 @@ static bool implIsMultiPresObj( PresObjKind eKind ) case PRESOBJ_ORGCHART: case PRESOBJ_TABLE: case PRESOBJ_IMAGE: + case PRESOBJ_MEDIA: return true; default: return false; -- cgit From 8ebd9d44d4d0ed08df12eaf356df1331bd0603e8 Mon Sep 17 00:00:00 2001 From: Christian Lippka Date: Wed, 24 Feb 2010 13:01:59 +0100 Subject: unix build fixes --- sd/source/core/sdpage.cxx | 2 +- sd/source/ui/func/fuinsert.cxx | 1 - sd/source/ui/view/drawview.cxx | 4 ++-- 3 files changed, 3 insertions(+), 4 deletions(-) (limited to 'sd') diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx index 360ac670de6c..97e936a092b8 100644 --- a/sd/source/core/sdpage.cxx +++ b/sd/source/core/sdpage.cxx @@ -220,7 +220,7 @@ SdrObject* SdPage::GetPresObj(PresObjKind eObjKind, int nIndex, bool bFuzzySearc if( nIndex > 0 ) nIndex--; - if( aMatches.size() > nIndex ) + if( (nIndex >= 0) && ( aMatches.size() > static_cast(nIndex)) ) return aMatches[nIndex]; return 0; diff --git a/sd/source/ui/func/fuinsert.cxx b/sd/source/ui/func/fuinsert.cxx index ce0dc8f67a58..df537fa8bb03 100644 --- a/sd/source/ui/func/fuinsert.cxx +++ b/sd/source/ui/func/fuinsert.cxx @@ -361,7 +361,6 @@ void FuInsertOLE::DoExecute( SfxRequest& rReq ) SdrOle2Obj* pOleObj = new SdrOle2Obj( svt::EmbeddedObjectRef( xObj, nAspect ), aObjName, aRect ); SdrPageView* pPV = mpView->GetSdrPageView(); - bool bUndo = false; // if we have a pick obj we need to make this new ole a pres obj replacing the current pick obj if( pPickObj ) { diff --git a/sd/source/ui/view/drawview.cxx b/sd/source/ui/view/drawview.cxx index e6fb02a06c3d..9c6273085b51 100644 --- a/sd/source/ui/view/drawview.cxx +++ b/sd/source/ui/view/drawview.cxx @@ -1,4 +1,4 @@ -/************************************************************************* + /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -650,7 +650,7 @@ void DrawView::DeleteMarked() ::sd::View::DeleteMarked(); - if( pPage &&& bResetLayout ) + if( pPage && bResetLayout ) pPage->SetAutoLayout( pPage->GetAutoLayout() ); if( pUndoManager ) -- cgit From 55525d4462565f4e47e92854158c5fe7a7e457ab Mon Sep 17 00:00:00 2001 From: Christian Lippka Date: Thu, 25 Feb 2010 18:04:05 +0100 Subject: more fixes for new presentation layout shapes --- sd/source/core/sdpage.cxx | 8 +++++--- .../configuration/ConfigurationController.cxx | 2 +- .../configuration/ConfigurationUpdater.cxx | 2 +- sd/source/ui/func/fuinsert.cxx | 6 ------ sd/source/ui/table/tablefunction.cxx | 6 ------ sd/source/ui/view/ViewShellManager.cxx | 2 +- sd/source/ui/view/drawview.cxx | 6 ++++++ sd/source/ui/view/sdview4.cxx | 21 ++++++++++++--------- sd/source/ui/view/viewoverlaymanager.cxx | 5 +++-- 9 files changed, 29 insertions(+), 29 deletions(-) (limited to 'sd') diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx index 97e936a092b8..9d333329e7c5 100644 --- a/sd/source/core/sdpage.cxx +++ b/sd/source/core/sdpage.cxx @@ -1380,7 +1380,7 @@ static void CalcAutoLayoutRectangles( SdPage& rPage, int nLayout, Rectangle* rRe } -void findAutoLayoutShapesImpl( SdPage& rPage, const LayoutDescriptor& rDescriptor, std::vector< SdrObject* >& rShapes, bool bInit ) +void findAutoLayoutShapesImpl( SdPage& rPage, const LayoutDescriptor& rDescriptor, std::vector< SdrObject* >& rShapes, bool bInit, bool bSwitchLayout ) { int i; @@ -1400,7 +1400,7 @@ void findAutoLayoutShapesImpl( SdPage& rPage, const LayoutDescriptor& rDescripto { PresObjIndex[eKind]++; // on next search for eKind, find next shape with same eKind - if( !pObj->IsEmptyPresObj() ) + if( !bSwitchLayout || !pObj->IsEmptyPresObj() ) { rShapes[i] = pObj; break; @@ -1545,6 +1545,8 @@ void SdPage::SetAutoLayout(AutoLayout eLayout, BOOL bInit, BOOL bCreate ) { sd::ScopeLockGuard aGuard( maLockAutoLayoutArrangement ); + const bool bSwitchLayout = eLayout != GetAutoLayout(); + sd::UndoManager* pUndoManager = pModel ? static_cast(pModel)->GetUndoManager() : 0; const bool bUndo = pUndoManager && pUndoManager->isInListAction() && IsInserted(); @@ -1567,7 +1569,7 @@ void SdPage::SetAutoLayout(AutoLayout eLayout, BOOL bInit, BOOL bCreate ) std::vector< SdrObject* > aLayoutShapes(PRESOBJ_MAX, 0); - findAutoLayoutShapesImpl( *this, aDescriptor, aLayoutShapes, bInit ); + findAutoLayoutShapesImpl( *this, aDescriptor, aLayoutShapes, bInit, bSwitchLayout ); int i; diff --git a/sd/source/ui/framework/configuration/ConfigurationController.cxx b/sd/source/ui/framework/configuration/ConfigurationController.cxx index ef7fd4cdbf00..731b9d6963c0 100644 --- a/sd/source/ui/framework/configuration/ConfigurationController.cxx +++ b/sd/source/ui/framework/configuration/ConfigurationController.cxx @@ -59,7 +59,7 @@ using rtl::OUString; using ::sd::framework::FrameworkHelper; #undef VERBOSE -#define VERBOSE 3 +//#define VERBOSE 3 namespace sd { namespace framework { diff --git a/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx b/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx index e2aab7316937..5721f483595f 100644 --- a/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx +++ b/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx @@ -49,7 +49,7 @@ using ::rtl::OUString; using ::std::vector; #undef VERBOSE -#define VERBOSE 2 +//#define VERBOSE 2 namespace { static const sal_Int32 snShortTimeout (100); diff --git a/sd/source/ui/func/fuinsert.cxx b/sd/source/ui/func/fuinsert.cxx index df537fa8bb03..11af473cfd0b 100644 --- a/sd/source/ui/func/fuinsert.cxx +++ b/sd/source/ui/func/fuinsert.cxx @@ -410,12 +410,6 @@ void FuInsertOLE::DoExecute( SfxRequest& rReq ) mpViewShell->AdaptDefaultsForChart( xObj ); } } - - if( !mpView->IsUndoEnabled() && pPickObj ) - { - // replaced object must be freed if there is no undo action owning it - SdrObject::Free( pPickObj ); - } } else { diff --git a/sd/source/ui/table/tablefunction.cxx b/sd/source/ui/table/tablefunction.cxx index 4c12445a513f..4ef479af977e 100644 --- a/sd/source/ui/table/tablefunction.cxx +++ b/sd/source/ui/table/tablefunction.cxx @@ -193,12 +193,6 @@ void DrawViewShell::FuTable(SfxRequest& rReq) else mpView->InsertObjectAtView(pObj, *pPV, SDRINSERT_SETDEFLAYER); - if( !mpView->IsUndoEnabled() && pPickObj ) - { - // replaced object must be freed if there is no undo action owning it - SdrObject::Free( pPickObj ); - } - Invalidate(SID_DRAWTBX_INSERT); rReq.Ignore(); break; diff --git a/sd/source/ui/view/ViewShellManager.cxx b/sd/source/ui/view/ViewShellManager.cxx index e8337c97dfb3..528969bcbf4d 100755 --- a/sd/source/ui/view/ViewShellManager.cxx +++ b/sd/source/ui/view/ViewShellManager.cxx @@ -45,7 +45,7 @@ #include #undef VERBOSE -#define VERBOSE 2 +//#define VERBOSE 2 namespace sd { diff --git a/sd/source/ui/view/drawview.cxx b/sd/source/ui/view/drawview.cxx index 9c6273085b51..db7c981f80e2 100644 --- a/sd/source/ui/view/drawview.cxx +++ b/sd/source/ui/view/drawview.cxx @@ -593,6 +593,8 @@ SdrObject* DrawView::GetMaxToBtmObj(SdrObject* pObj) const void DrawView::DeleteMarked() { + OSL_TRACE( "DrawView::DeleteMarked() - enter" ); + sd::UndoManager* pUndoManager = mpDoc->GetUndoManager(); DBG_ASSERT( pUndoManager, "sd::DrawView::DeleteMarked(), ui action without undo manager!?" ); @@ -643,6 +645,8 @@ void DrawView::DeleteMarked() pPage->SetObjectOrdNum( pNewObj->GetOrdNum(), pObj->GetOrdNum() ); bResetLayout = true; + + OSL_TRACE( "DrawView::InsertAutoLayoutShape() - InsertAutoLayoutShape" ); } } } @@ -655,6 +659,8 @@ void DrawView::DeleteMarked() if( pUndoManager ) pUndoManager->LeaveListAction(); + + OSL_TRACE( "DrawView::InsertAutoLayoutShape() - leave" ); } } // end of namespace sd diff --git a/sd/source/ui/view/sdview4.cxx b/sd/source/ui/view/sdview4.cxx index 49496086e084..aeebb7d63f69 100644 --- a/sd/source/ui/view/sdview4.cxx +++ b/sd/source/ui/view/sdview4.cxx @@ -123,6 +123,9 @@ SdrGrafObj* View::InsertGraphic( const Graphic& rGraphic, sal_Int8& rAction, const bool bIsGraphic = pPickObj->ISA( SdrGrafObj ); if( bIsGraphic || pObj->IsEmptyPresObj() ) { + if( IsUndoEnabled() ) + BegUndo(String(SdResId(STR_INSERTGRAPHIC))); + SdPage* pPage = (SdPage*) pPickObj->GetPage(); if( bIsGraphic ) @@ -157,10 +160,8 @@ SdrGrafObj* View::InsertGraphic( const Graphic& rGraphic, sal_Int8& rAction, ReplaceObjectAtView(pPickObj, *pPV, pNewGrafObj); // maybe ReplaceObjectAtView - if( !IsUndoEnabled() && pPickObj ) - { - SdrObject::Free( pPickObj ); - } + if( IsUndoEnabled() ) + EndUndo(); } else if (pPickObj->IsClosedObj() && !pPickObj->ISA(SdrOle2Obj)) { @@ -329,13 +330,14 @@ SdrMediaObj* View::InsertMediaURL( const rtl::OUString& rMediaURL, sal_Int8& rAc pNewMediaObj = new SdrMediaObj( aRect ); + bool bIsPres = false; if( pPickObj ) { SdPage* pPage = static_cast< SdPage* >(pPickObj->GetPage()); - if(pPage && pPage->IsPresObj(pPickObj)) + bIsPres = pPage && pPage->IsPresObj(pPickObj); + if( bIsPres ) { pPage->InsertPresObj( pNewMediaObj, PRESOBJ_MEDIA ); - pNewMediaObj->SetUserCall(pPickObj->GetUserCall()); } } @@ -347,10 +349,11 @@ SdrMediaObj* View::InsertMediaURL( const rtl::OUString& rMediaURL, sal_Int8& rAc pNewMediaObj->setURL( rMediaURL ); if( pPickObj ) + { pNewMediaObj->AdjustToMaxRect( pPickObj->GetLogicRect() ); - - if( !IsUndoEnabled() ) - SdrObject::Free( pPickObj ); + if( bIsPres ) + pNewMediaObj->SetUserCall(pPickObj->GetUserCall()); + } } rAction = mnAction; diff --git a/sd/source/ui/view/viewoverlaymanager.cxx b/sd/source/ui/view/viewoverlaymanager.cxx index 172594adc2e8..d42c3a986f7f 100644 --- a/sd/source/ui/view/viewoverlaymanager.cxx +++ b/sd/source/ui/view/viewoverlaymanager.cxx @@ -312,14 +312,15 @@ bool ChangePlaceholderTag::KeyInput( const KeyEvent& rKEvt ) /** returns true if the SmartTag consumes this event. */ bool ChangePlaceholderTag::RequestHelp( const HelpEvent& rHEvt ) { +/* Rectangle aItemRect( rHEvt.GetMousePosPixel(), Size(1,1) ); String aHelpText(RTL_CONSTASCII_USTRINGPARAM("I'm a help text")); if( rHEvt.GetMode() == HELPMODE_BALLOON ) Help::ShowBalloon( static_cast< ::Window* >(mrView.GetFirstOutputDevice()), aItemRect.Center(), aItemRect, aHelpText); else Help::ShowQuickHelp( static_cast< ::Window* >(mrView.GetFirstOutputDevice()), aItemRect, aHelpText ); - - return true; +*/ + return false; } // -------------------------------------------------------------------- -- cgit From 7531716e6f1c08977105886102dcde4e536e0a72 Mon Sep 17 00:00:00 2001 From: Christian Lippka Date: Fri, 5 Mar 2010 10:49:41 +0100 Subject: enable toolbar menu cursor traveling without focus --- sd/source/ui/dlg/layoutdialog.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'sd') diff --git a/sd/source/ui/dlg/layoutdialog.cxx b/sd/source/ui/dlg/layoutdialog.cxx index 613fd46fdfca..4d1b6a7a9f06 100644 --- a/sd/source/ui/dlg/layoutdialog.cxx +++ b/sd/source/ui/dlg/layoutdialog.cxx @@ -155,7 +155,7 @@ SdLayoutDialogContent::SdLayoutDialogContent( ViewShellBase& rBase, ::Window* pP SetSelectHdl( LINK( this, SdLayoutDialogContent, SelectHdl ) ); - mpLayoutSet1 = new ValueSet( this, WB_TABSTOP | WB_MENUSTYLEVALUESET | WB_FLATVALUESET | WB_NOBORDER | WB_NO_DIRECTSELECT ); + mpLayoutSet1 = new ValueSet( this, WB_TABSTOP | /* WB_MENUSTYLEVALUESET | */ WB_FLATVALUESET | WB_NOBORDER | WB_NO_DIRECTSELECT ); // mpLayoutSet1->SetHelpId( HID_VALUESET_EXTRUSION_LIGHTING ); mpLayoutSet1->SetSelectHdl( LINK( this, SdLayoutDialogContent, SelectHdl ) ); @@ -171,7 +171,7 @@ SdLayoutDialogContent::SdLayoutDialogContent( ViewShellBase& rBase, ::Window* pP if( bVerticalEnabled ) { - mpLayoutSet2 = new ValueSet( this, WB_TABSTOP | WB_MENUSTYLEVALUESET | WB_FLATVALUESET | WB_NOBORDER | WB_NO_DIRECTSELECT ); + mpLayoutSet2 = new ValueSet( this, WB_TABSTOP | /* WB_MENUSTYLEVALUESET | */ WB_FLATVALUESET | WB_NOBORDER | WB_NO_DIRECTSELECT ); // mpLayoutSet2->SetHelpId( HID_VALUESET_EXTRUSION_LIGHTING ); mpLayoutSet2->SetSelectHdl( LINK( this, SdLayoutDialogContent, SelectHdl ) ); -- 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/prj/build.lst | 3 +- sd/source/ui/app/layoutctrl.cxx | 123 ------- sd/source/ui/app/sddll2.cxx | 5 +- sd/source/ui/controller/makefile.mk | 54 ++++ sd/source/ui/controller/slidelayoutcontroller.cxx | 376 ++++++++++++++++++++++ sd/source/ui/controller/slidelayoutcontroller.hxx | 53 +++ sd/source/ui/dlg/layoutdialog.cxx | 298 ----------------- sd/source/ui/dlg/layoutdialog.hrc | 34 -- sd/source/ui/dlg/layoutdialog.src | 55 ---- sd/source/ui/dlg/makefile.mk | 10 +- sd/source/ui/inc/layoutctrl.hxx | 56 ---- sd/source/ui/inc/layoutdialog.hxx | 69 ---- sd/source/ui/unoidl/facreg.cxx | 36 ++- sd/source/ui/view/ViewShellBase.cxx | 10 +- sd/source/ui/view/drviews2.cxx | 2 - sd/source/ui/view/drviews6.cxx | 1 - sd/uiconfig/simpress/toolbar/commontaskbar.xml | 4 +- sd/util/makefile.mk | 3 +- 18 files changed, 537 insertions(+), 655 deletions(-) delete mode 100644 sd/source/ui/app/layoutctrl.cxx create mode 100644 sd/source/ui/controller/makefile.mk create mode 100644 sd/source/ui/controller/slidelayoutcontroller.cxx create mode 100644 sd/source/ui/controller/slidelayoutcontroller.hxx delete mode 100644 sd/source/ui/dlg/layoutdialog.cxx delete mode 100644 sd/source/ui/dlg/layoutdialog.hrc delete mode 100644 sd/source/ui/dlg/layoutdialog.src delete mode 100644 sd/source/ui/inc/layoutctrl.hxx delete mode 100644 sd/source/ui/inc/layoutdialog.hxx (limited to 'sd') diff --git a/sd/prj/build.lst b/sd/prj/build.lst index bc8bf923f7e5..c8a15328d886 100644 --- a/sd/prj/build.lst +++ b/sd/prj/build.lst @@ -26,6 +26,7 @@ sd sd\source\ui\slidesorter\model nmake - all sd_slsmodel sd_inc NULL sd sd\source\ui\slidesorter\view nmake - all sd_slsview sd_inc NULL sd sd\source\ui\slidesorter\controller nmake - all sd_slscontroller sd_sdi sd_inc NULL sd sd\source\ui\slidesorter\cache nmake - all sd_slscache sd_inc NULL +sd sd\source\ui\controller nmake - all sd_controller sd_inc NULL sd sd\source\ui\notes nmake - all sd_notes sd_inc NULL sd sd\source\ui\table nmake - all sd_table sd_inc NULL sd sd\source\filter\ppt nmake - all sd_ppt sd_inc NULL @@ -43,4 +44,4 @@ sd sd\source\ui\framework\module nmake - all sd_framework_module sd_inc N sd sd\source\ui\framework\factories nmake - all sd_framework_factories sd_inc NULL sd sd\source\ui\framework\tools nmake - all sd_framework_tools sd_inc NULL sd sd\source\ui\annotations nmake - all sd_uiannotations sd_inc NULL -sd sd\util nmake - all sd_util sd_app sd_cgm sd_core sd_dlg sd_docsh sd_eppt sd_filt sd_func sd_grf sd_unid sd_view sd_xml sd_html sd_ppt sd_accessibility sd_animations sd_toolpanel sd_toolpanel_controls sd_tools sd_slsshell sd_slsmodel sd_slsview sd_slscontroller sd_slscache sd_notes sd_table sd_slideshow sd_presenter sd_undo sd_helper sd_framework_configuration sd_framework_module sd_framework_tools sd_framework_factories sd_text sd_annotations sd_uiannotations NULL +sd sd\util nmake - all sd_util sd_app sd_cgm sd_core sd_dlg sd_docsh sd_eppt sd_filt sd_func sd_grf sd_unid sd_view sd_xml sd_html sd_ppt sd_accessibility sd_animations sd_toolpanel sd_toolpanel_controls sd_tools sd_slsshell sd_slsmodel sd_slsview sd_slscontroller sd_slscache sd_notes sd_controller sd_table sd_slideshow sd_presenter sd_undo sd_helper sd_framework_configuration sd_framework_module sd_framework_tools sd_framework_factories sd_text sd_annotations sd_uiannotations NULL diff --git a/sd/source/ui/app/layoutctrl.cxx b/sd/source/ui/app/layoutctrl.cxx deleted file mode 100644 index d2ca5f09d46e..000000000000 --- a/sd/source/ui/app/layoutctrl.cxx +++ /dev/null @@ -1,123 +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.cxx,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. - * - ************************************************************************/ - -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_sd.hxx" - -#include -#include - -#include -#include -#include - -#include -#include -#include -#include - -#include - -#include - -#include "layoutdialog.hxx" -#include "sdresid.hxx" -#include "res_bmp.hrc" -#include "strings.hrc" -#include "layoutctrl.hxx" -#include "ViewShellBase.hxx" -#include "drawdoc.hxx" -#include "sdattr.hrc" -#include "app.hrc" -#include "glob.hrc" - -using ::rtl::OUString; -using namespace ::com::sun::star; -using namespace ::com::sun::star::text; -using namespace ::com::sun::star::uno; -using namespace ::com::sun::star::beans; - -SFX_IMPL_TOOLBOX_CONTROL( SdLayoutControl, SfxVoidItem ); - -// class SdLayoutControl ------------------------------------------ - -SdLayoutControl::SdLayoutControl( USHORT _nSlotId, USHORT _nId, ToolBox& rTbx ) -: SfxToolBoxControl( _nSlotId, _nId, rTbx ) -{ - if( SID_INSERTPAGE != _nSlotId ) - rTbx.SetItemBits( _nId, TIB_DROPDOWNONLY | rTbx.GetItemBits( _nId ) ); - - rTbx.Invalidate(); -} - -// ----------------------------------------------------------------------- - -SdLayoutControl::~SdLayoutControl() -{ -} - -// ----------------------------------------------------------------------- - -void SdLayoutControl::Select( BOOL bMod1 ) -{ - SfxToolBoxControl::Select( bMod1 ); -} - -// ----------------------------------------------------------------------- - -void SdLayoutControl::StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState ) -{ - SfxToolBoxControl::StateChanged( nSID, eState, pState ); -} - -// ----------------------------------------------------------------------- - -SfxPopupWindowType SdLayoutControl::GetPopupWindowType() const -{ - return SFX_POPUPWINDOW_ONCLICK; -} - -// ----------------------------------------------------------------------- - -SfxPopupWindow* SdLayoutControl::CreatePopupWindow() -{ - Window* pWin = 0; - - ToolBox& rTbx = GetToolBox(); - sd::ViewShellBase* pViewShellBase = sd::ViewShellBase::GetViewShellBase( SfxViewFrame::Current() ); - if( pViewShellBase ) - { - pWin = new sd::SdLayoutDialogContent( *pViewShellBase, &rTbx, GetSlotId() == SID_INSERTPAGE ); - if( pWin ) - StartPopupMode( pWin ); - } - return 0; -} diff --git a/sd/source/ui/app/sddll2.cxx b/sd/source/ui/app/sddll2.cxx index 606789ef84a9..947cc841eb71 100644 --- a/sd/source/ui/app/sddll2.cxx +++ b/sd/source/ui/app/sddll2.cxx @@ -89,7 +89,6 @@ #include "PaneChildWindows.hxx" #include "tmplctrl.hxx" -#include "layoutctrl.hxx" /************************************************************************* |* @@ -217,6 +216,6 @@ void SdDLL::RegisterControllers() SvxFrameToolBoxControl::RegisterControl(SID_ATTR_BORDER, pMod ); SvxSubToolBoxControl::RegisterControl(SID_OPTIMIZE_TABLE, pMod); - SdLayoutControl::RegisterControl( SID_ASSIGN_LAYOUT, pMod ); - SdLayoutControl::RegisterControl( SID_INSERTPAGE, pMod ); +// SdLayoutControl::RegisterControl( SID_ASSIGN_LAYOUT, pMod ); +// SdLayoutControl::RegisterControl( SID_INSERTPAGE, pMod ); } diff --git a/sd/source/ui/controller/makefile.mk b/sd/source/ui/controller/makefile.mk new file mode 100644 index 000000000000..4e37fbd5ea88 --- /dev/null +++ b/sd/source/ui/controller/makefile.mk @@ -0,0 +1,54 @@ +#************************************************************************* +# +# 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: makefile.mk,v $ +# +# $Revision: 1.21 $ +# +# 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. +# +#************************************************************************* + + +PRJ=..$/..$/.. + +PROJECTPCH=sd +PROJECTPCHSOURCE=$(PRJ)$/util$/sd +PRJNAME=sd +TARGET=controller +ENABLE_EXCEPTIONS=TRUE +AUTOSEG=true + +# --- Settings ----------------------------------------------------- + +.INCLUDE : settings.mk +.INCLUDE : $(PRJ)$/util$/makefile.pmk + +# --- Files -------------------------------------------------------- + +SLOFILES = \ + $(SLO)$/slidelayoutcontroller.obj + +# --- Tagets ------------------------------------------------------- + +.INCLUDE : target.mk diff --git a/sd/source/ui/controller/slidelayoutcontroller.cxx b/sd/source/ui/controller/slidelayoutcontroller.cxx new file mode 100644 index 000000000000..57fafdc7c8c0 --- /dev/null +++ b/sd/source/ui/controller/slidelayoutcontroller.cxx @@ -0,0 +1,376 @@ +/************************************************************************* + * + * 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. + * + ************************************************************************/ + +// MARKER(update_precomp.py): autogen include statement, do not remove +#include "precompiled_sd.hxx" + +#include +#include +#include +#include +#include + +#include +#include + +#include + +#include +#include + +#include + +#include +#include +#include +#include + +#include + +#include + +#include "app.hrc" +#include "glob.hrc" +#include "strings.hrc" +#include "res_bmp.hrc" +#include "sdresid.hxx" +#include "pres.hxx" +#include "slidelayoutcontroller.hxx" + +using rtl::OUString; + +using namespace ::com::sun::star; +using namespace ::com::sun::star::uno; +using namespace ::com::sun::star::lang; +using namespace ::com::sun::star::text; +using namespace ::com::sun::star::frame; +using namespace ::com::sun::star::beans; + +namespace sd +{ + +extern ::rtl::OUString ImplRetrieveLabelFromCommand( const Reference< XFrame >& xFrame, const OUString& aCmdURL ); + +// ----------------------------------------------------------------------- + +class LayoutToolbarMenu : public svtools::ToolbarMenu +{ +public: + LayoutToolbarMenu( SlideLayoutController& rController, const Reference< XFrame >& xFrame, ::Window* pParent, const bool bInsertPage ); + virtual ~LayoutToolbarMenu(); + +protected: + DECL_LINK( SelectHdl, void * ); + +private: + SlideLayoutController& mrController; + Reference< XFrame > mxFrame; + bool mbInsertPage; + ValueSet* mpLayoutSet1; + ValueSet* mpLayoutSet2; +}; + +// ----------------------------------------------------------------------- + +struct snewfoil_value_info +{ + USHORT mnBmpResId; + USHORT mnHCBmpResId; + USHORT mnStrResId; + WritingMode meWritingMode; + AutoLayout maAutoLayout; +}; +static snewfoil_value_info standard[] = +{ + {BMP_LAYOUT_EMPTY, BMP_LAYOUT_EMPTY_H, STR_AUTOLAYOUT_NONE, WritingMode_LR_TB, AUTOLAYOUT_NONE}, + {BMP_LAYOUT_HEAD03, BMP_LAYOUT_HEAD03_H, STR_AUTOLAYOUT_TITLE, WritingMode_LR_TB, AUTOLAYOUT_TITLE}, + {BMP_LAYOUT_HEAD02, BMP_LAYOUT_HEAD02_H, STR_AUTOLAYOUT_CONTENT, WritingMode_LR_TB, AUTOLAYOUT_ENUM}, + {BMP_LAYOUT_HEAD02A, BMP_LAYOUT_HEAD02A_H, STR_AUTOLAYOUT_2CONTENT, WritingMode_LR_TB, AUTOLAYOUT_2TEXT}, + {BMP_LAYOUT_HEAD01, BMP_LAYOUT_HEAD01_H, STR_AUTOLAYOUT_ONLY_TITLE, WritingMode_LR_TB, AUTOLAYOUT_ONLY_TITLE}, + {BMP_LAYOUT_TEXTONLY, BMP_LAYOUT_TEXTONLY_H, STR_AUTOLAYOUT_ONLY_TEXT, WritingMode_LR_TB, AUTOLAYOUT_ONLY_TEXT}, + {BMP_LAYOUT_HEAD03B, BMP_LAYOUT_HEAD03B_H, STR_AUTOLAYOUT_2CONTENT_CONTENT, WritingMode_LR_TB, AUTOLAYOUT_2OBJTEXT}, + {BMP_LAYOUT_HEAD03C, BMP_LAYOUT_HEAD03C_H, STR_AUTOLAYOUT_CONTENT_2CONTENT, WritingMode_LR_TB, AUTOLAYOUT_TEXT2OBJ}, + {BMP_LAYOUT_HEAD03A, BMP_LAYOUT_HEAD03A_H, STR_AUTOLAYOUT_2CONTENT_OVER_CONTENT,WritingMode_LR_TB, AUTOLAYOUT_2OBJOVERTEXT}, + {BMP_LAYOUT_HEAD02B, BMP_LAYOUT_HEAD02B_H, STR_AUTOLAYOUT_CONTENT_OVER_CONTENT, WritingMode_LR_TB, AUTOLAYOUT_OBJOVERTEXT}, + {BMP_LAYOUT_HEAD04, BMP_LAYOUT_HEAD04_H, STR_AUTOLAYOUT_4CONTENT, WritingMode_LR_TB, AUTOLAYOUT_4OBJ}, + {BMP_LAYOUT_HEAD06, BMP_LAYOUT_HEAD06_H, STR_AUTOLAYOUT_6CONTENT, WritingMode_LR_TB, AUTOLAYOUT_6CLIPART}, + {0, 0, 0, WritingMode_LR_TB, AUTOLAYOUT_NONE} +}; + +static snewfoil_value_info v_standard[] = +{ + // vertical + {BMP_LAYOUT_VERTICAL02, BMP_LAYOUT_VERTICAL02_H, STR_AL_VERT_TITLE_TEXT_CHART, WritingMode_TB_RL,AUTOLAYOUT_VERTICAL_TITLE_TEXT_CHART}, + {BMP_LAYOUT_VERTICAL01, BMP_LAYOUT_VERTICAL01_H, STR_AL_VERT_TITLE_VERT_OUTLINE, WritingMode_TB_RL, AUTOLAYOUT_VERTICAL_TITLE_VERTICAL_OUTLINE}, + {BMP_LAYOUT_HEAD02, BMP_LAYOUT_HEAD02_H, STR_AL_TITLE_VERT_OUTLINE, WritingMode_TB_RL, AUTOLAYOUT_TITLE_VERTICAL_OUTLINE}, + {BMP_LAYOUT_HEAD02A, BMP_LAYOUT_HEAD02A_H, STR_AL_TITLE_VERT_OUTLINE_CLIPART, WritingMode_TB_RL, AUTOLAYOUT_TITLE_VERTICAL_OUTLINE_CLIPART}, + {0, 0, 0, WritingMode_LR_TB, AUTOLAYOUT_NONE} +}; + +// ----------------------------------------------------------------------- + +static void fillLayoutValueSet( ValueSet* pValue, snewfoil_value_info* pInfo, const bool bHighContrast ) +{ + Size aLayoutItemSize; + for( ; pInfo->mnBmpResId; pInfo++ ) + { + String aText( SdResId( pInfo->mnStrResId ) ); + BitmapEx aBmp( SdResId( (bHighContrast ? pInfo->mnHCBmpResId : pInfo->mnBmpResId) ) ); + + pValue->InsertItem( static_cast(pInfo->maAutoLayout)+1, aBmp, aText ); + + aLayoutItemSize.Width() = std::max( aLayoutItemSize.Width(), aBmp.GetSizePixel().Width() ); + aLayoutItemSize.Height() = std::max( aLayoutItemSize.Height(), aBmp.GetSizePixel().Height() ); + } + + aLayoutItemSize = pValue->CalcItemSizePixel( aLayoutItemSize ); + pValue->SetSizePixel( pValue->CalcWindowSizePixel( aLayoutItemSize ) ); +} + +// ----------------------------------------------------------------------- + +LayoutToolbarMenu::LayoutToolbarMenu( SlideLayoutController& rController, const Reference< XFrame >& xFrame, ::Window* pParent, const bool bInsertPage ) +: svtools::ToolbarMenu(xFrame, pParent, WB_CLIPCHILDREN ) +, mrController( rController ) +, mxFrame(xFrame) +, mbInsertPage( bInsertPage ) +, mpLayoutSet1( 0 ) +, mpLayoutSet2( 0 ) +{ + String aTitle1( SdResId( STR_GLUE_ESCDIR_HORZ ) ); + String aTitle2( SdResId( STR_GLUE_ESCDIR_VERT ) ); + + const Color aMenuColor( GetSettings().GetStyleSettings().GetMenuColor() ); + const Color aMenuBarColor( GetSettings().GetStyleSettings().GetMenuBarColor() ); + const Color aMenuTextColor( GetSettings().GetStyleSettings().GetMenuBarColor() ); + const Color aMenuBarTextColor( GetSettings().GetStyleSettings().GetMenuBarTextColor() ); + + const bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode(); + SvtLanguageOptions aLanguageOptions; + const bool bVerticalEnabled = aLanguageOptions.IsVerticalTextEnabled(); + + SetSelectHdl( LINK( this, LayoutToolbarMenu, SelectHdl ) ); + + mpLayoutSet1 = new ValueSet( this, WB_TABSTOP | WB_MENUSTYLEVALUESET | WB_FLATVALUESET | WB_NOBORDER | WB_NO_DIRECTSELECT ); +// mpLayoutSet1->SetHelpId( HID_VALUESET_EXTRUSION_LIGHTING ); + + mpLayoutSet1->SetSelectHdl( LINK( this, LayoutToolbarMenu, SelectHdl ) ); + mpLayoutSet1->SetColCount( 4 ); + mpLayoutSet1->EnableFullItemMode( FALSE ); + mpLayoutSet1->SetColor( GetControlBackground() ); + + fillLayoutValueSet( mpLayoutSet1, &standard[0], bHighContrast ); + + if( bVerticalEnabled ) + appendEntry( -1, aTitle1 ); + appendEntry( 0, mpLayoutSet1 ); + + if( bVerticalEnabled ) + { + mpLayoutSet2 = new ValueSet( this, WB_TABSTOP | WB_MENUSTYLEVALUESET | WB_FLATVALUESET | WB_NOBORDER | WB_NO_DIRECTSELECT ); + // mpLayoutSet2->SetHelpId( HID_VALUESET_EXTRUSION_LIGHTING ); + + mpLayoutSet2->SetSelectHdl( LINK( this, LayoutToolbarMenu, SelectHdl ) ); + mpLayoutSet2->SetColCount( 4 ); + mpLayoutSet2->EnableFullItemMode( FALSE ); + mpLayoutSet2->SetColor( GetControlBackground() ); + + fillLayoutValueSet( mpLayoutSet2, &v_standard[0], bHighContrast ); + + appendEntry( -1, aTitle2 ); + appendEntry( 1, mpLayoutSet2 ); + } + + OUString sSlotStr; + Image aSlotImage; + if( mxFrame.is() ) + { + if( bInsertPage ) + sSlotStr = OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:DuplicatePage" ) ); + else + sSlotStr = OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:Undo" ) ); + aSlotImage = ::GetImage( mxFrame, sSlotStr, FALSE, FALSE ); + + String sSlotTitle; + if( bInsertPage ) + sSlotTitle = ImplRetrieveLabelFromCommand( mxFrame, sSlotStr ); + else + sSlotTitle = String( SdResId( STR_RESET_LAYOUT ) ); + appendEntry( 2, sSlotTitle, aSlotImage); + } + + SetOutputSizePixel( getMenuSize() ); +} + +// ----------------------------------------------------------------------- + +LayoutToolbarMenu::~LayoutToolbarMenu() +{ +} + + +// ----------------------------------------------------------------------- + + +/* +void LayoutToolbarMenu::DataChanged( const DataChangedEvent& rDCEvt ) +{ + SfxDockingWindow::DataChanged( rDCEvt ); + + if( ( rDCEvt.GetType() == DATACHANGED_SETTINGS ) && ( rDCEvt.GetFlags() & SETTINGS_STYLE ) ) + { + // const bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode(); + + // todo switch images + } +} +*/ + +// ----------------------------------------------------------------------- + +IMPL_LINK( LayoutToolbarMenu, SelectHdl, void *, pControl ) +{ + if ( IsInPopupMode() ) + EndPopupMode(); + + Sequence< PropertyValue > aArgs; + + AutoLayout eLayout = AUTOLAYOUT__END; + + OUString sCommandURL( mrController.getCommandURL() ); + + if( pControl == mpLayoutSet1 ) + { + eLayout = static_cast< AutoLayout >(mpLayoutSet1->GetSelectItemId()-1); + } + else if( pControl == mpLayoutSet2 ) + { + eLayout = static_cast< AutoLayout >(mpLayoutSet2->GetSelectItemId()-1); + } + + if( eLayout != AUTOLAYOUT__END ) + { + aArgs = Sequence< PropertyValue >(1); + aArgs[0].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "WhatLayout" ) ); + aArgs[0].Value <<= (sal_Int32)eLayout; + } + else if( mbInsertPage ) + { + sCommandURL = OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:DuplicatePage" ) ); + } + + mrController.dispatchCommand( sCommandURL, aArgs ); + + return 0; +} + +// ==================================================================== + +OUString SlideLayoutController_getImplementationName() +{ + return OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.sd.SlideLayoutController" )); +} + +// -------------------------------------------------------------------- + +Sequence< OUString > SlideLayoutController_getSupportedServiceNames() throw( RuntimeException ) +{ + Sequence< OUString > aSNS( 1 ); + aSNS.getArray()[0] = OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.ToolbarController" )); + return aSNS; +} + +// -------------------------------------------------------------------- + +Reference< XInterface > SAL_CALL SlideLayoutController_createInstance( const Reference< XMultiServiceFactory >& rSMgr ) throw( RuntimeException ) +{ + return *new SlideLayoutController( rSMgr, OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:AssignLayout" )), false ); +} + +// -------------------------------------------------------------------- + +OUString InsertSlideController_getImplementationName() +{ + return OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.sd.InsertSlideController" )); +} + +// -------------------------------------------------------------------- + +Sequence< OUString > InsertSlideController_getSupportedServiceNames() throw( RuntimeException ) +{ + Sequence< OUString > aSNS( 1 ); + aSNS.getArray()[0] = OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.ToolbarController" )); + return aSNS; +} + +// -------------------------------------------------------------------- + +Reference< XInterface > SAL_CALL InsertSlideController_createInstance( const Reference< XMultiServiceFactory >& rSMgr ) throw( RuntimeException ) +{ + return *new SlideLayoutController( rSMgr, OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:InsertPage" )), true ); +} + +//======================================================================== +// class SlideLayoutController +//======================================================================== + +SlideLayoutController::SlideLayoutController( const Reference< lang::XMultiServiceFactory >& rServiceManager, const rtl::OUString& sCommandURL, bool bInsertPage ) +: svt::PopupWindowController( rServiceManager, Reference< frame::XFrame >(), sCommandURL ) +, mbInsertPage( bInsertPage ) +{ +} + +// -------------------------------------------------------------------- + +::Window* SlideLayoutController::createPopupWindow( ::Window* pParent ) +{ + return new sd::LayoutToolbarMenu( *this, m_xFrame, pParent, mbInsertPage ); +} + +// -------------------------------------------------------------------- +// XServiceInfo +// -------------------------------------------------------------------- + +OUString SAL_CALL SlideLayoutController::getImplementationName() throw( RuntimeException ) +{ + if( mbInsertPage ) + return InsertSlideController_getImplementationName(); + else + return SlideLayoutController_getImplementationName(); +} + +// -------------------------------------------------------------------- + +Sequence< OUString > SAL_CALL SlideLayoutController::getSupportedServiceNames( ) throw( RuntimeException ) +{ + if( mbInsertPage ) + return InsertSlideController_getSupportedServiceNames(); + else + return SlideLayoutController_getSupportedServiceNames(); +} + +} diff --git a/sd/source/ui/controller/slidelayoutcontroller.hxx b/sd/source/ui/controller/slidelayoutcontroller.hxx new file mode 100644 index 000000000000..9e1c1692f953 --- /dev/null +++ b/sd/source/ui/controller/slidelayoutcontroller.hxx @@ -0,0 +1,53 @@ +/************************************************************************* + * + * 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_SLIDELAYOUTCONTROLLER_HXX_ +#define __SD_SLIDELAYOUTCONTROLLER_HXX_ + +#include + +namespace sd +{ + +class SlideLayoutController : public svt::PopupWindowController +{ +public: + SlideLayoutController( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rServiceManager, const rtl::OUString& sCommandURL, bool bInsertPage ); + + virtual ::Window* createPopupWindow( ::Window* pParent ); + + // XServiceInfo + virtual ::rtl::OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ); + +private: + bool mbInsertPage; +}; + +} + +#endif // __SD_SLIDELAYOUTCONTROLLER_HXX_ diff --git a/sd/source/ui/dlg/layoutdialog.cxx b/sd/source/ui/dlg/layoutdialog.cxx deleted file mode 100644 index 4d1b6a7a9f06..000000000000 --- a/sd/source/ui/dlg/layoutdialog.cxx +++ /dev/null @@ -1,298 +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.cxx,v $ - * $Revision: 1.7 $ - * - * 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. - * - ************************************************************************/ - -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_sd.hxx" - -#include -#include - -#include - -#include -#include -#include -#include -#include - -#include - -#include - -#include - -#include "app.hrc" -#include "layoutdialog.hxx" -#include "glob.hrc" -#include "strings.hrc" -#include "res_bmp.hrc" -#include "sdresid.hxx" -#include "View.hxx" -#include "drawdoc.hxx" -#include "ViewShellBase.hxx" -#include "DrawViewShell.hxx" -#include "layoutdialog.hrc" - -using ::rtl::OUString; -using namespace ::com::sun::star; -using namespace ::com::sun::star::text; -using namespace ::com::sun::star::uno; -using namespace ::com::sun::star::beans; -using namespace ::com::sun::star::frame; - -namespace sd { - -// ----------------------------------------------------------------------- - -// ----------------------------------------------------------------------- - -struct snewfoil_value_info -{ - USHORT mnBmpResId; - USHORT mnHCBmpResId; - USHORT mnStrResId; - WritingMode meWritingMode; - AutoLayout maAutoLayout; -}; -static snewfoil_value_info standard[] = -{ - {BMP_LAYOUT_EMPTY, BMP_LAYOUT_EMPTY_H, STR_AUTOLAYOUT_NONE, WritingMode_LR_TB, AUTOLAYOUT_NONE}, - {BMP_LAYOUT_HEAD03, BMP_LAYOUT_HEAD03_H, STR_AUTOLAYOUT_TITLE, WritingMode_LR_TB, AUTOLAYOUT_TITLE}, - {BMP_LAYOUT_HEAD02, BMP_LAYOUT_HEAD02_H, STR_AUTOLAYOUT_CONTENT, WritingMode_LR_TB, AUTOLAYOUT_ENUM}, - {BMP_LAYOUT_HEAD02A, BMP_LAYOUT_HEAD02A_H, STR_AUTOLAYOUT_2CONTENT, WritingMode_LR_TB, AUTOLAYOUT_2TEXT}, - {BMP_LAYOUT_HEAD01, BMP_LAYOUT_HEAD01_H, STR_AUTOLAYOUT_ONLY_TITLE, WritingMode_LR_TB, AUTOLAYOUT_ONLY_TITLE}, - {BMP_LAYOUT_TEXTONLY, BMP_LAYOUT_TEXTONLY_H, STR_AUTOLAYOUT_ONLY_TEXT, WritingMode_LR_TB, AUTOLAYOUT_ONLY_TEXT}, - {BMP_LAYOUT_HEAD03B, BMP_LAYOUT_HEAD03B_H, STR_AUTOLAYOUT_2CONTENT_CONTENT, WritingMode_LR_TB, AUTOLAYOUT_2OBJTEXT}, - {BMP_LAYOUT_HEAD03C, BMP_LAYOUT_HEAD03C_H, STR_AUTOLAYOUT_CONTENT_2CONTENT, WritingMode_LR_TB, AUTOLAYOUT_TEXT2OBJ}, - {BMP_LAYOUT_HEAD03A, BMP_LAYOUT_HEAD03A_H, STR_AUTOLAYOUT_2CONTENT_OVER_CONTENT,WritingMode_LR_TB, AUTOLAYOUT_2OBJOVERTEXT}, - {BMP_LAYOUT_HEAD02B, BMP_LAYOUT_HEAD02B_H, STR_AUTOLAYOUT_CONTENT_OVER_CONTENT, WritingMode_LR_TB, AUTOLAYOUT_OBJOVERTEXT}, - {BMP_LAYOUT_HEAD04, BMP_LAYOUT_HEAD04_H, STR_AUTOLAYOUT_4CONTENT, WritingMode_LR_TB, AUTOLAYOUT_4OBJ}, - {BMP_LAYOUT_HEAD06, BMP_LAYOUT_HEAD06_H, STR_AUTOLAYOUT_6CONTENT, WritingMode_LR_TB, AUTOLAYOUT_6CLIPART}, - {0, 0, 0, WritingMode_LR_TB, AUTOLAYOUT_NONE} -}; - -static snewfoil_value_info v_standard[] = -{ - // vertical - {BMP_LAYOUT_VERTICAL02, BMP_LAYOUT_VERTICAL02_H, STR_AL_VERT_TITLE_TEXT_CHART, WritingMode_TB_RL,AUTOLAYOUT_VERTICAL_TITLE_TEXT_CHART}, - {BMP_LAYOUT_VERTICAL01, BMP_LAYOUT_VERTICAL01_H, STR_AL_VERT_TITLE_VERT_OUTLINE, WritingMode_TB_RL, AUTOLAYOUT_VERTICAL_TITLE_VERTICAL_OUTLINE}, - {BMP_LAYOUT_HEAD02, BMP_LAYOUT_HEAD02_H, STR_AL_TITLE_VERT_OUTLINE, WritingMode_TB_RL, AUTOLAYOUT_TITLE_VERTICAL_OUTLINE}, - {BMP_LAYOUT_HEAD02A, BMP_LAYOUT_HEAD02A_H, STR_AL_TITLE_VERT_OUTLINE_CLIPART, WritingMode_TB_RL, AUTOLAYOUT_TITLE_VERTICAL_OUTLINE_CLIPART}, - {0, 0, 0, WritingMode_LR_TB, AUTOLAYOUT_NONE} -}; - -// ----------------------------------------------------------------------- - -static void fillLayoutValueSet( ValueSet* pValue, snewfoil_value_info* pInfo, const bool bHighContrast ) -{ - Size aLayoutItemSize; - for( ; pInfo->mnBmpResId; pInfo++ ) - { - String aText( SdResId( pInfo->mnStrResId ) ); - BitmapEx aBmp( SdResId( (bHighContrast ? pInfo->mnHCBmpResId : pInfo->mnBmpResId) ) ); - - pValue->InsertItem( static_cast(pInfo->maAutoLayout)+1, aBmp, aText ); - - aLayoutItemSize.Width() = std::max( aLayoutItemSize.Width(), aBmp.GetSizePixel().Width() ); - aLayoutItemSize.Height() = std::max( aLayoutItemSize.Height(), aBmp.GetSizePixel().Height() ); - } - - aLayoutItemSize = pValue->CalcItemSizePixel( aLayoutItemSize ); - pValue->SetSizePixel( pValue->CalcWindowSizePixel( aLayoutItemSize ) ); -} - -// ----------------------------------------------------------------------- - - -SdLayoutDialogContent::SdLayoutDialogContent( ViewShellBase& rBase, ::Window* pParent, const bool bInsertPage ) -: ToolbarMenu(rBase.GetFrame()->GetTopFrame()->GetFrameInterface(), pParent, SdResId( DLG_LAYOUTDIALOG ) /*WB_CLIPCHILDREN|WB_DIALOGCONTROL|WB_SYSTEMWINDOW|WB_MOVEABLE|WB_SIZEABLE|WB_CLOSEABLE*/) -, mrBase(rBase) -, mbInsertPage( bInsertPage ) -, mpLayoutSet1( 0 ) -, mpLayoutSet2( 0 ) -, msAssignLayout( RTL_CONSTASCII_USTRINGPARAM( ".uno:AssignLayout" ) ) -{ - String aTitle1( SdResId( STR_HORIZONTAL_LAYOUTS ) ); - String aTitle2( SdResId( STR_VERTICAL_LAYOUTS ) ); - - FreeResource(); - - const Color aMenuColor( GetSettings().GetStyleSettings().GetMenuColor() ); - const Color aMenuBarColor( GetSettings().GetStyleSettings().GetMenuBarColor() ); - const Color aMenuTextColor( GetSettings().GetStyleSettings().GetMenuBarColor() ); - const Color aMenuBarTextColor( GetSettings().GetStyleSettings().GetMenuBarTextColor() ); - - const bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode(); - SvtLanguageOptions aLanguageOptions; - const bool bVerticalEnabled = aLanguageOptions.IsVerticalTextEnabled(); - - SetSelectHdl( LINK( this, SdLayoutDialogContent, SelectHdl ) ); - - mpLayoutSet1 = new ValueSet( this, WB_TABSTOP | /* WB_MENUSTYLEVALUESET | */ WB_FLATVALUESET | WB_NOBORDER | WB_NO_DIRECTSELECT ); -// mpLayoutSet1->SetHelpId( HID_VALUESET_EXTRUSION_LIGHTING ); - - mpLayoutSet1->SetSelectHdl( LINK( this, SdLayoutDialogContent, SelectHdl ) ); - mpLayoutSet1->SetColCount( 4 ); - mpLayoutSet1->EnableFullItemMode( FALSE ); - mpLayoutSet1->SetColor( GetControlBackground() ); - - fillLayoutValueSet( mpLayoutSet1, &standard[0], bHighContrast ); - - if( bVerticalEnabled ) - appendEntry( -1, aTitle1 ); - appendEntry( 0, mpLayoutSet1 ); - - if( bVerticalEnabled ) - { - mpLayoutSet2 = new ValueSet( this, WB_TABSTOP | /* WB_MENUSTYLEVALUESET | */ WB_FLATVALUESET | WB_NOBORDER | WB_NO_DIRECTSELECT ); - // mpLayoutSet2->SetHelpId( HID_VALUESET_EXTRUSION_LIGHTING ); - - mpLayoutSet2->SetSelectHdl( LINK( this, SdLayoutDialogContent, SelectHdl ) ); - mpLayoutSet2->SetColCount( 4 ); - mpLayoutSet2->EnableFullItemMode( FALSE ); - mpLayoutSet2->SetColor( GetControlBackground() ); - - fillLayoutValueSet( mpLayoutSet2, &v_standard[0], bHighContrast ); - - appendEntry( -1, aTitle2 ); - appendEntry( 1, mpLayoutSet2 ); - } - - //appendSeparator(); - - OUString sSlotStr; - Image aSlotImage; - Reference< XFrame > xFrame( GetFrame(), UNO_QUERY ); - if( xFrame.is() ) - { - if( bInsertPage ) - sSlotStr = OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:DuplicatePage" ) ); - else - sSlotStr = OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:Undo" ) ); - aSlotImage = ::GetImage( xFrame, sSlotStr, FALSE, FALSE ); - } - - String sSlotTitle; - if( bInsertPage ) - sSlotTitle = mrBase.RetrieveLabelFromCommand( sSlotStr ); - else - sSlotTitle = String( SdResId( STR_RESET_LAYOUT ) ); - appendEntry( 2, sSlotTitle, aSlotImage); - - SetOutputSizePixel( getMenuSize() ); - - AddStatusListener( msAssignLayout ); -} - -// ----------------------------------------------------------------------- - -SdLayoutDialogContent::~SdLayoutDialogContent() -{ -} - - -// ----------------------------------------------------------------------- - - -/* -void SdLayoutDialogContent::DataChanged( const DataChangedEvent& rDCEvt ) -{ - SfxDockingWindow::DataChanged( rDCEvt ); - - if( ( rDCEvt.GetType() == DATACHANGED_SETTINGS ) && ( rDCEvt.GetFlags() & SETTINGS_STYLE ) ) - { - // const bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode(); - - // todo switch images - } -} -*/ - -// ----------------------------------------------------------------------- - -/* -void SdLayoutDialogContent::StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState ) -{ - if( (nSID == SID_ASSIGN_LAYOUT) && (eState != SFX_ITEM_DISABLED) ) - { - const SfxUInt32Item* pStateItem = dynamic_cast< const SfxUInt32Item* >(pState); - if( pStateItem ) - { - meCurrentLayout = static_cast< AutoLayout >( pStateItem->GetValue() ); - mpLayoutSet1->SelectItem( static_cast(meCurrentLayout)+1 ); - } - } -} -*/ - -// ----------------------------------------------------------------------- - -IMPL_LINK( SdLayoutDialogContent, SelectHdl, void *, pControl ) -{ - if ( IsInPopupMode() ) - EndPopupMode(); - - if( mrBase.GetMainViewShell().get() && mrBase.GetMainViewShell()->GetViewFrame() ) - { - if( pControl == mpLayoutSet1 ) - { - AutoLayout eLayout = static_cast< AutoLayout >(mpLayoutSet1->GetSelectItemId()-1); - - const SfxUInt32Item aItem(ID_VAL_WHATLAYOUT, eLayout); - mrBase.GetMainViewShell()->GetViewFrame()->GetBindings().GetDispatcher()->Execute(mbInsertPage ? SID_INSERTPAGE : SID_ASSIGN_LAYOUT,SFX_CALLMODE_ASYNCHRON,&aItem,0); - } - else if( pControl == mpLayoutSet2 ) - { - AutoLayout eLayout = static_cast< AutoLayout >(mpLayoutSet2->GetSelectItemId()-1); - - const SfxUInt32Item aItem(ID_VAL_WHATLAYOUT, eLayout); - mrBase.GetMainViewShell()->GetViewFrame()->GetBindings().GetDispatcher()->Execute(mbInsertPage ? SID_INSERTPAGE : SID_ASSIGN_LAYOUT,SFX_CALLMODE_ASYNCHRON,&aItem,0); - } - else - { - // reset autolayout - mrBase.GetMainViewShell()->GetViewFrame()->GetBindings().GetDispatcher()->Execute( mbInsertPage ? SID_DUPLICATE_PAGE : SID_ASSIGN_LAYOUT,SFX_CALLMODE_ASYNCHRON); - } - } - - return 0; -} - -void SAL_CALL SdLayoutDialogContent::statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException ) -{ - if( Event.FeatureURL.Main.equals( msAssignLayout ) ) - { - sal_Int32 nLayout = 0; - Event.State >>= nLayout; - OSL_TRACE("SdLayoutDialogContent::statusChanged(%ld)", nLayout ); - } -} - -} // end of namespace sd diff --git a/sd/source/ui/dlg/layoutdialog.hrc b/sd/source/ui/dlg/layoutdialog.hrc deleted file mode 100644 index a0a29c577831..000000000000 --- a/sd/source/ui/dlg/layoutdialog.hrc +++ /dev/null @@ -1,34 +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: printdialog.hrc,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. - * - ************************************************************************/ - -#define DLG_LAYOUTDIALOG 1347 - -#define STR_HORIZONTAL_LAYOUTS 1 -#define STR_VERTICAL_LAYOUTS 2 diff --git a/sd/source/ui/dlg/layoutdialog.src b/sd/source/ui/dlg/layoutdialog.src deleted file mode 100644 index ffadd7412565..000000000000 --- a/sd/source/ui/dlg/layoutdialog.src +++ /dev/null @@ -1,55 +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: animobjs.src,v $ - * $Revision: 1.36 $ - * - * 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. - * - ************************************************************************/ - -#include "layoutdialog.hrc" - -DockingWindow DLG_LAYOUTDIALOG -{ - Border = FALSE; - Hide = TRUE ; - SVLook = TRUE ; - Sizeable = FALSE ; - Moveable = TRUE ; - Closeable = TRUE ; - Zoomable = TRUE ; - Dockable = TRUE; - - Text [ en-US ] = "Slide Layouts" ; - - String STR_HORIZONTAL_LAYOUTS - { - Text [ en-US ] = "Horizontal" ; - }; - - String STR_VERTICAL_LAYOUTS - { - Text [ en-US ] = "Vertical" ; - }; -}; diff --git a/sd/source/ui/dlg/makefile.mk b/sd/source/ui/dlg/makefile.mk index 252950a73a5e..64762afb0648 100644 --- a/sd/source/ui/dlg/makefile.mk +++ b/sd/source/ui/dlg/makefile.mk @@ -76,9 +76,7 @@ SRC1FILES =\ LayerDialog.src \ PaneDockingWindow.src \ layeroptionsdlg.src \ - printdialog.src \ - layoutdialog.src - + printdialog.src SLOFILES = \ $(SLO)$/inspagob.obj \ @@ -127,8 +125,7 @@ SLOFILES = \ $(SLO)$/PaneChildWindows.obj \ $(SLO)$/PaneDockingWindow.obj \ $(SLO)$/PaneShells.obj \ - $(SLO)$/printdialog.obj \ - $(SLO)$/layoutdialog.obj + $(SLO)$/printdialog.obj LIB1TARGET= $(SLB)$/$(TARGET).lib @@ -155,8 +152,7 @@ LIB1OBJFILES= \ $(SLO)$/PaneChildWindows.obj \ $(SLO)$/PaneDockingWindow.obj \ $(SLO)$/PaneShells.obj \ - $(SLO)$/printdialog.obj \ - $(SLO)$/layoutdialog.obj + $(SLO)$/printdialog.obj LIB2TARGET= $(SLB)$/sdui.lib 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 - diff --git a/sd/source/ui/unoidl/facreg.cxx b/sd/source/ui/unoidl/facreg.cxx index b90832acaa51..2f1f59a1d16d 100644 --- a/sd/source/ui/unoidl/facreg.cxx +++ b/sd/source/ui/unoidl/facreg.cxx @@ -75,6 +75,14 @@ namespace sd extern uno::Reference< uno::XInterface > SAL_CALL RandomNode_createInstance( const uno::Reference< lang::XMultiServiceFactory > & _rxFactory ); extern OUString RandomNode__getImplementationName() throw( uno::RuntimeException ); extern uno::Sequence< OUString > SAL_CALL RandomNode_getSupportedServiceNames() throw( uno::RuntimeException ); + +extern uno::Reference< uno::XInterface > SAL_CALL SlideLayoutController_createInstance( const uno::Reference< lang::XMultiServiceFactory > & _rxFactory ); +extern OUString SlideLayoutController_getImplementationName() throw( uno::RuntimeException ); +extern uno::Sequence< OUString > SlideLayoutController_getSupportedServiceNames() throw( uno::RuntimeException ); + +extern uno::Reference< uno::XInterface > SAL_CALL InsertSlideController_createInstance( const uno::Reference< lang::XMultiServiceFactory > & _rxFactory ); +extern OUString InsertSlideController_getImplementationName() throw( uno::RuntimeException ); +extern uno::Sequence< OUString > InsertSlideController_getSupportedServiceNames() throw( uno::RuntimeException ); } namespace sd { namespace framework { @@ -232,7 +240,9 @@ enum FactoryId PresenterTextViewServiceFactoryId, PresenterHelperServiceFactoryId, PresenterPreviewCacheFactoryId, - SlideSorterServiceFactoryId + SlideSorterServiceFactoryId, + SlideLayoutControllerFactoryId, + InsertSlideControllerFactoryId, }; typedef ::std::hash_map FactoryMap; @@ -264,6 +274,8 @@ static ::boost::shared_ptr spFactoryMap; (*spFactoryMap)[PresenterHelperService_getImplementationName()] = PresenterHelperServiceFactoryId; (*spFactoryMap)[PresenterPreviewCache_getImplementationName()] = PresenterPreviewCacheFactoryId; (*spFactoryMap)[SlideSorterService_getImplementationName()] = SlideSorterServiceFactoryId; + (*spFactoryMap)[SlideLayoutController_getImplementationName()] = SlideLayoutControllerFactoryId; + (*spFactoryMap)[InsertSlideController_getImplementationName()] = InsertSlideControllerFactoryId; } return spFactoryMap; }; @@ -370,6 +382,14 @@ SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( pKey, sd::slidesorter::SlideSorterService_getImplementationName(), sd::slidesorter::SlideSorterService_getSupportedServiceNames()); + writeInfo( + pKey, + sd::SlideLayoutController_getImplementationName(), + sd::SlideLayoutController_getSupportedServiceNames()); + writeInfo( + pKey, + sd::InsertSlideController_getImplementationName(), + sd::InsertSlideController_getSupportedServiceNames()); } catch (registry::InvalidRegistryException &) { @@ -545,6 +565,20 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( sd::slidesorter::SlideSorterService_getSupportedServiceNames()); break; + case SlideLayoutControllerFactoryId: + xFactory = ::cppu::createSingleFactory( + xMSF, + sd::SlideLayoutController_getImplementationName(), + sd::SlideLayoutController_createInstance, + sd::SlideLayoutController_getSupportedServiceNames()); + break; + + case InsertSlideControllerFactoryId: + xFactory = ::cppu::createSingleFactory( + xMSF, + sd::InsertSlideController_getImplementationName(), + sd::InsertSlideController_createInstance, + sd::InsertSlideController_getSupportedServiceNames()); default: break; } diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx index 431add66bc2b..e4ce8f287e19 100644 --- a/sd/source/ui/view/ViewShellBase.cxx +++ b/sd/source/ui/view/ViewShellBase.cxx @@ -1264,7 +1264,7 @@ CustomHandleManager& ViewShellBase::getCustomHandleManager() const return *mpImpl->mpCustomHandleManager.get(); } -::rtl::OUString ViewShellBase::RetrieveLabelFromCommand( const ::rtl::OUString& aCmdURL ) const +::rtl::OUString ImplRetrieveLabelFromCommand( const Reference< XFrame >& xFrame, const ::rtl::OUString& aCmdURL ) { ::rtl::OUString aLabel; @@ -1273,7 +1273,7 @@ CustomHandleManager& ViewShellBase::getCustomHandleManager() const Reference< XMultiServiceFactory > xServiceManager( ::comphelper::getProcessServiceFactory(), UNO_QUERY_THROW ); Reference< XModuleManager > xModuleManager( xServiceManager->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.ModuleManager") ) ), UNO_QUERY_THROW ); - Reference< XInterface > xIfac( GetMainViewShell()->GetViewFrame()->GetFrame()->GetFrameInterface(), UNO_QUERY_THROW ); + Reference< XInterface > xIfac( xFrame, UNO_QUERY_THROW ); ::rtl::OUString aModuleIdentifier( xModuleManager->identify( xIfac ) ); @@ -1305,6 +1305,12 @@ CustomHandleManager& ViewShellBase::getCustomHandleManager() const return aLabel; } +::rtl::OUString ViewShellBase::RetrieveLabelFromCommand( const ::rtl::OUString& aCmdURL ) const +{ + Reference< XFrame > xFrame( GetMainViewShell()->GetViewFrame()->GetFrame()->GetFrameInterface(), UNO_QUERY ); + return ImplRetrieveLabelFromCommand( xFrame, aCmdURL ); +} + //===== ViewShellBase::Implementation ========================================= diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx index f1bebd83da83..4ddc49c5efd0 100644 --- a/sd/source/ui/view/drviews2.cxx +++ b/sd/source/ui/view/drviews2.cxx @@ -101,8 +101,6 @@ #include -#include "layoutdialog.hxx" - using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/sd/source/ui/view/drviews6.cxx b/sd/source/ui/view/drviews6.cxx index bb5aa18d81c5..d89bb43a0098 100644 --- a/sd/source/ui/view/drviews6.cxx +++ b/sd/source/ui/view/drviews6.cxx @@ -73,7 +73,6 @@ #include "AnimationChildWindow.hxx" #include "NavigatorChildWindow.hxx" #include "LayerDialogChildWindow.hxx" -#include "layoutdialog.hxx" #include "sdresid.hxx" #include "fupoor.hxx" #include "fusldlg.hxx" diff --git a/sd/uiconfig/simpress/toolbar/commontaskbar.xml b/sd/uiconfig/simpress/toolbar/commontaskbar.xml index 794f55af134b..c64a4b935717 100644 --- a/sd/uiconfig/simpress/toolbar/commontaskbar.xml +++ b/sd/uiconfig/simpress/toolbar/commontaskbar.xml @@ -1,8 +1,8 @@ - - + + diff --git a/sd/util/makefile.mk b/sd/util/makefile.mk index d74700307291..cccaf572fa95 100644 --- a/sd/util/makefile.mk +++ b/sd/util/makefile.mk @@ -128,7 +128,8 @@ LIB3FILES= \ $(SLB)$/cgm.lib \ $(SLB)$/uitable.lib \ $(SLB)$/uiannotations.lib\ - $(SLB)$/grf.lib + $(SLB)$/grf.lib \ + $(SLB)$/controller.lib LIB5TARGET=$(SLB)$/sdraw3_2.lib LIB5FILES= \ -- 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/inc/app.hrc | 2 + sd/inc/glob.hrc | 3 + sd/inc/glob.hxx | 2 + sd/sdi/ToolPanelViewShell.sdi | 30 + sd/sdi/ViewShellBase.sdi | 31 + sd/sdi/makefile.mk | 2 + sd/sdi/sdslots.sdi | 1 + sd/source/ui/app/sddll1.cxx | 10 +- sd/source/ui/app/sddll2.cxx | 1 + sd/source/ui/app/strings.src | 8 + sd/source/ui/dlg/PaneChildWindows.cxx | 53 +- sd/source/ui/dlg/PaneDockingWindow.cxx | 12 +- sd/source/ui/dlg/PaneDockingWindow.src | 16 + sd/source/ui/dlg/PaneShells.cxx | 27 + .../ui/framework/factories/BasicPaneFactory.cxx | 14 +- .../ui/framework/factories/BasicViewFactory.cxx | 13 + sd/source/ui/framework/module/ImpressModule.cxx | 2 + .../ui/framework/module/PresentationModule.cxx | 1 - sd/source/ui/framework/module/ToolPanelModule.cxx | 165 ++++++ sd/source/ui/framework/module/ToolPanelModule.hxx | 53 ++ sd/source/ui/framework/module/makefile.mk | 1 + sd/source/ui/framework/tools/FrameworkHelper.cxx | 6 + 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 ++++++ sd/source/ui/toolpanel/LayoutMenu.cxx | 85 ++- sd/source/ui/toolpanel/LayoutMenu.hxx | 14 + sd/source/ui/toolpanel/ScrollPanel.cxx | 24 + sd/source/ui/toolpanel/SubToolPanel.cxx | 29 + sd/source/ui/toolpanel/TaskPaneControlFactory.cxx | 6 + sd/source/ui/toolpanel/TaskPaneShellManager.cxx | 17 +- sd/source/ui/toolpanel/TaskPaneShellManager.hxx | 5 + sd/source/ui/toolpanel/TaskPaneToolPanel.cxx | 131 +++++ sd/source/ui/toolpanel/TaskPaneToolPanel.hxx | 92 +++ sd/source/ui/toolpanel/TaskPaneTreeNode.cxx | 11 - sd/source/ui/toolpanel/TaskPaneViewShell.cxx | 83 +-- sd/source/ui/toolpanel/TestMenu.cxx | 5 + sd/source/ui/toolpanel/TestPanel.cxx | 5 + sd/source/ui/toolpanel/TitleBar.cxx | 38 +- sd/source/ui/toolpanel/TitledControl.cxx | 42 +- sd/source/ui/toolpanel/ToolPanelDeck.cxx | 93 +++ sd/source/ui/toolpanel/ToolPanelDeck.hxx | 75 +++ sd/source/ui/toolpanel/ToolPanelViewShell.cxx | 642 +++++++++++++++++++++ .../ui/toolpanel/controls/CustomAnimationPanel.cxx | 23 + .../ui/toolpanel/controls/CustomAnimationPanel.hxx | 10 + .../ui/toolpanel/controls/MasterPagesPanel.cxx | 38 +- .../ui/toolpanel/controls/MasterPagesPanel.hxx | 14 + .../ui/toolpanel/controls/SlideTransitionPanel.cxx | 26 +- .../ui/toolpanel/controls/SlideTransitionPanel.hxx | 10 + .../ui/toolpanel/controls/TableDesignPanel.cxx | 23 + .../ui/toolpanel/controls/TableDesignPanel.hxx | 10 + sd/source/ui/toolpanel/makefile.mk | 5 +- sd/source/ui/view/GraphicViewShellBase.cxx | 1 + sd/source/ui/view/ToolBarManager.cxx | 1 + sd/source/ui/view/ViewShellBase.cxx | 17 +- sd/source/ui/view/ViewShellImplementation.cxx | 1 + sd/uiconfig/simpress/menubar/menubar.xml | 3 +- 68 files changed, 2157 insertions(+), 202 deletions(-) create mode 100644 sd/sdi/ToolPanelViewShell.sdi create mode 100644 sd/source/ui/framework/module/ToolPanelModule.cxx create mode 100644 sd/source/ui/framework/module/ToolPanelModule.hxx create mode 100644 sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx create mode 100644 sd/source/ui/toolpanel/TaskPaneToolPanel.cxx create mode 100644 sd/source/ui/toolpanel/TaskPaneToolPanel.hxx create mode 100644 sd/source/ui/toolpanel/ToolPanelDeck.cxx create mode 100644 sd/source/ui/toolpanel/ToolPanelDeck.hxx create mode 100644 sd/source/ui/toolpanel/ToolPanelViewShell.cxx (limited to 'sd') diff --git a/sd/inc/app.hrc b/sd/inc/app.hrc index 0ccbbf921b6b..5f593463e2a7 100644 --- a/sd/inc/app.hrc +++ b/sd/inc/app.hrc @@ -466,4 +466,6 @@ #define SID_ADD_MOTION_PATH (SID_SD_START+441) #define SID_TABLE_TOOLBOX (SID_SD_START+442) +#define SID_TOOL_PANEL_PANE (SID_SD_START+443) + #endif diff --git a/sd/inc/glob.hrc b/sd/inc/glob.hrc index 7ef9ecad779c..9086d8408670 100644 --- a/sd/inc/glob.hrc +++ b/sd/inc/glob.hrc @@ -141,6 +141,7 @@ #define STR_LEFT_IMPRESS_PANE_SHELL RID_GLOB_START+113 #define STR_LEFT_DRAW_PANE_SHELL RID_GLOB_START+114 #define STR_RIGHT_PANE_SHELL RID_GLOB_START+115 +#define STR_TOOL_PANEL_SHELL RID_GLOB_START+116 #define RID_CUSTOMANIMATION_START RID_GLOB_START+120 #define RID_CUSTOMANIMATION_END RID_GLOB_START+199 @@ -153,6 +154,8 @@ #define DLG_TABLEDESIGNPANE RID_GLOB_START+224 #define STR_TABLEOBJECTBARSHELL RID_GLOB_START+225 #define RID_TABPAGE_PARA_NUMBERING RID_GLOB_START+226 +#define STR_CUSTOMANIMATIONPANE RID_GLOB_START+227 +#define STR_SLIDE_TRANSITION_PANE RID_GLOB_START+228 diff --git a/sd/inc/glob.hxx b/sd/inc/glob.hxx index ea9f22d209c5..1e28c1fb2266 100644 --- a/sd/inc/glob.hxx +++ b/sd/inc/glob.hxx @@ -69,6 +69,8 @@ #define SD_IF_SDRIGHTPANESHELL SFX_INTERFACE_SD_START + 26 #define SD_IF_SDDRAWTABLEOBJECTBAR SFX_INTERFACE_SD_START + 27 #define SD_IF_SDANNOTATIONSHELL SFX_INTERFACE_SD_START + 28 +#define SD_IF_SDTOOLPANELPANESHELL SFX_INTERFACE_SD_START + 29 +#define SD_IF_SDTOOLPANELSHELL SFX_INTERFACE_SD_START + 30 // Inventor-Id fuer StarDraw UserData const UINT32 SdUDInventor=UINT32('S')*0x00000001+ diff --git a/sd/sdi/ToolPanelViewShell.sdi b/sd/sdi/ToolPanelViewShell.sdi new file mode 100644 index 000000000000..d4a48d939846 --- /dev/null +++ b/sd/sdi/ToolPanelViewShell.sdi @@ -0,0 +1,30 @@ +/************************************************************************* + * 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. + * +************************************************************************/ + +shell ToolPanelViewShell +{ +} + diff --git a/sd/sdi/ViewShellBase.sdi b/sd/sdi/ViewShellBase.sdi index 67d9cfb1e85e..226bd38cb581 100644 --- a/sd/sdi/ViewShellBase.sdi +++ b/sd/sdi/ViewShellBase.sdi @@ -164,6 +164,32 @@ SfxBoolItem RightPane SID_RIGHT_PANE GroupId = GID_MODIFY; ] +SfxBoolItem ToolPanel SID_TOOL_PANEL_PANE + +[ + /* flags: */ + AutoUpdate = TRUE, + Cachable = Cachable, + FastCall = FALSE, + HasCoreId = FALSE, + HasDialog = TRUE, + ReadOnlyDoc = FALSE, + Toggle = FALSE, + Container = FALSE, + RecordAbsolute = FALSE, + RecordPerSet; + Asynchron; + + Readonly = FALSE, + + /* config: */ + AccelConfig = TRUE, + MenuConfig = TRUE, + StatusBarConfig = FALSE, + ToolBoxConfig = TRUE, + GroupId = GID_MODIFY; +] + SfxVoidItem NotesChildWindow SID_NOTES_WINDOW [ @@ -288,6 +314,11 @@ interface ViewShellBaseView ExecMethod = Execute; StateMethod = GetState; ] + SID_TOOL_PANEL_PANE + [ + ExecMethod = Execute; + StateMethod = GetState; + ] SID_NOTES_WINDOW [ ExecMethod = Execute; diff --git a/sd/sdi/makefile.mk b/sd/sdi/makefile.mk index 7eb22a96c770..dbe86abd7228 100644 --- a/sd/sdi/makefile.mk +++ b/sd/sdi/makefile.mk @@ -71,6 +71,7 @@ SVSDI1DEPEND= \ SlideSorterController.sdi \ ViewShellBase.sdi \ TaskPaneViewShell.sdi \ + ToolPanelViewShell.sdi \ sdslots.hrc \ $(PRJ)$/inc$/app.hrc @@ -93,6 +94,7 @@ SVSDI2DEPEND= \ outlnvsh.sdi \ ViewShellBase.sdi \ TaskPaneViewShell.sdi \ + ToolPanelViewShell.sdi \ sdslots.hrc \ $(PRJ)$/inc$/app.hrc diff --git a/sd/sdi/sdslots.sdi b/sd/sdi/sdslots.sdi index 208613595b65..e5deabe64ee8 100644 --- a/sd/sdi/sdslots.sdi +++ b/sd/sdi/sdslots.sdi @@ -108,4 +108,5 @@ ModulePrefix( "Sd" ) include "mediaob.sdi" include "tables.sdi" include "TaskPaneViewShell.sdi" + include "ToolPanelViewShell.sdi" } diff --git a/sd/source/ui/app/sddll1.cxx b/sd/source/ui/app/sddll1.cxx index 6b525a0b3f90..00810fd53227 100644 --- a/sd/source/ui/app/sddll1.cxx +++ b/sd/source/ui/app/sddll1.cxx @@ -51,12 +51,9 @@ #include "GraphicViewShellBase.hxx" #include "DrawDocShell.hxx" #include "GraphicDocShell.hxx" -#ifndef SD_SLIDEBROWSER_SLIDE_SORTER_VIEW_SHELL_HXX #include "SlideSorterViewShell.hxx" -#endif -#ifndef SD_SLIDEBROWSER_TASK_PANE_VIEW_SHELL_HXX +#include "taskpane/ToolPanelViewShell.hxx" #include "TaskPaneViewShell.hxx" -#endif #include "FactoryIds.hxx" #include "sdmod.hxx" #include "app.hrc" @@ -135,7 +132,8 @@ void SdDLL::RegisterInterfaces() // View shells for the side panes. ::sd::slidesorter::SlideSorterViewShell::RegisterInterface (pMod); ::sd::toolpanel::TaskPaneViewShell::RegisterInterface(pMod); - // Tell the task pane view shell to register the interfaces of its + ::sd::toolpanel::ToolPanelViewShell::RegisterInterface(pMod); + // Tell the tool panel view shell to register the interfaces of its // controls. - ::sd::toolpanel::TaskPaneViewShell::RegisterControls(); + ::sd::toolpanel::ToolPanelViewShell::RegisterControls(); } diff --git a/sd/source/ui/app/sddll2.cxx b/sd/source/ui/app/sddll2.cxx index c222e5f3cb44..6c5dd7fd187a 100644 --- a/sd/source/ui/app/sddll2.cxx +++ b/sd/source/ui/app/sddll2.cxx @@ -159,6 +159,7 @@ void SdDLL::RegisterControllers() ::sd::LeftPaneImpressChildWindow::RegisterChildWindow(0, pMod); ::sd::LeftPaneDrawChildWindow::RegisterChildWindow(0, pMod); ::sd::RightPaneChildWindow::RegisterChildWindow(0, pMod); + ::sd::ToolPanelChildWindow::RegisterChildWindow(0, pMod); SvxFillToolBoxControl::RegisterControl(0, pMod); SvxLineStyleToolBoxControl::RegisterControl(0, pMod); diff --git a/sd/source/ui/app/strings.src b/sd/source/ui/app/strings.src index 696e92940b9f..9b72d46f0fae 100644 --- a/sd/source/ui/app/strings.src +++ b/sd/source/ui/app/strings.src @@ -1253,6 +1253,14 @@ String DLG_TABLEDESIGNPANE { Text [ en-US ] = "Table Designs"; }; +String STR_CUSTOMANIMATIONPANE +{ + Text [ en-US ] = "Custom Animation"; +}; +String STR_SLIDE_TRANSITION_PANE +{ + Text [ en-US ] = "Slide Transition"; +}; String STR_NAVIGATOR_SHOW_NAMED_SHAPES { Text [ en-US ] = "Named shapes"; diff --git a/sd/source/ui/dlg/PaneChildWindows.cxx b/sd/source/ui/dlg/PaneChildWindows.cxx index f8b4d38a5780..008ceb228c75 100644 --- a/sd/source/ui/dlg/PaneChildWindows.cxx +++ b/sd/source/ui/dlg/PaneChildWindows.cxx @@ -32,28 +32,25 @@ #include "precompiled_sd.hxx" #include "PaneChildWindows.hxx" #include "PaneDockingWindow.hrc" +#include "PaneDockingWindow.hxx" +#include "ViewShellBase.hxx" +#include "framework/FrameworkHelper.hxx" #include "app.hrc" #include "strings.hrc" #include "sdresid.hxx" + #include #include #include #include -namespace sd -{ - SFX_IMPL_DOCKINGWINDOW(LeftPaneImpressChildWindow, SID_LEFT_PANE_IMPRESS) - SFX_IMPL_DOCKINGWINDOW(LeftPaneDrawChildWindow, SID_LEFT_PANE_DRAW) - SFX_IMPL_DOCKINGWINDOW(RightPaneChildWindow, SID_RIGHT_PANE) -} - - -#include "PaneDockingWindow.hxx" -#include "ViewShellBase.hxx" -#include "framework/FrameworkHelper.hxx" - namespace sd { +SFX_IMPL_DOCKINGWINDOW(LeftPaneImpressChildWindow, SID_LEFT_PANE_IMPRESS) +SFX_IMPL_DOCKINGWINDOW(LeftPaneDrawChildWindow, SID_LEFT_PANE_DRAW) +SFX_IMPL_DOCKINGWINDOW(RightPaneChildWindow, SID_RIGHT_PANE) +SFX_IMPL_DOCKINGWINDOW( ToolPanelChildWindow, SID_TOOL_PANEL_PANE ) + //===== PaneChildWindow ======================================================= PaneChildWindow::PaneChildWindow ( @@ -61,8 +58,8 @@ PaneChildWindow::PaneChildWindow ( USHORT nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo, - const ResId& rResId, - const ::rtl::OUString& rsTitle, + const USHORT nDockWinTitleResId, + const USHORT nTitleBarResId, SfxChildAlignment eAlignment) : SfxChildWindow (pParentWindow, nId) { @@ -70,9 +67,8 @@ PaneChildWindow::PaneChildWindow ( pBindings, this, pParentWindow, - rResId, - framework::FrameworkHelper::msLeftImpressPaneURL, - rsTitle); + SdResId( nDockWinTitleResId ), + String( SdResId( nTitleBarResId ) ) ); eChildAlignment = eAlignment; static_cast(pWindow)->Initialize(pInfo); SetHideNotDelete(TRUE); @@ -115,8 +111,8 @@ LeftPaneImpressChildWindow::LeftPaneImpressChildWindow ( nId, pBindings, pInfo, - SdResId(FLT_LEFT_PANE_IMPRESS_DOCKING_WINDOW), - String(SdResId(STR_LEFT_PANE_IMPRESS_TITLE)), + FLT_LEFT_PANE_IMPRESS_DOCKING_WINDOW, + STR_LEFT_PANE_IMPRESS_TITLE, SFX_ALIGN_LEFT) { } @@ -136,8 +132,8 @@ LeftPaneDrawChildWindow::LeftPaneDrawChildWindow ( nId, pBindings, pInfo, - SdResId(FLT_LEFT_PANE_DRAW_DOCKING_WINDOW), - String(SdResId(STR_LEFT_PANE_DRAW_TITLE)), + FLT_LEFT_PANE_DRAW_DOCKING_WINDOW, + STR_LEFT_PANE_DRAW_TITLE, SFX_ALIGN_LEFT) { } @@ -157,11 +153,22 @@ RightPaneChildWindow::RightPaneChildWindow ( nId, pBindings, pInfo, - SdResId(FLT_RIGHT_PANE_DOCKING_WINDOW), - String(SdResId(STR_RIGHT_PANE_TITLE)), + FLT_RIGHT_PANE_DOCKING_WINDOW, + STR_RIGHT_PANE_TITLE, SFX_ALIGN_RIGHT) { } +//====================================================================================================================== +//= ToolPanelChildWindow +//====================================================================================================================== +//---------------------------------------------------------------------------------------------------------------------- +ToolPanelChildWindow::ToolPanelChildWindow( ::Window* i_pParentWindow, USHORT i_nId, SfxBindings* i_pBindings, + SfxChildWinInfo* i_pChildWindowInfo ) + :PaneChildWindow( i_pParentWindow, i_nId, i_pBindings, i_pChildWindowInfo, + FLT_TOOL_PANEL_DOCKING_WINDOW, STR_RIGHT_PANE_TITLE, SFX_ALIGN_NOALIGNMENT ) +{ +} + } // end of namespace ::sd diff --git a/sd/source/ui/dlg/PaneDockingWindow.cxx b/sd/source/ui/dlg/PaneDockingWindow.cxx index 2aa6039cfb76..2b9ed848d60a 100644 --- a/sd/source/ui/dlg/PaneDockingWindow.cxx +++ b/sd/source/ui/dlg/PaneDockingWindow.cxx @@ -52,7 +52,6 @@ PaneDockingWindow::PaneDockingWindow ( SfxChildWindow *pChildWindow, ::Window* pParent, const ResId& rResId, - const ::rtl::OUString& rsPaneURL, const ::rtl::OUString& rsTitle) : SfxDockingWindow ( _pBindings, @@ -60,7 +59,6 @@ PaneDockingWindow::PaneDockingWindow ( pParent, rResId ), - msPaneURL(rsPaneURL), msTitle(rsTitle), mpTitleToolBox(), maBorder (3,1,3,3), @@ -397,6 +395,16 @@ void PaneDockingWindow::DataChanged (const DataChangedEvent& rEvent) +void PaneDockingWindow::EndDocking( const Rectangle& rRect, BOOL bFloatMode ) +{ + SfxDockingWindow::EndDocking( rRect, bFloatMode ); + + if ( maEndDockingHdl.IsSet() ) + maEndDockingHdl.Call( this ); +} + + + ::Window* PaneDockingWindow::GetContentWindow (void) { return mpContentWindow.get(); diff --git a/sd/source/ui/dlg/PaneDockingWindow.src b/sd/source/ui/dlg/PaneDockingWindow.src index b66ef778f903..e99105f456a4 100644 --- a/sd/source/ui/dlg/PaneDockingWindow.src +++ b/sd/source/ui/dlg/PaneDockingWindow.src @@ -77,3 +77,19 @@ DockingWindow FLT_RIGHT_PANE_DOCKING_WINDOW Size = MAP_APPFONT (100,200) ; Text [ en-US ] = "Task Pane" ; }; + +DockingWindow FLT_TOOL_PANEL_DOCKING_WINDOW +{ + // HelpID = SID_EFFECT_WIN ; + Border = TRUE ; + Hide = TRUE ; + SVLook = TRUE ; + Sizeable = TRUE ; + Moveable = TRUE ; + Closeable = TRUE ; + Zoomable = TRUE ; + Dockable = TRUE ; + EnableResizing = TRUE ; + Size = MAP_APPFONT (100,200) ; + Text [ en-US ] = "Task Pane" ; +}; diff --git a/sd/source/ui/dlg/PaneShells.cxx b/sd/source/ui/dlg/PaneShells.cxx index 99b7596189de..98071da3f04f 100644 --- a/sd/source/ui/dlg/PaneShells.cxx +++ b/sd/source/ui/dlg/PaneShells.cxx @@ -145,4 +145,31 @@ RightPaneShell::~RightPaneShell (void) { } +//===== ToolPanelPaneShell ======================================================== + +#undef ShellClass +#define ShellClass ToolPanelPaneShell + +SFX_SLOTMAP( ToolPanelPaneShell ) +{ + { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } +}; + +SFX_IMPL_INTERFACE( ToolPanelPaneShell, SfxShell, SdResId( STR_TOOL_PANEL_SHELL ) ) +{ + SFX_CHILDWINDOW_REGISTRATION( ::sd::ToolPanelChildWindow::GetChildWindowId() ); +} + +TYPEINIT1( ToolPanelPaneShell, SfxShell ); + +ToolPanelPaneShell::ToolPanelPaneShell() + :SfxShell() +{ + SetName( ::rtl::OUString::createFromAscii( "ToolPanel" ) ); +} + +ToolPanelPaneShell::~ToolPanelPaneShell(void) +{ +} + } // end of namespace ::sd diff --git a/sd/source/ui/framework/factories/BasicPaneFactory.cxx b/sd/source/ui/framework/factories/BasicPaneFactory.cxx index be59962f8655..8e28665551fe 100644 --- a/sd/source/ui/framework/factories/BasicPaneFactory.cxx +++ b/sd/source/ui/framework/factories/BasicPaneFactory.cxx @@ -59,7 +59,8 @@ namespace { FullScreenPaneId, LeftImpressPaneId, LeftDrawPaneId, - RightPaneId + RightPaneId, + ToolPanelPaneId }; static const sal_Int32 gnConfigurationUpdateStartEvent(0); @@ -243,6 +244,11 @@ void SAL_CALL BasicPaneFactory::initialize (const Sequence& aArguments) aDescriptor.mePaneId = RightPaneId; mpPaneContainer->push_back(aDescriptor); xCC->addResourceFactory(aDescriptor.msPaneURL, this); + + aDescriptor.msPaneURL = FrameworkHelper::msToolPanelPaneURL; + aDescriptor.mePaneId = ToolPanelPaneId; + mpPaneContainer->push_back(aDescriptor); + xCC->addResourceFactory(aDescriptor.msPaneURL, this); } // Register as configuration change listener. @@ -312,6 +318,7 @@ Reference SAL_CALL BasicPaneFactory::createResource ( case LeftImpressPaneId: case LeftDrawPaneId: case RightPaneId: + case ToolPanelPaneId: xPane = CreateChildWindowPane( rxPaneId, *iDescriptor); @@ -536,6 +543,11 @@ Reference BasicPaneFactory::CreateChildWindowPane ( nChildWindowId = ::sd::RightPaneChildWindow::GetChildWindowId(); break; + case ToolPanelPaneId: + pShell.reset(new ToolPanelPaneShell()); + nChildWindowId = ::sd::ToolPanelChildWindow::GetChildWindowId(); + break; + default: break; } diff --git a/sd/source/ui/framework/factories/BasicViewFactory.cxx b/sd/source/ui/framework/factories/BasicViewFactory.cxx index 1477cb2ec4b8..c5ca7414b707 100644 --- a/sd/source/ui/framework/factories/BasicViewFactory.cxx +++ b/sd/source/ui/framework/factories/BasicViewFactory.cxx @@ -47,6 +47,7 @@ #include "GraphicViewShell.hxx" #include "OutlineViewShell.hxx" #include "TaskPaneViewShell.hxx" +#include "taskpane/ToolPanelViewShell.hxx" #include "PresentationViewShell.hxx" #include "SlideSorterViewShell.hxx" #include "FrameView.hxx" @@ -334,6 +335,7 @@ void SAL_CALL BasicViewFactory::initialize (const Sequence& aArguments) mxConfigurationController->addResourceFactory(FrameworkHelper::msHandoutViewURL, this); mxConfigurationController->addResourceFactory(FrameworkHelper::msPresentationViewURL, this); mxConfigurationController->addResourceFactory(FrameworkHelper::msTaskPaneURL, this); + mxConfigurationController->addResourceFactory(FrameworkHelper::msToolPanelViewURL, this); mxConfigurationController->addResourceFactory(FrameworkHelper::msSlideSorterURL, this); } catch (RuntimeException&) @@ -459,6 +461,15 @@ void SAL_CALL BasicViewFactory::initialize (const Sequence& aArguments) &rWindow, pFrameView)); } + else if (rsViewURL.equals(FrameworkHelper::msToolPanelViewURL)) + { + pViewShell.reset( + new ::sd::toolpanel::ToolPanelViewShell( + &rFrame, + *mpBase, + &rWindow, + pFrameView)); + } else if (rsViewURL.equals(FrameworkHelper::msSlideSorterURL)) { pViewShell = ::sd::slidesorter::SlideSorterViewShell::Create ( @@ -535,6 +546,8 @@ bool BasicViewFactory::IsCacheable (const ::boost::shared_ptr& r FrameworkHelper::msSlideSorterURL, FrameworkHelper::msLeftImpressPaneURL)); maCacheableResources.push_back(pHelper->CreateResourceId( FrameworkHelper::msTaskPaneURL, FrameworkHelper::msRightPaneURL)); + maCacheableResources.push_back(pHelper->CreateResourceId( + FrameworkHelper::msToolPanelViewURL, FrameworkHelper::msToolPanelPaneURL)); } ::std::vector >::const_iterator iId; diff --git a/sd/source/ui/framework/module/ImpressModule.cxx b/sd/source/ui/framework/module/ImpressModule.cxx index aaa8e5621784..27e605d2108f 100644 --- a/sd/source/ui/framework/module/ImpressModule.cxx +++ b/sd/source/ui/framework/module/ImpressModule.cxx @@ -37,6 +37,7 @@ #include "CenterViewFocusModule.hxx" #include "SlideSorterModule.hxx" #include "TaskPaneModule.hxx" +#include "ToolPanelModule.hxx" #include "ToolBarModule.hxx" #include "ShellStackGuard.hxx" @@ -58,6 +59,7 @@ void ImpressModule::Initialize (Reference& rxController) rxController, FrameworkHelper::msLeftImpressPaneURL); TaskPaneModule::Initialize(rxController); + ToolPanelModule::Initialize(rxController); new ToolBarModule(rxController); new ShellStackGuard(rxController); } diff --git a/sd/source/ui/framework/module/PresentationModule.cxx b/sd/source/ui/framework/module/PresentationModule.cxx index 8da05b61d0a8..8829660471e3 100644 --- a/sd/source/ui/framework/module/PresentationModule.cxx +++ b/sd/source/ui/framework/module/PresentationModule.cxx @@ -34,7 +34,6 @@ #include "CenterViewFocusModule.hxx" #include "SlideSorterModule.hxx" -#include "TaskPaneModule.hxx" using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/sd/source/ui/framework/module/ToolPanelModule.cxx b/sd/source/ui/framework/module/ToolPanelModule.cxx new file mode 100644 index 000000000000..2741596cbfb3 --- /dev/null +++ b/sd/source/ui/framework/module/ToolPanelModule.cxx @@ -0,0 +1,165 @@ +/************************************************************************* + * + * 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: ToolPanelModule.cxx,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. + * + ************************************************************************/ + +#include "precompiled_sd.hxx" + +#include "ToolPanelModule.hxx" +#include "ReadOnlyModeObserver.hxx" +#include "framework/FrameworkHelper.hxx" + +#include +#include + +#include +#include +#include + +using namespace ::com::sun::star; +using namespace ::com::sun::star::uno; +using namespace ::com::sun::star::drawing::framework; +using ::rtl::OUString; +using ::sd::framework::FrameworkHelper; + + +namespace sd { namespace framework { + +namespace { + +typedef ::cppu::WeakComponentImplHelper1 < + ::com::sun::star::frame::XStatusListener + > LocalReadOnlyModeObserverInterfaceBase; + +/** This local class enables or disables the ResourceManager of a + ToolPanelModule. It connects to a ReadOnlyModeObserver and is called + when the state of the .uno:EditDoc command changes. When either the + ResourceManager or the ReadOnlyModeObserver are disposed then the + LocalReadOnlyModeObserver disposes itself. The link + between the ResourceManager and the ReadOnlyModeObserver is removed and + the ReadOnlyModeObserver typically looses its last reference and is + destroyed. +*/ +class LocalReadOnlyModeObserver + : private MutexOwner, + public LocalReadOnlyModeObserverInterfaceBase +{ +public: + LocalReadOnlyModeObserver ( + const Reference& rxController, + const ::rtl::Reference& rpResourceManager) + : MutexOwner(), + LocalReadOnlyModeObserverInterfaceBase(maMutex), + mpResourceManager(rpResourceManager), + mpObserver(new ReadOnlyModeObserver(rxController)) + { + mpObserver->AddStatusListener(this); + + Reference xComponent ( + static_cast(mpResourceManager.get()), UNO_QUERY); + if (xComponent.is()) + xComponent->addEventListener(this); + } + + ~LocalReadOnlyModeObserver (void) + { + } + + virtual void SAL_CALL disposing (void) + { + Reference xComponent (static_cast(mpObserver.get()), UNO_QUERY); + if (xComponent.is()) + xComponent->dispose(); + + xComponent = Reference( + static_cast(mpResourceManager.get()), UNO_QUERY); + if (xComponent.is()) + xComponent->removeEventListener(this); + + } + + virtual void SAL_CALL disposing (const com::sun::star::lang::EventObject& rEvent) + throw(RuntimeException) + { + if (rEvent.Source == Reference(static_cast(mpObserver.get()))) + { + mpObserver = NULL; + } + else if (rEvent.Source == Reference( + static_cast(mpResourceManager.get()))) + { + mpResourceManager = NULL; + } + dispose(); + } + + virtual void SAL_CALL statusChanged (const com::sun::star::frame::FeatureStateEvent& rEvent) + throw(RuntimeException) + { + bool bReadWrite (true); + if (rEvent.IsEnabled) + rEvent.State >>= bReadWrite; + + if (bReadWrite) + mpResourceManager->Enable(); + else + mpResourceManager->Disable(); + } + +private: + ::rtl::Reference mpResourceManager; + ::rtl::Reference mpObserver; + +}; +} + + + + +//===== ToolPanelModule ==================================================== + +void ToolPanelModule::Initialize (const Reference& rxController) +{ + ::rtl::Reference pResourceManager ( + new ResourceManager( + rxController, + FrameworkHelper::CreateResourceId( + FrameworkHelper::msToolPanelViewURL, + FrameworkHelper::msToolPanelPaneURL))); + pResourceManager->AddActiveMainView(FrameworkHelper::msImpressViewURL); + pResourceManager->AddActiveMainView(FrameworkHelper::msNotesViewURL); + pResourceManager->AddActiveMainView(FrameworkHelper::msHandoutViewURL); + pResourceManager->AddActiveMainView(FrameworkHelper::msSlideSorterURL); + + new LocalReadOnlyModeObserver(rxController, pResourceManager); +} + + + + +} } // end of namespace sd::framework diff --git a/sd/source/ui/framework/module/ToolPanelModule.hxx b/sd/source/ui/framework/module/ToolPanelModule.hxx new file mode 100644 index 000000000000..7ae815bfad5b --- /dev/null +++ b/sd/source/ui/framework/module/ToolPanelModule.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: TaskPaneModule.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_FRAMEWORK_TOOL_PANEL_MODULE_HXX +#define SD_FRAMEWORK_TOOL_PANEL_MODULE_HXX + +#include "ResourceManager.hxx" + +#include + +namespace sd { namespace framework { + +class ReadOnlyModeObserver; + +/** This module is responsible for showing the task pane. +*/ +class ToolPanelModule +{ +public: + static void Initialize ( + const ::com::sun::star::uno::Reference& rxController); +}; + +} } // end of namespace sd::framework + +#endif diff --git a/sd/source/ui/framework/module/makefile.mk b/sd/source/ui/framework/module/makefile.mk index 24a0b6ba0410..78c9e0038c8e 100644 --- a/sd/source/ui/framework/module/makefile.mk +++ b/sd/source/ui/framework/module/makefile.mk @@ -57,6 +57,7 @@ SLOFILES = \ $(SLO)$/ShellStackGuard.obj \ $(SLO)$/SlideSorterModule.obj \ $(SLO)$/TaskPaneModule.obj \ + $(SLO)$/ToolPanelModule.obj \ $(SLO)$/ToolBarModule.obj \ $(SLO)$/ViewTabBarModule.obj diff --git a/sd/source/ui/framework/tools/FrameworkHelper.cxx b/sd/source/ui/framework/tools/FrameworkHelper.cxx index 4ce1bfebf6ee..0ca93f1195f6 100644 --- a/sd/source/ui/framework/tools/FrameworkHelper.cxx +++ b/sd/source/ui/framework/tools/FrameworkHelper.cxx @@ -187,6 +187,8 @@ const OUString FrameworkHelper::msLeftDrawPaneURL( msPaneURLPrefix + OUString::createFromAscii("LeftDrawPane")); const OUString FrameworkHelper::msRightPaneURL( msPaneURLPrefix + OUString::createFromAscii("RightPane")); +const OUString FrameworkHelper::msToolPanelPaneURL( + msPaneURLPrefix + OUString::createFromAscii("ToolPanel")); // View URLs. @@ -209,6 +211,8 @@ const OUString FrameworkHelper::msPresentationViewURL( msViewURLPrefix + OUString::createFromAscii("PresentationView")); const OUString FrameworkHelper::msTaskPaneURL( msViewURLPrefix + OUString::createFromAscii("TaskPane")); +const OUString FrameworkHelper::msToolPanelViewURL( + msViewURLPrefix + OUString::createFromAscii("ToolPanelPane")); // Tool bar URLs. @@ -590,6 +594,7 @@ ViewShell::ShellType FrameworkHelper::GetViewId (const rtl::OUString& rsViewURL) (*mpViewURLMap)[msSlideSorterURL] = ViewShell::ST_SLIDE_SORTER; (*mpViewURLMap)[msPresentationViewURL] = ViewShell::ST_PRESENTATION; (*mpViewURLMap)[msTaskPaneURL] = ViewShell::ST_TASK_PANE; + (*mpViewURLMap)[msToolPanelViewURL] = ViewShell::ST_TOOL_PANEL; } ViewURLMap::const_iterator iView (mpViewURLMap->find(rsViewURL)); if (iView != mpViewURLMap->end()) @@ -613,6 +618,7 @@ ViewShell::ShellType FrameworkHelper::GetViewId (const rtl::OUString& rsViewURL) case ViewShell::ST_SLIDE_SORTER : return msSlideSorterURL; case ViewShell::ST_PRESENTATION : return msPresentationViewURL; case ViewShell::ST_TASK_PANE : return msTaskPaneURL; + case ViewShell::ST_TOOL_PANEL: return msToolPanelViewURL; default: return OUString(); } 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 diff --git a/sd/source/ui/toolpanel/LayoutMenu.cxx b/sd/source/ui/toolpanel/LayoutMenu.cxx index b78042e2e9ae..2a951cab82c5 100644 --- a/sd/source/ui/toolpanel/LayoutMenu.cxx +++ b/sd/source/ui/toolpanel/LayoutMenu.cxx @@ -50,6 +50,7 @@ #include "controller/SlideSorterController.hxx" #include "controller/SlsPageSelector.hxx" #include "taskpane/TaskPaneControlFactory.hxx" +#include "taskpane/ToolPanelViewShell.hxx" #include "taskpane/ScrollPanel.hxx" #include "tools/SlotStateListener.hxx" #include "EventMultiplexer.hxx" @@ -113,6 +114,12 @@ protected: return pScrollPanel; } + virtual TreeNode* InternalCreateRootControl( ::Window& /*i_rParent*/ ) + { + OSL_ENSURE( false, "LayoutMenuFactory::InternalCreateRootControl: not implemented!" ); + return NULL; + } + private: ViewShellBase& mrBase; DrawDocShell& mrDocShell; @@ -120,6 +127,37 @@ private: +class LayoutMenuRootFactory + : public ControlFactory +{ +public: + LayoutMenuRootFactory (ToolPanelViewShell& i_rPanelViewShell) + :mrPanelViewShell(i_rPanelViewShell) + { + } + +protected: + virtual TreeNode* InternalCreateControl (TreeNode* pTreeNode) + { + OSL_ENSURE( false, "LayoutMenuRootFactory::InternalCreateControl: not implemented!" ); + return NULL; + } + + virtual TreeNode* InternalCreateRootControl( ::Window& i_rParent ) + { + ScrollPanel* pScrollPanel = new ScrollPanel (i_rParent); + ::std::auto_ptr pMenu ( + new LayoutMenu ( + pScrollPanel, + mrPanelViewShell)); + pScrollPanel->AddControl(pMenu); + return pScrollPanel; + } + +private: + ToolPanelViewShell& mrPanelViewShell; +}; + SFX_IMPL_INTERFACE(LayoutMenu, SfxShell, SdResId(STR_TASKPANELAYOUTMENU)) @@ -235,12 +273,41 @@ LayoutMenu::LayoutMenu ( DragSourceHelper(this), DropTargetHelper(this), mrBase (rViewShellBase), + mpShellManager (NULL), mbUseOwnScrollBar (bUseOwnScrollBar), mnPreferredColumnCount(3), mxListener(NULL), mbSelectionUpdatePending(true), mbIsMainViewChangePending(false) { + ImplConstruct( rDocumentShell ); +} + + + +LayoutMenu::LayoutMenu( TreeNode* pParent, ToolPanelViewShell& i_rPanelViewShell ) + : ValueSet (pParent->GetWindow()), + TreeNode(pParent), + DragSourceHelper(this), + DropTargetHelper(this), + mrBase( i_rPanelViewShell.GetViewShellBase() ), + mpShellManager (&i_rPanelViewShell.GetSubShellManager()), + mbUseOwnScrollBar( false ), + mnPreferredColumnCount(3), + mxListener(NULL), + mbSelectionUpdatePending(true), + mbIsMainViewChangePending(false) +{ + ImplConstruct( *mrBase.GetDocument()->GetDocSh() ); +} + + +void LayoutMenu::ImplConstruct( DrawDocShell& rDocumentShell ) +{ + OSL_ENSURE( mrBase.GetDocument()->GetDocSh() == &rDocumentShell, + "LayoutMenu::ImplConstruct: hmm?" ); + // if this fires, then my assumption that the rDocumentShell parameter to our first ctor is superfluous ... + SetStyle ( ( GetStyle() & ~(WB_ITEMBORDER) ) | WB_TABSTOP @@ -279,7 +346,6 @@ LayoutMenu::LayoutMenu ( - LayoutMenu::~LayoutMenu (void) { // Tell the shell factory that this object is no longer available. @@ -308,6 +374,15 @@ LayoutMenu::~LayoutMenu (void) +::std::auto_ptr LayoutMenu::CreateControlFactory ( + ToolPanelViewShell& i_rPanelViewShell ) +{ + return ::std::auto_ptr(new LayoutMenuRootFactory(i_rPanelViewShell)); +} + + + + String LayoutMenu::GetSelectedLayoutName (void) { return GetItemText (GetSelectItemId()); @@ -434,6 +509,7 @@ void LayoutMenu::UpdateEnabledState (const MasterMode eMode) case ViewShell::ST_OUTLINE: case ViewShell::ST_PRESENTATION: case ViewShell::ST_TASK_PANE: + case ViewShell::ST_TOOL_PANEL: // The complete task pane is disabled for these values or // not even visible. Disabling the LayoutMenu would be // logical but unnecessary. The main disadvantage is that @@ -634,6 +710,13 @@ void LayoutMenu::InsertPageWithLayout (AutoLayout aLayout) +TaskPaneShellManager* LayoutMenu::GetShellManager() +{ + if ( mpShellManager ) + return mpShellManager; + return TreeNode::GetShellManager(); +} + void LayoutMenu::InvalidateContent (void) { // The number of items may have changed. Request a resize so that the diff --git a/sd/source/ui/toolpanel/LayoutMenu.hxx b/sd/source/ui/toolpanel/LayoutMenu.hxx index 3551d3853a8a..7fa5d42a1f76 100644 --- a/sd/source/ui/toolpanel/LayoutMenu.hxx +++ b/sd/source/ui/toolpanel/LayoutMenu.hxx @@ -63,6 +63,7 @@ class EventMultiplexerEvent; namespace sd { namespace toolpanel { class ControlFactory; +class ToolPanelViewShell; class LayoutMenu @@ -96,11 +97,16 @@ public: DrawDocShell& rDocumentShell, ViewShellBase& rViewShellBase, bool bUseOwnScrollBar); + LayoutMenu ( + TreeNode* pParent, + ToolPanelViewShell& i_rPanelViewShell); virtual ~LayoutMenu (void); static std::auto_ptr CreateControlFactory ( ViewShellBase& rBase, DrawDocShell& rDocShell); + static std::auto_ptr CreateControlFactory ( + ToolPanelViewShell& i_rPanelViewShell ); /** Return the name of the currently selected layout. */ @@ -143,6 +149,9 @@ public: enum MasterMode { MM_NORMAL, MM_MASTER, MM_UNKNOWN }; void UpdateEnabledState (const MasterMode eMode); + // TreeNode overridables + virtual TaskPaneShellManager* GetShellManager (void); + /** Call this method when the set of displayed layouts is not up-to-date anymore. It will re-assemple this set according to the current settings. @@ -171,6 +180,8 @@ public: private: ViewShellBase& mrBase; + TaskPaneShellManager* mpShellManager; + /** Do we use our own scroll bar or is viewport handling done by our parent? */ @@ -234,6 +245,9 @@ private: */ void UpdateSelection (void); + // internal ctor + void ImplConstruct( DrawDocShell& rDocumentShell ); + /** When clicked then set the current page of the view in the center pane. */ DECL_LINK(ClickHandler, ValueSet*); diff --git a/sd/source/ui/toolpanel/ScrollPanel.cxx b/sd/source/ui/toolpanel/ScrollPanel.cxx index f2614b321821..e5023131e908 100644 --- a/sd/source/ui/toolpanel/ScrollPanel.cxx +++ b/sd/source/ui/toolpanel/ScrollPanel.cxx @@ -58,6 +58,30 @@ ScrollPanel::ScrollPanel ( mnVerticalBorder(2), mnVerticalGap(3), mnHorizontalBorder(2) +{ + Construct(); +} + +ScrollPanel::ScrollPanel ( + ::Window& i_rParentWindow) + : Control (&i_rParentWindow, WB_DIALOGCONTROL), + TreeNode(NULL), + maScrollWindow(this, WB_DIALOGCONTROL), + maVerticalScrollBar(this, WB_VERT), + maHorizontalScrollBar(this, WB_HORZ), + maScrollBarFiller(this), + maScrollWindowFiller(&maScrollWindow), + mbIsRearrangePending(true), + mbIsLayoutPending(true), + mnChildrenWidth(0), + mnVerticalBorder(2), + mnVerticalGap(3), + mnHorizontalBorder(2) +{ + Construct(); +} + +void ScrollPanel::Construct() { SetAccessibleName ( ::rtl::OUString::createFromAscii("Sub Task Panel")); diff --git a/sd/source/ui/toolpanel/SubToolPanel.cxx b/sd/source/ui/toolpanel/SubToolPanel.cxx index 5b3b74f8bf55..3db1c839051e 100644 --- a/sd/source/ui/toolpanel/SubToolPanel.cxx +++ b/sd/source/ui/toolpanel/SubToolPanel.cxx @@ -73,6 +73,35 @@ SubToolPanel::SubToolPanel ( +SubToolPanel::SubToolPanel ( + Window& i_rParentWindow) + : Control (&i_rParentWindow, WB_DIALOGCONTROL), + TreeNode(NULL), + maWindowFiller(this), + mbIsRearrangePending(true), + mbIsLayoutPending(true), + mnChildrenWidth(0), + mnVerticalBorder(0), + mnVerticalGap(3), + mnHorizontalBorder(2) +{ + SetAccessibleName ( + ::rtl::OUString::createFromAscii("Sub Task Panel")); + mpControlContainer->SetMultiSelection (true); + + SetBorderStyle (WINDOW_BORDER_NORMAL); + SetMapMode (MapMode(MAP_PIXEL)); + + // To reduce flickering during repaints make the container windows + // transparent and rely on their children to paint the whole area. + SetBackground(Wallpaper()); + maWindowFiller.SetBackground( + Application::GetSettings().GetStyleSettings().GetWindowColor()); +} + + + + SubToolPanel::~SubToolPanel (void) { sal_uInt32 nCount = mpControlContainer->GetControlCount(); diff --git a/sd/source/ui/toolpanel/TaskPaneControlFactory.cxx b/sd/source/ui/toolpanel/TaskPaneControlFactory.cxx index eef90c3037c2..e9ea53d4c7b7 100644 --- a/sd/source/ui/toolpanel/TaskPaneControlFactory.cxx +++ b/sd/source/ui/toolpanel/TaskPaneControlFactory.cxx @@ -60,4 +60,10 @@ ControlFactory::~ControlFactory (void) } +::std::auto_ptr ControlFactory::CreateRootControl( ::Window& i_rParent ) +{ + TreeNode* pNewNode = InternalCreateRootControl( i_rParent ); + return ::std::auto_ptr( pNewNode ); +} + } } // end of namespace ::sd::toolpanel diff --git a/sd/source/ui/toolpanel/TaskPaneShellManager.cxx b/sd/source/ui/toolpanel/TaskPaneShellManager.cxx index 6400a51bf44a..3e117e6106f7 100644 --- a/sd/source/ui/toolpanel/TaskPaneShellManager.cxx +++ b/sd/source/ui/toolpanel/TaskPaneShellManager.cxx @@ -34,7 +34,7 @@ #include "TaskPaneShellManager.hxx" #include "ViewShellManager.hxx" -#include +#include #include #include @@ -114,6 +114,21 @@ void TaskPaneShellManager::AddSubShell ( +void TaskPaneShellManager::RemoveSubShell (const ShellId i_nShellId) +{ + SubShells::iterator pos = maSubShells.find( i_nShellId ); + ENSURE_OR_RETURN_VOID( pos != maSubShells.end(), "no shell for this ID" ); + if ( pos->second.mpWindow != NULL ) + { + pos->second.mpWindow->RemoveEventListener( LINK( this, TaskPaneShellManager, WindowCallback ) ); + } + mpViewShellManager->DeactivateSubShell( mrViewShell, pos->first ); + maSubShells.erase( pos ); +} + + + + void TaskPaneShellManager::RemoveSubShell (const SfxShell* pShell) { if (pShell != NULL) diff --git a/sd/source/ui/toolpanel/TaskPaneShellManager.hxx b/sd/source/ui/toolpanel/TaskPaneShellManager.hxx index 981d8bcd84bd..9152ea6a8bad 100644 --- a/sd/source/ui/toolpanel/TaskPaneShellManager.hxx +++ b/sd/source/ui/toolpanel/TaskPaneShellManager.hxx @@ -89,6 +89,11 @@ public: NULL when this shell is requested. */ void RemoveSubShell (const SfxShell* pShell); + /** removes the shell given by its ID from the set of sub shells managed by the + TaskPaneShellManager. Subsequent calls to CreateShell() will return + NULL when this shell is requested. + */ + void RemoveSubShell (const ShellId i_nShellId); /** Move the given sub-shell to the top of the local shell stack. Furthermore move the view shell whose sub-shells this class manages diff --git a/sd/source/ui/toolpanel/TaskPaneToolPanel.cxx b/sd/source/ui/toolpanel/TaskPaneToolPanel.cxx new file mode 100644 index 000000000000..11735d5433bd --- /dev/null +++ b/sd/source/ui/toolpanel/TaskPaneToolPanel.cxx @@ -0,0 +1,131 @@ +/************************************************************************* + * 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. + * +************************************************************************/ + +#include "precompiled_sd.hxx" + +#include "TaskPaneToolPanel.hxx" +#include "ToolPanelDeck.hxx" +#include "sdresid.hxx" + +#include +#include + +//...................................................................................................................... +namespace sd { namespace toolpanel +{ +//...................................................................................................................... + + //================================================================================================================== + //= TaskPaneToolPanel + //================================================================================================================== + //------------------------------------------------------------------------------------------------------------------ + TaskPaneToolPanel::TaskPaneToolPanel( ToolPanelDeck& i_rPanelDeck, ::std::auto_ptr< ControlFactory >& i_rControlFactory, + const Image& i_rImage, const USHORT i_nTitleResId, const ULONG i_nHelpId ) + :m_pPanelDeck( &i_rPanelDeck ) + ,m_pControlFactory( i_rControlFactory ) + ,m_pControl() + ,m_aImage( i_rImage ) + ,m_sTitle( SdResId( i_nTitleResId ) ) + ,m_aHelpId( i_nHelpId ) + { + ENSURE_OR_THROW( m_pControlFactory.get(), "illegal control factory" ); + } + + //------------------------------------------------------------------------------------------------------------------ + TaskPaneToolPanel::~TaskPaneToolPanel() + { + m_pControl.reset(); + } + + //------------------------------------------------------------------------------------------------------------------ + ::rtl::OUString TaskPaneToolPanel::GetDisplayName() const + { + return m_sTitle; + } + + //------------------------------------------------------------------------------------------------------------------ + Image TaskPaneToolPanel::GetImage() const + { + return m_aImage; + } + + //------------------------------------------------------------------------------------------------------------------ + void TaskPaneToolPanel::Show() + { + ENSURE_OR_RETURN_VOID( impl_ensureControl(), "no control to show" ); + m_pControl->GetWindow()->Show(); + } + + //------------------------------------------------------------------------------------------------------------------ + void TaskPaneToolPanel::Hide() + { + ENSURE_OR_RETURN_VOID( impl_ensureControl(), "no control to hide" ); + m_pControl->GetWindow()->Hide(); + } + + //------------------------------------------------------------------------------------------------------------------ + void TaskPaneToolPanel::SetPosSizePixel( const Rectangle& i_rPanelPlayground ) + { + ENSURE_OR_RETURN_VOID( impl_ensureControl(), "no control to position" ); + m_pControl->GetWindow()->SetPosSizePixel( i_rPanelPlayground.TopLeft(), i_rPanelPlayground.GetSize() ); + } + + //------------------------------------------------------------------------------------------------------------------ + void TaskPaneToolPanel::GrabFocus() + { + ENSURE_OR_RETURN_VOID( impl_ensureControl(), "no control to focus" ); + m_pControl->GetWindow()->GrabFocus(); + } + + //------------------------------------------------------------------------------------------------------------------ + bool TaskPaneToolPanel::HasFocus() const + { + ENSURE_OR_RETURN_FALSE( const_cast< TaskPaneToolPanel* >( this )->impl_ensureControl(), "no control to ask" ); + return m_pControl->GetWindow()->HasChildPathFocus(); + } + + //------------------------------------------------------------------------------------------------------------------ + void TaskPaneToolPanel::Dispose() + { + ENSURE_OR_RETURN_VOID( m_pPanelDeck, "disposed twice" ); + m_pControl.reset(); + m_pPanelDeck = NULL; + } + + //------------------------------------------------------------------------------------------------------------------ + bool TaskPaneToolPanel::impl_ensureControl() + { + if ( m_pControl.get() ) + return true; + if ( !m_pPanelDeck ) + return false; + m_pControl = m_pControlFactory->CreateRootControl( *m_pPanelDeck ); + return ( m_pControl.get() != NULL ); + } + +//...................................................................................................................... +} } // namespace sd::toolpanel +//...................................................................................................................... diff --git a/sd/source/ui/toolpanel/TaskPaneToolPanel.hxx b/sd/source/ui/toolpanel/TaskPaneToolPanel.hxx new file mode 100644 index 000000000000..d879d6549a0e --- /dev/null +++ b/sd/source/ui/toolpanel/TaskPaneToolPanel.hxx @@ -0,0 +1,92 @@ +/************************************************************************* + * 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_TASKPANETOOLPANEL_HXX +#define SD_TASKPANETOOLPANEL_HXX + +#include "taskpane/TaskPaneControlFactory.hxx" + +/** === begin UNO includes === **/ +#include +/** === end UNO includes === **/ + +#include + +#include +#include + +#include + +//...................................................................................................................... +namespace sd { namespace toolpanel +{ +//...................................................................................................................... + + class ToolPanelDeck; + + //================================================================================================================== + //= TaskPaneToolPanel + //================================================================================================================== + class TaskPaneToolPanel : public ::svt::ToolPanelBase + { + public: + TaskPaneToolPanel( + ToolPanelDeck& i_rPanelDeck, + ::std::auto_ptr< ControlFactory >& i_rControlFactory, + const Image& i_rImage, + const USHORT i_nTitleResId, + const ULONG i_nHelpId/*, + const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::framework::XResourceId >& i_rPanelContent*/ + ); + ~TaskPaneToolPanel(); + + // IToolPanel overridables + virtual ::rtl::OUString GetDisplayName() const; + virtual Image GetImage() const; + virtual void Show(); + virtual void Hide(); + virtual void SetPosSizePixel( const Rectangle& i_rPanelPlayground ); + virtual void GrabFocus(); + virtual bool HasFocus() const; + virtual void Dispose(); + + private: + bool impl_ensureControl(); + + private: + ToolPanelDeck* m_pPanelDeck; + ::std::auto_ptr< ControlFactory > m_pControlFactory; + ::std::auto_ptr< TreeNode > m_pControl; + const Image m_aImage; + const String m_sTitle; + const SmartId m_aHelpId; + }; + +//...................................................................................................................... +} } // namespace sd::toolpanel +//...................................................................................................................... + +#endif // SD_TASKPANETOOLPANEL_HXX diff --git a/sd/source/ui/toolpanel/TaskPaneTreeNode.cxx b/sd/source/ui/toolpanel/TaskPaneTreeNode.cxx index fca52cc328d6..611fee85d29d 100644 --- a/sd/source/ui/toolpanel/TaskPaneTreeNode.cxx +++ b/sd/source/ui/toolpanel/TaskPaneTreeNode.cxx @@ -125,17 +125,6 @@ sal_Int32 TreeNode::GetMinimumWidth (void) -ObjectBarManager* TreeNode::GetObjectBarManager (void) -{ - if (mpParent != NULL) - return mpParent->GetObjectBarManager(); - else - return NULL; -} - - - - bool TreeNode::IsResizable (void) { return false; diff --git a/sd/source/ui/toolpanel/TaskPaneViewShell.cxx b/sd/source/ui/toolpanel/TaskPaneViewShell.cxx index 7580d4104766..c0acf9788e50 100644 --- a/sd/source/ui/toolpanel/TaskPaneViewShell.cxx +++ b/sd/source/ui/toolpanel/TaskPaneViewShell.cxx @@ -47,7 +47,6 @@ #include "controls/TableDesignPanel.hxx" #include "controls/CustomAnimationPanel.hxx" #include "controls/SlideTransitionPanel.hxx" -#include "controls/AnimationSchemesPanel.hxx" #include "TitleToolBox.hxx" #include "taskpane/ControlContainer.hxx" #include "FrameView.hxx" @@ -260,37 +259,29 @@ void TaskPaneViewShell::Implementation::Setup ( AddPanel (nId, PID_TABLE_DESIGN); } - { - DummyControl aControl (pToolPanel, SdResId(RID_CUSTOMANIMATION_START+0)); - - // CustomAnimationPanel - nId = pToolPanel->AddControl ( - controls::CustomAnimationPanel::CreateControlFactory(rBase), - aControl.GetText(), - HID_SD_CUSTOM_ANIMATIONS, - ResourceActivationClickHandler( - pFrameworkHelper, - pFrameworkHelper->CreateResourceId( - FrameworkHelper::msCustomAnimationTaskPanelURL, xTaskPaneId), - pToolPanel->GetControlContainer())); - AddPanel (nId, PID_CUSTOM_ANIMATION); - } + // CustomAnimationPanel + nId = pToolPanel->AddControl ( + controls::CustomAnimationPanel::CreateControlFactory(rBase), + SdResId( STR_CUSTOMANIMATIONPANE ), + HID_SD_CUSTOM_ANIMATIONS, + ResourceActivationClickHandler( + pFrameworkHelper, + pFrameworkHelper->CreateResourceId( + FrameworkHelper::msCustomAnimationTaskPanelURL, xTaskPaneId), + pToolPanel->GetControlContainer())); + AddPanel (nId, PID_CUSTOM_ANIMATION); // SlideTransitionPanel - { - DummyControl aControl (pToolPanel, SdResId(RID_CUSTOMANIMATION_START+3)); - - nId = pToolPanel->AddControl ( - controls::SlideTransitionPanel::CreateControlFactory(rBase), - aControl.GetText(), - HID_SD_SLIDE_TRANSITIONS, - ResourceActivationClickHandler( - pFrameworkHelper, - pFrameworkHelper->CreateResourceId( - FrameworkHelper::msSlideTransitionTaskPanelURL, xTaskPaneId), - pToolPanel->GetControlContainer())); - AddPanel (nId, PID_SLIDE_TRANSITION); - } + nId = pToolPanel->AddControl ( + controls::SlideTransitionPanel::CreateControlFactory(rBase), + SdResId( STR_SLIDE_TRANSITION_PANE ), + HID_SD_SLIDE_TRANSITIONS, + ResourceActivationClickHandler( + pFrameworkHelper, + pFrameworkHelper->CreateResourceId( + FrameworkHelper::msSlideTransitionTaskPanelURL, xTaskPaneId), + pToolPanel->GetControlContainer())); + AddPanel (nId, PID_SLIDE_TRANSITION); #ifdef SHOW_COLOR_MENU // Test Menu. @@ -425,17 +416,6 @@ TaskPaneViewShell::~TaskPaneViewShell (void) -// static -void TaskPaneViewShell::RegisterControls (void) -{ - SfxModule* pModule = SD_MOD(); - controls::MasterPagesSelector::RegisterInterface (pModule); - LayoutMenu::RegisterInterface (pModule); -} - - - - void TaskPaneViewShell::ArrangeGUIElements (void) { ViewShell::ArrangeGUIElements(); @@ -841,27 +821,6 @@ sal_uInt32 -//===== PanelActivation ======================================================= - -PanelActivation::PanelActivation (ViewShellBase& rBase, TaskPaneViewShell::PanelId nPanelId) - : mrBase(rBase), - mnPanelId(nPanelId) -{ -} - -void PanelActivation::operator() (bool) -{ - toolpanel::TaskPaneViewShell* pTaskPane - = dynamic_cast( - framework::FrameworkHelper::Instance(mrBase) - ->GetViewShell(framework::FrameworkHelper::msRightPaneURL).get()); - if (pTaskPane != NULL) - pTaskPane->ShowPanel(mnPanelId); -} - - - - //===== ResourceActivationClickHandler ======================================== ResourceActivationClickHandler::ResourceActivationClickHandler ( diff --git a/sd/source/ui/toolpanel/TestMenu.cxx b/sd/source/ui/toolpanel/TestMenu.cxx index 46d0c7944aa5..3e90a56a00fe 100644 --- a/sd/source/ui/toolpanel/TestMenu.cxx +++ b/sd/source/ui/toolpanel/TestMenu.cxx @@ -52,6 +52,11 @@ protected: { return new ColorMenu (pTreeNode); } + virtual TreeNode* InternalCreateRootControl( ::Window& /*i_rParent*/ ) + { + OSL_ENSURE( false, "ColorMenuFactory::InternalCreateRootControl: not implemented!" ); + return NULL; + } }; diff --git a/sd/source/ui/toolpanel/TestPanel.cxx b/sd/source/ui/toolpanel/TestPanel.cxx index f012cb99c3dc..8b14eb5d0234 100644 --- a/sd/source/ui/toolpanel/TestPanel.cxx +++ b/sd/source/ui/toolpanel/TestPanel.cxx @@ -52,6 +52,11 @@ protected: { return new TestPanel (pTreeNode); } + virtual TreeNode* InternalCreateRootControl( ::Window& i_rParent ) + { + OSL_ENSURE( false, "TestPanelFactory::InternalCreateRootControl: not implemented!" ); + return NULL; + } }; diff --git a/sd/source/ui/toolpanel/TitleBar.cxx b/sd/source/ui/toolpanel/TitleBar.cxx index c0e605cac79e..ebf17bef51cb 100644 --- a/sd/source/ui/toolpanel/TitleBar.cxx +++ b/sd/source/ui/toolpanel/TitleBar.cxx @@ -216,14 +216,14 @@ bool TitleBar::IsExpanded (void) const } -void TitleBar::SetEnabledState(bool bFlag) -{ - if(bFlag) - Enable(); - else - Disable(); - Invalidate (); -} +void TitleBar::SetEnabledState(bool bFlag) +{ + if(bFlag) + Enable(); + else + Disable(); + Invalidate (); +} void TitleBar::SetFocus (bool bFlag) @@ -462,17 +462,17 @@ void TitleBar::PaintText (const Rectangle& rTextBox) USHORT TitleBar::GetTextStyle (void) { - if(IsEnabled()) - { - return TEXT_DRAW_LEFT - | TEXT_DRAW_TOP - | TEXT_DRAW_MULTILINE - | TEXT_DRAW_WORDBREAK; - } - else - { - return TEXT_DRAW_DISABLE; - } + if(IsEnabled()) + { + return TEXT_DRAW_LEFT + | TEXT_DRAW_TOP + | TEXT_DRAW_MULTILINE + | TEXT_DRAW_WORDBREAK; + } + else + { + return TEXT_DRAW_DISABLE; + } } diff --git a/sd/source/ui/toolpanel/TitledControl.cxx b/sd/source/ui/toolpanel/TitledControl.cxx index 2c2e791eb018..06e6e7b2e871 100644 --- a/sd/source/ui/toolpanel/TitledControl.cxx +++ b/sd/source/ui/toolpanel/TitledControl.cxx @@ -338,27 +338,27 @@ bool TitledControl::IsExpanded (void) const return false; } -void TitledControl::SetEnabledState(bool bFlag) -{ - if (!bFlag) - { - GetParentNode()->GetControlContainer().SetExpansionState ( - this, - ControlContainer::ES_COLLAPSE); - Disable(); - } - else - { -/* - GetParentNode()->GetControlContainer().SetExpansionState ( - this, - ControlContainer::ES_EXPAND); -*/ - Enable(); - } - - GetTitleBar()->SetEnabledState(bFlag); -} +void TitledControl::SetEnabledState(bool bFlag) +{ + if (!bFlag) + { + GetParentNode()->GetControlContainer().SetExpansionState ( + this, + ControlContainer::ES_COLLAPSE); + Disable(); + } + else + { +/* + GetParentNode()->GetControlContainer().SetExpansionState ( + this, + ControlContainer::ES_EXPAND); +*/ + Enable(); + } + + GetTitleBar()->SetEnabledState(bFlag); +} diff --git a/sd/source/ui/toolpanel/ToolPanelDeck.cxx b/sd/source/ui/toolpanel/ToolPanelDeck.cxx new file mode 100644 index 000000000000..c2a0d45b211f --- /dev/null +++ b/sd/source/ui/toolpanel/ToolPanelDeck.cxx @@ -0,0 +1,93 @@ +/************************************************************************* + * 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. + * +************************************************************************/ + +#include "precompiled_sd.hxx" + +#include "ToolPanelDeck.hxx" +#include "taskpane/ToolPanelViewShell.hxx" +#include "taskpane/ControlContainer.hxx" +#include "TaskPaneToolPanel.hxx" + +#include + +//...................................................................................................................... +namespace sd { namespace toolpanel +{ +//...................................................................................................................... + + //================================================================================================================== + //= ToolPanelDeck + //================================================================================================================== + //------------------------------------------------------------------------------------------------------------------ + ToolPanelDeck::ToolPanelDeck( Window& i_rParent, ToolPanelViewShell& i_rViewShell ) + :ToolPanelDeck_Base( i_rParent, 0 ) + ,m_rViewShell( i_rViewShell ) + { + SetTabsLayout( ::svt::TABS_RIGHT, ::svt::TABITEM_IMAGE_ONLY ); + } + + //------------------------------------------------------------------------------------------------------------------ + ToolPanelDeck::~ToolPanelDeck() + { + } + + //------------------------------------------------------------------------------------------------------------------ + void ToolPanelDeck::SetTabsLayout( const ::svt::TabAlignment i_eTabAlignment, const ::svt::TabItemContent i_eTabContent ) + { + ::svt::PDeckLayouter pLayouter( GetLayouter() ); + ::svt::TabDeckLayouter* pTabLayouter = dynamic_cast< ::svt::TabDeckLayouter* >( pLayouter.get() ); + if ( ( pTabLayouter != NULL ) + && ( pTabLayouter->GetTabAlignment() == i_eTabAlignment ) + && ( pTabLayouter->GetTabItemContent() == i_eTabContent ) + ) + return; + + if ( pTabLayouter && ( pTabLayouter->GetTabAlignment() == i_eTabAlignment ) ) + { + // changing only the item content does not require a new layouter instance + pTabLayouter->SetTabItemContent( i_eTabContent ); + return; + } + + SetLayouter( new ::svt::TabDeckLayouter( *this, i_eTabAlignment, i_eTabContent ) ); + } + + //------------------------------------------------------------------------------------------------------------------ + size_t ToolPanelDeck::CreateAndInsertPanel( ::std::auto_ptr< ControlFactory >& i_rControlFactory, + const Image& i_rImage, const USHORT i_nTitleResId, const ULONG i_nHelpId ) + { + // create panel + ::svt::PToolPanel pNewPanel( new TaskPaneToolPanel( + *this, i_rControlFactory, + i_rImage, i_nTitleResId, i_nHelpId + ) ); + // insert as new panel + return InsertPanel( pNewPanel, GetPanelCount() ); + } + +//...................................................................................................................... +} } // namespace sd::toolpanel +//...................................................................................................................... diff --git a/sd/source/ui/toolpanel/ToolPanelDeck.hxx b/sd/source/ui/toolpanel/ToolPanelDeck.hxx new file mode 100644 index 000000000000..65ad6f80ad83 --- /dev/null +++ b/sd/source/ui/toolpanel/ToolPanelDeck.hxx @@ -0,0 +1,75 @@ +/************************************************************************* + * 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_TOOLPANELDECK_HXX +#define SD_TOOLPANELDECK_HXX + +#include "taskpane/TaskPaneTreeNode.hxx" +#include "taskpane/TaskPaneControlFactory.hxx" + +#include +#include +#include + +//...................................................................................................................... +namespace sd { namespace toolpanel +{ +//...................................................................................................................... + + class ToolPanelViewShell; + + //================================================================================================================== + //= ToolPanelDeck + //================================================================================================================== + typedef ::svt::ToolPanelDeck ToolPanelDeck_Base; + class ToolPanelDeck : public ToolPanelDeck_Base + { + public: + ToolPanelDeck( + ::Window& i_rParent, + ToolPanelViewShell& i_rViewShell + ); + ~ToolPanelDeck(); + + // panel maintenance + size_t CreateAndInsertPanel( + ::std::auto_ptr< ControlFactory >& i_rControlFactory, + const Image& i_rImage, + const USHORT i_nTitleResId, + const ULONG i_nHelpId + ); + + void SetTabsLayout( const ::svt::TabAlignment i_eTabAlignment, const ::svt::TabItemContent i_eTabContent ); + + private: + ToolPanelViewShell& m_rViewShell; + }; + +//...................................................................................................................... +} } // sd::toolpanel +//...................................................................................................................... + +#endif // SD_TOOLPANELDECK_HXX diff --git a/sd/source/ui/toolpanel/ToolPanelViewShell.cxx b/sd/source/ui/toolpanel/ToolPanelViewShell.cxx new file mode 100644 index 000000000000..5075e280f296 --- /dev/null +++ b/sd/source/ui/toolpanel/ToolPanelViewShell.cxx @@ -0,0 +1,642 @@ +/************************************************************************* + * 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. + * +************************************************************************/ + +// MARKER(update_precomp.py): autogen include statement, do not remove +#include "precompiled_sd.hxx" + +#include "taskpane/ToolPanelViewShell.hxx" + +#include "TaskPaneShellManager.hxx" +#include "TaskPaneFocusManager.hxx" +#include "controls/MasterPagesPanel.hxx" +#include "LayoutMenu.hxx" +#include "controls/TableDesignPanel.hxx" +#include "controls/CustomAnimationPanel.hxx" +#include "controls/SlideTransitionPanel.hxx" +#include "controls/MasterPagesSelector.hxx" +#include "PaneDockingWindow.hxx" +#include "FrameView.hxx" +#include "Window.hxx" +#include "PaneDockingWindow.hxx" +#include "ToolPanelDeck.hxx" +#include "sdmod.hxx" +#include "app.hrc" +#include "glob.hrc" +#include "res_bmp.hrc" +#include "helpids.h" +#include "strings.hrc" +#include "sdresid.hxx" +#include "framework/FrameworkHelper.hxx" +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "sdtreelb.hxx" +#include "DrawViewShell.hxx" +#include "drawdoc.hxx" +#include "ViewShellBase.hxx" +#include +#include +#include +#include + +#include + +using namespace ::sd::toolpanel; + +#define ToolPanelViewShell +#include "sdslots.hxx" + +/** === begin UNO using === **/ +using ::com::sun::star::uno::Reference; +using ::com::sun::star::uno::XInterface; +using ::com::sun::star::uno::UNO_QUERY; +using ::com::sun::star::uno::UNO_QUERY_THROW; +using ::com::sun::star::uno::UNO_SET_THROW; +using ::com::sun::star::uno::Exception; +using ::com::sun::star::uno::RuntimeException; +using ::com::sun::star::uno::Any; +using ::com::sun::star::uno::makeAny; +using ::com::sun::star::uno::Sequence; +using ::com::sun::star::uno::Type; +using ::com::sun::star::accessibility::XAccessible; +using ::com::sun::star::drawing::XDrawSubController; +using ::com::sun::star::frame::XFrame; +/** === end UNO using === **/ + +using ::sd::framework::FrameworkHelper; + +namespace sd { namespace toolpanel { + +// ===================================================================================================================== +// = ToolPanelViewShell::Implementation - declaration +// ===================================================================================================================== +/** Inner implementation class of ToolPanelViewShell. +*/ +class ToolPanelViewShell::Implementation +{ +public: + static const size_t mnInvalidId = static_cast< size_t >( -1 ); + + Implementation(); + ~Implementation(); + + /** Here the panels are created that are shown in the task pane. + */ + void Setup( ToolPanelViewShell& i_rViewShell, ToolPanelDeck& i_rPanelDeck ); + + /** Return the public id for the given internal one. + @return + When the given public id is not known then PID_UNKNOWN is + returned. + */ + PanelId GetPublicId (size_t nInternalId) const; + + /** Return the internal id for the given public one. + @return + When the given public id is not known then mnInvalidId is + returned. + */ + size_t GetInternalId (PanelId nPublicId) const; + +private: + /** Make a new panel known to the translation table that translates + between internal indices as returned by + ControlContainer::AddControl() and public indices defined by + ToolPanelViewShell::PanelId. + */ + void AddPanel (size_t nInternalId, PanelId nPublicId); + + /** This map translates between internal indices returned by + ControlContainer::AddControl() and public indices defined by + ToolPanelViewShell::PanelId. + */ + typedef ::std::vector InternalIdToPanelIdMap; + InternalIdToPanelIdMap maIndexMap; +}; + +// ===================================================================================================================== +// = helpers +// ===================================================================================================================== +// --------------------------------------------------------------------------------------------------------------------- +namespace { + +enum MenuId { + MID_UNLOCK_TASK_PANEL = 1, + MID_LOCK_TASK_PANEL = 2, + MID_FIRST_CONTROL = 3 +}; + +} // end of anonymouse namespace + +// ===================================================================================================================== +// = ToolPanelViewShell +// ===================================================================================================================== +// --------------------------------------------------------------------------------------------------------------------- +SFX_IMPL_INTERFACE(ToolPanelViewShell, SfxShell, SdResId(STR_TASKPANEVIEWSHELL)) +{ +} + +// --------------------------------------------------------------------------------------------------------------------- +TYPEINIT1(ToolPanelViewShell, ViewShell); + +// --------------------------------------------------------------------------------------------------------------------- +void ToolPanelViewShell::Implementation::Setup( ToolPanelViewShell& i_rViewShell, ToolPanelDeck& i_rPanelDeck ) +{ + typedef std::auto_ptr (*ControlFactoryFactory)( ToolPanelViewShell& i_rToolPanelShell ); + + struct PanelDescriptor + { + ControlFactoryFactory pFactory; + const sal_Char* pImageCommandName; + USHORT nTitleResourceID; + ULONG nHelpID; + PanelId nPanelID; + }; + + PanelDescriptor aPanels[] = { + // "Master Pages" + { &controls::MasterPagesPanel::CreateControlFactory, "PresentationLayout", STR_TASKPANEL_MASTER_PAGE_TITLE, HID_SD_SLIDE_DESIGNS, PID_MASTER_PAGES }, + // "Layout" + { &LayoutMenu::CreateControlFactory, "ModifyPage", STR_TASKPANEL_LAYOUT_MENU_TITLE, HID_SD_SLIDE_LAYOUTS, PID_LAYOUT }, + // "Tables Design" + { &controls::TableDesignPanel::CreateControlFactory, "InsertTable", DLG_TABLEDESIGNPANE, HID_SD_TABLE_DESIGN, PID_TABLE_DESIGN }, + // "Custom Animation" + { &controls::CustomAnimationPanel::CreateControlFactory, "CustomAnimation", STR_CUSTOMANIMATIONPANE, HID_SD_CUSTOM_ANIMATIONS, PID_CUSTOM_ANIMATION }, + // "Slide Transition" + { &controls::SlideTransitionPanel::CreateControlFactory, "RehearseTimings", STR_SLIDE_TRANSITION_PANE, HID_SD_SLIDE_TRANSITIONS, PID_SLIDE_TRANSITION } + }; + + Reference< XFrame > xFrame( i_rViewShell.GetViewShellBase().GetViewFrame()->GetFrame()->GetFrameInterface() ); + for ( size_t i=0; i < sizeof( aPanels ) / sizeof( aPanels[0] ); ++i ) + { + ::rtl::OUStringBuffer aCommandName; + aCommandName.appendAscii( ".uno:" ); + aCommandName.appendAscii( aPanels[i].pImageCommandName ); + + size_t nPanelPos = i_rPanelDeck.CreateAndInsertPanel( + (*aPanels[i].pFactory)( i_rViewShell ), + GetImage( xFrame, aCommandName.makeStringAndClear(), FALSE, FALSE ), + aPanels[i].nTitleResourceID, + aPanels[i].nHelpID + ); + AddPanel( nPanelPos, aPanels[i].nPanelID ); + } + + // activate default panel + i_rPanelDeck.ActivatePanel( GetInternalId( PID_LAYOUT ) ); +} + +// --------------------------------------------------------------------------------------------------------------------- +void ToolPanelViewShell::Initialize() +{ + if ( !mbIsInitialized ) + { + mbIsInitialized = true; + mpImpl->Setup( *this, *mpPanelDeck ); + mpPanelDeck->Show(); + } +} + +// --------------------------------------------------------------------------------------------------------------------- +ToolPanelViewShell::ToolPanelViewShell( SfxViewFrame* pFrame, ViewShellBase& rViewShellBase, ::Window* pParentWindow, + FrameView* pFrameViewArgument ) + :ViewShell(pFrame, pParentWindow, rViewShellBase) + ,mpImpl( new Implementation ) + ,mpPanelDeck( new ToolPanelDeck( *mpContentWindow.get(), *this ) ) + ,mbIsInitialized(false) + ,mpSubShellManager() + ,mnMenuId(0) +{ + meShellType = ST_TOOL_PANEL; + + mpContentWindow->SetCenterAllowed( false ); + pParentWindow->SetStyle( pParentWindow->GetStyle() | WB_DIALOGCONTROL ); + + GetParentWindow()->SetBackground( Wallpaper() ); + mpContentWindow->SetBackground( Wallpaper() ); + + GetParentWindow()->SetHelpId(HID_SD_TASK_PANE); + + ConnectToDockingWindow(); + + SetPool( &GetDoc()->GetPool() ); + + if ( pFrameViewArgument ) + mpFrameView = pFrameViewArgument; + else + mpFrameView = new FrameView( GetDoc() ); + GetFrameView()->Connect(); + + // Hide or delete unused controls that we have inherited from the + // ViewShell base class. + mpHorizontalScrollBar.reset(); + mpVerticalScrollBar.reset(); + mpScrollBarBox.reset(); + mpHorizontalRuler.reset(); + mpVerticalRuler.reset(); + + SetName( String( RTL_CONSTASCII_USTRINGPARAM( "ToolPanelViewShell" ) ) ); + + // For accessibility we have to shortly hide the content window. This + // triggers the construction of a new accessibility object for the new + // view shell. (One is created earlier while the construtor of the base + // class is executed. At that time the correct accessibility object can + // not be constructed.) + if ( mpContentWindow.get() ) + { + mpContentWindow->Hide(); + mpContentWindow->Show(); + } + + // Register the shell manager as factory at the ViewShellManager. + mpSubShellManager.reset( new TaskPaneShellManager( + GetViewShellBase().GetViewShellManager(), + *this + ) ); + GetViewShellBase().GetViewShellManager()->AddSubShellFactory( this, mpSubShellManager ); +} + +// --------------------------------------------------------------------------------------------------------------------- +ToolPanelViewShell::~ToolPanelViewShell() +{ + mpPanelDeck.reset(); + GetViewShellBase().GetViewShellManager()->RemoveSubShellFactory(this, mpSubShellManager); +} + +// --------------------------------------------------------------------------------------------------------------------- +// static +void ToolPanelViewShell::RegisterControls() +{ + SfxModule* pModule = SD_MOD(); + controls::MasterPagesSelector::RegisterInterface( pModule ); + LayoutMenu::RegisterInterface( pModule ); +} + +// --------------------------------------------------------------------------------------------------------------------- +void ToolPanelViewShell::ArrangeGUIElements() +{ + ViewShell::ArrangeGUIElements(); + + Initialize(); + + mpPanelDeck->SetPosSizePixel( Point(), maViewSize ); +} + +// --------------------------------------------------------------------------------------------------------------------- +void ToolPanelViewShell::GetFocus() +{ + Invalidate(); +} + +// --------------------------------------------------------------------------------------------------------------------- +void ToolPanelViewShell::LoseFocus() +{ + Invalidate(); +} + +// --------------------------------------------------------------------------------------------------------------------- +void ToolPanelViewShell::KeyInput( const KeyEvent& i_rKeyEvent ) +{ + const KeyCode nCode = i_rKeyEvent.GetKeyCode(); + if ( nCode == KEY_RETURN ) + { + if ( !mpPanelDeck->HasChildPathFocus() ) + mpPanelDeck->GrabFocus(); + } + else + ViewShell::KeyInput( i_rKeyEvent, NULL ); +} + +// --------------------------------------------------------------------------------------------------------------------- +IMPL_LINK( ToolPanelViewShell, DockingChanged, PaneDockingWindow*, i_pDockingWindow ) +{ + ENSURE_OR_RETURN( i_pDockingWindow == dynamic_cast< PaneDockingWindow* >( GetDockingWindow() ), "unknown source", 0 ); + switch ( i_pDockingWindow->GetAlignment() ) + { + case SFX_ALIGN_LEFT: + mpPanelDeck->SetTabsLayout( ::svt::TABS_LEFT, ::svt::TABITEM_IMAGE_ONLY ); + break; + case SFX_ALIGN_RIGHT: + case SFX_ALIGN_NOALIGNMENT: + mpPanelDeck->SetTabsLayout( ::svt::TABS_RIGHT, ::svt::TABITEM_IMAGE_ONLY ); + break; + case SFX_ALIGN_TOP: + mpPanelDeck->SetTabsLayout( ::svt::TABS_TOP, ::svt::TABITEM_IMAGE_ONLY ); + break; + case SFX_ALIGN_BOTTOM: + mpPanelDeck->SetTabsLayout( ::svt::TABS_BOTTOM, ::svt::TABITEM_IMAGE_ONLY ); + break; + default: + OSL_ENSURE( false, "ToolPanelViewShell::DockingChanged: unexpected alignment!" ); + break; + } + return 0L; +} + +// --------------------------------------------------------------------------------------------------------------------- +IMPL_LINK(ToolPanelViewShell, ToolboxClickHandler, ToolBox*, pToolBox) +{ + if (pToolBox->GetCurItemId() == mnMenuId) + { + pToolBox->EndSelection(); + + DockingWindow* pDockingWindow = GetDockingWindow(); + ::std::auto_ptr pMenu = CreatePopupMenu ( + pDockingWindow!=NULL && !pDockingWindow->IsFloatingMode()); + pMenu->SetSelectHdl ( + LINK(this, ToolPanelViewShell, MenuSelectHandler)); + + // pass toolbox button rect so the menu can stay open on button up + Rectangle aRect = pToolBox->GetItemRect(mnMenuId); + aRect.SetPos(pToolBox->GetPosPixel() ); + pMenu->Execute (pDockingWindow, aRect, POPUPMENU_EXECUTE_DOWN); + } + + return 0; +} + +// --------------------------------------------------------------------------------------------------------------------- +IMPL_LINK(ToolPanelViewShell, MenuSelectHandler, Menu*, pMenu) +{ + if (pMenu) + { + pMenu->Deactivate(); + switch (pMenu->GetCurItemId()) + { + case MID_UNLOCK_TASK_PANEL: + { + DockingWindow* pDockingWindow = GetDockingWindow(); + if (pDockingWindow != NULL) + pDockingWindow->SetFloatingMode (TRUE); + } + break; + + case MID_LOCK_TASK_PANEL: + { + DockingWindow* pDockingWindow = GetDockingWindow(); + if (pDockingWindow != NULL) + pDockingWindow->SetFloatingMode (FALSE); + } + break; + + default: +// { +// sal_uInt32 nIndex (pMenu->GetUserValue(pMenu->GetCurItemId())); +// mpTaskPane->GetControlContainer().SetVisibilityState ( +// nIndex, +// ControlContainer::VS_TOGGLE); +// // mpTaskPane->Resize(); +// // mpTaskPane->Invalidate(); +// } + break; + } + } + + return 0; +} + +// --------------------------------------------------------------------------------------------------------------------- +::std::auto_ptr ToolPanelViewShell::CreatePopupMenu ( + bool bIsDocking) +{ + ::std::auto_ptr pMenu (new PopupMenu ()); + FloatingWindow* pFloat = static_cast(pMenu->GetWindow()); + if (pFloat != NULL) + { + pFloat->SetPopupModeFlags ( + pFloat->GetPopupModeFlags() + | FLOATWIN_POPUPMODE_NOMOUSEUPCLOSE); + } + + // Add one entry for every tool panel element to individually make + // them visible or hide them. +// USHORT nIndex = MID_FIRST_CONTROL; +// sal_uInt32 nControlIndex; +// ControlContainer& rContainer (mpTaskPane->GetControlContainer()); +// for (nControlIndex=0; +// nControlIndex(pChild->GetWindow()); +// pMenu->InsertItem (nIndex, +// pControl->GetTitle(), +// MIB_CHECKABLE); +// pMenu->SetUserValue (nIndex, nControlIndex); +// if (pControl->IsVisible()) +// pMenu->CheckItem (nIndex, TRUE); +// nIndex++; +// } + + pMenu->InsertSeparator (); + + // Add entry for docking or un-docking the tool panel. + if (bIsDocking) + pMenu->InsertItem ( + MID_UNLOCK_TASK_PANEL, + String(SdResId(STR_TASKPANEL_MASTER_PAGE_MENU_UNLOCK))); + else + pMenu->InsertItem ( + MID_LOCK_TASK_PANEL, + String(SdResId(STR_TASKPANEL_MASTER_PAGE_MENU_LOCK))); + pMenu->RemoveDisabledEntries (FALSE, FALSE); + + return pMenu; +} + +// --------------------------------------------------------------------------------------------------------------------- +SdPage* ToolPanelViewShell::GetActualPage() +{ + return NULL; +} + +// --------------------------------------------------------------------------------------------------------------------- +SdPage* ToolPanelViewShell::getCurrentPage() const +{ + return NULL; +} + +// --------------------------------------------------------------------------------------------------------------------- +void ToolPanelViewShell::Execute( SfxRequest& ) +{ + OSL_ENSURE( false, "ToolPanelViewShell::Execute: not to be called! (right?)" ); +} + +// --------------------------------------------------------------------------------------------------------------------- +void ToolPanelViewShell::GetState( SfxItemSet& ) +{ + OSL_ENSURE( false, "ToolPanelViewShell::GetState: not to be called! (right?)" ); +} + +// --------------------------------------------------------------------------------------------------------------------- +TaskPaneShellManager& ToolPanelViewShell::GetSubShellManager() const +{ + return *mpSubShellManager.get(); +} + +// --------------------------------------------------------------------------------------------------------------------- +DockingWindow* ToolPanelViewShell::GetDockingWindow() +{ + ::Window* pParentWindow = GetParentWindow(); + DockingWindow* pDockingWindow = NULL; + while (pParentWindow!=NULL && pDockingWindow==NULL) + { + pDockingWindow = dynamic_cast(pParentWindow); + pParentWindow = pParentWindow->GetParent(); + } + return pDockingWindow; +} + +// --------------------------------------------------------------------------------------------------------------------- +Reference< XAccessible > ToolPanelViewShell::CreateAccessibleDocumentView( ::sd::Window* pWindow ) +{ + ::com::sun::star::uno::Reference< + ::com::sun::star::accessibility::XAccessible> xAccessible; + + OSL_ENSURE( false, "ToolPanelViewShell::CreateAccessibleDocumentView: missing implementation!" ); +// if (mpTaskPane.get()!=NULL && pWindow!=NULL) +// { +// // We have to call CreateAccessible directly so that we can specify +// // the correct accessible parent. +// ::Window* pParentWindow = pWindow->GetAccessibleParentWindow(); +// if (pParentWindow != NULL) +// xAccessible = mpTaskPane->CreateAccessibleObject( +// pParentWindow->GetAccessible()); +// } + + return xAccessible; +} + +// --------------------------------------------------------------------------------------------------------------------- +Reference< XDrawSubController > ToolPanelViewShell::CreateSubController() +{ + // This view shell is not designed to be the main view shell and thus + // does not support a UNO sub controller. + return Reference< XDrawSubController >(); +} + +// --------------------------------------------------------------------------------------------------------------------- +void ToolPanelViewShell::ConnectToDockingWindow() +{ + PaneDockingWindow* pDockingWindow = dynamic_cast(GetDockingWindow()); + if (pDockingWindow != NULL) + { + pDockingWindow->InitializeTitleToolBox(); + mnMenuId = pDockingWindow->AddMenu ( + String(SdResId(STR_TASKPANEL_MASTER_PAGE_MENU_TITLE)), + HID_SD_TASK_PANE_VIEW_MENU, + LINK(this, ToolPanelViewShell, ToolboxClickHandler)); + + // be notified when the docking position of the window changes + pDockingWindow->SetEndDockingHdl( LINK( this, ToolPanelViewShell, DockingChanged ) ); + } + + // Tell the focus manager that we want to pass the focus to our + // child. + FocusManager::Instance().RegisterDownLink( GetParentWindow(), mpPanelDeck.get() ); +} + +// --------------------------------------------------------------------------------------------------------------------- +bool ToolPanelViewShell::RelocateToParentWindow( ::Window* pParentWindow ) +{ + ::Window* pOldParentWindow = GetParentWindow(); + FocusManager::Instance().RemoveLinks( pOldParentWindow, mpPanelDeck.get() ); + FocusManager::Instance().RemoveLinks( mpPanelDeck.get(), pOldParentWindow ); + + PaneDockingWindow* pDockingWindow = dynamic_cast< PaneDockingWindow* >( GetDockingWindow() ); + if ( pDockingWindow != NULL ) + { + pDockingWindow->SetEndDockingHdl( Link() ); + } + + ViewShell::RelocateToParentWindow(pParentWindow); + + ConnectToDockingWindow(); + + Resize(); + + return true; +} + + + + +// ===================================================================================================================== +// = ToolPanelViewShell:Implementation - implementation +// ===================================================================================================================== +// --------------------------------------------------------------------------------------------------------------------- +ToolPanelViewShell::Implementation::Implementation() + :maIndexMap( (InternalIdToPanelIdMap::size_type)PID__END, PID_UNKNOWN ) +{ +} + +// --------------------------------------------------------------------------------------------------------------------- +ToolPanelViewShell::Implementation::~Implementation() +{ +} + +// --------------------------------------------------------------------------------------------------------------------- +void ToolPanelViewShell::Implementation::AddPanel( size_t nInternalId, PanelId nPublicId ) +{ + maIndexMap[nInternalId] = nPublicId; +} + +// --------------------------------------------------------------------------------------------------------------------- +ToolPanelViewShell::PanelId ToolPanelViewShell::Implementation::GetPublicId ( size_t nInternalId ) const +{ + if ( nInternalId < maIndexMap.size() ) + return maIndexMap[nInternalId]; + else + return PID_UNKNOWN; +} + +// --------------------------------------------------------------------------------------------------------------------- +size_t ToolPanelViewShell::Implementation::GetInternalId( ToolPanelViewShell::PanelId nPublicId ) const +{ + for ( size_t i = 0; i < maIndexMap.size(); ++i ) + { + if ( maIndexMap[i] == nPublicId ) + { + return i; + } + } + + return mnInvalidId; +} + +} } // end of namespace ::sd::toolpanel diff --git a/sd/source/ui/toolpanel/controls/CustomAnimationPanel.cxx b/sd/source/ui/toolpanel/controls/CustomAnimationPanel.cxx index 47d7a40442b2..a745aeb79bb3 100644 --- a/sd/source/ui/toolpanel/controls/CustomAnimationPanel.cxx +++ b/sd/source/ui/toolpanel/controls/CustomAnimationPanel.cxx @@ -34,6 +34,7 @@ #include "CustomAnimationPanel.hxx" #include "taskpane/TaskPaneControlFactory.hxx" +#include "taskpane/ToolPanelViewShell.hxx" #include "strings.hrc" #include "sdresid.hxx" @@ -49,11 +50,20 @@ namespace toolpanel { namespace controls { CustomAnimationPanel::CustomAnimationPanel(TreeNode* pParent, ViewShellBase& rBase) : SubToolPanel (pParent) + , m_pPanelViewShell (NULL) { mpWrappedControl = createCustomAnimationPanel( pParent->GetWindow(), rBase ); mpWrappedControl->Show(); } +CustomAnimationPanel::CustomAnimationPanel(Window& i_rParentWindow, ToolPanelViewShell& i_rPanelViewShell) + :SubToolPanel( i_rParentWindow ) + ,m_pPanelViewShell( &i_rPanelViewShell ) +{ + mpWrappedControl = createCustomAnimationPanel( &i_rParentWindow, i_rPanelViewShell.GetViewShellBase() ); + mpWrappedControl->Show(); +} + CustomAnimationPanel::~CustomAnimationPanel() { delete mpWrappedControl; @@ -65,6 +75,19 @@ std::auto_ptr CustomAnimationPanel::CreateControlFactory (ViewSh new ControlFactoryWithArgs1(rBase)); } +std::auto_ptr< ControlFactory > CustomAnimationPanel::CreateControlFactory( ToolPanelViewShell& i_rToolPanelShell ) +{ + return std::auto_ptr< ControlFactory >( + new RootControlFactoryWithArg< CustomAnimationPanel, ToolPanelViewShell >( i_rToolPanelShell ) ); +} + +TaskPaneShellManager* CustomAnimationPanel::GetShellManager() +{ + if ( m_pPanelViewShell ) + return &m_pPanelViewShell->GetSubShellManager(); + return SubToolPanel::GetShellManager(); +} + Size CustomAnimationPanel::GetPreferredSize() { return maPreferredSize; diff --git a/sd/source/ui/toolpanel/controls/CustomAnimationPanel.hxx b/sd/source/ui/toolpanel/controls/CustomAnimationPanel.hxx index 4f23d5a5aa48..292c9842bc2c 100644 --- a/sd/source/ui/toolpanel/controls/CustomAnimationPanel.hxx +++ b/sd/source/ui/toolpanel/controls/CustomAnimationPanel.hxx @@ -40,6 +40,7 @@ class ViewShellBase; namespace sd { namespace toolpanel { class TreeNode; class ControlFactory; +class ToolPanelViewShell; } } namespace sd { namespace toolpanel { namespace controls { @@ -51,10 +52,18 @@ public: CustomAnimationPanel ( TreeNode* pParent, ViewShellBase& rBase); + CustomAnimationPanel ( + Window& i_rParentWindow, + ToolPanelViewShell& i_rPanelViewShell); virtual ~CustomAnimationPanel (void); static std::auto_ptr CreateControlFactory (ViewShellBase& rBase); + static std::auto_ptr CreateControlFactory (ToolPanelViewShell& i_rPanelViewShell); + + // TreeNode overridables + virtual TaskPaneShellManager* GetShellManager(); + // ILayoutableWindow overridables virtual Size GetPreferredSize (void); virtual sal_Int32 GetPreferredWidth (sal_Int32 nHeigh); virtual sal_Int32 GetPreferredHeight (sal_Int32 nWidth); @@ -71,6 +80,7 @@ public: private: Size maPreferredSize; ::Window* mpWrappedControl; + ToolPanelViewShell* m_pPanelViewShell; }; } } } // end of namespace ::sd::toolpanel::controls diff --git a/sd/source/ui/toolpanel/controls/MasterPagesPanel.cxx b/sd/source/ui/toolpanel/controls/MasterPagesPanel.cxx index dd96e1e117e1..0862010f1bb6 100644 --- a/sd/source/ui/toolpanel/controls/MasterPagesPanel.cxx +++ b/sd/source/ui/toolpanel/controls/MasterPagesPanel.cxx @@ -36,6 +36,7 @@ #include "CurrentMasterPagesSelector.hxx" #include "RecentMasterPagesSelector.hxx" #include "AllMasterPagesSelector.hxx" +#include "taskpane/ToolPanelViewShell.hxx" #include "taskpane/TaskPaneControlFactory.hxx" #include "taskpane/TitledControl.hxx" #include "../TaskPaneShellManager.hxx" @@ -53,6 +54,19 @@ namespace sd { namespace toolpanel { namespace controls { MasterPagesPanel::MasterPagesPanel (TreeNode* pParent, ViewShellBase& rBase) : ScrollPanel (pParent) + , m_pPanelViewShell (NULL) +{ + impl_construct( rBase ); +} + +MasterPagesPanel::MasterPagesPanel (::Window& i_rParentWindow, ToolPanelViewShell& i_rPanelViewShell) + :ScrollPanel (i_rParentWindow) + ,m_pPanelViewShell( &i_rPanelViewShell ) +{ + impl_construct( m_pPanelViewShell->GetViewShellBase() ); +} + +void MasterPagesPanel::impl_construct( ViewShellBase& rBase ) { SdDrawDocument* pDocument = rBase.GetDocument(); ::std::auto_ptr pSelector; @@ -121,6 +135,24 @@ MasterPagesPanel::MasterPagesPanel (TreeNode* pParent, ViewShellBase& rBase) MasterPagesPanel::~MasterPagesPanel (void) { + TaskPaneShellManager* pShellManager( GetShellManager() ); + OSL_ENSURE( pShellManager, "MasterPagesPanel::~MasterPagesPanel: no shell manager anymore - cannot remove sub shells!" ); + if ( pShellManager ) + { + pShellManager->RemoveSubShell( HID_SD_TASK_PANE_PREVIEW_CURRENT ); + pShellManager->RemoveSubShell( HID_SD_TASK_PANE_PREVIEW_RECENT ); + pShellManager->RemoveSubShell( HID_SD_TASK_PANE_PREVIEW_ALL ); + } +} + + + + +TaskPaneShellManager* MasterPagesPanel::GetShellManager() +{ + if ( m_pPanelViewShell ) + return &m_pPanelViewShell->GetSubShellManager(); + return TreeNode::GetShellManager(); } @@ -133,6 +165,10 @@ std::auto_ptr MasterPagesPanel::CreateControlFactory (ViewShellB } - +std::auto_ptr< ControlFactory > MasterPagesPanel::CreateControlFactory( ToolPanelViewShell& i_rToolPanelShell ) +{ + return std::auto_ptr< ControlFactory >( + new RootControlFactoryWithArg< MasterPagesPanel, ToolPanelViewShell >( i_rToolPanelShell ) ); +} } } } // end of namespace ::sd::toolpanel::controls diff --git a/sd/source/ui/toolpanel/controls/MasterPagesPanel.hxx b/sd/source/ui/toolpanel/controls/MasterPagesPanel.hxx index 476efd378850..fd64a81d9df0 100644 --- a/sd/source/ui/toolpanel/controls/MasterPagesPanel.hxx +++ b/sd/source/ui/toolpanel/controls/MasterPagesPanel.hxx @@ -40,6 +40,7 @@ class ViewShellBase; namespace sd { namespace toolpanel { class ControlFactory; class TreeNode; +class ToolPanelViewShell; } } namespace sd { namespace toolpanel { namespace controls { @@ -55,9 +56,22 @@ public: MasterPagesPanel ( TreeNode* pParent, ViewShellBase& rBase); + MasterPagesPanel ( + ::Window& i_rParentWindow, + ToolPanelViewShell& i_rPanelViewShell); virtual ~MasterPagesPanel (void); + // TreeNode overridables + virtual TaskPaneShellManager* GetShellManager (void); + static std::auto_ptr CreateControlFactory (ViewShellBase& rBase); + static std::auto_ptr CreateControlFactory (ToolPanelViewShell& i_rToolPanelShell); + +private: + void impl_construct( ViewShellBase& rBase ); + +private: + ToolPanelViewShell* m_pPanelViewShell; }; } } } // end of namespace ::sd::toolpanel::controls diff --git a/sd/source/ui/toolpanel/controls/SlideTransitionPanel.cxx b/sd/source/ui/toolpanel/controls/SlideTransitionPanel.cxx index eafffa494b25..cfef2ad7cb09 100644 --- a/sd/source/ui/toolpanel/controls/SlideTransitionPanel.cxx +++ b/sd/source/ui/toolpanel/controls/SlideTransitionPanel.cxx @@ -33,6 +33,7 @@ #include "SlideTransitionPanel.hxx" #include "taskpane/TaskPaneControlFactory.hxx" +#include "taskpane/ToolPanelViewShell.hxx" #include "strings.hrc" #include "sdresid.hxx" @@ -50,12 +51,22 @@ namespace toolpanel { namespace controls { SlideTransitionPanel::SlideTransitionPanel(TreeNode* pParent, ViewShellBase& rBase) : SubToolPanel (pParent), - maPreferredSize( 100, 200 ) + maPreferredSize( 100, 200 ), + m_pPanelViewShell( NULL ) { mpWrappedControl = createSlideTransitionPanel( pParent->GetWindow(), rBase ); mpWrappedControl->Show(); } +SlideTransitionPanel::SlideTransitionPanel(Window& i_rParentWindow, ToolPanelViewShell& i_rToolPanelShell) + :SubToolPanel( i_rParentWindow ) + ,maPreferredSize( 100, 200 ) + ,m_pPanelViewShell( &i_rToolPanelShell ) +{ + mpWrappedControl = createSlideTransitionPanel( &i_rParentWindow, i_rToolPanelShell.GetViewShellBase() ); + mpWrappedControl->Show(); +} + SlideTransitionPanel::~SlideTransitionPanel() { delete mpWrappedControl; @@ -67,6 +78,19 @@ std::auto_ptr SlideTransitionPanel::CreateControlFactory (ViewSh new ControlFactoryWithArgs1(rBase)); } +std::auto_ptr< ControlFactory > SlideTransitionPanel::CreateControlFactory( ToolPanelViewShell& i_rToolPanelShell ) +{ + return std::auto_ptr< ControlFactory >( + new RootControlFactoryWithArg< SlideTransitionPanel, ToolPanelViewShell >( i_rToolPanelShell ) ); +} + +TaskPaneShellManager* SlideTransitionPanel::GetShellManager() +{ + if ( m_pPanelViewShell ) + return &m_pPanelViewShell->GetSubShellManager(); + return SubToolPanel::GetShellManager(); +} + Size SlideTransitionPanel::GetPreferredSize() { return maPreferredSize; diff --git a/sd/source/ui/toolpanel/controls/SlideTransitionPanel.hxx b/sd/source/ui/toolpanel/controls/SlideTransitionPanel.hxx index f64843887492..a8eb59facf7c 100644 --- a/sd/source/ui/toolpanel/controls/SlideTransitionPanel.hxx +++ b/sd/source/ui/toolpanel/controls/SlideTransitionPanel.hxx @@ -39,6 +39,7 @@ class ViewShellBase; namespace sd { namespace toolpanel { class ControlFactory; class TreeNode; +class ToolPanelViewShell; } } namespace sd { namespace toolpanel { namespace controls { @@ -50,10 +51,18 @@ public: SlideTransitionPanel ( TreeNode* pParent, ViewShellBase& rBase); + SlideTransitionPanel ( + Window& i_rParentWindow, + ToolPanelViewShell& i_rToolPanelShell); virtual ~SlideTransitionPanel (void); static std::auto_ptr CreateControlFactory (ViewShellBase& rBase); + static std::auto_ptr CreateControlFactory (ToolPanelViewShell& i_rToolPanelShell); + + // TreeNode overridables + virtual TaskPaneShellManager* GetShellManager(); + // ILayoutableWindow overridables virtual Size GetPreferredSize (void); virtual sal_Int32 GetPreferredWidth (sal_Int32 nHeigh); virtual sal_Int32 GetPreferredHeight (sal_Int32 nWidth); @@ -71,6 +80,7 @@ public: private: Size maPreferredSize; ::Window* mpWrappedControl; + ToolPanelViewShell* m_pPanelViewShell; }; } } } // end of namespace ::sd::toolpanel::controls diff --git a/sd/source/ui/toolpanel/controls/TableDesignPanel.cxx b/sd/source/ui/toolpanel/controls/TableDesignPanel.cxx index d7dbd1d2fa56..cd314eb4ba03 100644 --- a/sd/source/ui/toolpanel/controls/TableDesignPanel.cxx +++ b/sd/source/ui/toolpanel/controls/TableDesignPanel.cxx @@ -34,6 +34,7 @@ #include "TableDesignPanel.hxx" #include "taskpane/TaskPaneControlFactory.hxx" +#include "taskpane/ToolPanelViewShell.hxx" #include "strings.hrc" #include "sdresid.hxx" @@ -49,11 +50,20 @@ namespace toolpanel { namespace controls { TableDesignPanel::TableDesignPanel(TreeNode* pParent, ViewShellBase& rBase) : SubToolPanel (pParent) + ,m_pPanelViewShell( NULL ) { mpWrappedControl = createTableDesignPanel( pParent->GetWindow(), rBase ); mpWrappedControl->Show(); } +TableDesignPanel::TableDesignPanel( ::Window& i_rParentWindow, ToolPanelViewShell& i_rPanelViewShell ) + :SubToolPanel( i_rParentWindow ) + ,m_pPanelViewShell( &i_rPanelViewShell ) +{ + mpWrappedControl = createTableDesignPanel( &i_rParentWindow, i_rPanelViewShell.GetViewShellBase() ); + mpWrappedControl->Show(); +} + TableDesignPanel::~TableDesignPanel() { delete mpWrappedControl; @@ -65,6 +75,19 @@ std::auto_ptr TableDesignPanel::CreateControlFactory (ViewShellB new ControlFactoryWithArgs1(rBase)); } +std::auto_ptr< ControlFactory > TableDesignPanel::CreateControlFactory( ToolPanelViewShell& i_rToolPanelShell ) +{ + return std::auto_ptr< ControlFactory >( + new RootControlFactoryWithArg< TableDesignPanel, ToolPanelViewShell >( i_rToolPanelShell ) ); +} + +TaskPaneShellManager* TableDesignPanel::GetShellManager() +{ + if ( m_pPanelViewShell ) + return &m_pPanelViewShell->GetSubShellManager(); + return SubToolPanel::GetShellManager(); +} + Size TableDesignPanel::GetPreferredSize() { return maPreferredSize; diff --git a/sd/source/ui/toolpanel/controls/TableDesignPanel.hxx b/sd/source/ui/toolpanel/controls/TableDesignPanel.hxx index 605e8a5c10db..a99b34df21bc 100644 --- a/sd/source/ui/toolpanel/controls/TableDesignPanel.hxx +++ b/sd/source/ui/toolpanel/controls/TableDesignPanel.hxx @@ -40,6 +40,7 @@ class ViewShellBase; namespace sd { namespace toolpanel { class TreeNode; class ControlFactory; +class ToolPanelViewShell; } } namespace sd { namespace toolpanel { namespace controls { @@ -51,10 +52,18 @@ public: TableDesignPanel ( TreeNode* pParent, ViewShellBase& rBase); + TableDesignPanel ( + ::Window& i_rParentWindow, + ToolPanelViewShell& i_rPanelViewShell); virtual ~TableDesignPanel (void); static std::auto_ptr CreateControlFactory (ViewShellBase& rBase); + static std::auto_ptr CreateControlFactory (ToolPanelViewShell& i_rToolPanelShell); + + // TreeNode overridables + virtual TaskPaneShellManager* GetShellManager(); + // ILayoutableWindow overridables virtual Size GetPreferredSize (void); virtual sal_Int32 GetPreferredWidth (sal_Int32 nHeigh); virtual sal_Int32 GetPreferredHeight (sal_Int32 nWidth); @@ -71,6 +80,7 @@ public: private: Size maPreferredSize; ::Window* mpWrappedControl; + ToolPanelViewShell* m_pPanelViewShell; }; } } } // end of namespace ::sd::toolpanel::controls diff --git a/sd/source/ui/toolpanel/makefile.mk b/sd/source/ui/toolpanel/makefile.mk index ba6a5d29fb1b..4ba8968bd715 100644 --- a/sd/source/ui/toolpanel/makefile.mk +++ b/sd/source/ui/toolpanel/makefile.mk @@ -59,7 +59,10 @@ SLOFILES = \ $(SLO)$/TaskPaneFocusManager.obj \ $(SLO)$/TaskPaneShellManager.obj \ $(SLO)$/TaskPaneTreeNode.obj \ - $(SLO)$/TaskPaneViewShell.obj \ + $(SLO)$/TaskPaneViewShell.obj \ + $(SLO)$/ToolPanelViewShell.obj \ + $(SLO)$/ToolPanelDeck.obj \ + $(SLO)$/TaskPaneToolPanel.obj \ \ $(SLO)$/EmptyWindow.obj \ $(SLO)$/LayoutMenu.obj \ diff --git a/sd/source/ui/view/GraphicViewShellBase.cxx b/sd/source/ui/view/GraphicViewShellBase.cxx index ed5b77d02655..2b3b4d4d864b 100644 --- a/sd/source/ui/view/GraphicViewShellBase.cxx +++ b/sd/source/ui/view/GraphicViewShellBase.cxx @@ -104,6 +104,7 @@ void GraphicViewShellBase::Execute (SfxRequest& rRequest) switch (nSlotId) { case SID_RIGHT_PANE: + case SID_TOOL_PANEL_PANE: case SID_NOTES_WINDOW: case SID_SLIDE_SORTER_MULTI_PANE_GUI: case SID_DIAMODE: diff --git a/sd/source/ui/view/ToolBarManager.cxx b/sd/source/ui/view/ToolBarManager.cxx index 487794816270..2ca39f66436c 100644 --- a/sd/source/ui/view/ToolBarManager.cxx +++ b/sd/source/ui/view/ToolBarManager.cxx @@ -1310,6 +1310,7 @@ void ToolBarRules::MainViewShellChanged (ViewShell::ShellType nShellType) case ViewShell::ST_NONE: case ViewShell::ST_PRESENTATION: case ViewShell::ST_TASK_PANE: + case ViewShell::ST_TOOL_PANEL: default: break; } diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx index 431add66bc2b..844a5e11b841 100644 --- a/sd/source/ui/view/ViewShellBase.cxx +++ b/sd/source/ui/view/ViewShellBase.cxx @@ -94,6 +94,7 @@ #include #include #include +#include #include "fubullet.hxx" @@ -822,6 +823,13 @@ void ViewShellBase::Execute (SfxRequest& rRequest) framework::FrameworkHelper::msTaskPaneURL); break; + case SID_TOOL_PANEL_PANE: + mpImpl->SetPaneVisibility( + rRequest, + framework::FrameworkHelper::msToolPanelPaneURL, + framework::FrameworkHelper::msToolPanelViewURL); + break; + case SID_NORMAL_MULTI_PANE_GUI: case SID_SLIDE_SORTER_MULTI_PANE_GUI: case SID_DRAWINGMODE: @@ -1494,9 +1502,9 @@ void ViewShellBase::Implementation::SetPaneVisibility ( xConfigurationController->requestResourceDeactivation( xPaneId); } - catch (RuntimeException&) + catch (const Exception &) { - DBG_ASSERT(false, "ViewShellBase::Implementation::SetPaneVisibility(): caught exception"); + DBG_UNHANDLED_EXCEPTION(); } } @@ -1546,6 +1554,11 @@ void ViewShellBase::Implementation::GetSlotState (SfxItemSet& rSet) xContext, FrameworkHelper::msRightPaneURL); break; + case SID_TOOL_PANEL_PANE: + xResourceId = ResourceId::create( + xContext, FrameworkHelper::msToolPanelPaneURL); + break; + case SID_NORMAL_MULTI_PANE_GUI: xResourceId = ResourceId::createWithAnchorURL( xContext, diff --git a/sd/source/ui/view/ViewShellImplementation.cxx b/sd/source/ui/view/ViewShellImplementation.cxx index 75b728c7849b..e46b1afd213d 100644 --- a/sd/source/ui/view/ViewShellImplementation.cxx +++ b/sd/source/ui/view/ViewShellImplementation.cxx @@ -376,6 +376,7 @@ sal_uInt16 ViewShell::Implementation::GetViewId (void) // and there is not (yet) a proper ViewShellBase sub class for the // remaining types we chose the Impress factory as a fall back. case ViewShell::ST_TASK_PANE: + case ViewShell::ST_TOOL_PANEL: case ViewShell::ST_NONE: default: return IMPRESS_FACTORY_ID; diff --git a/sd/uiconfig/simpress/menubar/menubar.xml b/sd/uiconfig/simpress/menubar/menubar.xml index c1dacd33e0c0..be0035c51ca6 100644 --- a/sd/uiconfig/simpress/menubar/menubar.xml +++ b/sd/uiconfig/simpress/menubar/menubar.xml @@ -100,7 +100,8 @@ - + + -- 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 - sd/source/ui/toolpanel/ToolPanelViewShell.cxx | 167 +++++++++++++---------- 3 files changed, 92 insertions(+), 77 deletions(-) (limited to 'sd') 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 diff --git a/sd/source/ui/toolpanel/ToolPanelViewShell.cxx b/sd/source/ui/toolpanel/ToolPanelViewShell.cxx index 5075e280f296..4f40d629c9ce 100644 --- a/sd/source/ui/toolpanel/ToolPanelViewShell.cxx +++ b/sd/source/ui/toolpanel/ToolPanelViewShell.cxx @@ -101,6 +101,33 @@ using ::sd::framework::FrameworkHelper; namespace sd { namespace toolpanel { +// ===================================================================================================================== +// = PanelDescriptor +// ===================================================================================================================== +/** is a helper class for ToolPanelViewShell::Implementation, holding the details about a single panel which is not + contained in the IToolPanel implementation itself. +*/ +struct PanelDescriptor +{ + ToolPanelViewShell::PanelId nId; + ::svt::PToolPanel pPanel; + bool bHidden; + + PanelDescriptor() + :nId( ToolPanelViewShell::PID_UNKNOWN ) + ,pPanel() + ,bHidden( false ) + { + } + + PanelDescriptor( const ToolPanelViewShell::PanelId i_nPanelId, const ::svt::PToolPanel& i_rPanel ) + :nId( i_nPanelId ) + ,pPanel( i_rPanel ) + ,bHidden( false ) + { + } +}; + // ===================================================================================================================== // = ToolPanelViewShell::Implementation - declaration // ===================================================================================================================== @@ -118,34 +145,23 @@ public: */ void Setup( ToolPanelViewShell& i_rViewShell, ToolPanelDeck& i_rPanelDeck ); - /** Return the public id for the given internal one. - @return - When the given public id is not known then PID_UNKNOWN is - returned. - */ - PanelId GetPublicId (size_t nInternalId) const; + size_t GetPanelCount() const + { + return size_t( PID__END ); + } - /** Return the internal id for the given public one. - @return - When the given public id is not known then mnInvalidId is - returned. - */ - size_t GetInternalId (PanelId nPublicId) const; + const PanelDescriptor& GetPanel( const size_t i_nLogicalPanelIndex ) const + { + return maPanels[ i_nLogicalPanelIndex ]; + } + + void TogglePanelVisibility( const size_t i_nLogicalPanelIndex, ToolPanelDeck& i_rPanelDeck ); private: - /** Make a new panel known to the translation table that translates - between internal indices as returned by - ControlContainer::AddControl() and public indices defined by - ToolPanelViewShell::PanelId. - */ - void AddPanel (size_t nInternalId, PanelId nPublicId); + void RegisterPanel( size_t i_nPosition, PanelId i_nPanelId, const ::svt::PToolPanel& i_rPanel ); - /** This map translates between internal indices returned by - ControlContainer::AddControl() and public indices defined by - ToolPanelViewShell::PanelId. - */ - typedef ::std::vector InternalIdToPanelIdMap; - InternalIdToPanelIdMap maIndexMap; + typedef ::std::vector< PanelDescriptor > PanelDescriptors; + PanelDescriptors maPanels; }; // ===================================================================================================================== @@ -157,7 +173,7 @@ namespace { enum MenuId { MID_UNLOCK_TASK_PANEL = 1, MID_LOCK_TASK_PANEL = 2, - MID_FIRST_CONTROL = 3 + MID_FIRST_PANEL = 3 }; } // end of anonymouse namespace @@ -200,7 +216,11 @@ void ToolPanelViewShell::Implementation::Setup( ToolPanelViewShell& i_rViewShell { &controls::SlideTransitionPanel::CreateControlFactory, "RehearseTimings", STR_SLIDE_TRANSITION_PANE, HID_SD_SLIDE_TRANSITIONS, PID_SLIDE_TRANSITION } }; + const PanelId nPanelIdToActivate = PID_LAYOUT; + size_t nPanelPosToActivate = size_t( -1 ); + Reference< XFrame > xFrame( i_rViewShell.GetViewShellBase().GetViewFrame()->GetFrame()->GetFrameInterface() ); + const BOOL bHiContrast( i_rPanelDeck.GetSettings().GetStyleSettings().GetHighContrastMode() ); for ( size_t i=0; i < sizeof( aPanels ) / sizeof( aPanels[0] ); ++i ) { ::rtl::OUStringBuffer aCommandName; @@ -209,15 +229,18 @@ void ToolPanelViewShell::Implementation::Setup( ToolPanelViewShell& i_rViewShell size_t nPanelPos = i_rPanelDeck.CreateAndInsertPanel( (*aPanels[i].pFactory)( i_rViewShell ), - GetImage( xFrame, aCommandName.makeStringAndClear(), FALSE, FALSE ), + GetImage( xFrame, aCommandName.makeStringAndClear(), FALSE, bHiContrast ), aPanels[i].nTitleResourceID, aPanels[i].nHelpID ); - AddPanel( nPanelPos, aPanels[i].nPanelID ); + RegisterPanel( nPanelPos, aPanels[i].nPanelID, i_rPanelDeck.GetPanel( nPanelPos ) ); + + if ( nPanelIdToActivate == aPanels[i].nPanelID ) + nPanelPosToActivate = nPanelPos; } // activate default panel - i_rPanelDeck.ActivatePanel( GetInternalId( PID_LAYOUT ) ); + i_rPanelDeck.ActivatePanel( nPanelPosToActivate ); } // --------------------------------------------------------------------------------------------------------------------- @@ -293,6 +316,9 @@ ToolPanelViewShell::ToolPanelViewShell( SfxViewFrame* pFrame, ViewShellBase& rVi // --------------------------------------------------------------------------------------------------------------------- ToolPanelViewShell::~ToolPanelViewShell() { + // reset our impl before destroying the panel deck, to ensure the hidden panels are properly + // disposed/destroyed, too + mpImpl.reset(); mpPanelDeck.reset(); GetViewShellBase().GetViewShellManager()->RemoveSubShellFactory(this, mpSubShellManager); } @@ -414,14 +440,10 @@ IMPL_LINK(ToolPanelViewShell, MenuSelectHandler, Menu*, pMenu) break; default: -// { -// sal_uInt32 nIndex (pMenu->GetUserValue(pMenu->GetCurItemId())); -// mpTaskPane->GetControlContainer().SetVisibilityState ( -// nIndex, -// ControlContainer::VS_TOGGLE); -// // mpTaskPane->Resize(); -// // mpTaskPane->Invalidate(); -// } + { + size_t nPanelIndex = size_t( pMenu->GetCurItemId() - MID_FIRST_PANEL ); + mpImpl->TogglePanelVisibility( nPanelIndex, *mpPanelDeck ); + } break; } } @@ -444,25 +466,14 @@ IMPL_LINK(ToolPanelViewShell, MenuSelectHandler, Menu*, pMenu) // Add one entry for every tool panel element to individually make // them visible or hide them. -// USHORT nIndex = MID_FIRST_CONTROL; -// sal_uInt32 nControlIndex; -// ControlContainer& rContainer (mpTaskPane->GetControlContainer()); -// for (nControlIndex=0; -// nControlIndex(pChild->GetWindow()); -// pMenu->InsertItem (nIndex, -// pControl->GetTitle(), -// MIB_CHECKABLE); -// pMenu->SetUserValue (nIndex, nControlIndex); -// if (pControl->IsVisible()) -// pMenu->CheckItem (nIndex, TRUE); -// nIndex++; -// } - + USHORT nIndex = MID_FIRST_PANEL; + for ( size_t i=0; iGetPanelCount(); ++i, ++nIndex ) + { + const PanelDescriptor& rPanelDesc( mpImpl->GetPanel(i) ); + pMenu->InsertItem( nIndex, rPanelDesc.pPanel->GetDisplayName(), MIB_CHECKABLE ); + pMenu->SetUserValue( nIndex, rPanelDesc.nId ); + pMenu->CheckItem( nIndex, !rPanelDesc.bHidden ); + } pMenu->InsertSeparator (); // Add entry for docking or un-docking the tool panel. @@ -601,7 +612,7 @@ bool ToolPanelViewShell::RelocateToParentWindow( ::Window* pParentWindow ) // ===================================================================================================================== // --------------------------------------------------------------------------------------------------------------------- ToolPanelViewShell::Implementation::Implementation() - :maIndexMap( (InternalIdToPanelIdMap::size_type)PID__END, PID_UNKNOWN ) + :maPanels( PanelDescriptors::size_type( PID__END ) ) { } @@ -611,32 +622,38 @@ ToolPanelViewShell::Implementation::~Implementation() } // --------------------------------------------------------------------------------------------------------------------- -void ToolPanelViewShell::Implementation::AddPanel( size_t nInternalId, PanelId nPublicId ) +void ToolPanelViewShell::Implementation::TogglePanelVisibility( const size_t i_nLogicalPanelIndex, ToolPanelDeck& i_rPanelDeck ) { - maIndexMap[nInternalId] = nPublicId; -} + ENSURE_OR_RETURN_VOID( i_nLogicalPanelIndex < maPanels.size(), "illegal index" ); -// --------------------------------------------------------------------------------------------------------------------- -ToolPanelViewShell::PanelId ToolPanelViewShell::Implementation::GetPublicId ( size_t nInternalId ) const -{ - if ( nInternalId < maIndexMap.size() ) - return maIndexMap[nInternalId]; + // get the actual panel index, within the deck + size_t nActualPanelIndex(0); + for ( size_t i=0; i < i_nLogicalPanelIndex; ++i ) + { + if ( !maPanels[i].bHidden ) + ++nActualPanelIndex; + } + if ( maPanels[ i_nLogicalPanelIndex ].bHidden ) + { + OSL_VERIFY( i_rPanelDeck.InsertPanel( maPanels[ i_nLogicalPanelIndex ].pPanel, nActualPanelIndex ) == nActualPanelIndex ); + // if there has not been an active panel before, activate the newly inserted one + ::boost::optional< size_t > aActivePanel( i_rPanelDeck.GetActivePanel() ); + if ( !aActivePanel ) + i_rPanelDeck.ActivatePanel( nActualPanelIndex ); + } else - return PID_UNKNOWN; + { + OSL_VERIFY( i_rPanelDeck.RemovePanel( nActualPanelIndex ).get() == maPanels[ i_nLogicalPanelIndex ].pPanel.get() ); + } + maPanels[ i_nLogicalPanelIndex ].bHidden = !maPanels[ i_nLogicalPanelIndex ].bHidden; } // --------------------------------------------------------------------------------------------------------------------- -size_t ToolPanelViewShell::Implementation::GetInternalId( ToolPanelViewShell::PanelId nPublicId ) const +void ToolPanelViewShell::Implementation::RegisterPanel( size_t i_nPosition, PanelId i_nPanelId, const ::svt::PToolPanel& i_rPanel ) { - for ( size_t i = 0; i < maIndexMap.size(); ++i ) - { - if ( maIndexMap[i] == nPublicId ) - { - return i; - } - } - - return mnInvalidId; + OSL_PRECOND( maPanels[ i_nPosition ].nId == PID_UNKNOWN, "ToolPanelViewShell::Implementation::RegisterPanel: " + "already registered a panel for this ID!" ); + maPanels[ i_nPosition ] = PanelDescriptor( i_nPanelId, i_rPanel ); } } } // end of namespace ::sd::toolpanel -- cgit From 504fa5b583bfe80e026b419dcb286ec1f34691ba Mon Sep 17 00:00:00 2001 From: Christian Lippka Date: Tue, 16 Mar 2010 09:18:10 +0100 Subject: fixing build error --- sd/source/ui/app/makefile.mk | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'sd') diff --git a/sd/source/ui/app/makefile.mk b/sd/source/ui/app/makefile.mk index 4c06a63b381b..84fbe3676b97 100644 --- a/sd/source/ui/app/makefile.mk +++ b/sd/source/ui/app/makefile.mk @@ -70,14 +70,12 @@ SLOFILES = \ $(SLO)$/sdresid.obj \ $(SLO)$/sdpopup.obj \ $(SLO)$/sdxfer.obj \ - $(SLO)$/tmplctrl.obj \ - $(SLO)$/layoutctrl.obj + $(SLO)$/tmplctrl.obj EXCEPTIONSFILES= \ $(SLO)$/sdxfer.obj \ $(SLO)$/sdmod1.obj \ - $(SLO)$/tmplctrl.obj \ - $(SLO)$/layoutctrl.obj + $(SLO)$/tmplctrl.obj .IF "$(GUI)" == "WNT" -- cgit From f5ad28b1e4a935ec5fec92353aa402eb28de63dc Mon Sep 17 00:00:00 2001 From: sj Date: Tue, 16 Mar 2010 10:20:44 +0100 Subject: impressbi01: #161701# PPT Export, now also exporting hidden/non printable shapes --- sd/source/filter/eppt/epptso.cxx | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'sd') diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx index cda15e75831d..f97bc92265f9 100644 --- a/sd/source/filter/eppt/epptso.cxx +++ b/sd/source/filter/eppt/epptso.cxx @@ -4155,6 +4155,7 @@ sal_Bool PPTWriter::ImplCreatePresentationPlaceholder( const sal_Bool bMasterPag ImplWriteTextStyleAtom( aClientTextBox, nStyleInstance, 0, NULL, aExtBu, &aPropOpt ); aPropOpt.CreateTextProperties( mXPropSet, mnTxId += 0x60, sal_False, sal_True ); + aPropOpt.CreateShapeProperties( mXShape ); aPropOpt.Commit( *mpStrm ); mpPptEscherEx->AddAtom( 8, ESCHER_ClientAnchor ); *mpStrm << (sal_Int16)maRect.Top() << (sal_Int16)maRect.Left() << (sal_Int16)maRect.Right() << (sal_Int16)maRect.Bottom(); // oben, links, rechts, unten ???? @@ -5400,6 +5401,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a maRect.Justify(); if ( mnAngle ) ImplFlipBoundingBox( aPropOpt ); + aPropOpt.CreateShapeProperties( mXShape ); aPropOpt.Commit( *mpStrm ); mpPptEscherEx->AddClientAnchor( maRect ); @@ -5469,6 +5471,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a SvMemoryStream aExtBu( 0x200, 0x200 ); ImplWriteTextStyleAtom( *pClientTextBox, EPP_TEXTTYPE_Other, 0, NULL, aExtBu, &aPropOpt ); + aPropOpt.CreateShapeProperties( mXShape ); aPropOpt.Commit( *mpStrm ); mpPptEscherEx->AddClientAnchor( maRect ); @@ -5646,6 +5649,7 @@ void PPTWriter::ImplCreateTable( uno::Reference< drawing::XShape >& rXShape, Esc aPropOpt.AddOpt( ESCHER_Prop_LockAgainstGrouping, 0x1000100 ); aPropOpt2.AddOpt( ESCHER_Prop_tableProperties, 1 ); aPropOpt2.AddOpt( ESCHER_Prop_tableRowProperties, sal_True, aMemStrm.Tell(), static_cast< sal_uInt8* >( const_cast< void* >( aMemStrm.GetData() ) ), aMemStrm.Tell() ); + aPropOpt.CreateShapeProperties( rXShape ); aPropOpt.Commit( *mpStrm ); aPropOpt2.Commit( *mpStrm, 3, ESCHER_UDefProp ); mpPptEscherEx->AddAtom( 8, ESCHER_ClientAnchor ); -- 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. --- .../ui/framework/factories/TaskPanelFactory.cxx | 176 ++++++++++++++------- sd/source/ui/inc/TaskPaneViewShell.hxx | 15 +- sd/source/ui/inc/taskpane/PanelId.hxx | 56 +++++++ sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx | 23 ++- sd/source/ui/toolpanel/TaskPaneToolPanel.cxx | 18 ++- sd/source/ui/toolpanel/TaskPaneToolPanel.hxx | 10 +- sd/source/ui/toolpanel/TaskPaneViewShell.cxx | 8 +- sd/source/ui/toolpanel/ToolPanelDeck.cxx | 68 +++++++- sd/source/ui/toolpanel/ToolPanelDeck.hxx | 26 ++- sd/source/ui/toolpanel/ToolPanelViewShell.cxx | 139 ++++++++++++++-- sd/source/ui/view/ViewShellBase.cxx | 8 +- sd/source/ui/view/ViewShellImplementation.cxx | 2 +- 12 files changed, 434 insertions(+), 115 deletions(-) create mode 100644 sd/source/ui/inc/taskpane/PanelId.hxx (limited to 'sd') diff --git a/sd/source/ui/framework/factories/TaskPanelFactory.cxx b/sd/source/ui/framework/factories/TaskPanelFactory.cxx index 65a2bb23cb33..1500cda89870 100644 --- a/sd/source/ui/framework/factories/TaskPanelFactory.cxx +++ b/sd/source/ui/framework/factories/TaskPanelFactory.cxx @@ -32,9 +32,11 @@ #include "precompiled_sd.hxx" #include "TaskPanelFactory.hxx" #include "TaskPaneViewShell.hxx" +#include "taskpane/ToolPanelViewShell.hxx" #include "DrawController.hxx" #include "framework/FrameworkHelper.hxx" #include +#include using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -89,14 +91,11 @@ class TaskPanelResource { public: TaskPanelResource ( - const Reference& rxResourceId, - const TaskPaneViewShell::PanelId ePaneId); + const Reference& rxResourceId ); virtual ~TaskPanelResource (); virtual void SAL_CALL disposing (); - TaskPaneViewShell::PanelId GetPaneId () const; - // XResource virtual Reference SAL_CALL getResourceId (void) @@ -107,7 +106,6 @@ public: private: const Reference mxResourceId; - const TaskPaneViewShell::PanelId mePaneId; }; } // end of anonymous namespace. @@ -189,56 +187,102 @@ void SAL_CALL TaskPanelFactory::initialize( //===== XResourceController =================================================== -Reference SAL_CALL TaskPanelFactory::createResource ( - const Reference& rxResourceId) - throw (RuntimeException) +namespace { - Reference xResource; - - if ( ! rxResourceId.is()) - return NULL; + void lcl_collectResourceURLs( const Reference< XResourceId >& i_rResourceId, ::std::vector< ::rtl::OUString >& o_rResourceURLs ) + { + ENSURE_OR_RETURN_VOID( i_rResourceId.is(), "illegal resource ID" ); + o_rResourceURLs.resize(0); - OUString sResourceURL (rxResourceId->getResourceURL()); + Reference< XResourceId > xResourceId( i_rResourceId ); + ::rtl::OUString sResourceURL = xResourceId->getResourceURL(); + while ( sResourceURL.getLength() > 0 ) + { + o_rResourceURLs.push_back( sResourceURL ); + xResourceId = xResourceId->getAnchor(); + sResourceURL = xResourceId->getResourceURL(); + } + } - if (sResourceURL.match(FrameworkHelper::msTaskPanelURLPrefix)) + toolpanel::PanelId lcl_getPanelId( const ::rtl::OUString& i_rResourceURL ) { - TaskPaneViewShell::PanelId ePaneId (TaskPaneViewShell::PID_UNKNOWN); + toolpanel::PanelId ePanelId( toolpanel::PID_UNKNOWN ); - if (sResourceURL.equals(FrameworkHelper::msMasterPagesTaskPanelURL)) + // TODO: this translation table PanelId<->PanelResourceURL is used in multiple files, + // perhaps it is worth putting this into a dedicated helper/meta-data class. + if ( i_rResourceURL.equals( FrameworkHelper::msMasterPagesTaskPanelURL ) ) { - ePaneId = TaskPaneViewShell::PID_MASTER_PAGES; + ePanelId = toolpanel::PID_MASTER_PAGES; } - else if (sResourceURL.equals(FrameworkHelper::msLayoutTaskPanelURL)) + else if ( i_rResourceURL.equals( FrameworkHelper::msLayoutTaskPanelURL ) ) { - ePaneId = TaskPaneViewShell::PID_LAYOUT; + ePanelId = toolpanel::PID_LAYOUT; } - else if (sResourceURL.equals(FrameworkHelper::msTableDesignPanelURL)) + else if ( i_rResourceURL.equals( FrameworkHelper::msTableDesignPanelURL ) ) { - ePaneId = TaskPaneViewShell::PID_TABLE_DESIGN; + ePanelId = toolpanel::PID_TABLE_DESIGN; } - else if (sResourceURL.equals(FrameworkHelper::msCustomAnimationTaskPanelURL)) + else if ( i_rResourceURL.equals( FrameworkHelper::msCustomAnimationTaskPanelURL ) ) { - ePaneId = TaskPaneViewShell::PID_CUSTOM_ANIMATION; + ePanelId = toolpanel::PID_CUSTOM_ANIMATION; } - else if (sResourceURL.equals(FrameworkHelper::msSlideTransitionTaskPanelURL)) + else if ( i_rResourceURL.equals( FrameworkHelper::msSlideTransitionTaskPanelURL ) ) { - ePaneId = TaskPaneViewShell::PID_SLIDE_TRANSITION; + ePanelId = toolpanel::PID_SLIDE_TRANSITION; } + else + { + OSL_ENSURE( false, "lcl_getPanelId: cannot translate the given resource URL!" ); + } + + return ePanelId; + } +} + +Reference SAL_CALL TaskPanelFactory::createResource ( + const Reference& rxResourceId) + throw (RuntimeException) +{ + Reference xResource; + + if ( ! rxResourceId.is()) + return NULL; + + OUString sResourceURL (rxResourceId->getResourceURL()); - if (ePaneId!=TaskPaneViewShell::PID_UNKNOWN && mpViewShellBase!=NULL) + if ( sResourceURL.match( FrameworkHelper::msTaskPanelURLPrefix ) ) + { + toolpanel::PanelId ePanelId( lcl_getPanelId( sResourceURL ) ); + + if ( ( ePanelId != toolpanel::PID_UNKNOWN ) && ( mpViewShellBase != NULL ) ) { - toolpanel::TaskPaneViewShell* pTaskPane - = dynamic_cast( - FrameworkHelper::Instance(*mpViewShellBase) - ->GetViewShell(FrameworkHelper::msRightPaneURL).get()); - if (pTaskPane != NULL) + ::boost::shared_ptr< FrameworkHelper > pFrameworkHelper( FrameworkHelper::Instance( *mpViewShellBase ) ); + + // assume that the top-level anchor is the URL of the pane + ::std::vector< ::rtl::OUString > aResourceURLs; + lcl_collectResourceURLs( rxResourceId, aResourceURLs ); + + const ::rtl::OUString sPaneURL = aResourceURLs[ aResourceURLs.size() - 1 ]; + const ::boost::shared_ptr< ViewShell > pPaneViewShell( pFrameworkHelper->GetViewShell( sPaneURL ) ); + + toolpanel::TaskPaneViewShell* pTaskPane = dynamic_cast< toolpanel::TaskPaneViewShell* >( pPaneViewShell.get() ); + if ( pTaskPane != NULL ) + { + xResource = new TaskPanelResource( rxResourceId ); + pTaskPane->ShowPanel(ePanelId); + pTaskPane->ExpandPanel(ePanelId); + } + else { - xResource = new TaskPanelResource( - rxResourceId, - ePaneId); - pTaskPane->ShowPanel(ePaneId); - pTaskPane->ExpandPanel(ePaneId); + toolpanel::ToolPanelViewShell* pToolPanel = dynamic_cast< toolpanel::ToolPanelViewShell* >( pPaneViewShell.get() ); + if ( pToolPanel != NULL ) + { + xResource = new TaskPanelResource( rxResourceId ); + pToolPanel->ActivatePanel( ePanelId ); + } } + + OSL_POSTCOND( xResource.is(), "TaskPanelFactory::createResource: did not find the given resource!" ); } } @@ -252,16 +296,46 @@ void SAL_CALL TaskPanelFactory::releaseResource ( const Reference& rxResource) throw (RuntimeException) { - toolpanel::TaskPaneViewShell* pTaskPane - = dynamic_cast( - FrameworkHelper::Instance(*mpViewShellBase) - ->GetViewShell(FrameworkHelper::msRightPaneURL).get()); + ENSURE_OR_RETURN_VOID( rxResource.is(), "illegal resource" ); + const Reference< XResourceId > xResourceId( rxResource->getResourceId(), UNO_SET_THROW ); - rtl::Reference pResource = dynamic_cast( - rxResource.get()); + // assume that the top-level anchor is the URL of the pane + ::std::vector< ::rtl::OUString > aResourceURLs; + lcl_collectResourceURLs( xResourceId, aResourceURLs ); - if (pTaskPane != NULL && pResource.is()) - pTaskPane->CollapsePanel(pResource->GetPaneId()); + OSL_ENSURE( !aResourceURLs.empty(), "TaskPanelFactory::releaseResource: illegal resource/URL!" ); + if ( !aResourceURLs.empty() ) + { + const ::rtl::OUString sPaneURL = aResourceURLs[ aResourceURLs.size() - 1 ]; + ::boost::shared_ptr< FrameworkHelper > pFrameworkHelper( FrameworkHelper::Instance( *mpViewShellBase ) ); + const ::boost::shared_ptr< ViewShell > pPaneViewShell( pFrameworkHelper->GetViewShell( sPaneURL ) ); + if ( pPaneViewShell != NULL ) + { + toolpanel::PanelId ePanelId( lcl_getPanelId( xResourceId->getResourceURL() ) ); + toolpanel::TaskPaneViewShell* pTaskPane( dynamic_cast< toolpanel::TaskPaneViewShell* >( pPaneViewShell.get() ) ); + toolpanel::ToolPanelViewShell* pToolPanel = dynamic_cast< toolpanel::ToolPanelViewShell* >( pPaneViewShell.get() ); + + if ( ( ePanelId != toolpanel::PID_UNKNOWN ) + && ( ( pTaskPane != NULL ) + || ( pToolPanel != NULL ) + ) + ) + { + if ( pTaskPane != NULL ) + { + pTaskPane->CollapsePanel( ePanelId ); + } + if ( pToolPanel != NULL ) + { + pToolPanel->DeactivatePanel( ePanelId ); + } + } + else + { + OSL_ENSURE( false, "TaskPanelFactory::releaseResource: don't know what to do with this resource!" ); + } + } + } Reference xComponent (rxResource, UNO_QUERY); if (xComponent.is()) @@ -293,11 +367,9 @@ void TaskPanelFactory::ThrowIfDisposed (void) const namespace { TaskPanelResource::TaskPanelResource ( - const Reference& rxResourceId, - const TaskPaneViewShell::PanelId ePaneId) + const Reference& rxResourceId) : TaskPanelResourceInterfaceBase(m_aMutex), - mxResourceId(rxResourceId), - mePaneId(ePaneId) + mxResourceId(rxResourceId) { } @@ -318,14 +390,6 @@ void SAL_CALL TaskPanelResource::disposing () -TaskPaneViewShell::PanelId TaskPanelResource::GetPaneId () const -{ - return mePaneId; -} - - - - Reference SAL_CALL TaskPanelResource::getResourceId () throw (css::uno::RuntimeException) { 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. diff --git a/sd/source/ui/toolpanel/TaskPaneToolPanel.cxx b/sd/source/ui/toolpanel/TaskPaneToolPanel.cxx index 11735d5433bd..3e5a7ba3065f 100644 --- a/sd/source/ui/toolpanel/TaskPaneToolPanel.cxx +++ b/sd/source/ui/toolpanel/TaskPaneToolPanel.cxx @@ -38,18 +38,34 @@ namespace sd { namespace toolpanel { //...................................................................................................................... + /** === begin UNO using === **/ + using ::com::sun::star::uno::Reference; + using ::com::sun::star::uno::XInterface; + using ::com::sun::star::uno::UNO_QUERY; + using ::com::sun::star::uno::UNO_QUERY_THROW; + using ::com::sun::star::uno::UNO_SET_THROW; + using ::com::sun::star::uno::Exception; + using ::com::sun::star::uno::RuntimeException; + using ::com::sun::star::uno::Any; + using ::com::sun::star::uno::makeAny; + using ::com::sun::star::uno::Sequence; + using ::com::sun::star::uno::Type; + using ::com::sun::star::drawing::framework::XResourceId; + /** === end UNO using === **/ + //================================================================================================================== //= TaskPaneToolPanel //================================================================================================================== //------------------------------------------------------------------------------------------------------------------ TaskPaneToolPanel::TaskPaneToolPanel( ToolPanelDeck& i_rPanelDeck, ::std::auto_ptr< ControlFactory >& i_rControlFactory, - const Image& i_rImage, const USHORT i_nTitleResId, const ULONG i_nHelpId ) + const Image& i_rImage, const USHORT i_nTitleResId, const ULONG i_nHelpId, const Reference< XResourceId >& i_rPanelResourceId ) :m_pPanelDeck( &i_rPanelDeck ) ,m_pControlFactory( i_rControlFactory ) ,m_pControl() ,m_aImage( i_rImage ) ,m_sTitle( SdResId( i_nTitleResId ) ) ,m_aHelpId( i_nHelpId ) + ,m_xPanelResourceId( i_rPanelResourceId ) { ENSURE_OR_THROW( m_pControlFactory.get(), "illegal control factory" ); } diff --git a/sd/source/ui/toolpanel/TaskPaneToolPanel.hxx b/sd/source/ui/toolpanel/TaskPaneToolPanel.hxx index d879d6549a0e..0ff352f58abb 100644 --- a/sd/source/ui/toolpanel/TaskPaneToolPanel.hxx +++ b/sd/source/ui/toolpanel/TaskPaneToolPanel.hxx @@ -58,8 +58,8 @@ namespace sd { namespace toolpanel ::std::auto_ptr< ControlFactory >& i_rControlFactory, const Image& i_rImage, const USHORT i_nTitleResId, - const ULONG i_nHelpId/*, - const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::framework::XResourceId >& i_rPanelContent*/ + const ULONG i_nHelpId, + const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::framework::XResourceId >& i_rPanelResourceId ); ~TaskPaneToolPanel(); @@ -73,6 +73,10 @@ namespace sd { namespace toolpanel virtual bool HasFocus() const; virtual void Dispose(); + // own attributes + const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::framework::XResourceId >& + getResourceId() const { return m_xPanelResourceId; } + private: bool impl_ensureControl(); @@ -83,6 +87,8 @@ namespace sd { namespace toolpanel const Image m_aImage; const String m_sTitle; const SmartId m_aHelpId; + ::com::sun::star::uno::Reference< ::com::sun::star::drawing::framework::XResourceId > + m_xPanelResourceId; }; //...................................................................................................................... diff --git a/sd/source/ui/toolpanel/TaskPaneViewShell.cxx b/sd/source/ui/toolpanel/TaskPaneViewShell.cxx index c0acf9788e50..3c33ff41620f 100644 --- a/sd/source/ui/toolpanel/TaskPaneViewShell.cxx +++ b/sd/source/ui/toolpanel/TaskPaneViewShell.cxx @@ -131,7 +131,7 @@ public: /** Make a new panel known to the translation table that translates between internal indices as returned by ControlContainer::AddControl() and public indices defined by - TaskPaneViewShell::PanelId. + PanelId. */ void AddPanel (sal_uInt32 nInternalId, PanelId nPublicId); @@ -152,7 +152,7 @@ public: private: /** This map translates between internal indices returned by ControlContainer::AddControl() and public indices defined by - TaskPaneViewShell::PanelId. + PanelId. */ typedef ::std::vector InternalIdToPanelIdMap; InternalIdToPanelIdMap maIndexMap; @@ -790,7 +790,7 @@ void TaskPaneViewShell::Implementation::AddPanel ( -TaskPaneViewShell::PanelId +PanelId TaskPaneViewShell::Implementation::GetPublicId ( sal_uInt32 nInternalId) const { @@ -805,7 +805,7 @@ TaskPaneViewShell::PanelId sal_uInt32 TaskPaneViewShell::Implementation::GetInternalId ( - TaskPaneViewShell::PanelId nPublicId) const + PanelId nPublicId) const { sal_uInt32 nId = mnInvalidId; for (sal_uInt32 nI=0; nI +/** === end UNO includes === **/ + #include +#include //...................................................................................................................... namespace sd { namespace toolpanel { //...................................................................................................................... + /** === begin UNO using === **/ + using ::com::sun::star::uno::Reference; + using ::com::sun::star::uno::XInterface; + using ::com::sun::star::uno::UNO_QUERY; + using ::com::sun::star::uno::UNO_QUERY_THROW; + using ::com::sun::star::uno::UNO_SET_THROW; + using ::com::sun::star::uno::Exception; + using ::com::sun::star::uno::RuntimeException; + using ::com::sun::star::uno::Any; + using ::com::sun::star::uno::makeAny; + using ::com::sun::star::uno::Sequence; + using ::com::sun::star::uno::Type; + using ::com::sun::star::drawing::framework::XResourceId; + using ::com::sun::star::drawing::framework::ResourceActivationMode_REPLACE; + /** === end UNO using === **/ + using ::sd::framework::FrameworkHelper; + //================================================================================================================== //= ToolPanelDeck //================================================================================================================== @@ -72,22 +95,61 @@ namespace sd { namespace toolpanel return; } - SetLayouter( new ::svt::TabDeckLayouter( *this, i_eTabAlignment, i_eTabContent ) ); + SetLayouter( new ::svt::TabDeckLayouter( *this, *this, i_eTabAlignment, i_eTabContent ) ); } //------------------------------------------------------------------------------------------------------------------ size_t ToolPanelDeck::CreateAndInsertPanel( ::std::auto_ptr< ControlFactory >& i_rControlFactory, - const Image& i_rImage, const USHORT i_nTitleResId, const ULONG i_nHelpId ) + const Image& i_rImage, const USHORT i_nTitleResId, const ULONG i_nHelpId, const Reference< XResourceId >& i_rPanelResourceId ) { // create panel ::svt::PToolPanel pNewPanel( new TaskPaneToolPanel( *this, i_rControlFactory, - i_rImage, i_nTitleResId, i_nHelpId + i_rImage, i_nTitleResId, i_nHelpId, + i_rPanelResourceId ) ); // insert as new panel return InsertPanel( pNewPanel, GetPanelCount() ); } + //------------------------------------------------------------------------------------------------------------------ + void ToolPanelDeck::ActivatePanelDirectly( const ::boost::optional< size_t >& i_rPanel ) + { + ToolPanelDeck_Base::ActivatePanel( i_rPanel ); + } + + //------------------------------------------------------------------------------------------------------------------ + void ToolPanelDeck::ActivatePanelResource( const size_t i_nPanel ) + { + // determine resource ID for the given panel + ::svt::PToolPanel pPanel( GetPanel( i_nPanel ) ); + const TaskPaneToolPanel* pTaskPanePanel( dynamic_cast< const TaskPaneToolPanel* >( pPanel.get() ) ); + ENSURE_OR_RETURN_VOID( pTaskPanePanel, "did not find the right panel/type at the given position" ); + const Reference< XResourceId > xPanelId( pTaskPanePanel->getResourceId() ); + + // delegate the request to the configuration controller + ::boost::shared_ptr< FrameworkHelper > pFrameworkHelper( FrameworkHelper::Instance( m_rViewShell.GetViewShellBase() ) ); + pFrameworkHelper->GetConfigurationController()->requestResourceActivation( + xPanelId, ResourceActivationMode_REPLACE ); + } + + //------------------------------------------------------------------------------------------------------------------ + void ToolPanelDeck::ActivatePanel( const ::boost::optional< size_t >& i_rPanel ) + { + if ( !i_rPanel ) + { + // this is a de-activate request. Quite improbable that this really happens: We're within the overloaded + // version of IToolPanelDeck::ActivatePanel. The only instance which has access to this IToolPanel + // interface is the panel layouter, which is not expected to call us with a NULL panel position. + // All other instances should now have access to this method, as it is protected in this class here. + OSL_ENSURE( false, "ToolPanelDeck::ActivatePanel: is this legitimate?" ); + // well, handle it nonetheless. + ActivatePanelDirectly( i_rPanel ); + } + else + ActivatePanelResource( *i_rPanel ); + } + //...................................................................................................................... } } // namespace sd::toolpanel //...................................................................................................................... diff --git a/sd/source/ui/toolpanel/ToolPanelDeck.hxx b/sd/source/ui/toolpanel/ToolPanelDeck.hxx index 65ad6f80ad83..845f391e298d 100644 --- a/sd/source/ui/toolpanel/ToolPanelDeck.hxx +++ b/sd/source/ui/toolpanel/ToolPanelDeck.hxx @@ -30,6 +30,10 @@ #include "taskpane/TaskPaneTreeNode.hxx" #include "taskpane/TaskPaneControlFactory.hxx" +/** === begin UNO includes === **/ +#include +/** === end UNO includes === **/ + #include #include #include @@ -59,11 +63,31 @@ namespace sd { namespace toolpanel ::std::auto_ptr< ControlFactory >& i_rControlFactory, const Image& i_rImage, const USHORT i_nTitleResId, - const ULONG i_nHelpId + const ULONG i_nHelpId, + const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::framework::XResourceId >& i_rPanelResourceId ); void SetTabsLayout( const ::svt::TabAlignment i_eTabAlignment, const ::svt::TabItemContent i_eTabContent ); + /** directly activates the given panel, without re-routing the activation request through the drawing + framework's configuration controller. + */ + void ActivatePanelDirectly( const ::boost::optional< size_t >& i_rPanel ); + + /** activates the given panel by delegating the acvtivation request to the drawing framework's configuration + controller. + */ + void ActivatePanelResource( const size_t i_nPanel ); + + protected: + // IToolPanelDeck + /** this method, which is part of the callback used by the PanelSelector, does not forward the request to + the base class. Instead, it forwards it to the ToolPanelViewShell, which transforms it into a request + to the drawing framework's configuration controller, which in turn will end up in our public + ActivatePanelDirectly method. + */ + virtual void ActivatePanel( const ::boost::optional< size_t >& i_rPanel ); + private: ToolPanelViewShell& m_rViewShell; }; diff --git a/sd/source/ui/toolpanel/ToolPanelViewShell.cxx b/sd/source/ui/toolpanel/ToolPanelViewShell.cxx index 4f40d629c9ce..fcf7761bf27d 100644 --- a/sd/source/ui/toolpanel/ToolPanelViewShell.cxx +++ b/sd/source/ui/toolpanel/ToolPanelViewShell.cxx @@ -40,7 +40,6 @@ #include "PaneDockingWindow.hxx" #include "FrameView.hxx" #include "Window.hxx" -#include "PaneDockingWindow.hxx" #include "ToolPanelDeck.hxx" #include "sdmod.hxx" #include "app.hrc" @@ -50,9 +49,12 @@ #include "strings.hrc" #include "sdresid.hxx" #include "framework/FrameworkHelper.hxx" + +/** === begin UNO includes === **/ #include #include #include +/** === end UNO includes === **/ #include #include @@ -95,6 +97,7 @@ using ::com::sun::star::uno::Type; using ::com::sun::star::accessibility::XAccessible; using ::com::sun::star::drawing::XDrawSubController; using ::com::sun::star::frame::XFrame; +using ::com::sun::star::drawing::framework::XResourceId; /** === end UNO using === **/ using ::sd::framework::FrameworkHelper; @@ -109,18 +112,18 @@ namespace sd { namespace toolpanel { */ struct PanelDescriptor { - ToolPanelViewShell::PanelId nId; - ::svt::PToolPanel pPanel; - bool bHidden; + PanelId nId; + ::svt::PToolPanel pPanel; + bool bHidden; PanelDescriptor() - :nId( ToolPanelViewShell::PID_UNKNOWN ) + :nId( PID_UNKNOWN ) ,pPanel() ,bHidden( false ) { } - PanelDescriptor( const ToolPanelViewShell::PanelId i_nPanelId, const ::svt::PToolPanel& i_rPanel ) + PanelDescriptor( const PanelId i_nPanelId, const ::svt::PToolPanel& i_rPanel ) :nId( i_nPanelId ) ,pPanel( i_rPanel ) ,bHidden( false ) @@ -157,6 +160,23 @@ public: void TogglePanelVisibility( const size_t i_nLogicalPanelIndex, ToolPanelDeck& i_rPanelDeck ); + /** ensures the panel with the given ID is visible, and directly activates it, bypassing the configuration controller + */ + void ActivatePanelDirectly( const PanelId i_nPanelId, ToolPanelDeck& i_rPanelDeck ); + + /** de-activates the panel given by ID, bypassing the configuration controller + + If the panel is not active currently, nothing happens. + */ + void DeactivatePanelDirectly( const PanelId i_nPanelId, ToolPanelDeck& i_rPanelDeck ); + +protected: + // IToolPanelDeckListener overridables + virtual void PanelInserted( const ::svt::PToolPanel& i_pPanel, const size_t i_nPosition ); + virtual void PanelRemoved( const size_t i_nPosition ); + virtual void ActivePanelChanged( const ::boost::optional< size_t >& i_rOldActive, const ::boost::optional< size_t >& i_rNewActive ); + virtual void Dying(); + private: void RegisterPanel( size_t i_nPosition, PanelId i_nPanelId, const ::svt::PToolPanel& i_rPanel ); @@ -201,38 +221,84 @@ void ToolPanelViewShell::Implementation::Setup( ToolPanelViewShell& i_rViewShell USHORT nTitleResourceID; ULONG nHelpID; PanelId nPanelID; + ::rtl::OUString sResourceURL; }; PanelDescriptor aPanels[] = { // "Master Pages" - { &controls::MasterPagesPanel::CreateControlFactory, "PresentationLayout", STR_TASKPANEL_MASTER_PAGE_TITLE, HID_SD_SLIDE_DESIGNS, PID_MASTER_PAGES }, + { &controls::MasterPagesPanel::CreateControlFactory, + "PresentationLayout", + STR_TASKPANEL_MASTER_PAGE_TITLE, + HID_SD_SLIDE_DESIGNS, + PID_MASTER_PAGES, + FrameworkHelper::msMasterPagesTaskPanelURL + }, // "Layout" - { &LayoutMenu::CreateControlFactory, "ModifyPage", STR_TASKPANEL_LAYOUT_MENU_TITLE, HID_SD_SLIDE_LAYOUTS, PID_LAYOUT }, + { &LayoutMenu::CreateControlFactory, + "ModifyPage", + STR_TASKPANEL_LAYOUT_MENU_TITLE, + HID_SD_SLIDE_LAYOUTS, + PID_LAYOUT, + FrameworkHelper::msLayoutTaskPanelURL + }, // "Tables Design" - { &controls::TableDesignPanel::CreateControlFactory, "InsertTable", DLG_TABLEDESIGNPANE, HID_SD_TABLE_DESIGN, PID_TABLE_DESIGN }, + { &controls::TableDesignPanel::CreateControlFactory, + "InsertTable", + DLG_TABLEDESIGNPANE, + HID_SD_TABLE_DESIGN, + PID_TABLE_DESIGN, + FrameworkHelper::msTableDesignPanelURL + }, // "Custom Animation" - { &controls::CustomAnimationPanel::CreateControlFactory, "CustomAnimation", STR_CUSTOMANIMATIONPANE, HID_SD_CUSTOM_ANIMATIONS, PID_CUSTOM_ANIMATION }, + { &controls::CustomAnimationPanel::CreateControlFactory, + "CustomAnimation", + STR_CUSTOMANIMATIONPANE, + HID_SD_CUSTOM_ANIMATIONS, + PID_CUSTOM_ANIMATION, + FrameworkHelper::msCustomAnimationTaskPanelURL + }, // "Slide Transition" - { &controls::SlideTransitionPanel::CreateControlFactory, "RehearseTimings", STR_SLIDE_TRANSITION_PANE, HID_SD_SLIDE_TRANSITIONS, PID_SLIDE_TRANSITION } + { &controls::SlideTransitionPanel::CreateControlFactory, + "RehearseTimings", + STR_SLIDE_TRANSITION_PANE, + HID_SD_SLIDE_TRANSITIONS, + PID_SLIDE_TRANSITION, + FrameworkHelper::msSlideTransitionTaskPanelURL + } }; + // compose the resource ID for the ToolPanel view + ::boost::shared_ptr< FrameworkHelper > pFrameworkHelper( FrameworkHelper::Instance( i_rViewShell.GetViewShellBase() ) ); + const Reference< XResourceId > xToolPanelId( pFrameworkHelper->CreateResourceId( FrameworkHelper::msToolPanelViewURL, FrameworkHelper::msToolPanelPaneURL ) ); + + // want to activate the "Layout" panel later on, need to translate its PanelId to an actual position const PanelId nPanelIdToActivate = PID_LAYOUT; size_t nPanelPosToActivate = size_t( -1 ); + // create the panels Reference< XFrame > xFrame( i_rViewShell.GetViewShellBase().GetViewFrame()->GetFrame()->GetFrameInterface() ); const BOOL bHiContrast( i_rPanelDeck.GetSettings().GetStyleSettings().GetHighContrastMode() ); for ( size_t i=0; i < sizeof( aPanels ) / sizeof( aPanels[0] ); ++i ) { + // compose the command name, and obtain the image for it ::rtl::OUStringBuffer aCommandName; aCommandName.appendAscii( ".uno:" ); aCommandName.appendAscii( aPanels[i].pImageCommandName ); + const Image aPanelImage( GetImage( xFrame, aCommandName.makeStringAndClear(), FALSE, bHiContrast ) ); + // compose the resource ID of the panel + const Reference< XResourceId > xPanelId( pFrameworkHelper->CreateResourceId( aPanels[i].sResourceURL, xToolPanelId ) ); + + // create and insert the panel size_t nPanelPos = i_rPanelDeck.CreateAndInsertPanel( (*aPanels[i].pFactory)( i_rViewShell ), - GetImage( xFrame, aCommandName.makeStringAndClear(), FALSE, bHiContrast ), + aPanelImage, aPanels[i].nTitleResourceID, - aPanels[i].nHelpID + aPanels[i].nHelpID, + xPanelId ); + + // remember it RegisterPanel( nPanelPos, aPanels[i].nPanelID, i_rPanelDeck.GetPanel( nPanelPos ) ); if ( nPanelIdToActivate == aPanels[i].nPanelID ) @@ -240,7 +306,7 @@ void ToolPanelViewShell::Implementation::Setup( ToolPanelViewShell& i_rViewShell } // activate default panel - i_rPanelDeck.ActivatePanel( nPanelPosToActivate ); + i_rPanelDeck.ActivatePanelResource( nPanelPosToActivate ); } // --------------------------------------------------------------------------------------------------------------------- @@ -604,7 +670,17 @@ bool ToolPanelViewShell::RelocateToParentWindow( ::Window* pParentWindow ) return true; } +// --------------------------------------------------------------------------------------------------------------------- +void ToolPanelViewShell::DeactivatePanel( const PanelId i_ePanelId ) +{ + mpImpl->DeactivatePanelDirectly( i_ePanelId, *mpPanelDeck ); +} +// --------------------------------------------------------------------------------------------------------------------- +void ToolPanelViewShell::ActivatePanel( const PanelId i_ePanelId ) +{ + mpImpl->ActivatePanelDirectly( i_ePanelId, *mpPanelDeck ); +} // ===================================================================================================================== @@ -639,7 +715,7 @@ void ToolPanelViewShell::Implementation::TogglePanelVisibility( const size_t i_n // if there has not been an active panel before, activate the newly inserted one ::boost::optional< size_t > aActivePanel( i_rPanelDeck.GetActivePanel() ); if ( !aActivePanel ) - i_rPanelDeck.ActivatePanel( nActualPanelIndex ); + i_rPanelDeck.ActivatePanelResource( nActualPanelIndex ); } else { @@ -648,6 +724,39 @@ void ToolPanelViewShell::Implementation::TogglePanelVisibility( const size_t i_n maPanels[ i_nLogicalPanelIndex ].bHidden = !maPanels[ i_nLogicalPanelIndex ].bHidden; } +// --------------------------------------------------------------------------------------------------------------------- +void ToolPanelViewShell::Implementation::DeactivatePanelDirectly( const PanelId i_nPanelId, ToolPanelDeck& i_rPanelDeck ) +{ + for ( size_t i=0; i() ); + return; + } + } +} + +// --------------------------------------------------------------------------------------------------------------------- +void ToolPanelViewShell::Implementation::ActivatePanelDirectly( const PanelId i_nPanelId, ToolPanelDeck& i_rPanelDeck ) +{ + size_t nActualPanelIndex(0); + for ( size_t i=0; i( + toolpanel::PanelId>( pPanelId->GetValue()); bPanelIdGiven = true; } @@ -1690,7 +1690,7 @@ void ViewShellBase::Implementation::ProcessTaskPaneSlot (SfxRequest& rRequest) // Ignore the request for some combinations of panels and view // shell types. if (bPanelIdGiven - && ! (nPanelId==toolpanel::TaskPaneViewShell::PID_LAYOUT + && ! (nPanelId==toolpanel::PID_LAYOUT && mrBase.GetMainViewShell()!=NULL && mrBase.GetMainViewShell()->GetShellType()==ViewShell::ST_OUTLINE)) { diff --git a/sd/source/ui/view/ViewShellImplementation.cxx b/sd/source/ui/view/ViewShellImplementation.cxx index e46b1afd213d..eb8863cfe49c 100644 --- a/sd/source/ui/view/ViewShellImplementation.cxx +++ b/sd/source/ui/view/ViewShellImplementation.cxx @@ -198,7 +198,7 @@ void ViewShell::Implementation::ProcessModifyPageSlot ( // Make the layout menu visible in the tool pane. SfxBoolItem aMakeToolPaneVisible (ID_VAL_ISVISIBLE, TRUE); SfxUInt32Item aPanelId (ID_VAL_PANEL_INDEX, - ::sd::toolpanel::TaskPaneViewShell::PID_LAYOUT); + ::sd::toolpanel::PID_LAYOUT); SfxViewFrame* pFrame = mrViewShell.GetViewFrame(); if (pFrame!=NULL && pFrame->GetDispatcher()!=NULL) { -- cgit From f4e9c47ce83d2d9fc6c0a2764a5c1c553e793882 Mon Sep 17 00:00:00 2001 From: "Frank Schoenheit [fs]" Date: Tue, 16 Mar 2010 13:36:45 +0100 Subject: slidecopy: display the name of the active panel in the tool panel window's title control --- sd/source/ui/toolpanel/ToolPanelViewShell.cxx | 105 ++++++++++++++++++++------ 1 file changed, 84 insertions(+), 21 deletions(-) (limited to 'sd') diff --git a/sd/source/ui/toolpanel/ToolPanelViewShell.cxx b/sd/source/ui/toolpanel/ToolPanelViewShell.cxx index fcf7761bf27d..293c55dd93fb 100644 --- a/sd/source/ui/toolpanel/ToolPanelViewShell.cxx +++ b/sd/source/ui/toolpanel/ToolPanelViewShell.cxx @@ -136,17 +136,20 @@ struct PanelDescriptor // ===================================================================================================================== /** Inner implementation class of ToolPanelViewShell. */ -class ToolPanelViewShell::Implementation +class ToolPanelViewShell::Implementation : public ::svt::IToolPanelDeckListener { public: static const size_t mnInvalidId = static_cast< size_t >( -1 ); - Implementation(); + Implementation( ToolPanelViewShell& i_rPanelViewShell ); ~Implementation(); /** Here the panels are created that are shown in the task pane. */ void Setup( ToolPanelViewShell& i_rViewShell, ToolPanelDeck& i_rPanelDeck ); + /** clean up the instance + */ + void Cleanup( ToolPanelDeck& i_rPanelDeck ); size_t GetPanelCount() const { @@ -155,7 +158,7 @@ public: const PanelDescriptor& GetPanel( const size_t i_nLogicalPanelIndex ) const { - return maPanels[ i_nLogicalPanelIndex ]; + return m_aPanels[ i_nLogicalPanelIndex ]; } void TogglePanelVisibility( const size_t i_nLogicalPanelIndex, ToolPanelDeck& i_rPanelDeck ); @@ -181,7 +184,8 @@ private: void RegisterPanel( size_t i_nPosition, PanelId i_nPanelId, const ::svt::PToolPanel& i_rPanel ); typedef ::std::vector< PanelDescriptor > PanelDescriptors; - PanelDescriptors maPanels; + PanelDescriptors m_aPanels; + ToolPanelViewShell& m_rPanelViewShell; }; // ===================================================================================================================== @@ -307,6 +311,15 @@ void ToolPanelViewShell::Implementation::Setup( ToolPanelViewShell& i_rViewShell // activate default panel i_rPanelDeck.ActivatePanelResource( nPanelPosToActivate ); + + // add as listener to the panel deck + i_rPanelDeck.AddListener( *this ); +} + +// --------------------------------------------------------------------------------------------------------------------- +void ToolPanelViewShell::Implementation::Cleanup( ToolPanelDeck& i_rPanelDeck ) +{ + i_rPanelDeck.RemoveListener( *this ); } // --------------------------------------------------------------------------------------------------------------------- @@ -324,7 +337,7 @@ void ToolPanelViewShell::Initialize() ToolPanelViewShell::ToolPanelViewShell( SfxViewFrame* pFrame, ViewShellBase& rViewShellBase, ::Window* pParentWindow, FrameView* pFrameViewArgument ) :ViewShell(pFrame, pParentWindow, rViewShellBase) - ,mpImpl( new Implementation ) + ,mpImpl( new Implementation( *this ) ) ,mpPanelDeck( new ToolPanelDeck( *mpContentWindow.get(), *this ) ) ,mbIsInitialized(false) ,mpSubShellManager() @@ -382,6 +395,11 @@ ToolPanelViewShell::ToolPanelViewShell( SfxViewFrame* pFrame, ViewShellBase& rVi // --------------------------------------------------------------------------------------------------------------------- ToolPanelViewShell::~ToolPanelViewShell() { + if ( mbIsInitialized ) + { + mpImpl->Cleanup( *mpPanelDeck ); + } + // reset our impl before destroying the panel deck, to ensure the hidden panels are properly // disposed/destroyed, too mpImpl.reset(); @@ -687,8 +705,9 @@ void ToolPanelViewShell::ActivatePanel( const PanelId i_ePanelId ) // = ToolPanelViewShell:Implementation - implementation // ===================================================================================================================== // --------------------------------------------------------------------------------------------------------------------- -ToolPanelViewShell::Implementation::Implementation() - :maPanels( PanelDescriptors::size_type( PID__END ) ) +ToolPanelViewShell::Implementation::Implementation( ToolPanelViewShell& i_rPanelViewShell ) + :m_aPanels( PanelDescriptors::size_type( PID__END ) ) + ,m_rPanelViewShell( i_rPanelViewShell ) { } @@ -700,18 +719,18 @@ ToolPanelViewShell::Implementation::~Implementation() // --------------------------------------------------------------------------------------------------------------------- void ToolPanelViewShell::Implementation::TogglePanelVisibility( const size_t i_nLogicalPanelIndex, ToolPanelDeck& i_rPanelDeck ) { - ENSURE_OR_RETURN_VOID( i_nLogicalPanelIndex < maPanels.size(), "illegal index" ); + ENSURE_OR_RETURN_VOID( i_nLogicalPanelIndex < m_aPanels.size(), "illegal index" ); // get the actual panel index, within the deck size_t nActualPanelIndex(0); for ( size_t i=0; i < i_nLogicalPanelIndex; ++i ) { - if ( !maPanels[i].bHidden ) + if ( !m_aPanels[i].bHidden ) ++nActualPanelIndex; } - if ( maPanels[ i_nLogicalPanelIndex ].bHidden ) + if ( m_aPanels[ i_nLogicalPanelIndex ].bHidden ) { - OSL_VERIFY( i_rPanelDeck.InsertPanel( maPanels[ i_nLogicalPanelIndex ].pPanel, nActualPanelIndex ) == nActualPanelIndex ); + OSL_VERIFY( i_rPanelDeck.InsertPanel( m_aPanels[ i_nLogicalPanelIndex ].pPanel, nActualPanelIndex ) == nActualPanelIndex ); // if there has not been an active panel before, activate the newly inserted one ::boost::optional< size_t > aActivePanel( i_rPanelDeck.GetActivePanel() ); if ( !aActivePanel ) @@ -719,17 +738,17 @@ void ToolPanelViewShell::Implementation::TogglePanelVisibility( const size_t i_n } else { - OSL_VERIFY( i_rPanelDeck.RemovePanel( nActualPanelIndex ).get() == maPanels[ i_nLogicalPanelIndex ].pPanel.get() ); + OSL_VERIFY( i_rPanelDeck.RemovePanel( nActualPanelIndex ).get() == m_aPanels[ i_nLogicalPanelIndex ].pPanel.get() ); } - maPanels[ i_nLogicalPanelIndex ].bHidden = !maPanels[ i_nLogicalPanelIndex ].bHidden; + m_aPanels[ i_nLogicalPanelIndex ].bHidden = !m_aPanels[ i_nLogicalPanelIndex ].bHidden; } // --------------------------------------------------------------------------------------------------------------------- void ToolPanelViewShell::Implementation::DeactivatePanelDirectly( const PanelId i_nPanelId, ToolPanelDeck& i_rPanelDeck ) { - for ( size_t i=0; i() ); @@ -742,16 +761,16 @@ void ToolPanelViewShell::Implementation::DeactivatePanelDirectly( const PanelId void ToolPanelViewShell::Implementation::ActivatePanelDirectly( const PanelId i_nPanelId, ToolPanelDeck& i_rPanelDeck ) { size_t nActualPanelIndex(0); - for ( size_t i=0; i& i_rOldActive, const ::boost::optional< size_t >& i_rNewActive ) +{ + (void)i_rOldActive; + PaneDockingWindow* pDockingWindow = dynamic_cast< PaneDockingWindow* >( m_rPanelViewShell.GetDockingWindow() ); + ENSURE_OR_RETURN_VOID( pDockingWindow, "ToolPanelViewShell::Implementation::ActivePanelChanged: no PaneDockingWindow!?" ); + if ( !i_rNewActive ) + pDockingWindow->SetTitle( String( SdResId( STR_RIGHT_PANE_TITLE ) ) ); + else + { + size_t nNewActive( *i_rNewActive ); + for ( size_t i=0; i < m_aPanels.size(); ++i ) + { + if ( m_aPanels[i].bHidden ) + continue; + + if ( !nNewActive ) + { + pDockingWindow->SetTitle( m_aPanels[i].pPanel->GetDisplayName() ); + break; + } + --nNewActive; + } + } +} + +// --------------------------------------------------------------------------------------------------------------------- +void ToolPanelViewShell::Implementation::Dying() +{ } } } // end of namespace ::sd::toolpanel -- 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 - sd/source/ui/toolpanel/TitleBar.cxx | 39 ---- sd/source/ui/toolpanel/ToolPanel.cxx | 49 ++++- sd/source/ui/toolpanel/ToolPanelDeck.cxx | 15 +- sd/source/ui/toolpanel/ToolPanelDeck.hxx | 7 + sd/source/ui/toolpanel/ToolPanelDrawer.cxx | 214 +++++++++++++++++++ sd/source/ui/toolpanel/ToolPanelDrawer.hxx | 93 +++++++++ sd/source/ui/toolpanel/ToolPanelViewShell.cxx | 253 ++++++++++++++++------- sd/source/ui/toolpanel/makefile.mk | 1 + 11 files changed, 571 insertions(+), 124 deletions(-) create mode 100644 sd/source/ui/toolpanel/ToolPanelDrawer.cxx create mode 100644 sd/source/ui/toolpanel/ToolPanelDrawer.hxx (limited to 'sd') 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; diff --git a/sd/source/ui/toolpanel/TitleBar.cxx b/sd/source/ui/toolpanel/TitleBar.cxx index ebf17bef51cb..dd408ca0b6d8 100644 --- a/sd/source/ui/toolpanel/TitleBar.cxx +++ b/sd/source/ui/toolpanel/TitleBar.cxx @@ -80,9 +80,6 @@ TitleBar::TitleBar ( ::Window* pParent, const String& rsTitle, TitleBarType eTyp // Change the mouse pointer shape so that it acts as a mouse over effect. switch (meType) { - case TBT_WINDOW_TITLE: - break; - case TBT_CONTROL_TITLE: case TBT_SUB_CONTROL_HEADLINE: if (mbIsExpandable) @@ -173,10 +170,6 @@ void TitleBar::Paint (const Rectangle& rBoundingBox) switch (meType) { - case TBT_WINDOW_TITLE: - PaintWindowTitleBar (); - break; - case TBT_CONTROL_TITLE: PaintPanelControlTitle (); break; @@ -258,11 +251,6 @@ bool TitleBar::HasExpansionIndicator (void) const case TBT_SUB_CONTROL_HEADLINE: bHasExpansionIndicator = true; break; - - default: - case TBT_WINDOW_TITLE: - // bHasExpansionIndicator remains false - break; } } return bHasExpansionIndicator; @@ -309,11 +297,6 @@ Image TitleBar::GetExpansionIndicator (void) const aIndicator = IconCache::Instance().GetIcon(nResourceId); break; - - default: - case TBT_WINDOW_TITLE: - // aIndicator remains empty Image. - break; } } @@ -339,19 +322,6 @@ void TitleBar::PaintPanelControlTitle (void) -void TitleBar::PaintWindowTitleBar (void) -{ - Rectangle aTextBox (CalculateTextBoundingBox ( - GetOutputSizePixel().Width(), - true)); - - PaintText (aTextBox); - PaintFocusIndicator (aTextBox); -} - - - - void TitleBar::PaintSubPanelHeadLineBar (void) { int nWidth (GetOutputSizePixel().Width()); @@ -537,10 +507,6 @@ void TitleBar::PaintBackground (const Rectangle& rTitleBarBox) Point(rTitleBarBox.Right(), rTitleBarBox.Bottom())); } break; - - default: - case TBT_WINDOW_TITLE: - break; } } @@ -591,11 +557,6 @@ Rectangle TitleBar::CalculateTitleBarBox ( switch (meType) { - case TBT_WINDOW_TITLE: - aTitleBarBox.Bottom() += aTitleBarBox.Top(); - aTitleBarBox.Top() = 0; - break; - case TBT_CONTROL_TITLE: aTitleBarBox.Bottom() += aTitleBarBox.Top(); aTitleBarBox.Top() = 0; diff --git a/sd/source/ui/toolpanel/ToolPanel.cxx b/sd/source/ui/toolpanel/ToolPanel.cxx index d9fe0cb8ac65..7a8a8273d53a 100644 --- a/sd/source/ui/toolpanel/ToolPanel.cxx +++ b/sd/source/ui/toolpanel/ToolPanel.cxx @@ -38,6 +38,7 @@ #include "taskpane/TitledControl.hxx" #include "taskpane/ControlContainer.hxx" #include "TaskPaneViewShell.hxx" +#include "taskpane/ToolPanelViewShell.hxx" #include "taskpane/TaskPaneControlFactory.hxx" #include "AccessibleTaskPane.hxx" @@ -46,6 +47,7 @@ #include #include #include +#include namespace sd { namespace toolpanel { @@ -59,7 +61,23 @@ ToolPanel::ToolPanel ( TaskPaneViewShell& rViewShell) : Control (pParentWindow, WB_DIALOGCONTROL), TreeNode (NULL), - mrViewShell(rViewShell), + mpTaskPaneViewShell( &rViewShell ), + mpToolPanelViewShell( NULL ), + mbRearrangeActive(false) +{ + SetBackground (Wallpaper ()); +} + + + + +ToolPanel::ToolPanel ( + Window* pParentWindow, + ToolPanelViewShell& rViewShell) + : Control (pParentWindow, WB_DIALOGCONTROL), + TreeNode (NULL), + mpTaskPaneViewShell( NULL ), + mpToolPanelViewShell( &rViewShell ), mbRearrangeActive(false) { SetBackground (Wallpaper ()); @@ -128,6 +146,29 @@ sal_uInt32 ToolPanel::AddControl ( +Rectangle ToolPanel::GetActiveControlContentArea() const +{ + const Rectangle aAllRect( Point(), GetOutputSizePixel() ); + + const sal_uInt32 nActiveControlIndex( mpControlContainer->GetActiveControlIndex() ); + if ( nActiveControlIndex >= mpControlContainer->GetControlCount() ) + return aAllRect; + + TreeNode* pChild = mpControlContainer->GetControl( nActiveControlIndex ); + TitledControl* pTitledControl = dynamic_cast< TitledControl* >( pChild ); + ENSURE_OR_RETURN( pTitledControl, "invalid active child", aAllRect ); + + TreeNode* pActiveControl( pTitledControl->GetControl() ); + ENSURE_OR_RETURN( pActiveControl, "invalid active control", aAllRect ); + + return Rectangle( + ScreenToOutputPixel( pActiveControl->GetWindow()->OutputToScreenPixel( Point( 0, 0 ) ) ), + pActiveControl->GetWindow()->GetOutputSizePixel() + ); +} + + + void ToolPanel::ListHasChanged (void) { mpControlContainer->ListHasChanged (); @@ -271,7 +312,11 @@ bool ToolPanel::IsResizable (void) TaskPaneShellManager* ToolPanel::GetShellManager (void) { - return &mrViewShell.GetSubShellManager(); + if ( mpTaskPaneViewShell != NULL ) + return &mpTaskPaneViewShell->GetSubShellManager(); + if ( mpToolPanelViewShell != NULL ) + return &mpToolPanelViewShell->GetSubShellManager(); + return TreeNode::GetShellManager(); } diff --git a/sd/source/ui/toolpanel/ToolPanelDeck.cxx b/sd/source/ui/toolpanel/ToolPanelDeck.cxx index e32b2960dacf..b437dffbf1d0 100644 --- a/sd/source/ui/toolpanel/ToolPanelDeck.cxx +++ b/sd/source/ui/toolpanel/ToolPanelDeck.cxx @@ -28,6 +28,7 @@ #include "ToolPanelDeck.hxx" #include "taskpane/ToolPanelViewShell.hxx" +#include "ToolPanelDrawer.hxx" #include "taskpane/ControlContainer.hxx" #include "framework/FrameworkHelper.hxx" #include "TaskPaneToolPanel.hxx" @@ -69,7 +70,7 @@ namespace sd { namespace toolpanel :ToolPanelDeck_Base( i_rParent, 0 ) ,m_rViewShell( i_rViewShell ) { - SetTabsLayout( ::svt::TABS_RIGHT, ::svt::TABITEM_IMAGE_ONLY ); + SetDrawersLayout(); } //------------------------------------------------------------------------------------------------------------------ @@ -77,6 +78,17 @@ namespace sd { namespace toolpanel { } + //------------------------------------------------------------------------------------------------------------------ + void ToolPanelDeck::SetDrawersLayout() + { + const ::svt::PDeckLayouter pLayouter( GetLayouter() ); + const ToolPanelDrawer* pDrawerLayouter = dynamic_cast< const ToolPanelDrawer* >( pLayouter.get() ); + if ( pDrawerLayouter != NULL ) + // already have the proper layout + return; + SetLayouter( new ToolPanelDrawer( *this, *this ) ); + } + //------------------------------------------------------------------------------------------------------------------ void ToolPanelDeck::SetTabsLayout( const ::svt::TabAlignment i_eTabAlignment, const ::svt::TabItemContent i_eTabContent ) { @@ -86,6 +98,7 @@ namespace sd { namespace toolpanel && ( pTabLayouter->GetTabAlignment() == i_eTabAlignment ) && ( pTabLayouter->GetTabItemContent() == i_eTabContent ) ) + // already have the requested layout return; if ( pTabLayouter && ( pTabLayouter->GetTabAlignment() == i_eTabAlignment ) ) diff --git a/sd/source/ui/toolpanel/ToolPanelDeck.hxx b/sd/source/ui/toolpanel/ToolPanelDeck.hxx index 845f391e298d..a9dc1a239144 100644 --- a/sd/source/ui/toolpanel/ToolPanelDeck.hxx +++ b/sd/source/ui/toolpanel/ToolPanelDeck.hxx @@ -67,8 +67,15 @@ namespace sd { namespace toolpanel const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::framework::XResourceId >& i_rPanelResourceId ); + /** activates a layout where the active panel is selected via tabs at the right/left/top/bottom (depending on + the given TabAlignment value). + */ void SetTabsLayout( const ::svt::TabAlignment i_eTabAlignment, const ::svt::TabItemContent i_eTabContent ); + /** activates the "classical" layout with the panels being represneted by stacked drawers + */ + void SetDrawersLayout(); + /** directly activates the given panel, without re-routing the activation request through the drawing framework's configuration controller. */ diff --git a/sd/source/ui/toolpanel/ToolPanelDrawer.cxx b/sd/source/ui/toolpanel/ToolPanelDrawer.cxx new file mode 100644 index 000000000000..b8e8002e215b --- /dev/null +++ b/sd/source/ui/toolpanel/ToolPanelDrawer.cxx @@ -0,0 +1,214 @@ +/************************************************************************* + * 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. + * +************************************************************************/ + +#include "precompiled_sd.hxx" + +#include "ToolPanelDrawer.hxx" +#include "taskpane/ToolPanel.hxx" +#include "taskpane/TitleBar.hxx" + +#include + +//...................................................................................................................... +namespace sd { namespace toolpanel +{ +//...................................................................................................................... + + //================================================================================================================== + //= ToolPanelDrawer + //================================================================================================================== + //------------------------------------------------------------------------------------------------------------------ + ToolPanelDrawer::ToolPanelDrawer( ::Window& i_rParentWindow, ::svt::IToolPanelDeck& i_rPanels ) + :m_rParentWindow( i_rParentWindow ) + ,m_rPanelDeck( i_rPanels ) + ,m_aDrawers() + { + m_rPanelDeck.AddListener( *this ); + + // simulate PanelInserted events for the panels which are already there + for ( size_t i=0; i aActivePanel( m_rPanelDeck.GetActivePanel() ); + + // arrange the title bars which are *above* the active panel (or *all* if there is no active panel), plus + // the title bar of the active panel itself + Point aUpperDrawerPos( i_rDeckPlayground.TopLeft() ); + const size_t nUpperBound = !!aActivePanel ? *aActivePanel : nPanelCount - 1; + for ( size_t i=0; i<=nUpperBound; ++i ) + { + sal_uInt32 nDrawerHeight = m_aDrawers[i]->GetPreferredHeight( nWidth ); + m_aDrawers[i]->GetWindow()->SetPosSizePixel( + aUpperDrawerPos, Size( nWidth, nDrawerHeight ) ); + aUpperDrawerPos.Move( 0, nDrawerHeight ); + } + + // arrange title bars which are below the active panel (or *none* if there is no active panel) + Point aLowerDrawerPos( i_rDeckPlayground.BottomLeft() ); + for ( size_t j = nPanelCount - 1; j > nUpperBound; --j ) + { + sal_uInt32 nDrawerHeight = m_aDrawers[j]->GetPreferredHeight( nWidth ); + m_aDrawers[j]->GetWindow()->SetPosSizePixel( + Point( aLowerDrawerPos.X(), aLowerDrawerPos.Y() - nDrawerHeight + 1 ), + Size( nWidth, nDrawerHeight ) + ); + aLowerDrawerPos.Move( 0, -nDrawerHeight ); + } + + // fincally calculate the rectangle for the active panel + return Rectangle( + aUpperDrawerPos, + Size( nWidth, aLowerDrawerPos.Y() - aUpperDrawerPos.Y() + 1 ) + ); + } + + //------------------------------------------------------------------------------------------------------------------ + void ToolPanelDrawer::Destroy() + { + while ( !m_aDrawers.empty() ) + impl_removeTitleBar( 0 ); + m_rPanelDeck.RemoveListener( *this ); + } + + //------------------------------------------------------------------------------------------------------------------ + void ToolPanelDrawer::SetFocusToPanelSelector() + { + // TODO + } + + //------------------------------------------------------------------------------------------------------------------ + void ToolPanelDrawer::PanelInserted( const ::svt::PToolPanel& i_pPanel, const size_t i_nPosition ) + { + OSL_PRECOND( i_nPosition <= m_aDrawers.size(), "ToolPanelDrawer::PanelInserted: inconsistency!" ); + + ::boost::shared_ptr< TitleBar > pTitleBar( new TitleBar( &m_rParentWindow, i_pPanel->GetDisplayName(), TitleBar::TBT_CONTROL_TITLE, true ) ); + pTitleBar->GetWindow()->Show(); + pTitleBar->GetWindow()->AddEventListener( LINK( this, ToolPanelDrawer, OnWindowEvent ) ); + m_aDrawers.insert( m_aDrawers.begin() + i_nPosition, pTitleBar ); + } + + //------------------------------------------------------------------------------------------------------------------ + void ToolPanelDrawer::PanelRemoved( const size_t i_nPosition ) + { + impl_removeTitleBar( i_nPosition ); + impl_triggerRearrange(); + } + + //------------------------------------------------------------------------------------------------------------------ + void ToolPanelDrawer::impl_triggerRearrange() const + { + // this is somewhat hacky, it assumes that the parent of our panels is a tool panel deck, which, in its + // Resize implementation, rearrances all elements. + m_rParentWindow.Resize(); + } + + //------------------------------------------------------------------------------------------------------------------ + void ToolPanelDrawer::ActivePanelChanged( const ::boost::optional< size_t >& i_rOldActive, const ::boost::optional< size_t >& i_rNewActive ) + { + impl_triggerRearrange(); + + if ( !!i_rOldActive ) + { + OSL_ENSURE( *i_rOldActive < m_aDrawers.size(), "ToolPanelDrawer::ActivePanelChanged: illegal old index!" ); + m_aDrawers[ *i_rOldActive ]->Expand( false ); + } + + if ( !!i_rNewActive ) + { + OSL_ENSURE( *i_rNewActive < m_aDrawers.size(), "ToolPanelDrawer::ActivePanelChanged: illegal new index!" ); + m_aDrawers[ *i_rNewActive ]->Expand( true ); + } + } + + //------------------------------------------------------------------------------------------------------------------ + size_t ToolPanelDrawer::impl_getPanelPositionFromWindow( const Window* i_pTitleBarWindow ) const + { + for ( ::std::vector< PTitleBar >::const_iterator drawerPos = m_aDrawers.begin(); + drawerPos != m_aDrawers.end(); + ++drawerPos + ) + { + if ( (*drawerPos)->GetWindow() == i_pTitleBarWindow ) + return drawerPos - m_aDrawers.begin(); + } + return m_aDrawers.size(); + } + + //------------------------------------------------------------------------------------------------------------------ + void ToolPanelDrawer::impl_removeTitleBar( const size_t i_nPosition ) + { + OSL_PRECOND( i_nPosition < m_aDrawers.size(), "ToolPanelDrawer::impl_removeTitleBar: invalid panel position!" ); + m_aDrawers[ i_nPosition ]->GetWindow()->RemoveEventListener( LINK( this, ToolPanelDrawer, OnWindowEvent ) ); + OSL_ENSURE( m_aDrawers[ i_nPosition ].unique(), "ToolPanelDrawer::impl_removeTitleBar: somebody else is still holding a reference!" ); + m_aDrawers.erase( m_aDrawers.begin() + i_nPosition ); + } + + //------------------------------------------------------------------------------------------------------------------ + IMPL_LINK( ToolPanelDrawer, OnWindowEvent, VclSimpleEvent*, i_pEvent ) + { + const VclWindowEvent* pWindowEvent = PTR_CAST( VclWindowEvent, i_pEvent ); + if ( !pWindowEvent ) + return 0L; + + switch ( pWindowEvent->GetId() ) + { + case VCLEVENT_WINDOW_MOUSEBUTTONUP: + { + const size_t nPanelPos = impl_getPanelPositionFromWindow( pWindowEvent->GetWindow() ); + m_rPanelDeck.ActivatePanel( nPanelPos ); + return 1L; + } + break; + } + return 0L; + } + + //------------------------------------------------------------------------------------------------------------------ + void ToolPanelDrawer::Dying() + { + Destroy(); + } + +//...................................................................................................................... +} } // namespace sd::toolpanel +//...................................................................................................................... diff --git a/sd/source/ui/toolpanel/ToolPanelDrawer.hxx b/sd/source/ui/toolpanel/ToolPanelDrawer.hxx new file mode 100644 index 000000000000..7972255b3a56 --- /dev/null +++ b/sd/source/ui/toolpanel/ToolPanelDrawer.hxx @@ -0,0 +1,93 @@ +/************************************************************************* + * 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_TOOLPANEL_TOOLPANELDRAWER_HXX +#define SD_TOOLPANEL_TOOLPANELDRAWER_HXX + +#include +#include +#include + +#include + +//...................................................................................................................... +namespace sd { namespace toolpanel +{ +//...................................................................................................................... + + class ToolPanelViewShell; + class TitleBar; + typedef ::boost::shared_ptr< TitleBar > PTitleBar; + + //================================================================================================================== + //= ToolPanelDrawer + //================================================================================================================== + /** a class which implements a tool panel selector in the form of the classical drawers + */ + class ToolPanelDrawer :public ::svt::RefBase + ,public ::svt::IDeckLayouter + ,public ::svt::IToolPanelDeckListener + { + public: + ToolPanelDrawer( + ::Window& i_rParentWindow, + ::svt::IToolPanelDeck& i_rPanels + ); + ~ToolPanelDrawer(); + + // IReference + DECLARE_IREFERENCE() + + // IDeckLayouter + virtual Rectangle Layout( const Rectangle& i_rDeckPlayground ); + virtual void Destroy(); + virtual void SetFocusToPanelSelector(); + + // IToolPanelDeckListener + virtual void PanelInserted( const ::svt::PToolPanel& i_pPanel, const size_t i_nPosition ); + virtual void PanelRemoved( const size_t i_nPosition ); + virtual void ActivePanelChanged( const ::boost::optional< size_t >& i_rOldActive, const ::boost::optional< size_t >& i_rNewActive ); + virtual void Dying(); + + private: + // triggers a re-arrance of the panel deck elements + void impl_triggerRearrange() const; + size_t impl_getPanelPositionFromWindow( const Window* i_pTitleBarWindow ) const; + void impl_removeTitleBar( const size_t i_nPosition ); + + DECL_LINK( OnWindowEvent, VclSimpleEvent* ); + +private: + Window& m_rParentWindow; + ::svt::IToolPanelDeck& m_rPanelDeck; + ::std::vector< PTitleBar > m_aDrawers; + }; + +//...................................................................................................................... +} } // namespace sd::toolpanel +//...................................................................................................................... + +#endif // SD_TOOLPANEL_TOOLPANELDRAWER_HXX diff --git a/sd/source/ui/toolpanel/ToolPanelViewShell.cxx b/sd/source/ui/toolpanel/ToolPanelViewShell.cxx index 293c55dd93fb..cb85c9d49fdf 100644 --- a/sd/source/ui/toolpanel/ToolPanelViewShell.cxx +++ b/sd/source/ui/toolpanel/ToolPanelViewShell.cxx @@ -131,6 +131,18 @@ struct PanelDescriptor } }; +// ===================================================================================================================== +// = PanelSelectorLayout +// ===================================================================================================================== +enum PanelSelectorLayout +{ + LAYOUT_DRAWERS, + LAYOUT_TABS_RIGHT, + LAYOUT_TABS_LEFT, + LAYOUT_TABS_TOP, + LAYOUT_TABS_BOTTOM +}; + // ===================================================================================================================== // = ToolPanelViewShell::Implementation - declaration // ===================================================================================================================== @@ -141,16 +153,34 @@ class ToolPanelViewShell::Implementation : public ::svt::IToolPanelDeckListener public: static const size_t mnInvalidId = static_cast< size_t >( -1 ); - Implementation( ToolPanelViewShell& i_rPanelViewShell ); + Implementation( ToolPanelViewShell& i_rPanelViewShell, ::Window& i_rPanelDeckParent ); ~Implementation(); /** Here the panels are created that are shown in the task pane. */ - void Setup( ToolPanelViewShell& i_rViewShell, ToolPanelDeck& i_rPanelDeck ); + void Setup(); + /** clean up the instance */ - void Cleanup( ToolPanelDeck& i_rPanelDeck ); + void Cleanup(); + + /** sets the given layout for the panel selector + */ + void SetLayout( const PanelSelectorLayout i_eLayout, const bool i_bForce = false ); + /** returns the current layout + */ + PanelSelectorLayout + GetLayout() const { return m_eCurrentLayout; } + + /** provides access to the the VCL window of the panel deck + */ + ::Window& GetPanelDeck() { return *m_pPanelDeck.get(); } + const ::Window& GetPanelDeck() const { return *m_pPanelDeck.get(); } + + /** returns the logical number of panels. This is greater than or equal to the number of panels displayed in the + panel deck + */ size_t GetPanelCount() const { return size_t( PID__END ); @@ -161,17 +191,17 @@ public: return m_aPanels[ i_nLogicalPanelIndex ]; } - void TogglePanelVisibility( const size_t i_nLogicalPanelIndex, ToolPanelDeck& i_rPanelDeck ); + void TogglePanelVisibility( const size_t i_nLogicalPanelIndex ); /** ensures the panel with the given ID is visible, and directly activates it, bypassing the configuration controller */ - void ActivatePanelDirectly( const PanelId i_nPanelId, ToolPanelDeck& i_rPanelDeck ); + void ActivatePanelDirectly( const PanelId i_nPanelId ); /** de-activates the panel given by ID, bypassing the configuration controller If the panel is not active currently, nothing happens. */ - void DeactivatePanelDirectly( const PanelId i_nPanelId, ToolPanelDeck& i_rPanelDeck ); + void DeactivatePanelDirectly( const PanelId i_nPanelId ); protected: // IToolPanelDeckListener overridables @@ -182,10 +212,13 @@ protected: private: void RegisterPanel( size_t i_nPosition, PanelId i_nPanelId, const ::svt::PToolPanel& i_rPanel ); + void UpdateDockingWindowTitle(); typedef ::std::vector< PanelDescriptor > PanelDescriptors; - PanelDescriptors m_aPanels; - ToolPanelViewShell& m_rPanelViewShell; + PanelDescriptors m_aPanels; + ToolPanelViewShell& m_rPanelViewShell; + ::boost::scoped_ptr< ToolPanelDeck > m_pPanelDeck; + PanelSelectorLayout m_eCurrentLayout; }; // ===================================================================================================================== @@ -197,7 +230,9 @@ namespace { enum MenuId { MID_UNLOCK_TASK_PANEL = 1, MID_LOCK_TASK_PANEL = 2, - MID_FIRST_PANEL = 3 + MID_LAYOUT_TABS = 3, + MID_LAYOUT_DRAWERS = 4, + MID_FIRST_PANEL = 5 }; } // end of anonymouse namespace @@ -214,7 +249,7 @@ SFX_IMPL_INTERFACE(ToolPanelViewShell, SfxShell, SdResId(STR_TASKPANEVIEWSHELL)) TYPEINIT1(ToolPanelViewShell, ViewShell); // --------------------------------------------------------------------------------------------------------------------- -void ToolPanelViewShell::Implementation::Setup( ToolPanelViewShell& i_rViewShell, ToolPanelDeck& i_rPanelDeck ) +void ToolPanelViewShell::Implementation::Setup() { typedef std::auto_ptr (*ControlFactoryFactory)( ToolPanelViewShell& i_rToolPanelShell ); @@ -272,7 +307,7 @@ void ToolPanelViewShell::Implementation::Setup( ToolPanelViewShell& i_rViewShell }; // compose the resource ID for the ToolPanel view - ::boost::shared_ptr< FrameworkHelper > pFrameworkHelper( FrameworkHelper::Instance( i_rViewShell.GetViewShellBase() ) ); + ::boost::shared_ptr< FrameworkHelper > pFrameworkHelper( FrameworkHelper::Instance( m_rPanelViewShell.GetViewShellBase() ) ); const Reference< XResourceId > xToolPanelId( pFrameworkHelper->CreateResourceId( FrameworkHelper::msToolPanelViewURL, FrameworkHelper::msToolPanelPaneURL ) ); // want to activate the "Layout" panel later on, need to translate its PanelId to an actual position @@ -280,8 +315,8 @@ void ToolPanelViewShell::Implementation::Setup( ToolPanelViewShell& i_rViewShell size_t nPanelPosToActivate = size_t( -1 ); // create the panels - Reference< XFrame > xFrame( i_rViewShell.GetViewShellBase().GetViewFrame()->GetFrame()->GetFrameInterface() ); - const BOOL bHiContrast( i_rPanelDeck.GetSettings().GetStyleSettings().GetHighContrastMode() ); + Reference< XFrame > xFrame( m_rPanelViewShell.GetViewShellBase().GetViewFrame()->GetFrame()->GetFrameInterface() ); + const BOOL bHiContrast( m_pPanelDeck->GetSettings().GetStyleSettings().GetHighContrastMode() ); for ( size_t i=0; i < sizeof( aPanels ) / sizeof( aPanels[0] ); ++i ) { // compose the command name, and obtain the image for it @@ -294,8 +329,8 @@ void ToolPanelViewShell::Implementation::Setup( ToolPanelViewShell& i_rViewShell const Reference< XResourceId > xPanelId( pFrameworkHelper->CreateResourceId( aPanels[i].sResourceURL, xToolPanelId ) ); // create and insert the panel - size_t nPanelPos = i_rPanelDeck.CreateAndInsertPanel( - (*aPanels[i].pFactory)( i_rViewShell ), + size_t nPanelPos = m_pPanelDeck->CreateAndInsertPanel( + (*aPanels[i].pFactory)( m_rPanelViewShell ), aPanelImage, aPanels[i].nTitleResourceID, aPanels[i].nHelpID, @@ -303,23 +338,57 @@ void ToolPanelViewShell::Implementation::Setup( ToolPanelViewShell& i_rViewShell ); // remember it - RegisterPanel( nPanelPos, aPanels[i].nPanelID, i_rPanelDeck.GetPanel( nPanelPos ) ); + RegisterPanel( nPanelPos, aPanels[i].nPanelID, m_pPanelDeck->GetPanel( nPanelPos ) ); if ( nPanelIdToActivate == aPanels[i].nPanelID ) nPanelPosToActivate = nPanelPos; } // activate default panel - i_rPanelDeck.ActivatePanelResource( nPanelPosToActivate ); + m_pPanelDeck->ActivatePanelResource( nPanelPosToActivate ); // add as listener to the panel deck - i_rPanelDeck.AddListener( *this ); + m_pPanelDeck->AddListener( *this ); + + // initialize panel selector + SetLayout( LAYOUT_DRAWERS, true ); + + m_pPanelDeck->Show(); +} + +// --------------------------------------------------------------------------------------------------------------------- +void ToolPanelViewShell::Implementation::SetLayout( const PanelSelectorLayout i_eLayout, const bool i_bForce ) +{ + if ( !i_bForce && ( m_eCurrentLayout == i_eLayout ) ) + return; + + switch ( i_eLayout ) + { + case LAYOUT_DRAWERS: + m_pPanelDeck->SetDrawersLayout(); + break; + case LAYOUT_TABS_TOP: + m_pPanelDeck->SetTabsLayout( ::svt::TABS_TOP, ::svt::TABITEM_IMAGE_ONLY ); + break; + case LAYOUT_TABS_BOTTOM: + m_pPanelDeck->SetTabsLayout( ::svt::TABS_BOTTOM, ::svt::TABITEM_IMAGE_ONLY ); + break; + case LAYOUT_TABS_LEFT: + m_pPanelDeck->SetTabsLayout( ::svt::TABS_LEFT, ::svt::TABITEM_IMAGE_ONLY ); + break; + case LAYOUT_TABS_RIGHT: + m_pPanelDeck->SetTabsLayout( ::svt::TABS_RIGHT, ::svt::TABITEM_IMAGE_ONLY ); + break; + } + m_eCurrentLayout = i_eLayout; + UpdateDockingWindowTitle(); } // --------------------------------------------------------------------------------------------------------------------- -void ToolPanelViewShell::Implementation::Cleanup( ToolPanelDeck& i_rPanelDeck ) +void ToolPanelViewShell::Implementation::Cleanup() { - i_rPanelDeck.RemoveListener( *this ); + m_pPanelDeck->RemoveListener( *this ); + m_pPanelDeck.reset(); } // --------------------------------------------------------------------------------------------------------------------- @@ -328,8 +397,7 @@ void ToolPanelViewShell::Initialize() if ( !mbIsInitialized ) { mbIsInitialized = true; - mpImpl->Setup( *this, *mpPanelDeck ); - mpPanelDeck->Show(); + mpImpl->Setup(); } } @@ -337,8 +405,7 @@ void ToolPanelViewShell::Initialize() ToolPanelViewShell::ToolPanelViewShell( SfxViewFrame* pFrame, ViewShellBase& rViewShellBase, ::Window* pParentWindow, FrameView* pFrameViewArgument ) :ViewShell(pFrame, pParentWindow, rViewShellBase) - ,mpImpl( new Implementation( *this ) ) - ,mpPanelDeck( new ToolPanelDeck( *mpContentWindow.get(), *this ) ) + ,mpImpl( new Implementation( *this, *mpContentWindow.get() ) ) ,mbIsInitialized(false) ,mpSubShellManager() ,mnMenuId(0) @@ -397,13 +464,12 @@ ToolPanelViewShell::~ToolPanelViewShell() { if ( mbIsInitialized ) { - mpImpl->Cleanup( *mpPanelDeck ); + mpImpl->Cleanup(); } // reset our impl before destroying the panel deck, to ensure the hidden panels are properly // disposed/destroyed, too mpImpl.reset(); - mpPanelDeck.reset(); GetViewShellBase().GetViewShellManager()->RemoveSubShellFactory(this, mpSubShellManager); } @@ -423,7 +489,7 @@ void ToolPanelViewShell::ArrangeGUIElements() Initialize(); - mpPanelDeck->SetPosSizePixel( Point(), maViewSize ); + mpImpl->GetPanelDeck().SetPosSizePixel( Point(), maViewSize ); } // --------------------------------------------------------------------------------------------------------------------- @@ -444,36 +510,41 @@ void ToolPanelViewShell::KeyInput( const KeyEvent& i_rKeyEvent ) const KeyCode nCode = i_rKeyEvent.GetKeyCode(); if ( nCode == KEY_RETURN ) { - if ( !mpPanelDeck->HasChildPathFocus() ) - mpPanelDeck->GrabFocus(); + if ( !mpImpl->GetPanelDeck().HasChildPathFocus() ) + mpImpl->GetPanelDeck().GrabFocus(); } else ViewShell::KeyInput( i_rKeyEvent, NULL ); } // --------------------------------------------------------------------------------------------------------------------- -IMPL_LINK( ToolPanelViewShell, DockingChanged, PaneDockingWindow*, i_pDockingWindow ) +namespace { - ENSURE_OR_RETURN( i_pDockingWindow == dynamic_cast< PaneDockingWindow* >( GetDockingWindow() ), "unknown source", 0 ); - switch ( i_pDockingWindow->GetAlignment() ) + PanelSelectorLayout lcl_getTabLayoutFromAlignment( const SfxChildAlignment i_eAlignment ) { - case SFX_ALIGN_LEFT: - mpPanelDeck->SetTabsLayout( ::svt::TABS_LEFT, ::svt::TABITEM_IMAGE_ONLY ); - break; - case SFX_ALIGN_RIGHT: - case SFX_ALIGN_NOALIGNMENT: - mpPanelDeck->SetTabsLayout( ::svt::TABS_RIGHT, ::svt::TABITEM_IMAGE_ONLY ); - break; - case SFX_ALIGN_TOP: - mpPanelDeck->SetTabsLayout( ::svt::TABS_TOP, ::svt::TABITEM_IMAGE_ONLY ); - break; - case SFX_ALIGN_BOTTOM: - mpPanelDeck->SetTabsLayout( ::svt::TABS_BOTTOM, ::svt::TABITEM_IMAGE_ONLY ); - break; - default: - OSL_ENSURE( false, "ToolPanelViewShell::DockingChanged: unexpected alignment!" ); - break; + switch ( i_eAlignment ) + { + case SFX_ALIGN_LEFT: + return LAYOUT_TABS_LEFT; + case SFX_ALIGN_TOP: + return LAYOUT_TABS_TOP; + case SFX_ALIGN_BOTTOM: + return LAYOUT_TABS_BOTTOM; + default: + return LAYOUT_TABS_RIGHT; + } } +} + +// --------------------------------------------------------------------------------------------------------------------- +IMPL_LINK( ToolPanelViewShell, DockingChanged, PaneDockingWindow*, i_pDockingWindow ) +{ + ENSURE_OR_RETURN( i_pDockingWindow == dynamic_cast< PaneDockingWindow* >( GetDockingWindow() ), "unknown source", 0 ); + + if ( mpImpl->GetLayout() == LAYOUT_DRAWERS ) + return 0L; + + mpImpl->SetLayout( lcl_getTabLayoutFromAlignment( i_pDockingWindow->GetAlignment() ) ); return 0L; } @@ -523,10 +594,23 @@ IMPL_LINK(ToolPanelViewShell, MenuSelectHandler, Menu*, pMenu) } break; + case MID_LAYOUT_DRAWERS: + mpImpl->SetLayout( LAYOUT_DRAWERS ); + break; + + case MID_LAYOUT_TABS: + { + PaneDockingWindow* pDockingWindow = dynamic_cast< PaneDockingWindow* >( GetDockingWindow() ); + OSL_ENSURE( pDockingWindow != NULL, "ToolPanelViewShell::MenuSelectHandler: unknown docking window type!" ); + if ( pDockingWindow ) + mpImpl->SetLayout( lcl_getTabLayoutFromAlignment( pDockingWindow->GetAlignment() ) ); + } + break; + default: { size_t nPanelIndex = size_t( pMenu->GetCurItemId() - MID_FIRST_PANEL ); - mpImpl->TogglePanelVisibility( nPanelIndex, *mpPanelDeck ); + mpImpl->TogglePanelVisibility( nPanelIndex ); } break; } @@ -558,7 +642,16 @@ IMPL_LINK(ToolPanelViewShell, MenuSelectHandler, Menu*, pMenu) pMenu->SetUserValue( nIndex, rPanelDesc.nId ); pMenu->CheckItem( nIndex, !rPanelDesc.bHidden ); } - pMenu->InsertSeparator (); + pMenu->InsertSeparator(); + +#if OSL_DEBUG_LEVEL > 0 + pMenu->InsertItem( MID_LAYOUT_TABS, String::CreateFromAscii( "Tab-Layout" ), MIB_CHECKABLE ); + pMenu->CheckItem( MID_LAYOUT_TABS, mpImpl->GetLayout() != LAYOUT_DRAWERS ); + pMenu->InsertItem( MID_LAYOUT_DRAWERS, String::CreateFromAscii( "Drawer-Layout" ), MIB_CHECKABLE ); + pMenu->CheckItem( MID_LAYOUT_DRAWERS, mpImpl->GetLayout() == LAYOUT_DRAWERS ); + + pMenu->InsertSeparator(); +#endif // Add entry for docking or un-docking the tool panel. if (bIsDocking) @@ -569,6 +662,7 @@ IMPL_LINK(ToolPanelViewShell, MenuSelectHandler, Menu*, pMenu) pMenu->InsertItem ( MID_LOCK_TASK_PANEL, String(SdResId(STR_TASKPANEL_MASTER_PAGE_MENU_LOCK))); + pMenu->RemoveDisabledEntries (FALSE, FALSE); return pMenu; @@ -663,15 +757,15 @@ void ToolPanelViewShell::ConnectToDockingWindow() // Tell the focus manager that we want to pass the focus to our // child. - FocusManager::Instance().RegisterDownLink( GetParentWindow(), mpPanelDeck.get() ); + FocusManager::Instance().RegisterDownLink( GetParentWindow(), &mpImpl->GetPanelDeck() ); } // --------------------------------------------------------------------------------------------------------------------- bool ToolPanelViewShell::RelocateToParentWindow( ::Window* pParentWindow ) { ::Window* pOldParentWindow = GetParentWindow(); - FocusManager::Instance().RemoveLinks( pOldParentWindow, mpPanelDeck.get() ); - FocusManager::Instance().RemoveLinks( mpPanelDeck.get(), pOldParentWindow ); + FocusManager::Instance().RemoveLinks( pOldParentWindow, &mpImpl->GetPanelDeck() ); + FocusManager::Instance().RemoveLinks( &mpImpl->GetPanelDeck(), pOldParentWindow ); PaneDockingWindow* pDockingWindow = dynamic_cast< PaneDockingWindow* >( GetDockingWindow() ); if ( pDockingWindow != NULL ) @@ -691,13 +785,13 @@ bool ToolPanelViewShell::RelocateToParentWindow( ::Window* pParentWindow ) // --------------------------------------------------------------------------------------------------------------------- void ToolPanelViewShell::DeactivatePanel( const PanelId i_ePanelId ) { - mpImpl->DeactivatePanelDirectly( i_ePanelId, *mpPanelDeck ); + mpImpl->DeactivatePanelDirectly( i_ePanelId ); } // --------------------------------------------------------------------------------------------------------------------- void ToolPanelViewShell::ActivatePanel( const PanelId i_ePanelId ) { - mpImpl->ActivatePanelDirectly( i_ePanelId, *mpPanelDeck ); + mpImpl->ActivatePanelDirectly( i_ePanelId ); } @@ -705,9 +799,11 @@ void ToolPanelViewShell::ActivatePanel( const PanelId i_ePanelId ) // = ToolPanelViewShell:Implementation - implementation // ===================================================================================================================== // --------------------------------------------------------------------------------------------------------------------- -ToolPanelViewShell::Implementation::Implementation( ToolPanelViewShell& i_rPanelViewShell ) +ToolPanelViewShell::Implementation::Implementation( ToolPanelViewShell& i_rPanelViewShell, ::Window& i_rPanelDeckParent ) :m_aPanels( PanelDescriptors::size_type( PID__END ) ) ,m_rPanelViewShell( i_rPanelViewShell ) + ,m_pPanelDeck( new ToolPanelDeck( i_rPanelDeckParent, i_rPanelViewShell ) ) + ,m_eCurrentLayout( LAYOUT_DRAWERS ) { } @@ -717,7 +813,7 @@ ToolPanelViewShell::Implementation::~Implementation() } // --------------------------------------------------------------------------------------------------------------------- -void ToolPanelViewShell::Implementation::TogglePanelVisibility( const size_t i_nLogicalPanelIndex, ToolPanelDeck& i_rPanelDeck ) +void ToolPanelViewShell::Implementation::TogglePanelVisibility( const size_t i_nLogicalPanelIndex ) { ENSURE_OR_RETURN_VOID( i_nLogicalPanelIndex < m_aPanels.size(), "illegal index" ); @@ -730,35 +826,35 @@ void ToolPanelViewShell::Implementation::TogglePanelVisibility( const size_t i_n } if ( m_aPanels[ i_nLogicalPanelIndex ].bHidden ) { - OSL_VERIFY( i_rPanelDeck.InsertPanel( m_aPanels[ i_nLogicalPanelIndex ].pPanel, nActualPanelIndex ) == nActualPanelIndex ); + OSL_VERIFY( m_pPanelDeck->InsertPanel( m_aPanels[ i_nLogicalPanelIndex ].pPanel, nActualPanelIndex ) == nActualPanelIndex ); // if there has not been an active panel before, activate the newly inserted one - ::boost::optional< size_t > aActivePanel( i_rPanelDeck.GetActivePanel() ); + ::boost::optional< size_t > aActivePanel( m_pPanelDeck->GetActivePanel() ); if ( !aActivePanel ) - i_rPanelDeck.ActivatePanelResource( nActualPanelIndex ); + m_pPanelDeck->ActivatePanelResource( nActualPanelIndex ); } else { - OSL_VERIFY( i_rPanelDeck.RemovePanel( nActualPanelIndex ).get() == m_aPanels[ i_nLogicalPanelIndex ].pPanel.get() ); + OSL_VERIFY( m_pPanelDeck->RemovePanel( nActualPanelIndex ).get() == m_aPanels[ i_nLogicalPanelIndex ].pPanel.get() ); } m_aPanels[ i_nLogicalPanelIndex ].bHidden = !m_aPanels[ i_nLogicalPanelIndex ].bHidden; } // --------------------------------------------------------------------------------------------------------------------- -void ToolPanelViewShell::Implementation::DeactivatePanelDirectly( const PanelId i_nPanelId, ToolPanelDeck& i_rPanelDeck ) +void ToolPanelViewShell::Implementation::DeactivatePanelDirectly( const PanelId i_nPanelId ) { for ( size_t i=0; i() ); + if ( m_pPanelDeck->GetActivePanel() == i ) + m_pPanelDeck->ActivatePanelDirectly( ::boost::optional< size_t >() ); return; } } } // --------------------------------------------------------------------------------------------------------------------- -void ToolPanelViewShell::Implementation::ActivatePanelDirectly( const PanelId i_nPanelId, ToolPanelDeck& i_rPanelDeck ) +void ToolPanelViewShell::Implementation::ActivatePanelDirectly( const PanelId i_nPanelId ) { size_t nActualPanelIndex(0); for ( size_t i=0; iActivatePanelDirectly( nActualPanelIndex ); return; } if ( !m_aPanels[i].bHidden ) @@ -798,16 +894,17 @@ void ToolPanelViewShell::Implementation::PanelRemoved( const size_t i_nPosition } // --------------------------------------------------------------------------------------------------------------------- -void ToolPanelViewShell::Implementation::ActivePanelChanged( const ::boost::optional< size_t >& i_rOldActive, const ::boost::optional< size_t >& i_rNewActive ) +void ToolPanelViewShell::Implementation::UpdateDockingWindowTitle() { - (void)i_rOldActive; PaneDockingWindow* pDockingWindow = dynamic_cast< PaneDockingWindow* >( m_rPanelViewShell.GetDockingWindow() ); - ENSURE_OR_RETURN_VOID( pDockingWindow, "ToolPanelViewShell::Implementation::ActivePanelChanged: no PaneDockingWindow!?" ); - if ( !i_rNewActive ) + ENSURE_OR_RETURN_VOID( pDockingWindow, "ToolPanelViewShell::Implementation::UpdateDockingWindowTitle: no PaneDockingWindow!?" ); + + ::boost::optional< size_t > aActivePanel( m_pPanelDeck->GetActivePanel() ); + if ( !aActivePanel || ( GetLayout() == LAYOUT_DRAWERS ) ) pDockingWindow->SetTitle( String( SdResId( STR_RIGHT_PANE_TITLE ) ) ); else { - size_t nNewActive( *i_rNewActive ); + size_t nNewActive( *aActivePanel ); for ( size_t i=0; i < m_aPanels.size(); ++i ) { if ( m_aPanels[i].bHidden ) @@ -823,6 +920,18 @@ void ToolPanelViewShell::Implementation::ActivePanelChanged( const ::boost::opti } } +// --------------------------------------------------------------------------------------------------------------------- +void ToolPanelViewShell::Implementation::ActivePanelChanged( const ::boost::optional< size_t >& i_rOldActive, const ::boost::optional< size_t >& i_rNewActive ) +{ + if ( GetLayout() == LAYOUT_DRAWERS ) + // no adjustment of the title when we use the classical "drawers" layout + return; + + UpdateDockingWindowTitle( ); + (void)i_rOldActive; + (void)i_rNewActive; +} + // --------------------------------------------------------------------------------------------------------------------- void ToolPanelViewShell::Implementation::Dying() { diff --git a/sd/source/ui/toolpanel/makefile.mk b/sd/source/ui/toolpanel/makefile.mk index 4ba8968bd715..775ff3515f96 100644 --- a/sd/source/ui/toolpanel/makefile.mk +++ b/sd/source/ui/toolpanel/makefile.mk @@ -62,6 +62,7 @@ SLOFILES = \ $(SLO)$/TaskPaneViewShell.obj \ $(SLO)$/ToolPanelViewShell.obj \ $(SLO)$/ToolPanelDeck.obj \ + $(SLO)$/ToolPanelDrawer.obj \ $(SLO)$/TaskPaneToolPanel.obj \ \ $(SLO)$/EmptyWindow.obj \ -- 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 - sd/source/ui/toolpanel/TitleBar.cxx | 19 ++++++++++--- sd/source/ui/toolpanel/TitledControl.cxx | 12 +------- sd/source/ui/toolpanel/ToolPanelDeck.cxx | 2 +- sd/source/ui/toolpanel/ToolPanelDrawer.cxx | 44 +++++++++++++++++++++++------ 6 files changed, 55 insertions(+), 27 deletions(-) (limited to 'sd') 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); diff --git a/sd/source/ui/toolpanel/TitleBar.cxx b/sd/source/ui/toolpanel/TitleBar.cxx index dd408ca0b6d8..e54c98428065 100644 --- a/sd/source/ui/toolpanel/TitleBar.cxx +++ b/sd/source/ui/toolpanel/TitleBar.cxx @@ -63,7 +63,7 @@ namespace sd { namespace toolpanel { const int TitleBar::snIndentationWidth = 16; TitleBar::TitleBar ( ::Window* pParent, const String& rsTitle, TitleBarType eType, bool bIsExpandable) -: ::Window (pParent) +: ::Window (pParent, WB_TABSTOP) , TreeNode(this) , meType(eType) , msTitle(rsTitle) @@ -219,10 +219,21 @@ void TitleBar::SetEnabledState(bool bFlag) } -void TitleBar::SetFocus (bool bFlag) + + +void TitleBar::GetFocus() { - mbFocused = bFlag; - Invalidate (); + mbFocused = true; + Invalidate(); +} + + + + +void TitleBar::LoseFocus() +{ + mbFocused = false; + Invalidate(); } diff --git a/sd/source/ui/toolpanel/TitledControl.cxx b/sd/source/ui/toolpanel/TitledControl.cxx index 06e6e7b2e871..07a6a7f7082c 100644 --- a/sd/source/ui/toolpanel/TitledControl.cxx +++ b/sd/source/ui/toolpanel/TitledControl.cxx @@ -222,17 +222,7 @@ void TitledControl::GetFocus (void) { ::Window::GetFocus(); if (GetTitleBar() != NULL) - GetTitleBar()->SetFocus (true); -} - - - - -void TitledControl::LoseFocus (void) -{ - ::Window::LoseFocus(); - if (GetTitleBar() != NULL) - GetTitleBar()->SetFocus (false); + GetTitleBar()->GrabFocus(); } diff --git a/sd/source/ui/toolpanel/ToolPanelDeck.cxx b/sd/source/ui/toolpanel/ToolPanelDeck.cxx index b437dffbf1d0..0b93e7178e18 100644 --- a/sd/source/ui/toolpanel/ToolPanelDeck.cxx +++ b/sd/source/ui/toolpanel/ToolPanelDeck.cxx @@ -67,7 +67,7 @@ namespace sd { namespace toolpanel //================================================================================================================== //------------------------------------------------------------------------------------------------------------------ ToolPanelDeck::ToolPanelDeck( Window& i_rParent, ToolPanelViewShell& i_rViewShell ) - :ToolPanelDeck_Base( i_rParent, 0 ) + :ToolPanelDeck_Base( i_rParent, WB_DIALOGCONTROL ) ,m_rViewShell( i_rViewShell ) { SetDrawersLayout(); diff --git a/sd/source/ui/toolpanel/ToolPanelDrawer.cxx b/sd/source/ui/toolpanel/ToolPanelDrawer.cxx index b8e8002e215b..3a938d460d5f 100644 --- a/sd/source/ui/toolpanel/ToolPanelDrawer.cxx +++ b/sd/source/ui/toolpanel/ToolPanelDrawer.cxx @@ -113,7 +113,15 @@ namespace sd { namespace toolpanel //------------------------------------------------------------------------------------------------------------------ void ToolPanelDrawer::SetFocusToPanelSelector() { - // TODO + const size_t nPanelCount( m_rPanelDeck.GetPanelCount() ); + if ( !nPanelCount ) + // nothing to focus + return; + ::boost::optional< size_t > aActivePanel( m_rPanelDeck.GetActivePanel() ); + if ( !aActivePanel ) + aActivePanel = 0; + ENSURE_OR_RETURN_VOID( *aActivePanel < m_aDrawers.size(), "ToolPanelDrawer::SetFocusToPanelSelector: invalid active panel, or inconsistent drawers!" ); + m_aDrawers[ *aActivePanel ]->GetWindow()->GrabFocus(); } //------------------------------------------------------------------------------------------------------------------ @@ -145,8 +153,6 @@ namespace sd { namespace toolpanel //------------------------------------------------------------------------------------------------------------------ void ToolPanelDrawer::ActivePanelChanged( const ::boost::optional< size_t >& i_rOldActive, const ::boost::optional< size_t >& i_rNewActive ) { - impl_triggerRearrange(); - if ( !!i_rOldActive ) { OSL_ENSURE( *i_rOldActive < m_aDrawers.size(), "ToolPanelDrawer::ActivePanelChanged: illegal old index!" ); @@ -158,6 +164,8 @@ namespace sd { namespace toolpanel OSL_ENSURE( *i_rNewActive < m_aDrawers.size(), "ToolPanelDrawer::ActivePanelChanged: illegal new index!" ); m_aDrawers[ *i_rNewActive ]->Expand( true ); } + + impl_triggerRearrange(); } //------------------------------------------------------------------------------------------------------------------ @@ -187,18 +195,38 @@ namespace sd { namespace toolpanel IMPL_LINK( ToolPanelDrawer, OnWindowEvent, VclSimpleEvent*, i_pEvent ) { const VclWindowEvent* pWindowEvent = PTR_CAST( VclWindowEvent, i_pEvent ); - if ( !pWindowEvent ) - return 0L; + ENSURE_OR_RETURN( pWindowEvent, "no WindowEvent", 0L ); + bool bActivatePanel = false; switch ( pWindowEvent->GetId() ) { case VCLEVENT_WINDOW_MOUSEBUTTONUP: { - const size_t nPanelPos = impl_getPanelPositionFromWindow( pWindowEvent->GetWindow() ); - m_rPanelDeck.ActivatePanel( nPanelPos ); - return 1L; + const MouseEvent* pMouseEvent = static_cast< const MouseEvent* >( pWindowEvent->GetData() ); + ENSURE_OR_RETURN( pMouseEvent, "no mouse event with MouseButtonUp", 0L ); + if ( pMouseEvent->GetButtons() == MOUSE_LEFT ) + { + bActivatePanel = true; + } } break; + case VCLEVENT_WINDOW_KEYINPUT: + { + const KeyEvent* pKeyEvent = static_cast< const KeyEvent* >( pWindowEvent->GetData() ); + ENSURE_OR_RETURN( pKeyEvent, "no key event with KeyInput", 0L ); + const KeyCode& rKeyCode( pKeyEvent->GetKeyCode() ); + if ( ( rKeyCode.GetModifier() == 0 ) && ( rKeyCode.GetCode() == KEY_RETURN ) ) + { + bActivatePanel = true; + } + } + break; + } + if ( bActivatePanel ) + { + const size_t nPanelPos = impl_getPanelPositionFromWindow( pWindowEvent->GetWindow() ); + m_rPanelDeck.ActivatePanel( nPanelPos ); + return 1L; } return 0L; } -- 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/inc/app.hrc | 2 - sd/sdi/TaskPaneViewShell.sdi | 311 -------- sd/sdi/ToolPanelViewShell.sdi | 277 +++++++ sd/sdi/ViewShellBase.sdi | 31 - sd/sdi/makefile.mk | 2 - sd/sdi/sdslots.sdi | 1 - sd/source/ui/accessibility/AccessibleTaskPane.cxx | 97 --- sd/source/ui/accessibility/makefile.mk | 1 - sd/source/ui/app/sddll1.cxx | 2 - sd/source/ui/app/sddll2.cxx | 1 - sd/source/ui/app/sdmod1.cxx | 1 - sd/source/ui/dlg/PaneChildWindows.cxx | 22 +- sd/source/ui/dlg/PaneShells.cxx | 33 - .../ui/framework/factories/BasicPaneFactory.cxx | 14 +- .../ui/framework/factories/BasicViewFactory.cxx | 13 - .../ui/framework/factories/TaskPanelFactory.cxx | 32 +- sd/source/ui/framework/module/ImpressModule.cxx | 2 - sd/source/ui/framework/module/TaskPaneModule.cxx | 165 ---- sd/source/ui/framework/module/TaskPaneModule.hxx | 53 -- sd/source/ui/framework/module/ToolPanelModule.cxx | 4 +- sd/source/ui/framework/module/ToolPanelModule.hxx | 8 +- sd/source/ui/framework/module/makefile.mk | 1 - sd/source/ui/framework/tools/FrameworkHelper.cxx | 6 - 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 ---- .../ui/slidesorter/controller/SlsSlotManager.cxx | 1 - sd/source/ui/toolpanel/LayoutMenu.cxx | 1 - sd/source/ui/toolpanel/TaskPaneShellManager.hxx | 2 +- sd/source/ui/toolpanel/TaskPaneViewShell.cxx | 849 --------------------- sd/source/ui/toolpanel/ToolPanel.cxx | 337 -------- sd/source/ui/toolpanel/ToolPanelDrawer.cxx | 1 - sd/source/ui/toolpanel/ToolPanelViewShell.cxx | 4 +- sd/source/ui/toolpanel/makefile.mk | 2 - sd/source/ui/view/GraphicViewShellBase.cxx | 1 - sd/source/ui/view/ToolBarManager.cxx | 1 - sd/source/ui/view/ViewShellBase.cxx | 14 +- sd/source/ui/view/ViewShellImplementation.cxx | 3 +- sd/source/ui/view/drviews6.cxx | 1 - sd/source/ui/view/viewshe3.cxx | 4 +- sd/uiconfig/simpress/menubar/menubar.xml | 1 - 47 files changed, 301 insertions(+), 2438 deletions(-) delete mode 100644 sd/sdi/TaskPaneViewShell.sdi delete mode 100644 sd/source/ui/accessibility/AccessibleTaskPane.cxx delete mode 100644 sd/source/ui/framework/module/TaskPaneModule.cxx delete mode 100644 sd/source/ui/framework/module/TaskPaneModule.hxx 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 delete mode 100644 sd/source/ui/toolpanel/TaskPaneViewShell.cxx delete mode 100644 sd/source/ui/toolpanel/ToolPanel.cxx (limited to 'sd') diff --git a/sd/inc/app.hrc b/sd/inc/app.hrc index 5f593463e2a7..0ccbbf921b6b 100644 --- a/sd/inc/app.hrc +++ b/sd/inc/app.hrc @@ -466,6 +466,4 @@ #define SID_ADD_MOTION_PATH (SID_SD_START+441) #define SID_TABLE_TOOLBOX (SID_SD_START+442) -#define SID_TOOL_PANEL_PANE (SID_SD_START+443) - #endif diff --git a/sd/sdi/TaskPaneViewShell.sdi b/sd/sdi/TaskPaneViewShell.sdi deleted file mode 100644 index 8d35e88155c4..000000000000 --- a/sd/sdi/TaskPaneViewShell.sdi +++ /dev/null @@ -1,311 +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.sdi,v $ - * $Revision: 1.9 $ - * - * 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. - * - ************************************************************************/ - -SfxVoidItem TaskPaneApplyToAllSlides SID_TP_APPLY_TO_ALL_SLIDES -[ - /* flags: */ - AutoUpdate = TRUE, - Cachable = Cachable, - FastCall = FALSE, - HasCoreId = FALSE, - HasDialog = FALSE, - ReadOnlyDoc = FALSE, - Toggle = FALSE, - Container = FALSE, - RecordAbsolute = FALSE, - RecordPerSet; - Synchron; - - Readonly = FALSE, - - /* config: */ - AccelConfig = FALSE, - MenuConfig = FALSE, - StatusBarConfig = FALSE, - ToolBoxConfig = FALSE, - GroupId = GID_VIEW; -] - -SfxVoidItem TaskPaneApplyToSelectedSlides SID_TP_APPLY_TO_SELECTED_SLIDES -[ - /* flags: */ - AutoUpdate = TRUE, - Cachable = Cachable, - FastCall = FALSE, - HasCoreId = FALSE, - HasDialog = FALSE, - ReadOnlyDoc = FALSE, - Toggle = FALSE, - Container = FALSE, - RecordAbsolute = FALSE, - RecordPerSet; - Synchron; - - Readonly = FALSE, - - /* config: */ - AccelConfig = FALSE, - MenuConfig = FALSE, - StatusBarConfig = FALSE, - ToolBoxConfig = FALSE, - GroupId = GID_VIEW; -] - -SfxVoidItem TaskPaneUseForNewPresentations SID_TP_USE_FOR_NEW_PRESENTATIONS -[ - /* flags: */ - AutoUpdate = TRUE, - Cachable = Cachable, - FastCall = FALSE, - HasCoreId = FALSE, - HasDialog = FALSE, - ReadOnlyDoc = FALSE, - Toggle = FALSE, - Container = FALSE, - RecordAbsolute = FALSE, - RecordPerSet; - Synchron; - - Readonly = FALSE, - - /* config: */ - AccelConfig = FALSE, - MenuConfig = FALSE, - StatusBarConfig = FALSE, - ToolBoxConfig = FALSE, - GroupId = GID_VIEW; -] - -SfxVoidItem TaskPaneShowSmallPreview SID_TP_SHOW_SMALL_PREVIEW -[ - /* flags: */ - AutoUpdate = TRUE, - Cachable = Cachable, - FastCall = FALSE, - HasCoreId = FALSE, - HasDialog = FALSE, - ReadOnlyDoc = FALSE, - Toggle = FALSE, - Container = FALSE, - RecordAbsolute = FALSE, - RecordPerSet; - Synchron; - - Readonly = FALSE, - - /* config: */ - AccelConfig = FALSE, - MenuConfig = FALSE, - StatusBarConfig = FALSE, - ToolBoxConfig = FALSE, - GroupId = GID_VIEW; -] - - -SfxVoidItem TaskPaneShowLargePreview SID_TP_SHOW_LARGE_PREVIEW -[ - /* flags: */ - AutoUpdate = TRUE, - Cachable = Cachable, - FastCall = FALSE, - HasCoreId = FALSE, - HasDialog = FALSE, - ReadOnlyDoc = FALSE, - Toggle = FALSE, - Container = FALSE, - RecordAbsolute = FALSE, - RecordPerSet; - Synchron; - - Readonly = FALSE, - - /* config: */ - AccelConfig = FALSE, - MenuConfig = FALSE, - StatusBarConfig = FALSE, - ToolBoxConfig = FALSE, - GroupId = GID_VIEW; -] - -SfxVoidItem TaskPaneEditMaster SID_TP_EDIT_MASTER -[ - /* flags: */ - AutoUpdate = TRUE, - Cachable = Cachable, - FastCall = FALSE, - HasCoreId = FALSE, - HasDialog = FALSE, - ReadOnlyDoc = FALSE, - Toggle = FALSE, - Container = FALSE, - RecordAbsolute = FALSE, - RecordPerSet; - Synchron; - - Readonly = FALSE, - - /* config: */ - AccelConfig = FALSE, - MenuConfig = FALSE, - StatusBarConfig = FALSE, - ToolBoxConfig = FALSE, - GroupId = GID_VIEW; -] - -SfxVoidItem TaskPaneInsertPage SID_INSERTPAGE_LAYOUT_MENU -[ - /* flags: */ - AutoUpdate = FALSE, - Cachable = Cachable, - FastCall = FALSE, - HasCoreId = FALSE, - HasDialog = FALSE, - ReadOnlyDoc = FALSE, - Toggle = FALSE, - Container = FALSE, - RecordAbsolute = FALSE, - RecordPerSet; - Synchron; - - Readonly = TRUE, - - /* config: */ - AccelConfig = TRUE, - MenuConfig = TRUE, - StatusBarConfig = FALSE, - ToolBoxConfig = TRUE, - GroupId = GID_INSERT; -] - - -interface MasterPagesSelectorInterface -{ - SID_TP_APPLY_TO_ALL_SLIDES - [ - ExecMethod = Execute ; - StateMethod = GetState ; - ] - SID_TP_APPLY_TO_SELECTED_SLIDES - [ - ExecMethod = Execute ; - StateMethod = GetState ; - ] - SID_TP_USE_FOR_NEW_PRESENTATIONS - [ - ExecMethod = Execute ; - StateMethod = GetState ; - ] - SID_TP_SHOW_SMALL_PREVIEW - [ - ExecMethod = Execute ; - StateMethod = GetState ; - ] - SID_TP_SHOW_LARGE_PREVIEW - [ - ExecMethod = Execute ; - StateMethod = GetState ; - ] - - SID_TP_EDIT_MASTER - [ - ExecMethod = Execute ; - StateMethod = GetState ; - ] - - // The copy and paste slots are included here so that they later can be - // disabled in order to remove them from context menus. - SID_CUT - [ - ExecMethod = Execute ; - StateMethod = GetState ; - ] - SID_COPY - [ - ExecMethod = Execute ; - StateMethod = GetState ; - ] - SID_PASTE - [ - ExecMethod = Execute ; - StateMethod = GetState ; - ] - SID_DELETE_MASTER_PAGE - [ - ExecMethod = Execute ; - StateMethod = GetState ; - ] -} - -interface TaskPaneLayoutMenuInterface -{ - SID_TP_APPLY_TO_SELECTED_SLIDES - [ - ExecMethod = Execute ; - StateMethod = GetState ; - ] - SID_INSERTPAGE_LAYOUT_MENU - [ - ExecMethod = Execute ; - StateMethod = GetState ; - ] - - // The copy and paste slots are included here so that they later can be - // disabled in order to remove them from context menus. - SID_CUT - [ - ExecMethod = Execute ; - StateMethod = GetState ; - ] - SID_COPY - [ - ExecMethod = Execute ; - StateMethod = GetState ; - ] - SID_PASTE - [ - ExecMethod = Execute ; - StateMethod = GetState ; - ] -} - -shell MasterPagesSelector -{ - import MasterPagesSelectorInterface[Automation]; -} - -shell LayoutMenu -{ - import TaskPaneLayoutMenuInterface[Automation]; -} - -shell TaskPaneViewShell -{ -} - diff --git a/sd/sdi/ToolPanelViewShell.sdi b/sd/sdi/ToolPanelViewShell.sdi index d4a48d939846..a72342c52da5 100644 --- a/sd/sdi/ToolPanelViewShell.sdi +++ b/sd/sdi/ToolPanelViewShell.sdi @@ -24,6 +24,283 @@ * ************************************************************************/ +SfxVoidItem TaskPaneApplyToAllSlides SID_TP_APPLY_TO_ALL_SLIDES +[ + /* flags: */ + AutoUpdate = TRUE, + Cachable = Cachable, + FastCall = FALSE, + HasCoreId = FALSE, + HasDialog = FALSE, + ReadOnlyDoc = FALSE, + Toggle = FALSE, + Container = FALSE, + RecordAbsolute = FALSE, + RecordPerSet; + Synchron; + + Readonly = FALSE, + + /* config: */ + AccelConfig = FALSE, + MenuConfig = FALSE, + StatusBarConfig = FALSE, + ToolBoxConfig = FALSE, + GroupId = GID_VIEW; +] + +SfxVoidItem TaskPaneApplyToSelectedSlides SID_TP_APPLY_TO_SELECTED_SLIDES +[ + /* flags: */ + AutoUpdate = TRUE, + Cachable = Cachable, + FastCall = FALSE, + HasCoreId = FALSE, + HasDialog = FALSE, + ReadOnlyDoc = FALSE, + Toggle = FALSE, + Container = FALSE, + RecordAbsolute = FALSE, + RecordPerSet; + Synchron; + + Readonly = FALSE, + + /* config: */ + AccelConfig = FALSE, + MenuConfig = FALSE, + StatusBarConfig = FALSE, + ToolBoxConfig = FALSE, + GroupId = GID_VIEW; +] + +SfxVoidItem TaskPaneUseForNewPresentations SID_TP_USE_FOR_NEW_PRESENTATIONS +[ + /* flags: */ + AutoUpdate = TRUE, + Cachable = Cachable, + FastCall = FALSE, + HasCoreId = FALSE, + HasDialog = FALSE, + ReadOnlyDoc = FALSE, + Toggle = FALSE, + Container = FALSE, + RecordAbsolute = FALSE, + RecordPerSet; + Synchron; + + Readonly = FALSE, + + /* config: */ + AccelConfig = FALSE, + MenuConfig = FALSE, + StatusBarConfig = FALSE, + ToolBoxConfig = FALSE, + GroupId = GID_VIEW; +] + +SfxVoidItem TaskPaneShowSmallPreview SID_TP_SHOW_SMALL_PREVIEW +[ + /* flags: */ + AutoUpdate = TRUE, + Cachable = Cachable, + FastCall = FALSE, + HasCoreId = FALSE, + HasDialog = FALSE, + ReadOnlyDoc = FALSE, + Toggle = FALSE, + Container = FALSE, + RecordAbsolute = FALSE, + RecordPerSet; + Synchron; + + Readonly = FALSE, + + /* config: */ + AccelConfig = FALSE, + MenuConfig = FALSE, + StatusBarConfig = FALSE, + ToolBoxConfig = FALSE, + GroupId = GID_VIEW; +] + + +SfxVoidItem TaskPaneShowLargePreview SID_TP_SHOW_LARGE_PREVIEW +[ + /* flags: */ + AutoUpdate = TRUE, + Cachable = Cachable, + FastCall = FALSE, + HasCoreId = FALSE, + HasDialog = FALSE, + ReadOnlyDoc = FALSE, + Toggle = FALSE, + Container = FALSE, + RecordAbsolute = FALSE, + RecordPerSet; + Synchron; + + Readonly = FALSE, + + /* config: */ + AccelConfig = FALSE, + MenuConfig = FALSE, + StatusBarConfig = FALSE, + ToolBoxConfig = FALSE, + GroupId = GID_VIEW; +] + +SfxVoidItem TaskPaneEditMaster SID_TP_EDIT_MASTER +[ + /* flags: */ + AutoUpdate = TRUE, + Cachable = Cachable, + FastCall = FALSE, + HasCoreId = FALSE, + HasDialog = FALSE, + ReadOnlyDoc = FALSE, + Toggle = FALSE, + Container = FALSE, + RecordAbsolute = FALSE, + RecordPerSet; + Synchron; + + Readonly = FALSE, + + /* config: */ + AccelConfig = FALSE, + MenuConfig = FALSE, + StatusBarConfig = FALSE, + ToolBoxConfig = FALSE, + GroupId = GID_VIEW; +] + +SfxVoidItem TaskPaneInsertPage SID_INSERTPAGE_LAYOUT_MENU +[ + /* flags: */ + AutoUpdate = FALSE, + Cachable = Cachable, + FastCall = FALSE, + HasCoreId = FALSE, + HasDialog = FALSE, + ReadOnlyDoc = FALSE, + Toggle = FALSE, + Container = FALSE, + RecordAbsolute = FALSE, + RecordPerSet; + Synchron; + + Readonly = TRUE, + + /* config: */ + AccelConfig = TRUE, + MenuConfig = TRUE, + StatusBarConfig = FALSE, + ToolBoxConfig = TRUE, + GroupId = GID_INSERT; +] + + +interface MasterPagesSelectorInterface +{ + SID_TP_APPLY_TO_ALL_SLIDES + [ + ExecMethod = Execute ; + StateMethod = GetState ; + ] + SID_TP_APPLY_TO_SELECTED_SLIDES + [ + ExecMethod = Execute ; + StateMethod = GetState ; + ] + SID_TP_USE_FOR_NEW_PRESENTATIONS + [ + ExecMethod = Execute ; + StateMethod = GetState ; + ] + SID_TP_SHOW_SMALL_PREVIEW + [ + ExecMethod = Execute ; + StateMethod = GetState ; + ] + SID_TP_SHOW_LARGE_PREVIEW + [ + ExecMethod = Execute ; + StateMethod = GetState ; + ] + + SID_TP_EDIT_MASTER + [ + ExecMethod = Execute ; + StateMethod = GetState ; + ] + + // The copy and paste slots are included here so that they later can be + // disabled in order to remove them from context menus. + SID_CUT + [ + ExecMethod = Execute ; + StateMethod = GetState ; + ] + SID_COPY + [ + ExecMethod = Execute ; + StateMethod = GetState ; + ] + SID_PASTE + [ + ExecMethod = Execute ; + StateMethod = GetState ; + ] + SID_DELETE_MASTER_PAGE + [ + ExecMethod = Execute ; + StateMethod = GetState ; + ] +} + +interface TaskPaneLayoutMenuInterface +{ + SID_TP_APPLY_TO_SELECTED_SLIDES + [ + ExecMethod = Execute ; + StateMethod = GetState ; + ] + SID_INSERTPAGE_LAYOUT_MENU + [ + ExecMethod = Execute ; + StateMethod = GetState ; + ] + + // The copy and paste slots are included here so that they later can be + // disabled in order to remove them from context menus. + SID_CUT + [ + ExecMethod = Execute ; + StateMethod = GetState ; + ] + SID_COPY + [ + ExecMethod = Execute ; + StateMethod = GetState ; + ] + SID_PASTE + [ + ExecMethod = Execute ; + StateMethod = GetState ; + ] +} + +shell MasterPagesSelector +{ + import MasterPagesSelectorInterface[Automation]; +} + +shell LayoutMenu +{ + import TaskPaneLayoutMenuInterface[Automation]; +} + shell ToolPanelViewShell { } diff --git a/sd/sdi/ViewShellBase.sdi b/sd/sdi/ViewShellBase.sdi index 226bd38cb581..67d9cfb1e85e 100644 --- a/sd/sdi/ViewShellBase.sdi +++ b/sd/sdi/ViewShellBase.sdi @@ -164,32 +164,6 @@ SfxBoolItem RightPane SID_RIGHT_PANE GroupId = GID_MODIFY; ] -SfxBoolItem ToolPanel SID_TOOL_PANEL_PANE - -[ - /* flags: */ - AutoUpdate = TRUE, - Cachable = Cachable, - FastCall = FALSE, - HasCoreId = FALSE, - HasDialog = TRUE, - ReadOnlyDoc = FALSE, - Toggle = FALSE, - Container = FALSE, - RecordAbsolute = FALSE, - RecordPerSet; - Asynchron; - - Readonly = FALSE, - - /* config: */ - AccelConfig = TRUE, - MenuConfig = TRUE, - StatusBarConfig = FALSE, - ToolBoxConfig = TRUE, - GroupId = GID_MODIFY; -] - SfxVoidItem NotesChildWindow SID_NOTES_WINDOW [ @@ -314,11 +288,6 @@ interface ViewShellBaseView ExecMethod = Execute; StateMethod = GetState; ] - SID_TOOL_PANEL_PANE - [ - ExecMethod = Execute; - StateMethod = GetState; - ] SID_NOTES_WINDOW [ ExecMethod = Execute; diff --git a/sd/sdi/makefile.mk b/sd/sdi/makefile.mk index dbe86abd7228..7205134b18ee 100644 --- a/sd/sdi/makefile.mk +++ b/sd/sdi/makefile.mk @@ -70,7 +70,6 @@ SVSDI1DEPEND= \ outlnvsh.sdi \ SlideSorterController.sdi \ ViewShellBase.sdi \ - TaskPaneViewShell.sdi \ ToolPanelViewShell.sdi \ sdslots.hrc \ $(PRJ)$/inc$/app.hrc @@ -93,7 +92,6 @@ SVSDI2DEPEND= \ mediaob.sdi \ outlnvsh.sdi \ ViewShellBase.sdi \ - TaskPaneViewShell.sdi \ ToolPanelViewShell.sdi \ sdslots.hrc \ $(PRJ)$/inc$/app.hrc diff --git a/sd/sdi/sdslots.sdi b/sd/sdi/sdslots.sdi index e5deabe64ee8..e90f2957b5f8 100644 --- a/sd/sdi/sdslots.sdi +++ b/sd/sdi/sdslots.sdi @@ -107,6 +107,5 @@ ModulePrefix( "Sd" ) include "ViewShellBase.sdi" include "mediaob.sdi" include "tables.sdi" - include "TaskPaneViewShell.sdi" include "ToolPanelViewShell.sdi" } diff --git a/sd/source/ui/accessibility/AccessibleTaskPane.cxx b/sd/source/ui/accessibility/AccessibleTaskPane.cxx deleted file mode 100644 index 941ca6a245ff..000000000000 --- a/sd/source/ui/accessibility/AccessibleTaskPane.cxx +++ /dev/null @@ -1,97 +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.cxx,v $ - * $Revision: 1.5 $ - * - * 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. - * - ************************************************************************/ - -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_sd.hxx" - -#include "AccessibleTaskPane.hxx" - -#include "AccessibleTreeNode.hxx" - -#include "taskpane/ToolPanel.hxx" -#include "taskpane/ControlContainer.hxx" -#include "taskpane/TitledControl.hxx" -#include - -#include -#include - -using namespace ::rtl; -using namespace ::com::sun::star; -using namespace ::com::sun::star::accessibility; -using namespace ::com::sun::star::uno; - -namespace accessibility { - -AccessibleTaskPane::AccessibleTaskPane ( - const ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible> & rxParent, - const OUString& rsName, - const OUString& rsDescription, - ::sd::toolpanel::ToolPanel& rTaskPane) - : AccessibleTreeNode( - rxParent, - rTaskPane, - rsName, - rsDescription, - AccessibleRole::PANEL) -{ -} - - - - -AccessibleTaskPane::~AccessibleTaskPane (void) -{ -} - - - - -//===== XServiceInfo ======================================================== - -OUString SAL_CALL - AccessibleTaskPane::getImplementationName (void) - throw (RuntimeException) -{ - return OUString(RTL_CONSTASCII_USTRINGPARAM("AccessibleTaskPane")); -} - - - - -void AccessibleTaskPane::UpdateStateSet (void) -{ - // The task pane itself can not be focused. - UpdateState(AccessibleStateType::FOCUSED, false); -} - - -} // end of namespace accessibility diff --git a/sd/source/ui/accessibility/makefile.mk b/sd/source/ui/accessibility/makefile.mk index f922021490a3..58f522512abb 100755 --- a/sd/source/ui/accessibility/makefile.mk +++ b/sd/source/ui/accessibility/makefile.mk @@ -60,7 +60,6 @@ SLOFILES = \ $(SLO)$/AccessibleScrollPanel.obj \ $(SLO)$/AccessibleSlideSorterView.obj \ $(SLO)$/AccessibleSlideSorterObject.obj \ - $(SLO)$/AccessibleTaskPane.obj \ $(SLO)$/AccessibleTreeNode.obj \ $(SLO)$/SdShapeTypes.obj diff --git a/sd/source/ui/app/sddll1.cxx b/sd/source/ui/app/sddll1.cxx index 00810fd53227..ec5c067a6651 100644 --- a/sd/source/ui/app/sddll1.cxx +++ b/sd/source/ui/app/sddll1.cxx @@ -53,7 +53,6 @@ #include "GraphicDocShell.hxx" #include "SlideSorterViewShell.hxx" #include "taskpane/ToolPanelViewShell.hxx" -#include "TaskPaneViewShell.hxx" #include "FactoryIds.hxx" #include "sdmod.hxx" #include "app.hrc" @@ -131,7 +130,6 @@ void SdDLL::RegisterInterfaces() // View shells for the side panes. ::sd::slidesorter::SlideSorterViewShell::RegisterInterface (pMod); - ::sd::toolpanel::TaskPaneViewShell::RegisterInterface(pMod); ::sd::toolpanel::ToolPanelViewShell::RegisterInterface(pMod); // Tell the tool panel view shell to register the interfaces of its // controls. diff --git a/sd/source/ui/app/sddll2.cxx b/sd/source/ui/app/sddll2.cxx index 6c5dd7fd187a..d5709c08aad7 100644 --- a/sd/source/ui/app/sddll2.cxx +++ b/sd/source/ui/app/sddll2.cxx @@ -158,7 +158,6 @@ void SdDLL::RegisterControllers() ::avmedia::MediaPlayer::RegisterChildWindow(0, pMod); ::sd::LeftPaneImpressChildWindow::RegisterChildWindow(0, pMod); ::sd::LeftPaneDrawChildWindow::RegisterChildWindow(0, pMod); - ::sd::RightPaneChildWindow::RegisterChildWindow(0, pMod); ::sd::ToolPanelChildWindow::RegisterChildWindow(0, pMod); SvxFillToolBoxControl::RegisterControl(0, pMod); diff --git a/sd/source/ui/app/sdmod1.cxx b/sd/source/ui/app/sdmod1.cxx index 65485d9df447..29c8be49e033 100644 --- a/sd/source/ui/app/sdmod1.cxx +++ b/sd/source/ui/app/sdmod1.cxx @@ -71,7 +71,6 @@ #include "sdresid.hxx" #include "OutlineViewShell.hxx" #include "ViewShellBase.hxx" -#include "TaskPaneViewShell.hxx" #ifndef SD_FRAMW_VIEW_HXX #include "FrameView.hxx" #endif diff --git a/sd/source/ui/dlg/PaneChildWindows.cxx b/sd/source/ui/dlg/PaneChildWindows.cxx index 008ceb228c75..552428bfd13e 100644 --- a/sd/source/ui/dlg/PaneChildWindows.cxx +++ b/sd/source/ui/dlg/PaneChildWindows.cxx @@ -48,8 +48,7 @@ namespace sd { SFX_IMPL_DOCKINGWINDOW(LeftPaneImpressChildWindow, SID_LEFT_PANE_IMPRESS) SFX_IMPL_DOCKINGWINDOW(LeftPaneDrawChildWindow, SID_LEFT_PANE_DRAW) -SFX_IMPL_DOCKINGWINDOW(RightPaneChildWindow, SID_RIGHT_PANE) -SFX_IMPL_DOCKINGWINDOW( ToolPanelChildWindow, SID_TOOL_PANEL_PANE ) +SFX_IMPL_DOCKINGWINDOW( ToolPanelChildWindow, SID_RIGHT_PANE) //===== PaneChildWindow ======================================================= @@ -141,25 +140,6 @@ LeftPaneDrawChildWindow::LeftPaneDrawChildWindow ( -//===== RightPaneChildWindow ================================================== - -RightPaneChildWindow::RightPaneChildWindow ( - ::Window* pParentWindow, - USHORT nId, - SfxBindings* pBindings, - SfxChildWinInfo* pInfo) - : PaneChildWindow( - pParentWindow, - nId, - pBindings, - pInfo, - FLT_RIGHT_PANE_DOCKING_WINDOW, - STR_RIGHT_PANE_TITLE, - SFX_ALIGN_RIGHT) -{ -} - - //====================================================================================================================== //= ToolPanelChildWindow //====================================================================================================================== diff --git a/sd/source/ui/dlg/PaneShells.cxx b/sd/source/ui/dlg/PaneShells.cxx index 98071da3f04f..b9bc8807ffff 100644 --- a/sd/source/ui/dlg/PaneShells.cxx +++ b/sd/source/ui/dlg/PaneShells.cxx @@ -112,39 +112,6 @@ LeftDrawPaneShell::~LeftDrawPaneShell (void) -//===== RightPaneShell ======================================================== - -#undef ShellClass -#define ShellClass RightPaneShell - -SFX_SLOTMAP(RightPaneShell) -{ - { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } -}; - -SFX_IMPL_INTERFACE(RightPaneShell, SfxShell, SdResId(STR_RIGHT_PANE_SHELL)) -{ - SFX_CHILDWINDOW_REGISTRATION( - ::sd::RightPaneChildWindow::GetChildWindowId()); -} - -TYPEINIT1(RightPaneShell, SfxShell); - - - -RightPaneShell::RightPaneShell (void) - : SfxShell() -{ - SetName(rtl::OUString::createFromAscii("RightPane")); -} - - - - -RightPaneShell::~RightPaneShell (void) -{ -} - //===== ToolPanelPaneShell ======================================================== #undef ShellClass diff --git a/sd/source/ui/framework/factories/BasicPaneFactory.cxx b/sd/source/ui/framework/factories/BasicPaneFactory.cxx index 8e28665551fe..998cc13571f7 100644 --- a/sd/source/ui/framework/factories/BasicPaneFactory.cxx +++ b/sd/source/ui/framework/factories/BasicPaneFactory.cxx @@ -59,8 +59,7 @@ namespace { FullScreenPaneId, LeftImpressPaneId, LeftDrawPaneId, - RightPaneId, - ToolPanelPaneId + RightPaneId }; static const sal_Int32 gnConfigurationUpdateStartEvent(0); @@ -244,11 +243,6 @@ void SAL_CALL BasicPaneFactory::initialize (const Sequence& aArguments) aDescriptor.mePaneId = RightPaneId; mpPaneContainer->push_back(aDescriptor); xCC->addResourceFactory(aDescriptor.msPaneURL, this); - - aDescriptor.msPaneURL = FrameworkHelper::msToolPanelPaneURL; - aDescriptor.mePaneId = ToolPanelPaneId; - mpPaneContainer->push_back(aDescriptor); - xCC->addResourceFactory(aDescriptor.msPaneURL, this); } // Register as configuration change listener. @@ -318,7 +312,6 @@ Reference SAL_CALL BasicPaneFactory::createResource ( case LeftImpressPaneId: case LeftDrawPaneId: case RightPaneId: - case ToolPanelPaneId: xPane = CreateChildWindowPane( rxPaneId, *iDescriptor); @@ -539,11 +532,6 @@ Reference BasicPaneFactory::CreateChildWindowPane ( break; case RightPaneId: - pShell.reset(new RightPaneShell()); - nChildWindowId = ::sd::RightPaneChildWindow::GetChildWindowId(); - break; - - case ToolPanelPaneId: pShell.reset(new ToolPanelPaneShell()); nChildWindowId = ::sd::ToolPanelChildWindow::GetChildWindowId(); break; diff --git a/sd/source/ui/framework/factories/BasicViewFactory.cxx b/sd/source/ui/framework/factories/BasicViewFactory.cxx index c5ca7414b707..d01d923ccb1d 100644 --- a/sd/source/ui/framework/factories/BasicViewFactory.cxx +++ b/sd/source/ui/framework/factories/BasicViewFactory.cxx @@ -46,7 +46,6 @@ #include "DrawViewShell.hxx" #include "GraphicViewShell.hxx" #include "OutlineViewShell.hxx" -#include "TaskPaneViewShell.hxx" #include "taskpane/ToolPanelViewShell.hxx" #include "PresentationViewShell.hxx" #include "SlideSorterViewShell.hxx" @@ -335,7 +334,6 @@ void SAL_CALL BasicViewFactory::initialize (const Sequence& aArguments) mxConfigurationController->addResourceFactory(FrameworkHelper::msHandoutViewURL, this); mxConfigurationController->addResourceFactory(FrameworkHelper::msPresentationViewURL, this); mxConfigurationController->addResourceFactory(FrameworkHelper::msTaskPaneURL, this); - mxConfigurationController->addResourceFactory(FrameworkHelper::msToolPanelViewURL, this); mxConfigurationController->addResourceFactory(FrameworkHelper::msSlideSorterURL, this); } catch (RuntimeException&) @@ -453,15 +451,6 @@ void SAL_CALL BasicViewFactory::initialize (const Sequence& aArguments) pFrameView)); } else if (rsViewURL.equals(FrameworkHelper::msTaskPaneURL)) - { - pViewShell.reset( - new ::sd::toolpanel::TaskPaneViewShell ( - &rFrame, - *mpBase, - &rWindow, - pFrameView)); - } - else if (rsViewURL.equals(FrameworkHelper::msToolPanelViewURL)) { pViewShell.reset( new ::sd::toolpanel::ToolPanelViewShell( @@ -546,8 +535,6 @@ bool BasicViewFactory::IsCacheable (const ::boost::shared_ptr& r FrameworkHelper::msSlideSorterURL, FrameworkHelper::msLeftImpressPaneURL)); maCacheableResources.push_back(pHelper->CreateResourceId( FrameworkHelper::msTaskPaneURL, FrameworkHelper::msRightPaneURL)); - maCacheableResources.push_back(pHelper->CreateResourceId( - FrameworkHelper::msToolPanelViewURL, FrameworkHelper::msToolPanelPaneURL)); } ::std::vector >::const_iterator iId; diff --git a/sd/source/ui/framework/factories/TaskPanelFactory.cxx b/sd/source/ui/framework/factories/TaskPanelFactory.cxx index 1500cda89870..b04373a6d23e 100644 --- a/sd/source/ui/framework/factories/TaskPanelFactory.cxx +++ b/sd/source/ui/framework/factories/TaskPanelFactory.cxx @@ -31,7 +31,6 @@ #include "precompiled_sd.hxx" #include "TaskPanelFactory.hxx" -#include "TaskPaneViewShell.hxx" #include "taskpane/ToolPanelViewShell.hxx" #include "DrawController.hxx" #include "framework/FrameworkHelper.hxx" @@ -44,7 +43,6 @@ using namespace ::com::sun::star::drawing::framework; using ::rtl::OUString; using ::sd::framework::FrameworkHelper; -using ::sd::toolpanel::TaskPaneViewShell; namespace sd { namespace framework { @@ -265,21 +263,11 @@ Reference SAL_CALL TaskPanelFactory::createResource ( const ::rtl::OUString sPaneURL = aResourceURLs[ aResourceURLs.size() - 1 ]; const ::boost::shared_ptr< ViewShell > pPaneViewShell( pFrameworkHelper->GetViewShell( sPaneURL ) ); - toolpanel::TaskPaneViewShell* pTaskPane = dynamic_cast< toolpanel::TaskPaneViewShell* >( pPaneViewShell.get() ); - if ( pTaskPane != NULL ) + toolpanel::ToolPanelViewShell* pToolPanel = dynamic_cast< toolpanel::ToolPanelViewShell* >( pPaneViewShell.get() ); + if ( pToolPanel != NULL ) { xResource = new TaskPanelResource( rxResourceId ); - pTaskPane->ShowPanel(ePanelId); - pTaskPane->ExpandPanel(ePanelId); - } - else - { - toolpanel::ToolPanelViewShell* pToolPanel = dynamic_cast< toolpanel::ToolPanelViewShell* >( pPaneViewShell.get() ); - if ( pToolPanel != NULL ) - { - xResource = new TaskPanelResource( rxResourceId ); - pToolPanel->ActivatePanel( ePanelId ); - } + pToolPanel->ActivatePanel( ePanelId ); } OSL_POSTCOND( xResource.is(), "TaskPanelFactory::createResource: did not find the given resource!" ); @@ -312,23 +300,13 @@ void SAL_CALL TaskPanelFactory::releaseResource ( if ( pPaneViewShell != NULL ) { toolpanel::PanelId ePanelId( lcl_getPanelId( xResourceId->getResourceURL() ) ); - toolpanel::TaskPaneViewShell* pTaskPane( dynamic_cast< toolpanel::TaskPaneViewShell* >( pPaneViewShell.get() ) ); toolpanel::ToolPanelViewShell* pToolPanel = dynamic_cast< toolpanel::ToolPanelViewShell* >( pPaneViewShell.get() ); if ( ( ePanelId != toolpanel::PID_UNKNOWN ) - && ( ( pTaskPane != NULL ) - || ( pToolPanel != NULL ) - ) + && ( pToolPanel != NULL ) ) { - if ( pTaskPane != NULL ) - { - pTaskPane->CollapsePanel( ePanelId ); - } - if ( pToolPanel != NULL ) - { - pToolPanel->DeactivatePanel( ePanelId ); - } + pToolPanel->DeactivatePanel( ePanelId ); } else { diff --git a/sd/source/ui/framework/module/ImpressModule.cxx b/sd/source/ui/framework/module/ImpressModule.cxx index 27e605d2108f..3ddd812c6e86 100644 --- a/sd/source/ui/framework/module/ImpressModule.cxx +++ b/sd/source/ui/framework/module/ImpressModule.cxx @@ -36,7 +36,6 @@ #include "ViewTabBarModule.hxx" #include "CenterViewFocusModule.hxx" #include "SlideSorterModule.hxx" -#include "TaskPaneModule.hxx" #include "ToolPanelModule.hxx" #include "ToolBarModule.hxx" #include "ShellStackGuard.hxx" @@ -58,7 +57,6 @@ void ImpressModule::Initialize (Reference& rxController) new SlideSorterModule( rxController, FrameworkHelper::msLeftImpressPaneURL); - TaskPaneModule::Initialize(rxController); ToolPanelModule::Initialize(rxController); new ToolBarModule(rxController); new ShellStackGuard(rxController); diff --git a/sd/source/ui/framework/module/TaskPaneModule.cxx b/sd/source/ui/framework/module/TaskPaneModule.cxx deleted file mode 100644 index a4529c15152e..000000000000 --- a/sd/source/ui/framework/module/TaskPaneModule.cxx +++ /dev/null @@ -1,165 +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: TaskPaneModule.cxx,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. - * - ************************************************************************/ - -#include "precompiled_sd.hxx" - -#include "TaskPaneModule.hxx" -#include "ReadOnlyModeObserver.hxx" -#include "framework/FrameworkHelper.hxx" - -#include -#include - -#include -#include -#include - -using namespace ::com::sun::star; -using namespace ::com::sun::star::uno; -using namespace ::com::sun::star::drawing::framework; -using ::rtl::OUString; -using ::sd::framework::FrameworkHelper; - - -namespace sd { namespace framework { - -namespace { - -typedef ::cppu::WeakComponentImplHelper1 < - ::com::sun::star::frame::XStatusListener - > LocalReadOnlyModeObserverInterfaceBase; - -/** This local class enables or disables the ResourceManager of a - TaskPaneModule. It connects to a ReadOnlyModeObserver and is called - when the state of the .uno:EditDoc command changes. When either the - ResourceManager or the ReadOnlyModeObserver are disposed then the - LocalReadOnlyModeObserver disposes itself. The link - between the ResourceManager and the ReadOnlyModeObserver is removed and - the ReadOnlyModeObserver typically looses its last reference and is - destroyed. -*/ -class LocalReadOnlyModeObserver - : private MutexOwner, - public LocalReadOnlyModeObserverInterfaceBase -{ -public: - LocalReadOnlyModeObserver ( - const Reference& rxController, - const ::rtl::Reference& rpResourceManager) - : MutexOwner(), - LocalReadOnlyModeObserverInterfaceBase(maMutex), - mpResourceManager(rpResourceManager), - mpObserver(new ReadOnlyModeObserver(rxController)) - { - mpObserver->AddStatusListener(this); - - Reference xComponent ( - static_cast(mpResourceManager.get()), UNO_QUERY); - if (xComponent.is()) - xComponent->addEventListener(this); - } - - ~LocalReadOnlyModeObserver (void) - { - } - - virtual void SAL_CALL disposing (void) - { - Reference xComponent (static_cast(mpObserver.get()), UNO_QUERY); - if (xComponent.is()) - xComponent->dispose(); - - xComponent = Reference( - static_cast(mpResourceManager.get()), UNO_QUERY); - if (xComponent.is()) - xComponent->removeEventListener(this); - - } - - virtual void SAL_CALL disposing (const com::sun::star::lang::EventObject& rEvent) - throw(RuntimeException) - { - if (rEvent.Source == Reference(static_cast(mpObserver.get()))) - { - mpObserver = NULL; - } - else if (rEvent.Source == Reference( - static_cast(mpResourceManager.get()))) - { - mpResourceManager = NULL; - } - dispose(); - } - - virtual void SAL_CALL statusChanged (const com::sun::star::frame::FeatureStateEvent& rEvent) - throw(RuntimeException) - { - bool bReadWrite (true); - if (rEvent.IsEnabled) - rEvent.State >>= bReadWrite; - - if (bReadWrite) - mpResourceManager->Enable(); - else - mpResourceManager->Disable(); - } - -private: - ::rtl::Reference mpResourceManager; - ::rtl::Reference mpObserver; - -}; -} - - - - -//===== TaskPaneModule ==================================================== - -void TaskPaneModule::Initialize (const Reference& rxController) -{ - ::rtl::Reference pResourceManager ( - new ResourceManager( - rxController, - FrameworkHelper::CreateResourceId( - FrameworkHelper::msTaskPaneURL, - FrameworkHelper::msRightPaneURL))); - pResourceManager->AddActiveMainView(FrameworkHelper::msImpressViewURL); - pResourceManager->AddActiveMainView(FrameworkHelper::msNotesViewURL); - pResourceManager->AddActiveMainView(FrameworkHelper::msHandoutViewURL); - pResourceManager->AddActiveMainView(FrameworkHelper::msSlideSorterURL); - - new LocalReadOnlyModeObserver(rxController, pResourceManager); -} - - - - -} } // end of namespace sd::framework diff --git a/sd/source/ui/framework/module/TaskPaneModule.hxx b/sd/source/ui/framework/module/TaskPaneModule.hxx deleted file mode 100644 index f214a8331348..000000000000 --- a/sd/source/ui/framework/module/TaskPaneModule.hxx +++ /dev/null @@ -1,53 +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: TaskPaneModule.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_FRAMEWORK_TASK_PANE_MODULE_HXX -#define SD_FRAMEWORK_TASK_PANE_MODULE_HXX - -#include "ResourceManager.hxx" - -#include - -namespace sd { namespace framework { - -class ReadOnlyModeObserver; - -/** This module is responsible for showing the task pane. -*/ -class TaskPaneModule -{ -public: - static void Initialize ( - const ::com::sun::star::uno::Reference& rxController); -}; - -} } // end of namespace sd::framework - -#endif diff --git a/sd/source/ui/framework/module/ToolPanelModule.cxx b/sd/source/ui/framework/module/ToolPanelModule.cxx index 2741596cbfb3..888fa68ad708 100644 --- a/sd/source/ui/framework/module/ToolPanelModule.cxx +++ b/sd/source/ui/framework/module/ToolPanelModule.cxx @@ -149,8 +149,8 @@ void ToolPanelModule::Initialize (const Reference& rxControl new ResourceManager( rxController, FrameworkHelper::CreateResourceId( - FrameworkHelper::msToolPanelViewURL, - FrameworkHelper::msToolPanelPaneURL))); + FrameworkHelper::msTaskPaneURL, + FrameworkHelper::msRightPaneURL))); pResourceManager->AddActiveMainView(FrameworkHelper::msImpressViewURL); pResourceManager->AddActiveMainView(FrameworkHelper::msNotesViewURL); pResourceManager->AddActiveMainView(FrameworkHelper::msHandoutViewURL); diff --git a/sd/source/ui/framework/module/ToolPanelModule.hxx b/sd/source/ui/framework/module/ToolPanelModule.hxx index 7ae815bfad5b..7d728e60e93d 100644 --- a/sd/source/ui/framework/module/ToolPanelModule.hxx +++ b/sd/source/ui/framework/module/ToolPanelModule.hxx @@ -1,14 +1,10 @@ /************************************************************************* - * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: TaskPaneModule.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -26,7 +22,7 @@ * * for a copy of the LGPLv3 License. * - ************************************************************************/ +************************************************************************/ #ifndef SD_FRAMEWORK_TOOL_PANEL_MODULE_HXX #define SD_FRAMEWORK_TOOL_PANEL_MODULE_HXX diff --git a/sd/source/ui/framework/module/makefile.mk b/sd/source/ui/framework/module/makefile.mk index 78c9e0038c8e..82da23ba2b69 100644 --- a/sd/source/ui/framework/module/makefile.mk +++ b/sd/source/ui/framework/module/makefile.mk @@ -56,7 +56,6 @@ SLOFILES = \ $(SLO)$/ResourceManager.obj \ $(SLO)$/ShellStackGuard.obj \ $(SLO)$/SlideSorterModule.obj \ - $(SLO)$/TaskPaneModule.obj \ $(SLO)$/ToolPanelModule.obj \ $(SLO)$/ToolBarModule.obj \ $(SLO)$/ViewTabBarModule.obj diff --git a/sd/source/ui/framework/tools/FrameworkHelper.cxx b/sd/source/ui/framework/tools/FrameworkHelper.cxx index 0ca93f1195f6..4ce1bfebf6ee 100644 --- a/sd/source/ui/framework/tools/FrameworkHelper.cxx +++ b/sd/source/ui/framework/tools/FrameworkHelper.cxx @@ -187,8 +187,6 @@ const OUString FrameworkHelper::msLeftDrawPaneURL( msPaneURLPrefix + OUString::createFromAscii("LeftDrawPane")); const OUString FrameworkHelper::msRightPaneURL( msPaneURLPrefix + OUString::createFromAscii("RightPane")); -const OUString FrameworkHelper::msToolPanelPaneURL( - msPaneURLPrefix + OUString::createFromAscii("ToolPanel")); // View URLs. @@ -211,8 +209,6 @@ const OUString FrameworkHelper::msPresentationViewURL( msViewURLPrefix + OUString::createFromAscii("PresentationView")); const OUString FrameworkHelper::msTaskPaneURL( msViewURLPrefix + OUString::createFromAscii("TaskPane")); -const OUString FrameworkHelper::msToolPanelViewURL( - msViewURLPrefix + OUString::createFromAscii("ToolPanelPane")); // Tool bar URLs. @@ -594,7 +590,6 @@ ViewShell::ShellType FrameworkHelper::GetViewId (const rtl::OUString& rsViewURL) (*mpViewURLMap)[msSlideSorterURL] = ViewShell::ST_SLIDE_SORTER; (*mpViewURLMap)[msPresentationViewURL] = ViewShell::ST_PRESENTATION; (*mpViewURLMap)[msTaskPaneURL] = ViewShell::ST_TASK_PANE; - (*mpViewURLMap)[msToolPanelViewURL] = ViewShell::ST_TOOL_PANEL; } ViewURLMap::const_iterator iView (mpViewURLMap->find(rsViewURL)); if (iView != mpViewURLMap->end()) @@ -618,7 +613,6 @@ ViewShell::ShellType FrameworkHelper::GetViewId (const rtl::OUString& rsViewURL) case ViewShell::ST_SLIDE_SORTER : return msSlideSorterURL; case ViewShell::ST_PRESENTATION : return msPresentationViewURL; case ViewShell::ST_TASK_PANE : return msTaskPaneURL; - case ViewShell::ST_TOOL_PANEL: return msToolPanelViewURL; default: return OUString(); } 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 diff --git a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx index 4aa35f91292f..75faa089c04e 100644 --- a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx @@ -68,7 +68,6 @@ #include "ViewShellBase.hxx" #include "ViewShellImplementation.hxx" #include "sdattr.hxx" -#include "TaskPaneViewShell.hxx" #include "FrameView.hxx" #include "zoomlist.hxx" #include "sdpage.hxx" diff --git a/sd/source/ui/toolpanel/LayoutMenu.cxx b/sd/source/ui/toolpanel/LayoutMenu.cxx index 2a951cab82c5..16d2e1592444 100644 --- a/sd/source/ui/toolpanel/LayoutMenu.cxx +++ b/sd/source/ui/toolpanel/LayoutMenu.cxx @@ -509,7 +509,6 @@ void LayoutMenu::UpdateEnabledState (const MasterMode eMode) case ViewShell::ST_OUTLINE: case ViewShell::ST_PRESENTATION: case ViewShell::ST_TASK_PANE: - case ViewShell::ST_TOOL_PANEL: // The complete task pane is disabled for these values or // not even visible. Disabling the LayoutMenu would be // logical but unnecessary. The main disadvantage is that diff --git a/sd/source/ui/toolpanel/TaskPaneShellManager.hxx b/sd/source/ui/toolpanel/TaskPaneShellManager.hxx index 9152ea6a8bad..37b7d98cede5 100644 --- a/sd/source/ui/toolpanel/TaskPaneShellManager.hxx +++ b/sd/source/ui/toolpanel/TaskPaneShellManager.hxx @@ -49,7 +49,7 @@ namespace sd { namespace toolpanel { /** The TaskPaneShellManager implements the ViewShellManager::ShellFactory interface. However, it does not create or delete shells. It only gives the ViewShellManager access to the sub shells of the - TaskPaneViewShell. Life time control of the sub shells is managed by + ToolPanelViewShell. Life time control of the sub shells is managed by the sub shells themselves. */ class TaskPaneShellManager diff --git a/sd/source/ui/toolpanel/TaskPaneViewShell.cxx b/sd/source/ui/toolpanel/TaskPaneViewShell.cxx deleted file mode 100644 index 3c33ff41620f..000000000000 --- a/sd/source/ui/toolpanel/TaskPaneViewShell.cxx +++ /dev/null @@ -1,849 +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.cxx,v $ - * $Revision: 1.21 $ - * - * 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. - * - ************************************************************************/ - -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_sd.hxx" - -#include "TaskPaneViewShell.hxx" - -#include "TaskPaneShellManager.hxx" -#include "taskpane/SlideSorterCacheDisplay.hxx" -#include "taskpane/ToolPanel.hxx" -#include "taskpane/TitledControl.hxx" -#include "LayoutMenu.hxx" -#include "TaskPaneFocusManager.hxx" -#include "taskpane/SubToolPanel.hxx" -#include "taskpane/ScrollPanel.hxx" -#include "taskpane/TaskPaneControlFactory.hxx" -#include "controls/MasterPagesPanel.hxx" -#include "controls/MasterPagesSelector.hxx" -#include "controls/TableDesignPanel.hxx" -#include "controls/CustomAnimationPanel.hxx" -#include "controls/SlideTransitionPanel.hxx" -#include "TitleToolBox.hxx" -#include "taskpane/ControlContainer.hxx" -#include "FrameView.hxx" -#include "Window.hxx" -#include "PaneDockingWindow.hxx" -#include "AccessibleTaskPane.hxx" -#include "DrawSubController.hxx" -#include "sdmod.hxx" -#include "app.hrc" -#include "glob.hrc" -#include "res_bmp.hrc" -#include "helpids.h" -#include "strings.hrc" -#include "sdresid.hxx" -#include "framework/FrameworkHelper.hxx" -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include "sdtreelb.hxx" -#include "DrawViewShell.hxx" -#include "drawdoc.hxx" -#include "ViewShellBase.hxx" -#include -#include - -//#define SHOW_TEST_PANEL -#ifdef SHOW_TEST_PANEL -#include "TestPanel.hxx" -#endif -//#define SHOW_COLOR_MENU -#ifdef SHOW_COLOR_MENU -#include "TestMenu.hxx" -#endif - -#include -#include - -using namespace ::sd::toolpanel; - -#define TaskPaneViewShell -#include "sdslots.hxx" - - -using namespace ::com::sun::star; -using namespace ::com::sun::star::uno; -using ::sd::framework::FrameworkHelper; - -namespace sd { namespace toolpanel { - -SFX_IMPL_INTERFACE(TaskPaneViewShell, SfxShell, SdResId(STR_TASKPANEVIEWSHELL)) -{ -} - - -TYPEINIT1(TaskPaneViewShell, ViewShell); - - -/** Inner implementation class of TaskPaneViewShell. -*/ -class TaskPaneViewShell::Implementation -{ -public: - static const sal_uInt32 mnInvalidId = 0xffffffff; - - Implementation (void); - ~Implementation (void); - - /** Here the panels are created that are shown in the task pane. - */ - void Setup (ToolPanel* pToolPanel, ViewShellBase& rBase); - - /** Make a new panel known to the translation table that translates - between internal indices as returned by - ControlContainer::AddControl() and public indices defined by - PanelId. - */ - void AddPanel (sal_uInt32 nInternalId, PanelId nPublicId); - - /** Return the public id for the given internal one. - @return - When the given public id is not known then PID_UNKNOWN is - returned. - */ - PanelId GetPublicId (sal_uInt32 nInternalId) const; - - /** Return the internal id for the given public one. - @return - When the given public id is not known then mnInvalidId is - returned. - */ - sal_uInt32 GetInternalId (PanelId nPublicId) const; - -private: - /** This map translates between internal indices returned by - ControlContainer::AddControl() and public indices defined by - PanelId. - */ - typedef ::std::vector InternalIdToPanelIdMap; - InternalIdToPanelIdMap maIndexMap; -}; - - - - -namespace { - -enum MenuId { - MID_UNLOCK_TASK_PANEL = 1, - MID_LOCK_TASK_PANEL = 2, - MID_CUSTOMIZE = 3, - MID_FIRST_CONTROL = 4 -}; - -/** This control is used for extracting the title string from the resource - of some dialogs that are displayed in the task pane. With this the - actual controls can be created on demand. This class only loads (a part - of) their resource. -*/ -class DummyControl : public Control -{ -public: - DummyControl (::Window* pParent, const ResId& rResId) - : Control(pParent,rResId) - { - FreeResource(); - } -}; - -class ResourceActivationClickHandler -{ -public: - ResourceActivationClickHandler ( - const ::boost::shared_ptr& rpFrameworkHelper, - const Reference& rxResourceId, - ControlContainer& rControlContainer); - void operator () (TitledControl& rTitledControl); - -private: - ::boost::shared_ptr mpFrameworkHelper; - Reference mxResourceId; - ControlContainer& mrControlContainer; -}; - -} // end of anonymouse namespace - - - - - -void TaskPaneViewShell::Implementation::Setup ( - ToolPanel* pToolPanel, - ViewShellBase& rBase) -{ - SdDrawDocument* pDocument = rBase.GetDocument(); - sal_uInt32 nId; - sal_uInt32 nIdOfControlToExpand; - - ::boost::shared_ptr pFrameworkHelper (FrameworkHelper::Instance(rBase)); - Reference xTaskPaneId (pFrameworkHelper->CreateResourceId( - FrameworkHelper::msTaskPaneURL, FrameworkHelper::msRightPaneURL)); - - // The master page controls. - nId = pToolPanel->AddControl ( - controls::MasterPagesPanel::CreateControlFactory(rBase), - SdResId(STR_TASKPANEL_MASTER_PAGE_TITLE), - HID_SD_SLIDE_DESIGNS, - ResourceActivationClickHandler( - pFrameworkHelper, - pFrameworkHelper->CreateResourceId( - FrameworkHelper::msMasterPagesTaskPanelURL, xTaskPaneId), - pToolPanel->GetControlContainer())); - AddPanel (nId, PID_MASTER_PAGES); - - // Layout Menu. - nId = pToolPanel->AddControl ( - LayoutMenu::CreateControlFactory(rBase, *pDocument->GetDocSh()), - SdResId(STR_TASKPANEL_LAYOUT_MENU_TITLE), - HID_SD_SLIDE_LAYOUTS, - ResourceActivationClickHandler( - pFrameworkHelper, - pFrameworkHelper->CreateResourceId( - FrameworkHelper::msLayoutTaskPanelURL, xTaskPaneId), - pToolPanel->GetControlContainer())); - AddPanel (nId, PID_LAYOUT); - nIdOfControlToExpand = nId; - - { - DummyControl aControl (pToolPanel, SdResId(DLG_TABLEDESIGNPANE)); - - // TableDesignPanel - nId = pToolPanel->AddControl ( - controls::TableDesignPanel::CreateControlFactory(rBase), - aControl.GetText(), - HID_SD_TABLE_DESIGN, - ResourceActivationClickHandler( - pFrameworkHelper, - pFrameworkHelper->CreateResourceId( - FrameworkHelper::msTableDesignPanelURL, xTaskPaneId), - pToolPanel->GetControlContainer())); - AddPanel (nId, PID_TABLE_DESIGN); - } - - // CustomAnimationPanel - nId = pToolPanel->AddControl ( - controls::CustomAnimationPanel::CreateControlFactory(rBase), - SdResId( STR_CUSTOMANIMATIONPANE ), - HID_SD_CUSTOM_ANIMATIONS, - ResourceActivationClickHandler( - pFrameworkHelper, - pFrameworkHelper->CreateResourceId( - FrameworkHelper::msCustomAnimationTaskPanelURL, xTaskPaneId), - pToolPanel->GetControlContainer())); - AddPanel (nId, PID_CUSTOM_ANIMATION); - - // SlideTransitionPanel - nId = pToolPanel->AddControl ( - controls::SlideTransitionPanel::CreateControlFactory(rBase), - SdResId( STR_SLIDE_TRANSITION_PANE ), - HID_SD_SLIDE_TRANSITIONS, - ResourceActivationClickHandler( - pFrameworkHelper, - pFrameworkHelper->CreateResourceId( - FrameworkHelper::msSlideTransitionTaskPanelURL, xTaskPaneId), - pToolPanel->GetControlContainer())); - AddPanel (nId, PID_SLIDE_TRANSITION); - -#ifdef SHOW_COLOR_MENU - // Test Menu. - pToolPanel->AddControl ( - ColorMenu::CreateControlFactory(), - String::CreateFromAscii ("Color Test Menu"), - 0); -#endif - -#ifdef SHOW_TEST_PANEL - // Test Panel. - pToolPanel->AddControl ( - TestPanel::CreateControlFactory(), - String::CreateFromAscii ("Test Panel"), - 0); -#endif - -#ifdef USE_SLIDE_SORTER_CACHE_DISPLAY - pToolPanel->AddControl ( - SlideSorterCacheDisplay::CreateControlFactory(pDocument), - String::CreateFromAscii("Slide Sorter Cache Status"), - 0); -#endif - - // Expand the layout menu. - pToolPanel->GetControlContainer().SetExpansionState ( - nIdOfControlToExpand, - ControlContainer::ES_EXPAND); - - pToolPanel->GetWindow()->Show(); -} - - - - -void TaskPaneViewShell::Initialize (void) -{ - if ( ! mbIsInitialized) - { - mbIsInitialized = true; - mpImpl->Setup (mpTaskPane.get(), GetViewShellBase()); - } -} - - - - -TaskPaneViewShell::TaskPaneViewShell ( - SfxViewFrame* pFrame, - ViewShellBase& rViewShellBase, - ::Window* pParentWindow, - FrameView* pFrameViewArgument) - : ViewShell (pFrame, pParentWindow, rViewShellBase), - mpImpl(NULL), - mpTaskPane(NULL), - mbIsInitialized(false), - mpSubShellManager(), - mnMenuId(0) -{ - meShellType = ST_TASK_PANE; - - mpImpl.reset (new Implementation()); - - mpContentWindow->SetCenterAllowed (false); - pParentWindow->SetStyle(pParentWindow->GetStyle() | WB_DIALOGCONTROL); - - mpTaskPane = ::std::auto_ptr(new ToolPanel ( - mpContentWindow.get(), *this)); - - GetParentWindow()->SetBackground(Wallpaper()); - mpContentWindow->SetBackground(Wallpaper()); - - GetParentWindow()->SetHelpId(HID_SD_TASK_PANE); - - PaneDockingWindow* pDockingWindow = dynamic_cast(GetDockingWindow()); - if (pDockingWindow != NULL) - { - pDockingWindow->InitializeTitleToolBox(); - mnMenuId = pDockingWindow->AddMenu ( - String(SdResId(STR_TASKPANEL_MASTER_PAGE_MENU_TITLE)), - HID_SD_TASK_PANE_VIEW_MENU, - LINK(this, TaskPaneViewShell, ToolboxClickHandler)); - } - - // Tell the focus manager that we want to pass the focus to our - // child. - FocusManager::Instance().RegisterDownLink(pParentWindow, mpTaskPane.get()); - - SetPool (&GetDoc()->GetPool()); - - if (pFrameViewArgument != NULL) - mpFrameView = pFrameViewArgument; - else - mpFrameView = new FrameView(GetDoc()); - GetFrameView()->Connect(); - - // Hide or delete unused controls that we have inherited from the - // ViewShell base class. - mpHorizontalScrollBar.reset(); - mpVerticalScrollBar.reset(); - mpScrollBarBox.reset(); - mpHorizontalRuler.reset(); - mpVerticalRuler.reset(); - - SetName (String (RTL_CONSTASCII_USTRINGPARAM("TaskPaneViewShell"))); - - // For accessibility we have to shortly hide the content window. This - // triggers the construction of a new accessibility object for the new - // view shell. (One is created earlier while the construtor of the base - // class is executed. At that time the correct accessibility object can - // not be constructed.) - if (mpContentWindow.get() !=NULL) - { - mpContentWindow->Hide(); - mpContentWindow->Show(); - } - - // Register the shell manager as factory at the ViewShellManager. - mpSubShellManager.reset (new TaskPaneShellManager( - GetViewShellBase().GetViewShellManager(), - *this)); - GetViewShellBase().GetViewShellManager()->AddSubShellFactory(this, mpSubShellManager); -} - - - - -TaskPaneViewShell::~TaskPaneViewShell (void) -{ - GetViewShellBase().GetViewShellManager()->RemoveSubShellFactory(this, mpSubShellManager); -} - - - -void TaskPaneViewShell::ArrangeGUIElements (void) -{ - ViewShell::ArrangeGUIElements(); - - Point aOrigin (maViewPos); - Size aSize (maViewSize); - - Initialize(); - - // Place the task pane. - if (mpTaskPane.get() != NULL) - mpTaskPane->SetPosSizePixel (Point(0,0), aSize); -} - - - - -void TaskPaneViewShell::GetFocus (void) -{ - Invalidate (); -} - - - - -void TaskPaneViewShell::LoseFocus (void) -{ - Invalidate (); -} - - - - -void TaskPaneViewShell::KeyInput (const KeyEvent& rEvent) -{ - KeyCode nCode = rEvent.GetKeyCode(); - if (nCode == KEY_RETURN) - { - mpTaskPane->GrabFocus(); - } - else - ViewShell::KeyInput (rEvent, NULL); -} - - - - -IMPL_LINK(TaskPaneViewShell, ToolboxClickHandler, ToolBox*, pToolBox) -{ - if (pToolBox->GetCurItemId() == mnMenuId) - { - pToolBox->EndSelection(); - - DockingWindow* pDockingWindow = GetDockingWindow(); - ::std::auto_ptr pMenu = CreatePopupMenu ( - pDockingWindow!=NULL && !pDockingWindow->IsFloatingMode()); - pMenu->SetSelectHdl ( - LINK(this, TaskPaneViewShell, MenuSelectHandler)); - - // pass toolbox button rect so the menu can stay open on button up - Rectangle aRect = pToolBox->GetItemRect(mnMenuId); - aRect.SetPos(pToolBox->GetPosPixel() ); - pMenu->Execute (pDockingWindow, aRect, POPUPMENU_EXECUTE_DOWN); - } - - return 0; -} - - - - -IMPL_LINK(TaskPaneViewShell, MenuSelectHandler, Menu*, pMenu) -{ - if (pMenu) - { - pMenu->Deactivate(); - switch (pMenu->GetCurItemId()) - { - case MID_UNLOCK_TASK_PANEL: - { - DockingWindow* pDockingWindow = GetDockingWindow(); - if (pDockingWindow != NULL) - pDockingWindow->SetFloatingMode (TRUE); - } - break; - - case MID_LOCK_TASK_PANEL: - { - DockingWindow* pDockingWindow = GetDockingWindow(); - if (pDockingWindow != NULL) - pDockingWindow->SetFloatingMode (FALSE); - } - break; - - case MID_CUSTOMIZE: - DBG_ASSERT (0, "Customization not yet implemented"); - break; - - default: - { - sal_uInt32 nIndex (pMenu->GetUserValue(pMenu->GetCurItemId())); - mpTaskPane->GetControlContainer().SetVisibilityState ( - nIndex, - ControlContainer::VS_TOGGLE); - // mpTaskPane->Resize(); - // mpTaskPane->Invalidate(); - } - break; - } - } - - return 0; -} - - - - -::std::auto_ptr TaskPaneViewShell::CreatePopupMenu ( - bool bIsDocking) -{ - ::std::auto_ptr pMenu (new PopupMenu ()); - FloatingWindow* pFloat = static_cast(pMenu->GetWindow()); - if (pFloat != NULL) - { - pFloat->SetPopupModeFlags ( - pFloat->GetPopupModeFlags() - | FLOATWIN_POPUPMODE_NOMOUSEUPCLOSE); - } - - // warning free code changes: - // FLOATWIN_POPUPMODE_NOMOUSEUPCLOSE is 0x10000, so cast to USHORT is 0 - // so why was this used anyway? - pMenu->SetMenuFlags ( - pMenu->GetMenuFlags() /* | (USHORT)FLOATWIN_POPUPMODE_NOMOUSEUPCLOSE */ ); - - // Add one entry for every tool panel element to individually make - // them visible or hide them. - USHORT nIndex = MID_FIRST_CONTROL; - sal_uInt32 nControlIndex; - ControlContainer& rContainer (mpTaskPane->GetControlContainer()); - for (nControlIndex=0; - nControlIndex(pChild->GetWindow()); - pMenu->InsertItem (nIndex, - pControl->GetTitle(), - MIB_CHECKABLE); - pMenu->SetUserValue (nIndex, nControlIndex); - if (pControl->IsVisible()) - pMenu->CheckItem (nIndex, TRUE); - nIndex++; - } - - pMenu->InsertSeparator (); - - // Add entry for docking or un-docking the tool panel. - if (bIsDocking) - pMenu->InsertItem ( - MID_UNLOCK_TASK_PANEL, - String(SdResId(STR_TASKPANEL_MASTER_PAGE_MENU_UNLOCK))); - else - pMenu->InsertItem ( - MID_LOCK_TASK_PANEL, - String(SdResId(STR_TASKPANEL_MASTER_PAGE_MENU_LOCK))); - pMenu->RemoveDisabledEntries (FALSE, FALSE); - - return pMenu; -} - - - - -SdPage* TaskPaneViewShell::GetActualPage (void) -{ - return NULL; -} - -SdPage* TaskPaneViewShell::getCurrentPage(void) const -{ - return NULL; -} - - - -void TaskPaneViewShell::Execute (SfxRequest& ) -{ -} - - - - -void TaskPaneViewShell::GetState (SfxItemSet& rItemSet) -{ - (void)rItemSet; -} - - - - -TaskPaneShellManager& TaskPaneViewShell::GetSubShellManager (void) const -{ - return *mpSubShellManager.get(); -} - - - - -DockingWindow* TaskPaneViewShell::GetDockingWindow (void) -{ - ::Window* pParentWindow = GetParentWindow(); - DockingWindow* pDockingWindow = NULL; - while (pParentWindow!=NULL && pDockingWindow==NULL) - { - pDockingWindow = dynamic_cast(pParentWindow); - pParentWindow = pParentWindow->GetParent(); - } - return pDockingWindow; -} - - - - -void TaskPaneViewShell::ShowPanel (const PanelId nPublicId) -{ - Initialize(); - sal_uInt32 nId (mpImpl->GetInternalId(nPublicId)); - if (nId != Implementation::mnInvalidId) - { - mpTaskPane->GetControlContainer().SetVisibilityState ( - nId, - ControlContainer::VS_SHOW); - } -} - - - - -void TaskPaneViewShell::HidePanel (const PanelId nPublicId) -{ - Initialize(); - sal_uInt32 nId (mpImpl->GetInternalId(nPublicId)); - if (nId != Implementation::mnInvalidId) - { - mpTaskPane->GetControlContainer().SetVisibilityState ( - nId, - ControlContainer::VS_HIDE); - } -} - - - - -void TaskPaneViewShell::ExpandPanel (const PanelId nPublicId) -{ - Initialize(); - sal_uInt32 nId (mpImpl->GetInternalId(nPublicId)); - if (nId != Implementation::mnInvalidId) - { - mpTaskPane->GetControlContainer().SetExpansionState ( - nId, - ControlContainer::ES_EXPAND); - } -} - - - - -void TaskPaneViewShell::CollapsePanel (const PanelId nPublicId) -{ - Initialize(); - sal_uInt32 nId (mpImpl->GetInternalId(nPublicId)); - if (nId != Implementation::mnInvalidId) - { - mpTaskPane->GetControlContainer().SetExpansionState ( - nId, - ControlContainer::ES_COLLAPSE); - } -} - - - - -::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible> - TaskPaneViewShell::CreateAccessibleDocumentView (::sd::Window* pWindow) -{ - ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible> xAccessible; - - if (mpTaskPane.get()!=NULL && pWindow!=NULL) - { - // We have to call CreateAccessible directly so that we can specify - // the correct accessible parent. - ::Window* pParentWindow = pWindow->GetAccessibleParentWindow(); - if (pParentWindow != NULL) - xAccessible = mpTaskPane->CreateAccessibleObject( - pParentWindow->GetAccessible()); - } - - return xAccessible; -} - - - - -Reference TaskPaneViewShell::CreateSubController (void) -{ - // This view shell is not designed to be the main view shell and thus - // does not support a UNO sub controller. - return Reference(); -} - - - - -bool TaskPaneViewShell::RelocateToParentWindow (::Window* pParentWindow) -{ - ::Window* pOldParentWindow = GetParentWindow(); - FocusManager::Instance().RemoveLinks(pOldParentWindow, mpTaskPane.get()); - FocusManager::Instance().RemoveLinks(mpTaskPane.get(), pOldParentWindow); - - ViewShell::RelocateToParentWindow(pParentWindow); - - PaneDockingWindow* pDockingWindow = dynamic_cast(GetDockingWindow()); - if (pDockingWindow != NULL) - { - pDockingWindow->InitializeTitleToolBox(); - mnMenuId = pDockingWindow->AddMenu ( - String(SdResId(STR_TASKPANEL_MASTER_PAGE_MENU_TITLE)), - HID_SD_TASK_PANE_VIEW_MENU, - LINK(this, TaskPaneViewShell, ToolboxClickHandler)); - } - FocusManager::Instance().RegisterDownLink(pParentWindow, mpTaskPane.get()); - - Resize(); - - return true; -} - - - - -//===== TaskPaneViewShell::Implementation ===================================== - -TaskPaneViewShell::Implementation::Implementation (void) - : maIndexMap( - (InternalIdToPanelIdMap::size_type)PID__END, - PID_UNKNOWN) -{ -} - - - - -TaskPaneViewShell::Implementation::~Implementation (void) -{ -} - - - - -void TaskPaneViewShell::Implementation::AddPanel ( - sal_uInt32 nInternalId, - PanelId nPublicId) -{ - maIndexMap[nInternalId] = nPublicId; -} - - - - -PanelId - TaskPaneViewShell::Implementation::GetPublicId ( - sal_uInt32 nInternalId) const -{ - if (nInternalId < maIndexMap.size()) - return maIndexMap[nInternalId]; - else - return PID_UNKNOWN; -} - - - - -sal_uInt32 - TaskPaneViewShell::Implementation::GetInternalId ( - PanelId nPublicId) const -{ - sal_uInt32 nId = mnInvalidId; - for (sal_uInt32 nI=0; nI& rpFrameworkHelper, - const Reference& rxResourceId, - ControlContainer& rControlContainer) - : mpFrameworkHelper(rpFrameworkHelper), - mxResourceId(rxResourceId), - mrControlContainer(rControlContainer) -{ -} - - - - -void ResourceActivationClickHandler::operator () (TitledControl& rTitledControl) -{ - mrControlContainer.SetExpansionState ( - &rTitledControl, - ControlContainer::ES_EXPAND); - mpFrameworkHelper->GetConfigurationController()->requestResourceActivation( - mxResourceId, drawing::framework::ResourceActivationMode_REPLACE); -} - - -} } // end of namespace ::sd::toolpanel diff --git a/sd/source/ui/toolpanel/ToolPanel.cxx b/sd/source/ui/toolpanel/ToolPanel.cxx deleted file mode 100644 index 7a8a8273d53a..000000000000 --- a/sd/source/ui/toolpanel/ToolPanel.cxx +++ /dev/null @@ -1,337 +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.cxx,v $ - * $Revision: 1.14 $ - * - * 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. - * - ************************************************************************/ - -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_sd.hxx" - -#include "taskpane/ToolPanel.hxx" - -#include "TaskPaneFocusManager.hxx" -#include "taskpane/TitleBar.hxx" -#include "taskpane/TitledControl.hxx" -#include "taskpane/ControlContainer.hxx" -#include "TaskPaneViewShell.hxx" -#include "taskpane/ToolPanelViewShell.hxx" -#include "taskpane/TaskPaneControlFactory.hxx" -#include "AccessibleTaskPane.hxx" - -#include "strings.hrc" -#include "sdresid.hxx" -#include -#include -#include -#include - -namespace sd { namespace toolpanel { - - -/** Use WB_DIALOGCONTROL as argument for the Control constructor to - let VCL handle focus traveling. In addition the control - descriptors have to use WB_TABSTOP. -*/ -ToolPanel::ToolPanel ( - Window* pParentWindow, - TaskPaneViewShell& rViewShell) - : Control (pParentWindow, WB_DIALOGCONTROL), - TreeNode (NULL), - mpTaskPaneViewShell( &rViewShell ), - mpToolPanelViewShell( NULL ), - mbRearrangeActive(false) -{ - SetBackground (Wallpaper ()); -} - - - - -ToolPanel::ToolPanel ( - Window* pParentWindow, - ToolPanelViewShell& rViewShell) - : Control (pParentWindow, WB_DIALOGCONTROL), - TreeNode (NULL), - mpTaskPaneViewShell( NULL ), - mpToolPanelViewShell( &rViewShell ), - mbRearrangeActive(false) -{ - SetBackground (Wallpaper ()); -} - - - - -ToolPanel::~ToolPanel (void) -{ -} - - - - -sal_uInt32 ToolPanel::AddControl ( - ::std::auto_ptr pControlFactory, - const String& rTitle, - ULONG nHelpId, - const TitledControl::ClickHandler& rClickHandler) -{ - TitledControl* pTitledControl = new TitledControl ( - this, - pControlFactory, - rTitle, - rClickHandler, - TitleBar::TBT_CONTROL_TITLE); - ::std::auto_ptr pChild (pTitledControl); - - // Get the (grand) parent window which is focus-wise our parent. - Window* pParent = GetParent(); - if (pParent != NULL) - pParent = pParent->GetParent(); - - FocusManager& rFocusManager (FocusManager::Instance()); - int nControlCount (mpControlContainer->GetControlCount()); - - // Add a link up from every control to the parent. A down link is added - // only for the first control so that when entering the sub tool panel - // the focus is set to the first control. - if (pParent != NULL) - { - if (nControlCount == 1) - rFocusManager.RegisterDownLink(pParent, pChild->GetWindow()); - rFocusManager.RegisterUpLink(pChild->GetWindow(), pParent); - } - - // Replace the old links for cycling between first and last child by - // current ones. - if (nControlCount > 0) - { - ::Window* pFirst = mpControlContainer->GetControl(0)->GetWindow(); - ::Window* pLast = mpControlContainer->GetControl(nControlCount-1)->GetWindow(); - rFocusManager.RemoveLinks(pFirst,pLast); - rFocusManager.RemoveLinks(pLast,pFirst); - - rFocusManager.RegisterLink(pFirst,pChild->GetWindow(), KEY_UP); - rFocusManager.RegisterLink(pChild->GetWindow(),pFirst, KEY_DOWN); - } - - pTitledControl->GetWindow()->SetHelpId(nHelpId); - - return mpControlContainer->AddControl (pChild); -} - - - - -Rectangle ToolPanel::GetActiveControlContentArea() const -{ - const Rectangle aAllRect( Point(), GetOutputSizePixel() ); - - const sal_uInt32 nActiveControlIndex( mpControlContainer->GetActiveControlIndex() ); - if ( nActiveControlIndex >= mpControlContainer->GetControlCount() ) - return aAllRect; - - TreeNode* pChild = mpControlContainer->GetControl( nActiveControlIndex ); - TitledControl* pTitledControl = dynamic_cast< TitledControl* >( pChild ); - ENSURE_OR_RETURN( pTitledControl, "invalid active child", aAllRect ); - - TreeNode* pActiveControl( pTitledControl->GetControl() ); - ENSURE_OR_RETURN( pActiveControl, "invalid active control", aAllRect ); - - return Rectangle( - ScreenToOutputPixel( pActiveControl->GetWindow()->OutputToScreenPixel( Point( 0, 0 ) ) ), - pActiveControl->GetWindow()->GetOutputSizePixel() - ); -} - - - -void ToolPanel::ListHasChanged (void) -{ - mpControlContainer->ListHasChanged (); - Rearrange (); -} - - - - -void ToolPanel::Resize (void) -{ - Control::Resize(); - Rearrange (); -} - - - - -void ToolPanel::RequestResize (void) -{ - Invalidate(); - Rearrange (); -} - - - - -/** Subtract the space for the title bars from the available space and - give the remaining space to the active control. -*/ -void ToolPanel::Rearrange (void) -{ - // Prevent recursive calls. - if ( ! mbRearrangeActive && mpControlContainer->GetVisibleControlCount()>0) - { - mbRearrangeActive = true; - - SetBackground (Wallpaper ()); - - // Make the area that is covered by the children a little bit - // smaller so that a frame is visible arround them. - Rectangle aAvailableArea (Point(0,0), GetOutputSizePixel()); - - int nWidth = aAvailableArea.GetWidth(); - sal_uInt32 nControlCount (mpControlContainer->GetControlCount()); - sal_uInt32 nActiveControlIndex ( - mpControlContainer->GetActiveControlIndex()); - - // Place title bars of controls above the active control and thereby - // determine the top of the active control. - sal_uInt32 nIndex; - for (nIndex=mpControlContainer->GetFirstIndex(); - nIndexGetNextIndex(nIndex)) - { - TreeNode* pChild = mpControlContainer->GetControl(nIndex); - if (pChild != NULL) - { - sal_uInt32 nHeight = pChild->GetPreferredHeight (nWidth); - pChild->GetWindow()->SetPosSizePixel ( - aAvailableArea.TopLeft(), - Size(nWidth, nHeight)); - aAvailableArea.Top() += nHeight; - } - } - - // Place title bars of controls below the active control and thereby - // determine the bottom of the active control. - for (nIndex=mpControlContainer->GetLastIndex(); - nIndexGetPreviousIndex(nIndex)) - { - TreeNode* pChild = mpControlContainer->GetControl(nIndex); - if (pChild != NULL) - { - sal_uInt32 nHeight = pChild->GetPreferredHeight (nWidth); - pChild->GetWindow()->SetPosSizePixel ( - Point(aAvailableArea.Left(), - aAvailableArea.Bottom()-nHeight+1), - Size(nWidth, nHeight)); - aAvailableArea.Bottom() -= nHeight; - } - } - - // Finally place the active control. - TreeNode* pChild = mpControlContainer->GetControl(nActiveControlIndex); - if (pChild != NULL) - pChild->GetWindow()->SetPosSizePixel ( - aAvailableArea.TopLeft(), - aAvailableArea.GetSize()); - - mbRearrangeActive = false; - } - else - SetBackground ( - Application::GetSettings().GetStyleSettings().GetDialogColor()); -} - - - - -Size ToolPanel::GetPreferredSize (void) -{ - return Size(300,300); -} - - - - -sal_Int32 ToolPanel::GetPreferredWidth (sal_Int32 ) -{ - return 300; -} - - - - -sal_Int32 ToolPanel::GetPreferredHeight (sal_Int32 ) -{ - return 300; -} - - - - -bool ToolPanel::IsResizable (void) -{ - return true; -} - - - - -::Window* ToolPanel::GetWindow (void) -{ - return this; -} - - - - -TaskPaneShellManager* ToolPanel::GetShellManager (void) -{ - if ( mpTaskPaneViewShell != NULL ) - return &mpTaskPaneViewShell->GetSubShellManager(); - if ( mpToolPanelViewShell != NULL ) - return &mpToolPanelViewShell->GetSubShellManager(); - return TreeNode::GetShellManager(); -} - - - - -::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible> ToolPanel::CreateAccessibleObject ( - const ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible>& rxParent) -{ - return new ::accessibility::AccessibleTaskPane ( - rxParent, - String(SdResId(STR_RIGHT_PANE_TITLE)), - String(SdResId(STR_RIGHT_PANE_TITLE)), - *this); -} - -} } // end of namespace ::sd::toolpanel diff --git a/sd/source/ui/toolpanel/ToolPanelDrawer.cxx b/sd/source/ui/toolpanel/ToolPanelDrawer.cxx index 3a938d460d5f..151fd4350790 100644 --- a/sd/source/ui/toolpanel/ToolPanelDrawer.cxx +++ b/sd/source/ui/toolpanel/ToolPanelDrawer.cxx @@ -27,7 +27,6 @@ #include "precompiled_sd.hxx" #include "ToolPanelDrawer.hxx" -#include "taskpane/ToolPanel.hxx" #include "taskpane/TitleBar.hxx" #include diff --git a/sd/source/ui/toolpanel/ToolPanelViewShell.cxx b/sd/source/ui/toolpanel/ToolPanelViewShell.cxx index cb85c9d49fdf..0da1da192ce1 100644 --- a/sd/source/ui/toolpanel/ToolPanelViewShell.cxx +++ b/sd/source/ui/toolpanel/ToolPanelViewShell.cxx @@ -308,7 +308,7 @@ void ToolPanelViewShell::Implementation::Setup() // compose the resource ID for the ToolPanel view ::boost::shared_ptr< FrameworkHelper > pFrameworkHelper( FrameworkHelper::Instance( m_rPanelViewShell.GetViewShellBase() ) ); - const Reference< XResourceId > xToolPanelId( pFrameworkHelper->CreateResourceId( FrameworkHelper::msToolPanelViewURL, FrameworkHelper::msToolPanelPaneURL ) ); + const Reference< XResourceId > xToolPanelId( pFrameworkHelper->CreateResourceId( FrameworkHelper::msTaskPaneURL, FrameworkHelper::msRightPaneURL ) ); // want to activate the "Layout" panel later on, need to translate its PanelId to an actual position const PanelId nPanelIdToActivate = PID_LAYOUT; @@ -410,7 +410,7 @@ ToolPanelViewShell::ToolPanelViewShell( SfxViewFrame* pFrame, ViewShellBase& rVi ,mpSubShellManager() ,mnMenuId(0) { - meShellType = ST_TOOL_PANEL; + meShellType = ST_TASK_PANE; mpContentWindow->SetCenterAllowed( false ); pParentWindow->SetStyle( pParentWindow->GetStyle() | WB_DIALOGCONTROL ); diff --git a/sd/source/ui/toolpanel/makefile.mk b/sd/source/ui/toolpanel/makefile.mk index 775ff3515f96..d364b74ea062 100644 --- a/sd/source/ui/toolpanel/makefile.mk +++ b/sd/source/ui/toolpanel/makefile.mk @@ -54,12 +54,10 @@ SLOFILES = \ $(SLO)$/TitleBar.obj \ $(SLO)$/TitleToolBox.obj \ $(SLO)$/TitledControl.obj \ - $(SLO)$/ToolPanel.obj \ $(SLO)$/TaskPaneControlFactory.obj \ $(SLO)$/TaskPaneFocusManager.obj \ $(SLO)$/TaskPaneShellManager.obj \ $(SLO)$/TaskPaneTreeNode.obj \ - $(SLO)$/TaskPaneViewShell.obj \ $(SLO)$/ToolPanelViewShell.obj \ $(SLO)$/ToolPanelDeck.obj \ $(SLO)$/ToolPanelDrawer.obj \ diff --git a/sd/source/ui/view/GraphicViewShellBase.cxx b/sd/source/ui/view/GraphicViewShellBase.cxx index 2b3b4d4d864b..ed5b77d02655 100644 --- a/sd/source/ui/view/GraphicViewShellBase.cxx +++ b/sd/source/ui/view/GraphicViewShellBase.cxx @@ -104,7 +104,6 @@ void GraphicViewShellBase::Execute (SfxRequest& rRequest) switch (nSlotId) { case SID_RIGHT_PANE: - case SID_TOOL_PANEL_PANE: case SID_NOTES_WINDOW: case SID_SLIDE_SORTER_MULTI_PANE_GUI: case SID_DIAMODE: diff --git a/sd/source/ui/view/ToolBarManager.cxx b/sd/source/ui/view/ToolBarManager.cxx index 2ca39f66436c..487794816270 100644 --- a/sd/source/ui/view/ToolBarManager.cxx +++ b/sd/source/ui/view/ToolBarManager.cxx @@ -1310,7 +1310,6 @@ void ToolBarRules::MainViewShellChanged (ViewShell::ShellType nShellType) case ViewShell::ST_NONE: case ViewShell::ST_PRESENTATION: case ViewShell::ST_TASK_PANE: - case ViewShell::ST_TOOL_PANEL: default: break; } diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx index c0cf73187ef4..614afc06eece 100644 --- a/sd/source/ui/view/ViewShellBase.cxx +++ b/sd/source/ui/view/ViewShellBase.cxx @@ -67,9 +67,9 @@ #include "OutlineViewShell.hxx" #include "SlideSorterViewShell.hxx" #include "PresentationViewShell.hxx" -#include "TaskPaneViewShell.hxx" #include "FormShellManager.hxx" #include "ToolBarManager.hxx" +#include "taskpane/PanelId.hxx" #include "Window.hxx" #include "framework/ConfigurationController.hxx" #include "DocumentRenderer.hxx" @@ -823,13 +823,6 @@ void ViewShellBase::Execute (SfxRequest& rRequest) framework::FrameworkHelper::msTaskPaneURL); break; - case SID_TOOL_PANEL_PANE: - mpImpl->SetPaneVisibility( - rRequest, - framework::FrameworkHelper::msToolPanelPaneURL, - framework::FrameworkHelper::msToolPanelViewURL); - break; - case SID_NORMAL_MULTI_PANE_GUI: case SID_SLIDE_SORTER_MULTI_PANE_GUI: case SID_DRAWINGMODE: @@ -1554,11 +1547,6 @@ void ViewShellBase::Implementation::GetSlotState (SfxItemSet& rSet) xContext, FrameworkHelper::msRightPaneURL); break; - case SID_TOOL_PANEL_PANE: - xResourceId = ResourceId::create( - xContext, FrameworkHelper::msToolPanelPaneURL); - break; - case SID_NORMAL_MULTI_PANE_GUI: xResourceId = ResourceId::createWithAnchorURL( xContext, diff --git a/sd/source/ui/view/ViewShellImplementation.cxx b/sd/source/ui/view/ViewShellImplementation.cxx index eb8863cfe49c..2bb7ad697e2b 100644 --- a/sd/source/ui/view/ViewShellImplementation.cxx +++ b/sd/source/ui/view/ViewShellImplementation.cxx @@ -50,11 +50,11 @@ #include "DrawController.hxx" #include "FactoryIds.hxx" #include "slideshow.hxx" -#include "TaskPaneViewShell.hxx" #include "ViewShellBase.hxx" #include "FrameView.hxx" #include "DrawViewShell.hxx" #include "ViewShellHint.hxx" +#include "taskpane/PanelId.hxx" #include "framework/FrameworkHelper.hxx" #include @@ -376,7 +376,6 @@ sal_uInt16 ViewShell::Implementation::GetViewId (void) // and there is not (yet) a proper ViewShellBase sub class for the // remaining types we chose the Impress factory as a fall back. case ViewShell::ST_TASK_PANE: - case ViewShell::ST_TOOL_PANEL: case ViewShell::ST_NONE: default: return IMPRESS_FACTORY_ID; diff --git a/sd/source/ui/view/drviews6.cxx b/sd/source/ui/view/drviews6.cxx index d89bb43a0098..9d8978eadd88 100644 --- a/sd/source/ui/view/drviews6.cxx +++ b/sd/source/ui/view/drviews6.cxx @@ -84,7 +84,6 @@ #include "FrameView.hxx" #include "Window.hxx" #include "DrawDocShell.hxx" -#include "TaskPaneViewShell.hxx" #include "framework/FrameworkHelper.hxx" namespace sd { diff --git a/sd/source/ui/view/viewshe3.cxx b/sd/source/ui/view/viewshe3.cxx index 86e441939b0e..4ebe041be26a 100644 --- a/sd/source/ui/view/viewshe3.cxx +++ b/sd/source/ui/view/viewshe3.cxx @@ -72,7 +72,6 @@ #endif #include "DrawViewShell.hxx" #include "OutlineViewShell.hxx" -#include "TaskPaneViewShell.hxx" #include "drawview.hxx" #include "sdattr.hxx" @@ -83,6 +82,7 @@ #include "Window.hxx" #include "DrawDocShell.hxx" #include "FrameView.hxx" +#include "framework/FrameworkHelper.hxx" #include "optsitem.hxx" #include "sdresid.hxx" @@ -256,7 +256,7 @@ SdPage* ViewShell::CreateOrDuplicatePage ( && rBase.GetMainViewShell()->GetShellType()!=ViewShell::ST_DRAW) { framework::FrameworkHelper::Instance(GetViewShellBase())->RequestTaskPanel( - framework::FrameworkHelper::msLayoutTaskPanelURL); + framework::FrameworkHelper::msLayoutTaskPanelURL); } // AutoLayouts muessen fertig sein diff --git a/sd/uiconfig/simpress/menubar/menubar.xml b/sd/uiconfig/simpress/menubar/menubar.xml index be0035c51ca6..5b79fdd1f098 100644 --- a/sd/uiconfig/simpress/menubar/menubar.xml +++ b/sd/uiconfig/simpress/menubar/menubar.xml @@ -100,7 +100,6 @@ - -- cgit From 32feee91361deef53c3077f2baf941f37e7302d5 Mon Sep 17 00:00:00 2001 From: "Frank Schoenheit [fs]" Date: Thu, 18 Mar 2010 14:37:10 +0100 Subject: slidecopy: use DBG_UNHANDLED_EXCEPTION instead of OSL_ASSERT, as the former will also print you the exception type and message --- sd/source/ui/dlg/sdtreelb.cxx | 3 ++- .../configuration/ConfigurationControllerBroadcaster.cxx | 7 +++---- .../ConfigurationControllerResourceManager.cxx | 7 ++++--- .../ui/framework/configuration/ConfigurationUpdater.cxx | 6 +++--- sd/source/ui/framework/factories/PresentationFactory.cxx | 5 +++-- sd/source/ui/framework/module/ModuleController.cxx | 4 +++- sd/source/ui/framework/tools/FrameworkHelper.cxx | 9 +++++---- sd/source/ui/slideshow/PaneHider.cxx | 4 +++- sd/source/ui/slidesorter/controller/SlsListener.cxx | 15 +++++---------- sd/source/ui/slidesorter/model/SlideSorterModel.cxx | 10 ++++------ .../slidesorter/view/SlsPageObjectViewObjectContact.cxx | 3 ++- sd/source/ui/toolpanel/controls/DocumentHelper.cxx | 5 ++--- .../toolpanel/controls/MasterPageContainerProviders.cxx | 3 ++- sd/source/ui/tools/ConfigurationAccess.cxx | 7 +++---- sd/source/ui/tools/PreviewRenderer.cxx | 7 ++++--- sd/source/ui/view/Outliner.cxx | 3 ++- sd/source/ui/view/ViewShellBase.cxx | 2 +- sd/source/ui/view/ViewTabBar.cxx | 3 ++- sd/source/ui/view/drviews3.cxx | 3 ++- 19 files changed, 55 insertions(+), 51 deletions(-) (limited to 'sd') diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx index bd93b07beb9a..1fd6adca3c98 100644 --- a/sd/source/ui/dlg/sdtreelb.cxx +++ b/sd/source/ui/dlg/sdtreelb.cxx @@ -59,6 +59,7 @@ #include #include +#include #include using namespace com::sun::star; @@ -1271,7 +1272,7 @@ sal_Int8 SdPageObjsTLB::ExecuteDrop( const ExecuteDropEvent& rEvt ) } catch (com::sun::star::uno::Exception&) { - OSL_ASSERT(false); + DBG_UNHANDLED_EXCEPTION(); } if (nRet == DND_ACTION_NONE) diff --git a/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.cxx b/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.cxx index afaa4a97505e..2e481096d884 100644 --- a/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.cxx +++ b/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.cxx @@ -34,6 +34,7 @@ #include #include #include +#include using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -126,8 +127,7 @@ void ConfigurationControllerBroadcaster::NotifyListeners ( } catch(RuntimeException&) { - DBG_ASSERT(false, - "ConfigurationController: caught exception while notifying listeners"); + DBG_UNHANDLED_EXCEPTION(); } } } @@ -215,8 +215,7 @@ void ConfigurationControllerBroadcaster::DisposeAndClear (void) } catch (RuntimeException&) { - DBG_ASSERT(false, - "ConfigurationController: caught exception while notifying dispose"); + DBG_UNHANDLED_EXCEPTION(); } } else diff --git a/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx b/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx index 5c680e274392..97f67cf5541f 100644 --- a/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx +++ b/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx @@ -36,6 +36,7 @@ #include "ResourceFactoryManager.hxx" #include "framework/FrameworkHelper.hxx" #include +#include #include #include @@ -172,7 +173,7 @@ void ConfigurationControllerResourceManager::ActivateResource ( } catch(Exception&) { - OSL_ENSURE(false, "caught exception while activating resource"); + DBG_UNHANDLED_EXCEPTION(); } if (xResource.is()) @@ -201,7 +202,7 @@ void ConfigurationControllerResourceManager::ActivateResource ( } catch (RuntimeException&) { - OSL_ASSERT(false); + DBG_UNHANDLED_EXCEPTION(); } } @@ -261,7 +262,7 @@ void ConfigurationControllerResourceManager::DeactivateResource ( } catch (RuntimeException&) { - OSL_ASSERT(false); + DBG_UNHANDLED_EXCEPTION(); } #if defined VERBOSE && VERBOSE>=1 diff --git a/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx b/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx index d6400e567597..957945c2f097 100644 --- a/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx +++ b/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx @@ -38,6 +38,7 @@ #include "framework/FrameworkHelper.hxx" #include +#include #include @@ -247,8 +248,7 @@ void ConfigurationUpdater::UpdateConfiguration (void) } catch (RuntimeException e) { - OSL_TRACE("caught exception while updating the current configuration"); - DBG_ASSERT(false, "caught exception while updating the current configuration"); + DBG_UNHANDLED_EXCEPTION(); } #if defined VERBOSE && VERBOSE>0 @@ -343,7 +343,7 @@ void ConfigurationUpdater::UpdateCore (const ConfigurationClassifier& rClassifie } catch(RuntimeException) { - OSL_ASSERT(false); + DBG_UNHANDLED_EXCEPTION(); } } diff --git a/sd/source/ui/framework/factories/PresentationFactory.cxx b/sd/source/ui/framework/factories/PresentationFactory.cxx index 7165b93f8ca8..96c18243b01a 100644 --- a/sd/source/ui/framework/factories/PresentationFactory.cxx +++ b/sd/source/ui/framework/factories/PresentationFactory.cxx @@ -38,6 +38,7 @@ #include "ViewShellBase.hxx" #include #include +#include #include "slideshow.hxx" using namespace ::com::sun::star; @@ -158,7 +159,7 @@ PresentationFactory::PresentationFactory ( } catch (RuntimeException&) { - OSL_ASSERT(false); + DBG_UNHANDLED_EXCEPTION(); } } @@ -312,7 +313,7 @@ void SAL_CALL PresentationFactoryProvider::initialize( } catch (RuntimeException&) { - OSL_ASSERT(false); + DBG_UNHANDLED_EXCEPTION(); } } } diff --git a/sd/source/ui/framework/module/ModuleController.cxx b/sd/source/ui/framework/module/ModuleController.cxx index 63ff7e9589bd..a241d9020ac7 100644 --- a/sd/source/ui/framework/module/ModuleController.cxx +++ b/sd/source/ui/framework/module/ModuleController.cxx @@ -38,6 +38,8 @@ #include #include +#include + using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; @@ -171,7 +173,7 @@ void ModuleController::LoadFactories (const Reference& rxCont } catch (Exception&) { - OSL_TRACE("ERROR in ModuleController::LoadFactories"); + DBG_UNHANDLED_EXCEPTION(); } } diff --git a/sd/source/ui/framework/tools/FrameworkHelper.cxx b/sd/source/ui/framework/tools/FrameworkHelper.cxx index 4ce1bfebf6ee..9a49aa88876d 100644 --- a/sd/source/ui/framework/tools/FrameworkHelper.cxx +++ b/sd/source/ui/framework/tools/FrameworkHelper.cxx @@ -55,6 +55,7 @@ #include "vcl/svapp.hxx" #include #include +#include using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -720,7 +721,7 @@ void FrameworkHelper::HandleModeChangeSlot ( } catch (RuntimeException&) { - OSL_TRACE("HandleModeChangeSlot: caught exception"); + DBG_UNHANDLED_EXCEPTION(); } } @@ -855,7 +856,7 @@ void FrameworkHelper::UpdateConfiguration (void) } catch (RuntimeException&) { - DBG_ASSERT(false, "FrameworkHelper::UpdateConfiguration: caught exception"); + DBG_UNHANDLED_EXCEPTION(); } } } @@ -1056,7 +1057,7 @@ CallbackCaller::CallbackCaller ( } catch (RuntimeException&) { - DBG_ASSERT(false,"ConfigurationUpdateGuard: caught exception"); + DBG_UNHANDLED_EXCEPTION(); } } @@ -1083,7 +1084,7 @@ void CallbackCaller::disposing (void) } catch (RuntimeException&) { - DBG_ASSERT(false,"~ConfigurationUpdateGuard: caught exception"); + DBG_UNHANDLED_EXCEPTION(); } } diff --git a/sd/source/ui/slideshow/PaneHider.cxx b/sd/source/ui/slideshow/PaneHider.cxx index a6b1241496ca..43d24395cdd4 100644 --- a/sd/source/ui/slideshow/PaneHider.cxx +++ b/sd/source/ui/slideshow/PaneHider.cxx @@ -45,6 +45,8 @@ #include #include +#include + using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; using ::sd::framework::FrameworkHelper; @@ -91,7 +93,7 @@ PaneHider::PaneHider (const ViewShell& rViewShell, SlideshowImpl* pSlideShow) } catch (RuntimeException&) { - DBG_ASSERT(false, "caught exception in PaneHider constructor"); + DBG_UNHANDLED_EXCEPTION(); } } diff --git a/sd/source/ui/slidesorter/controller/SlsListener.cxx b/sd/source/ui/slidesorter/controller/SlsListener.cxx index 9c51643b2b49..c9e5a7a37fa6 100644 --- a/sd/source/ui/slidesorter/controller/SlsListener.cxx +++ b/sd/source/ui/slidesorter/controller/SlsListener.cxx @@ -52,6 +52,7 @@ #include #include #include +#include using namespace ::com::sun::star::accessibility; @@ -231,8 +232,7 @@ void Listener::ConnectToController (void) } catch (beans::UnknownPropertyException aEvent) { - OSL_TRACE ("caught exception in SlideSorterController::SetupListeners: %s", - ::rtl::OUStringToOString(aEvent.Message, RTL_TEXTENCODING_UTF8).getStr()); + DBG_UNHANDLED_EXCEPTION(); } try { @@ -240,8 +240,7 @@ void Listener::ConnectToController (void) } catch (beans::UnknownPropertyException aEvent) { - OSL_TRACE ("caught exception in SlideSorterController::SetupListeners: %s", - ::rtl::OUStringToOString(aEvent.Message, RTL_TEXTENCODING_UTF8).getStr()); + DBG_UNHANDLED_EXCEPTION(); } } @@ -289,9 +288,7 @@ void Listener::DisconnectFromController (void) } catch (beans::UnknownPropertyException aEvent) { - OSL_TRACE ("caught exception in destructor of SlideSorterController: %s", - ::rtl::OUStringToOString(aEvent.Message, - RTL_TEXTENCODING_UTF8).getStr()); + DBG_UNHANDLED_EXCEPTION(); } mbListeningToController = false; @@ -491,9 +488,7 @@ void SAL_CALL Listener::propertyChange ( } catch (beans::UnknownPropertyException aEvent) { - OSL_TRACE ("caught exception while accessing the page number of a slide: %s", - ::rtl::OUStringToOString(aEvent.Message, - RTL_TEXTENCODING_UTF8).getStr()); + DBG_UNHANDLED_EXCEPTION(); } catch (lang::DisposedException&) { diff --git a/sd/source/ui/slidesorter/model/SlideSorterModel.cxx b/sd/source/ui/slidesorter/model/SlideSorterModel.cxx index 4f21e48cce93..fa1976c24c81 100644 --- a/sd/source/ui/slidesorter/model/SlideSorterModel.cxx +++ b/sd/source/ui/slidesorter/model/SlideSorterModel.cxx @@ -53,6 +53,8 @@ #include "sdpage.hxx" #include "FrameView.hxx" +#include + using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -228,13 +230,9 @@ sal_Int32 SlideSorterModel::GetIndex (const Reference& rxSli return nNumber; } } - catch (beans::UnknownPropertyException&) - { - OSL_ASSERT(false); - } - catch (lang::DisposedException&) + catch (uno::Exception&) { - OSL_ASSERT(false); + DBG_UNHANDLED_EXCEPTION(); } } diff --git a/sd/source/ui/slidesorter/view/SlsPageObjectViewObjectContact.cxx b/sd/source/ui/slidesorter/view/SlsPageObjectViewObjectContact.cxx index 8c3fd4532c4f..19b14dc37fdb 100644 --- a/sd/source/ui/slidesorter/view/SlsPageObjectViewObjectContact.cxx +++ b/sd/source/ui/slidesorter/view/SlsPageObjectViewObjectContact.cxx @@ -64,6 +64,7 @@ #include #include #include +#include using namespace ::sdr::contact; using namespace ::sd::slidesorter::model; @@ -1169,7 +1170,7 @@ BitmapEx PageObjectViewObjectContact::GetPreview ( } catch (const ::com::sun::star::uno::Exception&) { - OSL_TRACE("PageObjectViewObjectContact::GetPreview: caught exception"); + DBG_UNHANDLED_EXCEPTION(); } return aBitmap; diff --git a/sd/source/ui/toolpanel/controls/DocumentHelper.cxx b/sd/source/ui/toolpanel/controls/DocumentHelper.cxx index 19e51186299b..80189f8d0128 100644 --- a/sd/source/ui/toolpanel/controls/DocumentHelper.cxx +++ b/sd/source/ui/toolpanel/controls/DocumentHelper.cxx @@ -46,6 +46,7 @@ #include #include #include "stlpool.hxx" +#include using namespace ::com::sun::star; @@ -248,9 +249,7 @@ SdPage* DocumentHelper::AddMasterPage ( catch (uno::Exception& rException) { pClonedMasterPage = NULL; - OSL_TRACE("caught exception while adding master page: %s", - ::rtl::OUStringToOString(rException.Message, - RTL_TEXTENCODING_UTF8).getStr()); + DBG_UNHANDLED_EXCEPTION(); } catch (::std::exception rException) { diff --git a/sd/source/ui/toolpanel/controls/MasterPageContainerProviders.cxx b/sd/source/ui/toolpanel/controls/MasterPageContainerProviders.cxx index d01a86a94276..4726dc4a7b1f 100644 --- a/sd/source/ui/toolpanel/controls/MasterPageContainerProviders.cxx +++ b/sd/source/ui/toolpanel/controls/MasterPageContainerProviders.cxx @@ -43,6 +43,7 @@ #include #include #include +#include using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -294,7 +295,7 @@ SdPage* TemplatePageObjectProvider::operator() (SdDrawDocument* pContainerDocume } catch (uno::RuntimeException) { - OSL_TRACE ("caught exception while loading page from template file"); + DBG_UNHANDLED_EXCEPTION(); pPage = NULL; } diff --git a/sd/source/ui/tools/ConfigurationAccess.cxx b/sd/source/ui/tools/ConfigurationAccess.cxx index a262f0e1a652..2c3e2c33e648 100644 --- a/sd/source/ui/tools/ConfigurationAccess.cxx +++ b/sd/source/ui/tools/ConfigurationAccess.cxx @@ -36,6 +36,7 @@ #include #include #include +#include using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -116,11 +117,9 @@ void ConfigurationAccess::Initialize ( sAccessService, aCreationArguments); } - catch (Exception& rException) + catch (Exception&) { - OSL_TRACE ("caught exception while opening configuration: %s", - ::rtl::OUStringToOString(rException.Message, - RTL_TEXTENCODING_UTF8).getStr()); + DBG_UNHANDLED_EXCEPTION(); } } diff --git a/sd/source/ui/tools/PreviewRenderer.cxx b/sd/source/ui/tools/PreviewRenderer.cxx index 770ca7fabf6c..ea8177087c86 100644 --- a/sd/source/ui/tools/PreviewRenderer.cxx +++ b/sd/source/ui/tools/PreviewRenderer.cxx @@ -45,6 +45,7 @@ #include #include #include +#include namespace sd { @@ -134,7 +135,7 @@ Image PreviewRenderer::RenderPage ( } catch (const com::sun::star::uno::Exception&) { - OSL_TRACE("PreviewRenderer::RenderPage: caught exception"); + DBG_UNHANDLED_EXCEPTION(); } } @@ -196,7 +197,7 @@ Image PreviewRenderer::RenderSubstitution ( } catch (const com::sun::star::uno::Exception&) { - OSL_TRACE("PreviewRenderer::RenderPage: caught exception"); + DBG_UNHANDLED_EXCEPTION(); } return aPreview; @@ -305,7 +306,7 @@ void PreviewRenderer::PaintPage (const SdPage* pPage) } catch (const ::com::sun::star::uno::Exception&) { - OSL_TRACE("PreviewRenderer::PaintPage: caught exception"); + DBG_UNHANDLED_EXCEPTION(); } // Restore the previous online spelling and redlining states. diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx index a672ce978233..47b4dbf05671 100644 --- a/sd/source/ui/view/Outliner.cxx +++ b/sd/source/ui/view/Outliner.cxx @@ -61,6 +61,7 @@ #include #include #include +#include #include "strings.hrc" #include "sdstring.hrc" @@ -977,7 +978,7 @@ void Outliner::ProvideNextTextObject (void) } catch (::com::sun::star::uno::Exception e) { - OSL_TRACE ("Outliner %p: caught exception while ending text edit mode", this); + DBG_UNHANDLED_EXCEPTION(); } SetUpdateMode(FALSE); OutlinerView* pOutlinerView = mpImpl->GetOutlinerView(); diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx index 614afc06eece..475dd3fdcedb 100644 --- a/sd/source/ui/view/ViewShellBase.cxx +++ b/sd/source/ui/view/ViewShellBase.cxx @@ -1633,7 +1633,7 @@ void ViewShellBase::Implementation::GetSlotState (SfxItemSet& rSet) } catch (RuntimeException&) { - DBG_ASSERT(false, "ViewShellBase::Implementation::GetSlotState(): caught exception"); + DBG_UNHANDLED_EXCEPTION(); } } diff --git a/sd/source/ui/view/ViewTabBar.cxx b/sd/source/ui/view/ViewTabBar.cxx index 8b2440c0938f..66e5c2c82223 100644 --- a/sd/source/ui/view/ViewTabBar.cxx +++ b/sd/source/ui/view/ViewTabBar.cxx @@ -57,6 +57,7 @@ #include #include #include +#include using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -475,7 +476,7 @@ bool ViewTabBar::ActivatePage (void) } catch (RuntimeException&) { - DBG_ASSERT(false,"ViewTabBar::ActivatePage(): caught exception"); + DBG_UNHANDLED_EXCEPTION(); } return false; diff --git a/sd/source/ui/view/drviews3.cxx b/sd/source/ui/view/drviews3.cxx index 54e0f37a1b19..10da05fac3dc 100644 --- a/sd/source/ui/view/drviews3.cxx +++ b/sd/source/ui/view/drviews3.cxx @@ -93,6 +93,7 @@ #include "DrawDocShell.hxx" #include "sdabstdlg.hxx" #include +#include #include "ViewShellBase.hxx" #include "FormShellManager.hxx" #include "LayerTabBar.hxx" @@ -417,7 +418,7 @@ void DrawViewShell::ExecCtrl(SfxRequest& rReq) } catch (RuntimeException&) { - DBG_ASSERT(false, "caught exception while handline SID_RELOAD"); + DBG_UNHANDLED_EXCEPTION(); } // We have to return immediately to avoid accessing this object. -- 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/prj/build.lst | 1 + sd/source/ui/inc/taskpane/PanelId.hxx | 16 +- sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx | 2 - sd/source/ui/toolpanel/CustomToolPanel.cxx | 184 ++++++++++++++++++++++ sd/source/ui/toolpanel/CustomToolPanel.hxx | 95 ++++++++++++ sd/source/ui/toolpanel/StandardToolPanel.cxx | 111 ++++++++++++++ sd/source/ui/toolpanel/StandardToolPanel.hxx | 76 +++++++++ sd/source/ui/toolpanel/TaskPaneToolPanel.cxx | 57 +++---- sd/source/ui/toolpanel/TaskPaneToolPanel.hxx | 32 ++-- sd/source/ui/toolpanel/ToolPanelDeck.cxx | 14 -- sd/source/ui/toolpanel/ToolPanelDeck.hxx | 9 -- sd/source/ui/toolpanel/ToolPanelDrawer.cxx | 1 + sd/source/ui/toolpanel/ToolPanelViewShell.cxx | 119 ++++++++++++--- sd/source/ui/toolpanel/makefile.mk | 2 + sd/workben/custompanel/Impress.xcu | 34 +++++ sd/workben/custompanel/colorpanel.map | 8 + sd/workben/custompanel/ctp_factory.cxx | 187 +++++++++++++++++++++++ sd/workben/custompanel/ctp_factory.hxx | 114 ++++++++++++++ sd/workben/custompanel/ctp_panel.cxx | 90 +++++++++++ sd/workben/custompanel/ctp_panel.hxx | 79 ++++++++++ sd/workben/custompanel/ctp_services.cxx | 92 +++++++++++ sd/workben/custompanel/delzip | 0 sd/workben/custompanel/description.xml | 16 ++ sd/workben/custompanel/makefile.mk | 102 +++++++++++++ sd/workben/custompanel/manifest.xml | 8 + 25 files changed, 1340 insertions(+), 109 deletions(-) mode change 100755 => 100644 sd/prj/build.lst create mode 100644 sd/source/ui/toolpanel/CustomToolPanel.cxx create mode 100644 sd/source/ui/toolpanel/CustomToolPanel.hxx create mode 100644 sd/source/ui/toolpanel/StandardToolPanel.cxx create mode 100644 sd/source/ui/toolpanel/StandardToolPanel.hxx create mode 100644 sd/workben/custompanel/Impress.xcu create mode 100644 sd/workben/custompanel/colorpanel.map create mode 100644 sd/workben/custompanel/ctp_factory.cxx create mode 100644 sd/workben/custompanel/ctp_factory.hxx create mode 100644 sd/workben/custompanel/ctp_panel.cxx create mode 100644 sd/workben/custompanel/ctp_panel.hxx create mode 100644 sd/workben/custompanel/ctp_services.cxx create mode 100644 sd/workben/custompanel/delzip create mode 100644 sd/workben/custompanel/description.xml create mode 100644 sd/workben/custompanel/makefile.mk create mode 100644 sd/workben/custompanel/manifest.xml (limited to 'sd') diff --git a/sd/prj/build.lst b/sd/prj/build.lst old mode 100755 new mode 100644 index bc8bf923f7e5..1b565ac71fb0 --- a/sd/prj/build.lst +++ b/sd/prj/build.lst @@ -44,3 +44,4 @@ sd sd\source\ui\framework\factories nmake - all sd_framework_factories sd sd sd\source\ui\framework\tools nmake - all sd_framework_tools sd_inc NULL sd sd\source\ui\annotations nmake - all sd_uiannotations sd_inc NULL sd sd\util nmake - all sd_util sd_app sd_cgm sd_core sd_dlg sd_docsh sd_eppt sd_filt sd_func sd_grf sd_unid sd_view sd_xml sd_html sd_ppt sd_accessibility sd_animations sd_toolpanel sd_toolpanel_controls sd_tools sd_slsshell sd_slsmodel sd_slsview sd_slscontroller sd_slscache sd_notes sd_table sd_slideshow sd_presenter sd_undo sd_helper sd_framework_configuration sd_framework_module sd_framework_tools sd_framework_factories sd_text sd_annotations sd_uiannotations NULL +sd sd\workben\custompanel nmake - all sd_workben_panel sd_inc NULL 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 diff --git a/sd/source/ui/toolpanel/CustomToolPanel.cxx b/sd/source/ui/toolpanel/CustomToolPanel.cxx new file mode 100644 index 000000000000..33ee1270ab1d --- /dev/null +++ b/sd/source/ui/toolpanel/CustomToolPanel.cxx @@ -0,0 +1,184 @@ +/************************************************************************* + * 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. + * +************************************************************************/ + +#include "precompiled_sd.hxx" + +#include "CustomToolPanel.hxx" +#include "framework/FrameworkHelper.hxx" + +/** === begin UNO includes === **/ +#include +/** === end UNO includes === **/ + +#include +#include +#include + +#if OSL_DEBUG_LEVEL > 0 +#include +#endif + +//...................................................................................................................... +namespace sd { namespace toolpanel +{ +//...................................................................................................................... + + /** === begin UNO using === **/ + using ::com::sun::star::uno::Reference; + using ::com::sun::star::uno::XInterface; + using ::com::sun::star::uno::UNO_QUERY; + using ::com::sun::star::uno::UNO_QUERY_THROW; + using ::com::sun::star::uno::UNO_SET_THROW; + using ::com::sun::star::uno::Exception; + using ::com::sun::star::uno::RuntimeException; + using ::com::sun::star::uno::Any; + using ::com::sun::star::uno::makeAny; + using ::com::sun::star::uno::Sequence; + using ::com::sun::star::uno::Type; + using ::com::sun::star::drawing::framework::XConfigurationController; + using ::com::sun::star::drawing::framework::XResourceId; + using ::com::sun::star::drawing::framework::ResourceId; + using ::com::sun::star::drawing::framework::XResource; + /** === end UNO using === **/ + + //================================================================================================================== + //= helper + //================================================================================================================== + namespace + { + ::rtl::OUString lcl_getPanelConfig( const ::utl::OConfigurationNode& i_rPanelConfig, const sal_Char* i_pAsciiPropName ) + { + ::rtl::OUString sConfigValue; + OSL_VERIFY( i_rPanelConfig.getNodeValue( i_pAsciiPropName ) >>= sConfigValue ); + if ( sConfigValue.getLength() == 0 ) + { +#if OSL_DEBUG_LEVEL > 0 + ::rtl::OStringBuffer aMessage; + aMessage.append( "lcl_getPanelConfig: invalid config value (" ); + aMessage.append( i_pAsciiPropName ); + aMessage.append( ") for panel config '" ); + aMessage.append( ::rtl::OUStringToOString( i_rPanelConfig.getLocalName(), RTL_TEXTENCODING_UTF8 ) ); + aMessage.append( "'" ); + OSL_ENSURE( false, aMessage.makeStringAndClear().getStr() ); +#endif + } + return sConfigValue; + } + } + + //================================================================================================================== + //= CustomToolPanel + //================================================================================================================== + //------------------------------------------------------------------------------------------------------------------ + CustomToolPanel::CustomToolPanel( ToolPanelDeck& i_rPanelDeck, const ::utl::OConfigurationNode& i_rPanelConfig, + const Reference< XResourceId >& i_rPaneResourceId, const ::boost::shared_ptr< framework::FrameworkHelper >& i_pFrameworkHelper ) + :TaskPaneToolPanel( i_rPanelDeck, lcl_getPanelConfig( i_rPanelConfig, "DisplayTitle" ), Image() /* TODO */, SmartId() /* TODO */ ) + ,m_pFrameworkHelper( i_pFrameworkHelper ) + ,m_xPanelResourceId() + ,m_xPanel() + ,m_bAttemptedPanelCreation( false ) + { + ENSURE_OR_THROW( m_pFrameworkHelper.get() != NULL, "invalid framework helper" ); + ENSURE_OR_THROW( i_rPaneResourceId.is(), "invalid pane resource id" ); + try + { + ::rtl::OUString sPanelResourceURL( lcl_getPanelConfig( i_rPanelConfig, "ResourceURL" ) ); + m_xPanelResourceId.set( + ResourceId::createWithAnchor( + ::comphelper::getProcessComponentContext(), + sPanelResourceURL, + i_rPaneResourceId ), + UNO_SET_THROW + ); + } + catch( const Exception& ) + { + DBG_UNHANDLED_EXCEPTION(); + } + } + + //------------------------------------------------------------------------------------------------------------------ + CustomToolPanel::~CustomToolPanel() + { + } + + //------------------------------------------------------------------------------------------------------------------ + void CustomToolPanel::Dispose() + { + if ( m_xPanel.is() ) + { + try + { + // TODO: obtain the factory for our panel, and invoke its destroyResource method + } + catch ( const Exception& ) + { + DBG_UNHANDLED_EXCEPTION(); + } + } + TaskPaneToolPanel::Dispose(); + } + + //------------------------------------------------------------------------------------------------------------------ + const Reference< XResourceId >& CustomToolPanel::getResourceId() const + { + return m_xPanelResourceId; + } + + //------------------------------------------------------------------------------------------------------------------ + ::Window* CustomToolPanel::getPanelWindow() const + { + ENSURE_OR_RETURN( impl_ensurePanel(), "could not create the panel", NULL ); + // TODO + return NULL; + } + + //------------------------------------------------------------------------------------------------------------------ + bool CustomToolPanel::impl_ensurePanel() const + { + ENSURE_OR_RETURN_FALSE( !isDisposed(), "already disposed" ); + + if ( !m_bAttemptedPanelCreation ) + { + const_cast< CustomToolPanel* >( this )->m_bAttemptedPanelCreation = true; + + try + { + Reference< XConfigurationController > xConfigController( m_pFrameworkHelper->GetConfigurationController(), UNO_QUERY_THROW ); + Reference< XResource > xToolPanelResource( xConfigController->getResource( m_xPanelResourceId ) ); + } + catch( const Exception& ) + { + DBG_UNHANDLED_EXCEPTION(); + } + } + return m_xPanel.is(); + } + +//...................................................................................................................... +} } // namespace sd::toolpanel +//...................................................................................................................... + diff --git a/sd/source/ui/toolpanel/CustomToolPanel.hxx b/sd/source/ui/toolpanel/CustomToolPanel.hxx new file mode 100644 index 000000000000..23a3dcbb3cfc --- /dev/null +++ b/sd/source/ui/toolpanel/CustomToolPanel.hxx @@ -0,0 +1,95 @@ +/************************************************************************* + * 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_TOOLPANEL_CUSTOMTOOLPANEL_HXX +#define SD_TOOLPANEL_CUSTOMTOOLPANEL_HXX + +#include "TaskPaneToolPanel.hxx" + +/** === begin UNO includes === **/ +#include +#include +/** === end UNO includes === **/ + +#include + +namespace utl +{ + class OConfigurationNode; +} + +namespace sd { namespace framework +{ + class FrameworkHelper; +} } + +//...................................................................................................................... +namespace sd { namespace toolpanel +{ +//...................................................................................................................... + + class ToolPanelDeck; + + //================================================================================================================== + //= CustomToolPanel + //================================================================================================================== + /** is a ::svt::IToolPanel implementation for custom tool panels, i.e. those defined in the configuration, and + implemented by external components. + */ + class CustomToolPanel : public TaskPaneToolPanel + { + public: + CustomToolPanel( + ToolPanelDeck& i_rPanelDeck, + const ::utl::OConfigurationNode& i_rPanelConfig, + const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::framework::XResourceId >& i_rPaneResourceId, + const ::boost::shared_ptr< framework::FrameworkHelper >& i_pFrameworkHelper + ); + ~CustomToolPanel(); + + // IToolPanel overridables + virtual void Dispose(); + + protected: + // TaskPaneToolPanel overridables + virtual const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::framework::XResourceId >& getResourceId() const; + virtual ::Window* getPanelWindow() const; + + private: + bool impl_ensurePanel() const; + + private: + ::boost::shared_ptr< framework::FrameworkHelper > m_pFrameworkHelper; + ::com::sun::star::uno::Reference< ::com::sun::star::drawing::framework::XResourceId > m_xPanelResourceId; + ::com::sun::star::uno::Reference< ::com::sun::star::drawing::framework::XPane2 > m_xPanel; + bool m_bAttemptedPanelCreation; + }; + +//...................................................................................................................... +} } // namespace sd::toolpanel +//...................................................................................................................... + +#endif // SD_TOOLPANEL_CUSTOMTOOLPANEL_HXX diff --git a/sd/source/ui/toolpanel/StandardToolPanel.cxx b/sd/source/ui/toolpanel/StandardToolPanel.cxx new file mode 100644 index 000000000000..5e4d35ee1729 --- /dev/null +++ b/sd/source/ui/toolpanel/StandardToolPanel.cxx @@ -0,0 +1,111 @@ +/************************************************************************* + * 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. + * +************************************************************************/ + +#include "precompiled_sd.hxx" + +#include "StandardToolPanel.hxx" +#include "ToolPanelDeck.hxx" +#include "sdresid.hxx" + +/** === begin UNO includes === **/ +/** === end UNO includes === **/ + +#include + +//...................................................................................................................... +namespace sd { namespace toolpanel +{ +//...................................................................................................................... + + /** === begin UNO using === **/ + using ::com::sun::star::uno::Reference; + using ::com::sun::star::uno::XInterface; + using ::com::sun::star::uno::UNO_QUERY; + using ::com::sun::star::uno::UNO_QUERY_THROW; + using ::com::sun::star::uno::UNO_SET_THROW; + using ::com::sun::star::uno::Exception; + using ::com::sun::star::uno::RuntimeException; + using ::com::sun::star::uno::Any; + using ::com::sun::star::uno::makeAny; + using ::com::sun::star::uno::Sequence; + using ::com::sun::star::uno::Type; + using ::com::sun::star::drawing::framework::XResourceId; + /** === end UNO using === **/ + + //================================================================================================================== + //= StandardToolPanel + //================================================================================================================== + //------------------------------------------------------------------------------------------------------------------ + StandardToolPanel::StandardToolPanel( ToolPanelDeck& i_rPanelDeck, ::std::auto_ptr< ControlFactory >& i_rControlFactory, + const USHORT i_nTitleResId, const Image& i_rImage, const ULONG i_nHelpId, + const Reference< XResourceId >& i_rPanelResourceId ) + :TaskPaneToolPanel( i_rPanelDeck, SdResId( i_nTitleResId ), i_rImage, SmartId( i_nHelpId ) ) + ,m_pControlFactory( i_rControlFactory ) + ,m_xPanelResourceId( i_rPanelResourceId ) + { + ENSURE_OR_THROW( m_pControlFactory.get(), "illegal control factory" ); + } + + //------------------------------------------------------------------------------------------------------------------ + StandardToolPanel::~StandardToolPanel() + { + m_pControl.reset(); + } + + //------------------------------------------------------------------------------------------------------------------ + void StandardToolPanel::Dispose() + { + m_pControl.reset(); + TaskPaneToolPanel::Dispose(); + } + + //------------------------------------------------------------------------------------------------------------------ + const Reference< XResourceId >& StandardToolPanel::getResourceId() const + { + return m_xPanelResourceId; + } + + //------------------------------------------------------------------------------------------------------------------ + ::Window* StandardToolPanel::getPanelWindow() const + { + ENSURE_OR_RETURN( const_cast< StandardToolPanel* >( this )->impl_ensureControl(), "StandardToolPanel::getPanelWindow: no control!", NULL ); + return m_pControl->GetWindow(); + } + + //------------------------------------------------------------------------------------------------------------------ + bool StandardToolPanel::impl_ensureControl() + { + if ( m_pControl.get() ) + return true; + if ( isDisposed() ) + return false; + m_pControl = m_pControlFactory->CreateRootControl( getPanelDeck() ); + return ( m_pControl.get() != NULL ); + } + +//...................................................................................................................... +} } // namespace sd::toolpanel +//...................................................................................................................... diff --git a/sd/source/ui/toolpanel/StandardToolPanel.hxx b/sd/source/ui/toolpanel/StandardToolPanel.hxx new file mode 100644 index 000000000000..8e4ad7e8eeea --- /dev/null +++ b/sd/source/ui/toolpanel/StandardToolPanel.hxx @@ -0,0 +1,76 @@ +/************************************************************************* + * 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_TOOLPANEL_STANDARDTOOLPANEL_HXX +#define SD_TOOLPANEL_STANDARDTOOLPANEL_HXX + +#include "TaskPaneToolPanel.hxx" + +//...................................................................................................................... +namespace sd { namespace toolpanel +{ +//...................................................................................................................... + + //================================================================================================================== + //= StandardToolPanel + //================================================================================================================== + /** an IToolPanel implementation for one of the standard (aka built-in) tool panels + */ + class StandardToolPanel : public TaskPaneToolPanel + { + public: + StandardToolPanel( + ToolPanelDeck& i_rPanelDeck, + ::std::auto_ptr< ControlFactory >& i_rControlFactory, + const USHORT i_nTitleResId, + const Image& i_rImage, + const ULONG i_nHelpId, + const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::framework::XResourceId >& i_rPanelResourceId + ); + ~StandardToolPanel(); + + // IToolPanel overridables + virtual void Dispose(); + + // TaskPaneToolPanel overridables + virtual const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::framework::XResourceId >& getResourceId() const; + virtual ::Window* getPanelWindow() const; + + private: + bool impl_ensureControl(); + + private: + ::std::auto_ptr< ControlFactory > m_pControlFactory; + ::std::auto_ptr< TreeNode > m_pControl; + ::com::sun::star::uno::Reference< ::com::sun::star::drawing::framework::XResourceId > + m_xPanelResourceId; + }; + +//...................................................................................................................... +} } // namespace sd::toolpanel +//...................................................................................................................... + +#endif // SD_TOOLPANEL_STANDARDTOOLPANEL_HXX diff --git a/sd/source/ui/toolpanel/TaskPaneToolPanel.cxx b/sd/source/ui/toolpanel/TaskPaneToolPanel.cxx index 3e5a7ba3065f..92530bf9e5bc 100644 --- a/sd/source/ui/toolpanel/TaskPaneToolPanel.cxx +++ b/sd/source/ui/toolpanel/TaskPaneToolPanel.cxx @@ -28,7 +28,6 @@ #include "TaskPaneToolPanel.hxx" #include "ToolPanelDeck.hxx" -#include "sdresid.hxx" #include #include @@ -57,91 +56,79 @@ namespace sd { namespace toolpanel //= TaskPaneToolPanel //================================================================================================================== //------------------------------------------------------------------------------------------------------------------ - TaskPaneToolPanel::TaskPaneToolPanel( ToolPanelDeck& i_rPanelDeck, ::std::auto_ptr< ControlFactory >& i_rControlFactory, - const Image& i_rImage, const USHORT i_nTitleResId, const ULONG i_nHelpId, const Reference< XResourceId >& i_rPanelResourceId ) + TaskPaneToolPanel::TaskPaneToolPanel( ToolPanelDeck& i_rPanelDeck, const String& i_rPanelName, const Image& i_rImage, + const SmartId& i_rHelpId ) :m_pPanelDeck( &i_rPanelDeck ) - ,m_pControlFactory( i_rControlFactory ) - ,m_pControl() - ,m_aImage( i_rImage ) - ,m_sTitle( SdResId( i_nTitleResId ) ) - ,m_aHelpId( i_nHelpId ) - ,m_xPanelResourceId( i_rPanelResourceId ) + ,m_aPanelImage( i_rImage ) + ,m_sPanelName( i_rPanelName ) + ,m_aHelpId( i_rHelpId ) { - ENSURE_OR_THROW( m_pControlFactory.get(), "illegal control factory" ); } //------------------------------------------------------------------------------------------------------------------ TaskPaneToolPanel::~TaskPaneToolPanel() { - m_pControl.reset(); } //------------------------------------------------------------------------------------------------------------------ ::rtl::OUString TaskPaneToolPanel::GetDisplayName() const { - return m_sTitle; + return m_sPanelName; } //------------------------------------------------------------------------------------------------------------------ Image TaskPaneToolPanel::GetImage() const { - return m_aImage; + return m_aPanelImage; } //------------------------------------------------------------------------------------------------------------------ void TaskPaneToolPanel::Show() { - ENSURE_OR_RETURN_VOID( impl_ensureControl(), "no control to show" ); - m_pControl->GetWindow()->Show(); + Window* pPanelWindow( getPanelWindow() ); + ENSURE_OR_RETURN_VOID( pPanelWindow, "no window to show" ); + pPanelWindow->Show(); } //------------------------------------------------------------------------------------------------------------------ void TaskPaneToolPanel::Hide() { - ENSURE_OR_RETURN_VOID( impl_ensureControl(), "no control to hide" ); - m_pControl->GetWindow()->Hide(); + Window* pPanelWindow( getPanelWindow() ); + ENSURE_OR_RETURN_VOID( pPanelWindow, "no window to hide" ); + pPanelWindow->Hide(); } //------------------------------------------------------------------------------------------------------------------ void TaskPaneToolPanel::SetPosSizePixel( const Rectangle& i_rPanelPlayground ) { - ENSURE_OR_RETURN_VOID( impl_ensureControl(), "no control to position" ); - m_pControl->GetWindow()->SetPosSizePixel( i_rPanelPlayground.TopLeft(), i_rPanelPlayground.GetSize() ); + Window* pPanelWindow( getPanelWindow() ); + ENSURE_OR_RETURN_VOID( pPanelWindow, "no window to position" ); + pPanelWindow->SetPosSizePixel( i_rPanelPlayground.TopLeft(), i_rPanelPlayground.GetSize() ); } //------------------------------------------------------------------------------------------------------------------ void TaskPaneToolPanel::GrabFocus() { - ENSURE_OR_RETURN_VOID( impl_ensureControl(), "no control to focus" ); - m_pControl->GetWindow()->GrabFocus(); + Window* pPanelWindow( getPanelWindow() ); + ENSURE_OR_RETURN_VOID( pPanelWindow, "no window to focus" ); + pPanelWindow->GrabFocus(); } //------------------------------------------------------------------------------------------------------------------ bool TaskPaneToolPanel::HasFocus() const { - ENSURE_OR_RETURN_FALSE( const_cast< TaskPaneToolPanel* >( this )->impl_ensureControl(), "no control to ask" ); - return m_pControl->GetWindow()->HasChildPathFocus(); + Window* pPanelWindow( getPanelWindow() ); + ENSURE_OR_RETURN_FALSE( pPanelWindow, "no window to ask" ); + return pPanelWindow->HasChildPathFocus(); } //------------------------------------------------------------------------------------------------------------------ void TaskPaneToolPanel::Dispose() { ENSURE_OR_RETURN_VOID( m_pPanelDeck, "disposed twice" ); - m_pControl.reset(); m_pPanelDeck = NULL; } - //------------------------------------------------------------------------------------------------------------------ - bool TaskPaneToolPanel::impl_ensureControl() - { - if ( m_pControl.get() ) - return true; - if ( !m_pPanelDeck ) - return false; - m_pControl = m_pControlFactory->CreateRootControl( *m_pPanelDeck ); - return ( m_pControl.get() != NULL ); - } - //...................................................................................................................... } } // namespace sd::toolpanel //...................................................................................................................... diff --git a/sd/source/ui/toolpanel/TaskPaneToolPanel.hxx b/sd/source/ui/toolpanel/TaskPaneToolPanel.hxx index 0ff352f58abb..8fad423d1c79 100644 --- a/sd/source/ui/toolpanel/TaskPaneToolPanel.hxx +++ b/sd/source/ui/toolpanel/TaskPaneToolPanel.hxx @@ -52,17 +52,16 @@ namespace sd { namespace toolpanel //================================================================================================================== class TaskPaneToolPanel : public ::svt::ToolPanelBase { - public: + protected: TaskPaneToolPanel( ToolPanelDeck& i_rPanelDeck, - ::std::auto_ptr< ControlFactory >& i_rControlFactory, + const String& i_rPanelName, const Image& i_rImage, - const USHORT i_nTitleResId, - const ULONG i_nHelpId, - const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::framework::XResourceId >& i_rPanelResourceId + const SmartId& i_rHelpId ); ~TaskPaneToolPanel(); + public: // IToolPanel overridables virtual ::rtl::OUString GetDisplayName() const; virtual Image GetImage() const; @@ -73,22 +72,19 @@ namespace sd { namespace toolpanel virtual bool HasFocus() const; virtual void Dispose(); - // own attributes - const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::framework::XResourceId >& - getResourceId() const { return m_xPanelResourceId; } + // own overridables + virtual const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::framework::XResourceId >& getResourceId() const = 0; + virtual ::Window* getPanelWindow() const = 0; - private: - bool impl_ensureControl(); + protected: + bool isDisposed() const { return m_pPanelDeck == NULL; } + ToolPanelDeck& getPanelDeck() { OSL_ENSURE( !isDisposed(), "already disposed!" ); return *m_pPanelDeck; } private: - ToolPanelDeck* m_pPanelDeck; - ::std::auto_ptr< ControlFactory > m_pControlFactory; - ::std::auto_ptr< TreeNode > m_pControl; - const Image m_aImage; - const String m_sTitle; - const SmartId m_aHelpId; - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::framework::XResourceId > - m_xPanelResourceId; + ToolPanelDeck* m_pPanelDeck; + const Image m_aPanelImage; + const String m_sPanelName; + const SmartId m_aHelpId; }; //...................................................................................................................... diff --git a/sd/source/ui/toolpanel/ToolPanelDeck.cxx b/sd/source/ui/toolpanel/ToolPanelDeck.cxx index 0b93e7178e18..25d8bb45c012 100644 --- a/sd/source/ui/toolpanel/ToolPanelDeck.cxx +++ b/sd/source/ui/toolpanel/ToolPanelDeck.cxx @@ -111,20 +111,6 @@ namespace sd { namespace toolpanel SetLayouter( new ::svt::TabDeckLayouter( *this, *this, i_eTabAlignment, i_eTabContent ) ); } - //------------------------------------------------------------------------------------------------------------------ - size_t ToolPanelDeck::CreateAndInsertPanel( ::std::auto_ptr< ControlFactory >& i_rControlFactory, - const Image& i_rImage, const USHORT i_nTitleResId, const ULONG i_nHelpId, const Reference< XResourceId >& i_rPanelResourceId ) - { - // create panel - ::svt::PToolPanel pNewPanel( new TaskPaneToolPanel( - *this, i_rControlFactory, - i_rImage, i_nTitleResId, i_nHelpId, - i_rPanelResourceId - ) ); - // insert as new panel - return InsertPanel( pNewPanel, GetPanelCount() ); - } - //------------------------------------------------------------------------------------------------------------------ void ToolPanelDeck::ActivatePanelDirectly( const ::boost::optional< size_t >& i_rPanel ) { diff --git a/sd/source/ui/toolpanel/ToolPanelDeck.hxx b/sd/source/ui/toolpanel/ToolPanelDeck.hxx index a9dc1a239144..e140d9577220 100644 --- a/sd/source/ui/toolpanel/ToolPanelDeck.hxx +++ b/sd/source/ui/toolpanel/ToolPanelDeck.hxx @@ -58,15 +58,6 @@ namespace sd { namespace toolpanel ); ~ToolPanelDeck(); - // panel maintenance - size_t CreateAndInsertPanel( - ::std::auto_ptr< ControlFactory >& i_rControlFactory, - const Image& i_rImage, - const USHORT i_nTitleResId, - const ULONG i_nHelpId, - const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::framework::XResourceId >& i_rPanelResourceId - ); - /** activates a layout where the active panel is selected via tabs at the right/left/top/bottom (depending on the given TabAlignment value). */ diff --git a/sd/source/ui/toolpanel/ToolPanelDrawer.cxx b/sd/source/ui/toolpanel/ToolPanelDrawer.cxx index 151fd4350790..c071e5e611c1 100644 --- a/sd/source/ui/toolpanel/ToolPanelDrawer.cxx +++ b/sd/source/ui/toolpanel/ToolPanelDrawer.cxx @@ -132,6 +132,7 @@ namespace sd { namespace toolpanel pTitleBar->GetWindow()->Show(); pTitleBar->GetWindow()->AddEventListener( LINK( this, ToolPanelDrawer, OnWindowEvent ) ); m_aDrawers.insert( m_aDrawers.begin() + i_nPosition, pTitleBar ); + impl_triggerRearrange(); } //------------------------------------------------------------------------------------------------------------------ diff --git a/sd/source/ui/toolpanel/ToolPanelViewShell.cxx b/sd/source/ui/toolpanel/ToolPanelViewShell.cxx index 0da1da192ce1..276cc5a83fec 100644 --- a/sd/source/ui/toolpanel/ToolPanelViewShell.cxx +++ b/sd/source/ui/toolpanel/ToolPanelViewShell.cxx @@ -31,6 +31,8 @@ #include "TaskPaneShellManager.hxx" #include "TaskPaneFocusManager.hxx" +#include "StandardToolPanel.hxx" +#include "CustomToolPanel.hxx" #include "controls/MasterPagesPanel.hxx" #include "LayoutMenu.hxx" #include "controls/TableDesignPanel.hxx" @@ -74,6 +76,9 @@ #include #include #include +#include +#include +#include #include @@ -183,7 +188,7 @@ public: */ size_t GetPanelCount() const { - return size_t( PID__END ); + return m_aPanels.size(); } const PanelDescriptor& GetPanel( const size_t i_nLogicalPanelIndex ) const @@ -214,11 +219,20 @@ private: void RegisterPanel( size_t i_nPosition, PanelId i_nPanelId, const ::svt::PToolPanel& i_rPanel ); void UpdateDockingWindowTitle(); + /** creates the built-in panels, returns the position of the panel to activate initially + */ + size_t SetupDefaultPanels(); + + /** creates the custom panels + */ + void SetupCustomPanels(); + typedef ::std::vector< PanelDescriptor > PanelDescriptors; - PanelDescriptors m_aPanels; - ToolPanelViewShell& m_rPanelViewShell; - ::boost::scoped_ptr< ToolPanelDeck > m_pPanelDeck; - PanelSelectorLayout m_eCurrentLayout; + PanelDescriptors m_aPanels; + ToolPanelViewShell& m_rPanelViewShell; + ::boost::scoped_ptr< ToolPanelDeck > m_pPanelDeck; + PanelSelectorLayout m_eCurrentLayout; + bool m_bInitialized; }; // ===================================================================================================================== @@ -249,7 +263,7 @@ SFX_IMPL_INTERFACE(ToolPanelViewShell, SfxShell, SdResId(STR_TASKPANEVIEWSHELL)) TYPEINIT1(ToolPanelViewShell, ViewShell); // --------------------------------------------------------------------------------------------------------------------- -void ToolPanelViewShell::Implementation::Setup() +size_t ToolPanelViewShell::Implementation::SetupDefaultPanels() { typedef std::auto_ptr (*ControlFactoryFactory)( ToolPanelViewShell& i_rToolPanelShell ); @@ -263,7 +277,8 @@ void ToolPanelViewShell::Implementation::Setup() ::rtl::OUString sResourceURL; }; - PanelDescriptor aPanels[] = { + PanelDescriptor aPanels[] = + { // "Master Pages" { &controls::MasterPagesPanel::CreateControlFactory, "PresentationLayout", @@ -329,21 +344,70 @@ void ToolPanelViewShell::Implementation::Setup() const Reference< XResourceId > xPanelId( pFrameworkHelper->CreateResourceId( aPanels[i].sResourceURL, xToolPanelId ) ); // create and insert the panel - size_t nPanelPos = m_pPanelDeck->CreateAndInsertPanel( + ::svt::PToolPanel pNewPanel( new StandardToolPanel( + *m_pPanelDeck, (*aPanels[i].pFactory)( m_rPanelViewShell ), - aPanelImage, aPanels[i].nTitleResourceID, + aPanelImage, aPanels[i].nHelpID, xPanelId - ); + ) ); + const size_t nPanelPos = m_pPanelDeck->InsertPanel( pNewPanel, m_pPanelDeck->GetPanelCount() ); // remember it - RegisterPanel( nPanelPos, aPanels[i].nPanelID, m_pPanelDeck->GetPanel( nPanelPos ) ); + RegisterPanel( nPanelPos, aPanels[i].nPanelID, pNewPanel ); if ( nPanelIdToActivate == aPanels[i].nPanelID ) nPanelPosToActivate = nPanelPos; } + return nPanelPosToActivate; +} + +// --------------------------------------------------------------------------------------------------------------------- +void ToolPanelViewShell::Implementation::SetupCustomPanels() +{ + // compose the resource ID for the ToolPanel view + ::boost::shared_ptr< FrameworkHelper > pFrameworkHelper( FrameworkHelper::Instance( m_rPanelViewShell.GetViewShellBase() ) ); + const Reference< XResourceId > xToolPanelId( pFrameworkHelper->CreateResourceId( FrameworkHelper::msTaskPaneURL, FrameworkHelper::msRightPaneURL ) ); + + // get the config node holding the custom tool panel descriptions + ::utl::OConfigurationTreeRoot aConfig( ::comphelper::ComponentContext( ::comphelper::getProcessServiceFactory() ), + "/org.openoffice.Office.Impress/MultiPaneGUI/ToolPanel/CustomPanels", false ); + const Sequence< ::rtl::OUString > aCustomPanelDescs( aConfig.getNodeNames() ); + + // create panels + size_t nCustomPanelNo = 0; + for ( const ::rtl::OUString* panelNodeName = aCustomPanelDescs.getConstArray(); + panelNodeName != aCustomPanelDescs.getConstArray() + aCustomPanelDescs.getLength(); + ++panelNodeName + ) + { + ::utl::OConfigurationNode aPanelDesc( aConfig.openNode( *panelNodeName ) ); + + // create and insert the panel + ::svt::PToolPanel pNewPanel( new CustomToolPanel( *m_pPanelDeck, aPanelDesc, xToolPanelId, pFrameworkHelper ) ); + const size_t nPanelPos = m_pPanelDeck->InsertPanel( pNewPanel, m_pPanelDeck->GetPanelCount() ); + + // remember it + RegisterPanel( nPanelPos, PanelId( PID_FIRST_CUSTOM_PANEL + nCustomPanelNo ), pNewPanel ); + ++nCustomPanelNo; + } +} + +// --------------------------------------------------------------------------------------------------------------------- +void ToolPanelViewShell::Implementation::Setup() +{ + if ( m_bInitialized ) + return; + m_bInitialized = true; + + // standard (built-in) panels + const size_t nPanelPosToActivate = SetupDefaultPanels(); + + // custom panels + SetupCustomPanels(); + // activate default panel m_pPanelDeck->ActivatePanelResource( nPanelPosToActivate ); @@ -387,18 +451,27 @@ void ToolPanelViewShell::Implementation::SetLayout( const PanelSelectorLayout i_ // --------------------------------------------------------------------------------------------------------------------- void ToolPanelViewShell::Implementation::Cleanup() { - m_pPanelDeck->RemoveListener( *this ); + if ( !m_bInitialized ) + { + m_pPanelDeck->RemoveListener( *this ); + // remove the panels which are not under the control of the panel deck currently + for ( PanelDescriptors::iterator panelPos = m_aPanels.begin(); + panelPos != m_aPanels.end(); + ++panelPos + ) + { + if ( panelPos->bHidden ) + panelPos->pPanel->Dispose(); + } + m_aPanels.clear(); + } m_pPanelDeck.reset(); } // --------------------------------------------------------------------------------------------------------------------- void ToolPanelViewShell::Initialize() { - if ( !mbIsInitialized ) - { - mbIsInitialized = true; - mpImpl->Setup(); - } + mpImpl->Setup(); } // --------------------------------------------------------------------------------------------------------------------- @@ -406,7 +479,6 @@ ToolPanelViewShell::ToolPanelViewShell( SfxViewFrame* pFrame, ViewShellBase& rVi FrameView* pFrameViewArgument ) :ViewShell(pFrame, pParentWindow, rViewShellBase) ,mpImpl( new Implementation( *this, *mpContentWindow.get() ) ) - ,mbIsInitialized(false) ,mpSubShellManager() ,mnMenuId(0) { @@ -462,10 +534,7 @@ ToolPanelViewShell::ToolPanelViewShell( SfxViewFrame* pFrame, ViewShellBase& rVi // --------------------------------------------------------------------------------------------------------------------- ToolPanelViewShell::~ToolPanelViewShell() { - if ( mbIsInitialized ) - { - mpImpl->Cleanup(); - } + mpImpl->Cleanup(); // reset our impl before destroying the panel deck, to ensure the hidden panels are properly // disposed/destroyed, too @@ -800,10 +869,11 @@ void ToolPanelViewShell::ActivatePanel( const PanelId i_ePanelId ) // ===================================================================================================================== // --------------------------------------------------------------------------------------------------------------------- ToolPanelViewShell::Implementation::Implementation( ToolPanelViewShell& i_rPanelViewShell, ::Window& i_rPanelDeckParent ) - :m_aPanels( PanelDescriptors::size_type( PID__END ) ) + :m_aPanels() ,m_rPanelViewShell( i_rPanelViewShell ) ,m_pPanelDeck( new ToolPanelDeck( i_rPanelDeckParent, i_rPanelViewShell ) ) ,m_eCurrentLayout( LAYOUT_DRAWERS ) + ,m_bInitialized( false ) { } @@ -875,6 +945,9 @@ void ToolPanelViewShell::Implementation::ActivatePanelDirectly( const PanelId i_ // --------------------------------------------------------------------------------------------------------------------- void ToolPanelViewShell::Implementation::RegisterPanel( size_t i_nPosition, PanelId i_nPanelId, const ::svt::PToolPanel& i_rPanel ) { + if ( i_nPosition >= m_aPanels.size() ) + m_aPanels.resize( i_nPosition + 1 ); + OSL_PRECOND( m_aPanels[ i_nPosition ].nId == PID_UNKNOWN, "ToolPanelViewShell::Implementation::RegisterPanel: " "already registered a panel for this ID!" ); m_aPanels[ i_nPosition ] = PanelDescriptor( i_nPanelId, i_rPanel ); diff --git a/sd/source/ui/toolpanel/makefile.mk b/sd/source/ui/toolpanel/makefile.mk index d364b74ea062..837ffb710499 100644 --- a/sd/source/ui/toolpanel/makefile.mk +++ b/sd/source/ui/toolpanel/makefile.mk @@ -62,6 +62,8 @@ SLOFILES = \ $(SLO)$/ToolPanelDeck.obj \ $(SLO)$/ToolPanelDrawer.obj \ $(SLO)$/TaskPaneToolPanel.obj \ + $(SLO)$/CustomToolPanel.obj \ + $(SLO)$/StandardToolPanel.obj \ \ $(SLO)$/EmptyWindow.obj \ $(SLO)$/LayoutMenu.obj \ diff --git a/sd/workben/custompanel/Impress.xcu b/sd/workben/custompanel/Impress.xcu new file mode 100644 index 000000000000..1c7bb5f6b102 --- /dev/null +++ b/sd/workben/custompanel/Impress.xcu @@ -0,0 +1,34 @@ + + + + + + + + + private:resource/view/SingleColorView + + + Single Color Panel + + + + + + + + + org.openoffice.example.colorpanel.ResourceFactory + + + + + private:resource/view/SingleColorView + + + + + + + + diff --git a/sd/workben/custompanel/colorpanel.map b/sd/workben/custompanel/colorpanel.map new file mode 100644 index 000000000000..f4ed78b9e970 --- /dev/null +++ b/sd/workben/custompanel/colorpanel.map @@ -0,0 +1,8 @@ +UDK_3_0_0 { + global: + component_getImplementationEnvironment; + component_writeInfo; + component_getFactory; + local: + *; +}; diff --git a/sd/workben/custompanel/ctp_factory.cxx b/sd/workben/custompanel/ctp_factory.cxx new file mode 100644 index 000000000000..573c68ebfecb --- /dev/null +++ b/sd/workben/custompanel/ctp_factory.cxx @@ -0,0 +1,187 @@ +/************************************************************************* + * 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. + * +************************************************************************/ + +#include "precompiled_sd.hxx" + +#include "ctp_factory.hxx" +#include "ctp_panel.hxx" + +/** === begin UNO includes === **/ +#include +#include +#include +/** === end UNO includes === **/ + +//...................................................................................................................... +namespace sd { namespace colortoolpanel +{ +//...................................................................................................................... + + /** === begin UNO using === **/ + using ::com::sun::star::uno::Reference; + using ::com::sun::star::uno::XInterface; + using ::com::sun::star::uno::UNO_QUERY; + using ::com::sun::star::uno::UNO_QUERY_THROW; + using ::com::sun::star::uno::UNO_SET_THROW; + using ::com::sun::star::uno::Exception; + using ::com::sun::star::uno::RuntimeException; + using ::com::sun::star::uno::Any; + using ::com::sun::star::uno::makeAny; + using ::com::sun::star::uno::Sequence; + using ::com::sun::star::uno::Type; + using ::com::sun::star::uno::XComponentContext; + using ::com::sun::star::drawing::framework::XResourceId; + using ::com::sun::star::drawing::framework::XResource; + using ::com::sun::star::lang::NotInitializedException; + using ::com::sun::star::lang::IllegalArgumentException; + using ::com::sun::star::drawing::framework::XResourceFactoryManager; + /** === end UNO using === **/ + + //================================================================================================================== + //= helper + //================================================================================================================== + namespace + { + const ::rtl::OUString& lcl_getSingleColorViewURL() + { + static ::rtl::OUString s_sSingleColorViewURL( RTL_CONSTASCII_USTRINGPARAM( "private:resource/view/SingleColorView" ) ); + return s_sSingleColorViewURL; + } + } + + //================================================================================================================== + //= ResourceFactory + //================================================================================================================== + //------------------------------------------------------------------------------------------------------------------ + ResourceFactory::ResourceFactory( const Reference< XComponentContext >& i_rContext ) + :m_xContext( i_rContext ) + { + } + + //------------------------------------------------------------------------------------------------------------------ + ResourceFactory::~ResourceFactory() + { + } + + //------------------------------------------------------------------------------------------------------------------ + Reference< XResource > SAL_CALL ResourceFactory::createResource( const Reference< XResourceId >& i_rResourceId ) throw (RuntimeException) + { + FactoryGuard aGuard( *this ); + if ( !i_rResourceId.is() ) + // TODO: the API should allow me to throw an IllegalArgumentException here + throw NULL; + + const ::rtl::OUString sResourceURL( i_rResourceId->getResourceURL() ); + if ( sResourceURL != lcl_getSingleColorViewURL() ) + return NULL; + + return new SingleColorPanel( m_xContext, m_xControllerManager->getConfigurationController(), i_rResourceId ); + } + + //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL ResourceFactory::releaseResource( const Reference< XResource >& i_rResource ) throw (RuntimeException) + { + FactoryGuard aGuard( *this ); + // TODO: place your code here + (void)i_rResource; + } + + //------------------------------------------------------------------------------------------------------------------ + ::rtl::OUString SAL_CALL ResourceFactory::getImplementationName( ) throw (RuntimeException) + { + return getImplementationName_static(); + } + + //------------------------------------------------------------------------------------------------------------------ + ::rtl::OUString SAL_CALL ResourceFactory::getImplementationName_static( ) throw (RuntimeException) + { + return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "org.openoffice.comp.example.colorpanel.ResourceFactory" ) ); + } + + //------------------------------------------------------------------------------------------------------------------ + ::sal_Bool SAL_CALL ResourceFactory::supportsService( const ::rtl::OUString& i_rServiceName ) throw (RuntimeException) + { + const Sequence< ::rtl::OUString > aServiceNames( getSupportedServiceNames() ); + for ( const ::rtl::OUString* serviceName = aServiceNames.getConstArray(); + serviceName != aServiceNames.getConstArray() + aServiceNames.getLength(); + ++serviceName + ) + { + if ( i_rServiceName == *serviceName ) + return sal_True; + } + return sal_False; + } + + //------------------------------------------------------------------------------------------------------------------ + Sequence< ::rtl::OUString > SAL_CALL ResourceFactory::getSupportedServiceNames() throw (RuntimeException) + { + return getSupportedServiceNames_static(); + } + + //------------------------------------------------------------------------------------------------------------------ + Sequence< ::rtl::OUString > SAL_CALL ResourceFactory::getSupportedServiceNames_static() throw (RuntimeException) + { + Sequence< ::rtl::OUString > aServiceNames(1); + aServiceNames[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "org.openoffice.example.colorpanel.ResourceFactory" ) ); + return aServiceNames; + } + + //------------------------------------------------------------------------------------------------------------------ + Reference< XInterface > SAL_CALL ResourceFactory::Create( const Reference< XComponentContext >& i_rContext ) throw (RuntimeException) + { + return *( new ResourceFactory( i_rContext ) ); + } + + //------------------------------------------------------------------------------------------------------------------ + void ResourceFactory::checkInitialized( GuardAccess ) const + { + if ( !m_xControllerManager.is() ) + throw NotInitializedException( ::rtl::OUString(), *const_cast< ResourceFactory* >( this ) ); + } + + //------------------------------------------------------------------------------------------------------------------ + void ResourceFactory::checkDisposed( GuardAccess ) const + { + // cannot be disposed currently ... + } + + //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL ResourceFactory::initialize( const Sequence< Any >& i_rArguments ) throw (Exception, RuntimeException) + { + if ( !i_rArguments.getLength() ) + throw IllegalArgumentException(); + + FactoryGuard aGuard( *this, false ); + m_xControllerManager.set( i_rArguments[0], UNO_QUERY_THROW ); + + Reference< XResourceFactoryManager > xFactoryManager( m_xControllerManager->getConfigurationController(), UNO_QUERY_THROW ); + xFactoryManager->addResourceFactory( lcl_getSingleColorViewURL(), this ); + } + +//...................................................................................................................... +} } // namespace sd::colortoolpanel +//...................................................................................................................... diff --git a/sd/workben/custompanel/ctp_factory.hxx b/sd/workben/custompanel/ctp_factory.hxx new file mode 100644 index 000000000000..8f9ff523f5ec --- /dev/null +++ b/sd/workben/custompanel/ctp_factory.hxx @@ -0,0 +1,114 @@ +/************************************************************************* + * 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_WORKBENCH_CTP_FACTORY_HXX +#define SD_WORKBENCH_CTP_FACTORY_HXX + +/** === begin UNO includes === **/ +#include +#include +#include +#include +#include +/** === end UNO includes === **/ + +#include +#include + +//...................................................................................................................... +namespace sd { namespace colortoolpanel +{ +//...................................................................................................................... + + class FactoryGuard; + + //================================================================================================================== + //= ResourceFactory + //================================================================================================================== + typedef ::cppu::WeakImplHelper3 < ::com::sun::star::drawing::framework::XResourceFactory + , ::com::sun::star::lang::XServiceInfo + , ::com::sun::star::lang::XInitialization + > ResourceFactory_Base; + class ResourceFactory :public ::cppu::BaseMutex + ,public ResourceFactory_Base + { + public: + ResourceFactory( + const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& i_rContext + ); + ~ResourceFactory(); + + // XResourceFactory + virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::framework::XResource > SAL_CALL createResource( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::framework::XResourceId >& xResourceId ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL releaseResource( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::framework::XResource >& xResource ) 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); + + // XServiceInfo - static versions + static ::rtl::OUString SAL_CALL getImplementationName_static( ) throw (::com::sun::star::uno::RuntimeException); + static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames_static( ) throw (::com::sun::star::uno::RuntimeException); + static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& i_rContext ) throw (::com::sun::star::uno::RuntimeException); + + // XInitialization + virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + + public: + struct GuardAccess { friend class FactoryGuard; private: GuardAccess() { } }; + + void checkInitialized( GuardAccess ) const; + void checkDisposed( GuardAccess ) const; + ::osl::Mutex& getMutex( GuardAccess ) { return m_aMutex; } + + private: + const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > + m_xContext; + ::com::sun::star::uno::Reference< ::com::sun::star::drawing::framework::XControllerManager > + m_xControllerManager; + }; + + class FactoryGuard + { + public: + FactoryGuard( ResourceFactory& i_rFactory, const bool i_bNeedInit = true ) + :m_aGuard( i_rFactory.getMutex( ResourceFactory::GuardAccess() ) ) + { + i_rFactory.checkDisposed( ResourceFactory::GuardAccess() ); + if ( i_bNeedInit ) + i_rFactory.checkInitialized( ResourceFactory::GuardAccess() ); + } + + protected: + ::osl::MutexGuard m_aGuard; + }; + +//...................................................................................................................... +} } // namespace sd::colortoolpanel +//...................................................................................................................... + +#endif // SD_WORKBENCH_CTP_FACTORY_HXX diff --git a/sd/workben/custompanel/ctp_panel.cxx b/sd/workben/custompanel/ctp_panel.cxx new file mode 100644 index 000000000000..dbbbb8c6f273 --- /dev/null +++ b/sd/workben/custompanel/ctp_panel.cxx @@ -0,0 +1,90 @@ +/************************************************************************* + * 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. + * +************************************************************************/ + +#include "precompiled_sd.hxx" + +#include "ctp_panel.hxx" + +/** === begin UNO includes === **/ +/** === end UNO includes === **/ + +//...................................................................................................................... +namespace sd { namespace colortoolpanel +{ +//...................................................................................................................... + + /** === begin UNO using === **/ + using ::com::sun::star::uno::Reference; + using ::com::sun::star::uno::XInterface; + using ::com::sun::star::uno::UNO_QUERY; + using ::com::sun::star::uno::UNO_QUERY_THROW; + using ::com::sun::star::uno::UNO_SET_THROW; + using ::com::sun::star::uno::Exception; + using ::com::sun::star::uno::RuntimeException; + using ::com::sun::star::uno::Any; + using ::com::sun::star::uno::makeAny; + using ::com::sun::star::uno::Sequence; + using ::com::sun::star::uno::Type; + using ::com::sun::star::drawing::framework::XConfigurationController; + using ::com::sun::star::drawing::framework::XResourceId; + using ::com::sun::star::uno::XComponentContext; + /** === end UNO using === **/ + + //================================================================================================================== + //= class SingleColorPanel + //================================================================================================================== + //------------------------------------------------------------------------------------------------------------------ + SingleColorPanel::SingleColorPanel( const Reference< XComponentContext >& i_rContext, + const Reference< XConfigurationController >& i_rConfigController, const Reference< XResourceId >& i_rResourceId ) + :m_xContext( i_rContext ) + ,m_xResourceId( i_rResourceId ) + { + // TODO: retrieve the resource object for the anchor, ask it for its XPane interface, retrieve the window + // associated with it, create our own window as child of the pane's window + (void)i_rConfigController; + } + + //------------------------------------------------------------------------------------------------------------------ + SingleColorPanel::~SingleColorPanel() + { + } + + //-------------------------------------------------------------------- + Reference< XResourceId > SAL_CALL SingleColorPanel::getResourceId( ) throw (RuntimeException) + { + return m_xResourceId; + } + + //-------------------------------------------------------------------- + ::sal_Bool SAL_CALL SingleColorPanel::isAnchorOnly( ) throw (RuntimeException) + { + return sal_False; + } + + +//...................................................................................................................... +} } // namespace sd::colortoolpanel +//...................................................................................................................... diff --git a/sd/workben/custompanel/ctp_panel.hxx b/sd/workben/custompanel/ctp_panel.hxx new file mode 100644 index 000000000000..c7ecb7c19795 --- /dev/null +++ b/sd/workben/custompanel/ctp_panel.hxx @@ -0,0 +1,79 @@ +/************************************************************************* + * 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_WORKBENCH_CTP_PANEL_HXX +#define SD_WORKBENCH_CTP_PANEL_HXX + +/** === begin UNO includes === **/ +#include +#include +#include +#include +/** === end UNO includes === **/ + +#include +#include + +//...................................................................................................................... +namespace sd { namespace colortoolpanel +{ +//...................................................................................................................... + + //================================================================================================================== + //= class SingleColorPanel + //================================================================================================================== + typedef ::cppu::WeakImplHelper1 < ::com::sun::star::drawing::framework::XView + > SingleColorPanel_Base; + class SingleColorPanel :public ::cppu::BaseMutex + ,public SingleColorPanel_Base + { + public: + SingleColorPanel( + const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& i_rContext, + const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::framework::XConfigurationController >& i_rConfigController, + const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::framework::XResourceId >& i_rResourceId + ); + + // XView + // (no methods) + + // XResource + virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::framework::XResourceId > SAL_CALL getResourceId( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL isAnchorOnly( ) throw (::com::sun::star::uno::RuntimeException); + + protected: + ~SingleColorPanel(); + + private: + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; + ::com::sun::star::uno::Reference< ::com::sun::star::drawing::framework::XResourceId > m_xResourceId; + }; + +//...................................................................................................................... +} } // namespace sd::colortoolpanel +//...................................................................................................................... + +#endif // SD_WORKBENCH_CTP_PANEL_HXX diff --git a/sd/workben/custompanel/ctp_services.cxx b/sd/workben/custompanel/ctp_services.cxx new file mode 100644 index 000000000000..67fd5af14c7b --- /dev/null +++ b/sd/workben/custompanel/ctp_services.cxx @@ -0,0 +1,92 @@ +/************************************************************************* + * 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. + * +************************************************************************/ + +#include "precompiled_sd.hxx" + +#include "ctp_factory.hxx" + +/** === begin UNO includes === **/ +/** === end UNO includes === **/ + +#include + +//...................................................................................................................... +namespace sd { namespace colortoolpanel +{ +//...................................................................................................................... + + /** === begin UNO using === **/ + using ::com::sun::star::uno::Reference; + using ::com::sun::star::uno::XInterface; + using ::com::sun::star::uno::UNO_QUERY; + using ::com::sun::star::uno::UNO_QUERY_THROW; + using ::com::sun::star::uno::UNO_SET_THROW; + using ::com::sun::star::uno::Exception; + using ::com::sun::star::uno::RuntimeException; + using ::com::sun::star::uno::Any; + using ::com::sun::star::uno::makeAny; + using ::com::sun::star::uno::Sequence; + using ::com::sun::star::uno::Type; + /** === end UNO using === **/ + + //================================================================================================================== + //= descriptors for the services implemented in this component + //================================================================================================================== + static struct ::cppu::ImplementationEntry s_aServiceEntries[] = + { + { + ResourceFactory::Create, + ResourceFactory::getImplementationName_static, + ResourceFactory::getSupportedServiceNames_static, + ::cppu::createSingleComponentFactory, NULL, 0 + }, + { 0, 0, 0, 0, 0, 0 } + }; + +//...................................................................................................................... +} } // namespace sd::colortoolpanel +//...................................................................................................................... + +extern "C" +{ + //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** ) + { + *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; + } + + //------------------------------------------------------------------------------------------------------------------ + sal_Bool SAL_CALL component_writeInfo( void * pServiceManager, void * pRegistryKey ) + { + return ::cppu::component_writeInfoHelper( pServiceManager, pRegistryKey, ::sd::colortoolpanel::s_aServiceEntries ); + } + + //------------------------------------------------------------------------------------------------------------------ + void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) + { + return ::cppu::component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey , ::sd::colortoolpanel::s_aServiceEntries ); + } +} diff --git a/sd/workben/custompanel/delzip b/sd/workben/custompanel/delzip new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/sd/workben/custompanel/description.xml b/sd/workben/custompanel/description.xml new file mode 100644 index 000000000000..a1dbdf4f125d --- /dev/null +++ b/sd/workben/custompanel/description.xml @@ -0,0 +1,16 @@ + + + + + + + + Custom Tool Panel Example + + + + + diff --git a/sd/workben/custompanel/makefile.mk b/sd/workben/custompanel/makefile.mk new file mode 100644 index 000000000000..7703b7163fa3 --- /dev/null +++ b/sd/workben/custompanel/makefile.mk @@ -0,0 +1,102 @@ +#************************************************************************* +# +# 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. +# +#************************************************************************* + +PRJ=../.. +PRJNAME=sd + +TARGET=colorpanel +ENABLE_EXCEPTIONS=TRUE +LIBTARGET=NO +EXTENSIONNAME:=colored-tool-panel + +# --- Settings ----------------------------------------------------- + +.INCLUDE : settings.mk + +#------------------------------------------------------------------- + +#---- extension version +EXTENSION_VERSION_BASE=0.1 +.IF ( "$(CWS_WORK_STAMP)" == "" ) || ( "$(UPDATER)" == "YES" ) + EXTENSION_VERSION=$(EXTENSION_VERSION_BASE) +.ELSE + EXTENSION_VERSION=$(EXTENSION_VERSION_BASE).cws.$(CWS_WORK_STAMP) +.ENDIF + +#---- extension title package name +EXTENSION_TITLE=Custom Tool Panel Example +EXTENSION_ZIPNAME=$(EXTENSIONNAME)-$(EXTENSION_VERSION_BASE)-$(RTL_OS:l)-$(RTL_ARCH:l) + +#-------------------------------------------------- + +SHL1DLLPRE= +SHL1TARGET=$(TARGET).uno +LIB1TARGET=$(SLB)/$(SHL1TARGET).lib +LIB1OBJFILES= \ + $(SLO)/ctp_factory.obj \ + $(SLO)/ctp_services.obj \ + $(SLO)/ctp_panel.obj + +SHL1STDLIBS= \ + $(CPPULIB) \ + $(SALLIB) \ + $(SALHELPERLIB) \ + $(CPPUHELPERLIB) + +SHL1VERSIONMAP=$(TARGET).map +SHL1LIBS= $(LIB1TARGET) +SHL1DEF= $(MISC)/$(SHL1TARGET).def +SHL1RPATH= OXT +DEF1NAME= $(SHL1TARGET) + +# create Extension ----------------------------- + +COMPONENT_CONFIGDEST=. + +COMPONENT_XCU = \ + $(EXTENSIONDIR)/Impress.xcu + +COMPONENT_LIBRARIES = \ + $(EXTENSIONDIR)$/$(SHL1TARGET)$(DLLPOST) + +# ........ dependencies for packaging the extension ........ +EXTENSION_PACKDEPS=makefile.mk + +# --- Targets ------------------------------------------------------ +.INCLUDE : extension_pre.mk +.INCLUDE : target.mk +.INCLUDE : extension_post.mk + +# xcu files: copy + +#$(COMPONENT_XCU) : ./Impress.xcu +# @-$(MKDIRHIER) $(@:d) +# $(COPY) $< $@ + +#$(COMPONENT_LIBRARY) : $(BIN)/$(SHL1TARGET)$(DLLPOST) +# @@-$(MKDIRHIER) $(@:d) +# @$(COPY) $< $@ diff --git a/sd/workben/custompanel/manifest.xml b/sd/workben/custompanel/manifest.xml new file mode 100644 index 000000000000..96f62afe4e27 --- /dev/null +++ b/sd/workben/custompanel/manifest.xml @@ -0,0 +1,8 @@ + + + + + + -- cgit From 1644d80f7aa55a6b2e4a926215b105842c3ab242 Mon Sep 17 00:00:00 2001 From: "Frank Schoenheit [fs]" Date: Fri, 19 Mar 2010 10:28:04 +0100 Subject: slidecopy: reworked the ToolPanelDeck to have a dedicated anchor window for the panel's windows. This will ease some later changes --- sd/source/ui/toolpanel/StandardToolPanel.cxx | 2 +- sd/source/ui/toolpanel/TaskPaneToolPanel.cxx | 26 +++++++++++++------------- sd/source/ui/toolpanel/TaskPaneToolPanel.hxx | 9 ++++----- 3 files changed, 18 insertions(+), 19 deletions(-) (limited to 'sd') diff --git a/sd/source/ui/toolpanel/StandardToolPanel.cxx b/sd/source/ui/toolpanel/StandardToolPanel.cxx index 5e4d35ee1729..1e2ba8f6308e 100644 --- a/sd/source/ui/toolpanel/StandardToolPanel.cxx +++ b/sd/source/ui/toolpanel/StandardToolPanel.cxx @@ -102,7 +102,7 @@ namespace sd { namespace toolpanel return true; if ( isDisposed() ) return false; - m_pControl = m_pControlFactory->CreateRootControl( getPanelDeck() ); + m_pControl = m_pControlFactory->CreateRootControl( getPanelWindowAnchor() ); return ( m_pControl.get() != NULL ); } diff --git a/sd/source/ui/toolpanel/TaskPaneToolPanel.cxx b/sd/source/ui/toolpanel/TaskPaneToolPanel.cxx index 92530bf9e5bc..5dc8498abbe4 100644 --- a/sd/source/ui/toolpanel/TaskPaneToolPanel.cxx +++ b/sd/source/ui/toolpanel/TaskPaneToolPanel.cxx @@ -70,6 +70,13 @@ namespace sd { namespace toolpanel { } + //------------------------------------------------------------------------------------------------------------------ + Window& TaskPaneToolPanel::getPanelWindowAnchor() + { + OSL_ENSURE( !isDisposed(), "already disposed!" ); + return m_pPanelDeck->GetPanelWindowAnchor(); + } + //------------------------------------------------------------------------------------------------------------------ ::rtl::OUString TaskPaneToolPanel::GetDisplayName() const { @@ -83,15 +90,16 @@ namespace sd { namespace toolpanel } //------------------------------------------------------------------------------------------------------------------ - void TaskPaneToolPanel::Show() + void TaskPaneToolPanel::Activate( ::Window& i_rParentWindow ) { Window* pPanelWindow( getPanelWindow() ); ENSURE_OR_RETURN_VOID( pPanelWindow, "no window to show" ); + pPanelWindow->SetPosSizePixel( Point(), i_rParentWindow.GetSizePixel() ); pPanelWindow->Show(); } //------------------------------------------------------------------------------------------------------------------ - void TaskPaneToolPanel::Hide() + void TaskPaneToolPanel::Deactivate() { Window* pPanelWindow( getPanelWindow() ); ENSURE_OR_RETURN_VOID( pPanelWindow, "no window to hide" ); @@ -99,11 +107,11 @@ namespace sd { namespace toolpanel } //------------------------------------------------------------------------------------------------------------------ - void TaskPaneToolPanel::SetPosSizePixel( const Rectangle& i_rPanelPlayground ) + void TaskPaneToolPanel::SetSizePixel( const Size& i_rPanelWindowSize ) { Window* pPanelWindow( getPanelWindow() ); - ENSURE_OR_RETURN_VOID( pPanelWindow, "no window to position" ); - pPanelWindow->SetPosSizePixel( i_rPanelPlayground.TopLeft(), i_rPanelPlayground.GetSize() ); + ENSURE_OR_RETURN_VOID( pPanelWindow, "no window to resize" ); + pPanelWindow->SetSizePixel( i_rPanelWindowSize ); } //------------------------------------------------------------------------------------------------------------------ @@ -114,14 +122,6 @@ namespace sd { namespace toolpanel pPanelWindow->GrabFocus(); } - //------------------------------------------------------------------------------------------------------------------ - bool TaskPaneToolPanel::HasFocus() const - { - Window* pPanelWindow( getPanelWindow() ); - ENSURE_OR_RETURN_FALSE( pPanelWindow, "no window to ask" ); - return pPanelWindow->HasChildPathFocus(); - } - //------------------------------------------------------------------------------------------------------------------ void TaskPaneToolPanel::Dispose() { diff --git a/sd/source/ui/toolpanel/TaskPaneToolPanel.hxx b/sd/source/ui/toolpanel/TaskPaneToolPanel.hxx index 8fad423d1c79..7cf60b10325e 100644 --- a/sd/source/ui/toolpanel/TaskPaneToolPanel.hxx +++ b/sd/source/ui/toolpanel/TaskPaneToolPanel.hxx @@ -65,11 +65,10 @@ namespace sd { namespace toolpanel // IToolPanel overridables virtual ::rtl::OUString GetDisplayName() const; virtual Image GetImage() const; - virtual void Show(); - virtual void Hide(); - virtual void SetPosSizePixel( const Rectangle& i_rPanelPlayground ); + virtual void Activate( ::Window& i_rParentWindow ); + virtual void Deactivate(); + virtual void SetSizePixel( const Size& i_rPanelWindowSize ); virtual void GrabFocus(); - virtual bool HasFocus() const; virtual void Dispose(); // own overridables @@ -78,7 +77,7 @@ namespace sd { namespace toolpanel protected: bool isDisposed() const { return m_pPanelDeck == NULL; } - ToolPanelDeck& getPanelDeck() { OSL_ENSURE( !isDisposed(), "already disposed!" ); return *m_pPanelDeck; } + Window& getPanelWindowAnchor(); private: ToolPanelDeck* m_pPanelDeck; -- 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/framework/factories/BasicPaneFactory.cxx | 3 ++- sd/source/ui/framework/factories/BasicPaneFactory.hxx | 2 +- sd/source/ui/framework/factories/BasicToolBarFactory.cxx | 3 ++- sd/source/ui/framework/factories/BasicToolBarFactory.hxx | 2 +- sd/source/ui/framework/factories/BasicViewFactory.cxx | 3 ++- sd/source/ui/framework/factories/BasicViewFactory.hxx | 2 +- sd/source/ui/framework/factories/PresentationFactory.cxx | 3 ++- sd/source/ui/framework/factories/TaskPanelFactory.cxx | 3 ++- sd/source/ui/framework/factories/TaskPanelFactory.hxx | 2 +- sd/source/ui/inc/framework/PresentationFactory.hxx | 2 +- sd/workben/custompanel/ctp_factory.cxx | 8 ++++---- sd/workben/custompanel/ctp_factory.hxx | 2 +- 12 files changed, 20 insertions(+), 15 deletions(-) (limited to 'sd') diff --git a/sd/source/ui/framework/factories/BasicPaneFactory.cxx b/sd/source/ui/framework/factories/BasicPaneFactory.cxx index 998cc13571f7..4db98498c582 100644 --- a/sd/source/ui/framework/factories/BasicPaneFactory.cxx +++ b/sd/source/ui/framework/factories/BasicPaneFactory.cxx @@ -48,6 +48,7 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; +using namespace ::com::sun::star::lang; using namespace ::com::sun::star::drawing::framework; using ::rtl::OUString; @@ -274,7 +275,7 @@ void SAL_CALL BasicPaneFactory::initialize (const Sequence& aArguments) Reference SAL_CALL BasicPaneFactory::createResource ( const Reference& rxPaneId) - throw (RuntimeException) + throw (RuntimeException, IllegalArgumentException, WrappedTargetException) { ThrowIfDisposed(); diff --git a/sd/source/ui/framework/factories/BasicPaneFactory.hxx b/sd/source/ui/framework/factories/BasicPaneFactory.hxx index b60f9f272a35..1654e59247a1 100644 --- a/sd/source/ui/framework/factories/BasicPaneFactory.hxx +++ b/sd/source/ui/framework/factories/BasicPaneFactory.hxx @@ -103,7 +103,7 @@ public: virtual css::uno::Reference SAL_CALL createResource ( const css::uno::Reference& rxPaneId) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException); virtual void SAL_CALL releaseResource ( diff --git a/sd/source/ui/framework/factories/BasicToolBarFactory.cxx b/sd/source/ui/framework/factories/BasicToolBarFactory.cxx index 7bbb4921aaee..eb43db80c366 100644 --- a/sd/source/ui/framework/factories/BasicToolBarFactory.cxx +++ b/sd/source/ui/framework/factories/BasicToolBarFactory.cxx @@ -42,6 +42,7 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; +using namespace ::com::sun::star::lang; using namespace ::com::sun::star::drawing::framework; namespace sd { namespace framework { @@ -195,7 +196,7 @@ void SAL_CALL BasicToolBarFactory::disposing ( Reference SAL_CALL BasicToolBarFactory::createResource ( const Reference& rxToolBarId) - throw (RuntimeException) + throw (RuntimeException, IllegalArgumentException, WrappedTargetException) { ThrowIfDisposed(); diff --git a/sd/source/ui/framework/factories/BasicToolBarFactory.hxx b/sd/source/ui/framework/factories/BasicToolBarFactory.hxx index e5f228dd4a25..f8a2f5e538bc 100644 --- a/sd/source/ui/framework/factories/BasicToolBarFactory.hxx +++ b/sd/source/ui/framework/factories/BasicToolBarFactory.hxx @@ -84,7 +84,7 @@ public: createResource ( const css::uno::Reference< css::drawing::framework::XResourceId>& rxToolBarId) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException); virtual void SAL_CALL releaseResource ( diff --git a/sd/source/ui/framework/factories/BasicViewFactory.cxx b/sd/source/ui/framework/factories/BasicViewFactory.cxx index d01d923ccb1d..d6ae0fea249d 100644 --- a/sd/source/ui/framework/factories/BasicViewFactory.cxx +++ b/sd/source/ui/framework/factories/BasicViewFactory.cxx @@ -59,6 +59,7 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; +using namespace ::com::sun::star::lang; using namespace ::com::sun::star::drawing::framework; using ::rtl::OUString; @@ -193,7 +194,7 @@ void SAL_CALL BasicViewFactory::disposing (void) Reference SAL_CALL BasicViewFactory::createResource ( const Reference& rxViewId) - throw(RuntimeException) + throw(RuntimeException, IllegalArgumentException, WrappedTargetException) { Reference xView; const bool bIsCenterPane ( diff --git a/sd/source/ui/framework/factories/BasicViewFactory.hxx b/sd/source/ui/framework/factories/BasicViewFactory.hxx index 59d2826ac106..da9f0b0b3b79 100644 --- a/sd/source/ui/framework/factories/BasicViewFactory.hxx +++ b/sd/source/ui/framework/factories/BasicViewFactory.hxx @@ -100,7 +100,7 @@ public: virtual css::uno::Reference SAL_CALL createResource ( const css::uno::Reference& 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) diff --git a/sd/source/ui/framework/factories/PresentationFactory.cxx b/sd/source/ui/framework/factories/PresentationFactory.cxx index 96c18243b01a..c4f42a5ef8e7 100644 --- a/sd/source/ui/framework/factories/PresentationFactory.cxx +++ b/sd/source/ui/framework/factories/PresentationFactory.cxx @@ -43,6 +43,7 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; +using namespace ::com::sun::star::lang; using namespace ::com::sun::star::drawing::framework; using ::rtl::OUString; @@ -185,7 +186,7 @@ void SAL_CALL PresentationFactory::disposing (void) Reference SAL_CALL PresentationFactory::createResource ( const Reference& rxViewId) - throw (RuntimeException) + throw (RuntimeException, IllegalArgumentException, WrappedTargetException) { ThrowIfDisposed(); diff --git a/sd/source/ui/framework/factories/TaskPanelFactory.cxx b/sd/source/ui/framework/factories/TaskPanelFactory.cxx index b04373a6d23e..0ff2893507c7 100644 --- a/sd/source/ui/framework/factories/TaskPanelFactory.cxx +++ b/sd/source/ui/framework/factories/TaskPanelFactory.cxx @@ -39,6 +39,7 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; +using namespace ::com::sun::star::lang; using namespace ::com::sun::star::drawing::framework; using ::rtl::OUString; @@ -239,7 +240,7 @@ namespace Reference SAL_CALL TaskPanelFactory::createResource ( const Reference& rxResourceId) - throw (RuntimeException) + throw (RuntimeException, IllegalArgumentException, WrappedTargetException) { Reference xResource; diff --git a/sd/source/ui/framework/factories/TaskPanelFactory.hxx b/sd/source/ui/framework/factories/TaskPanelFactory.hxx index 14068a617909..f60264f10590 100644 --- a/sd/source/ui/framework/factories/TaskPanelFactory.hxx +++ b/sd/source/ui/framework/factories/TaskPanelFactory.hxx @@ -84,7 +84,7 @@ public: SAL_CALL createResource ( const css::uno::Reference< css::drawing::framework::XResourceId>& rxResourcesId) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException); virtual void SAL_CALL releaseResource ( const css::uno::Reference< 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) diff --git a/sd/workben/custompanel/ctp_factory.cxx b/sd/workben/custompanel/ctp_factory.cxx index 573c68ebfecb..caa19170ca59 100644 --- a/sd/workben/custompanel/ctp_factory.cxx +++ b/sd/workben/custompanel/ctp_factory.cxx @@ -58,6 +58,7 @@ namespace sd { namespace colortoolpanel using ::com::sun::star::lang::NotInitializedException; using ::com::sun::star::lang::IllegalArgumentException; using ::com::sun::star::drawing::framework::XResourceFactoryManager; + using ::com::sun::star::lang::WrappedTargetException; /** === end UNO using === **/ //================================================================================================================== @@ -87,16 +88,15 @@ namespace sd { namespace colortoolpanel } //------------------------------------------------------------------------------------------------------------------ - Reference< XResource > SAL_CALL ResourceFactory::createResource( const Reference< XResourceId >& i_rResourceId ) throw (RuntimeException) + Reference< XResource > SAL_CALL ResourceFactory::createResource( const Reference< XResourceId >& i_rResourceId ) throw (RuntimeException, IllegalArgumentException, WrappedTargetException) { FactoryGuard aGuard( *this ); if ( !i_rResourceId.is() ) - // TODO: the API should allow me to throw an IllegalArgumentException here - throw NULL; + throw IllegalArgumentException( ::rtl::OUString::createFromAscii( "illegal resource ID" ), *this, 1 ); const ::rtl::OUString sResourceURL( i_rResourceId->getResourceURL() ); if ( sResourceURL != lcl_getSingleColorViewURL() ) - return NULL; + throw IllegalArgumentException( ::rtl::OUString::createFromAscii( "unsupported resource URL" ), *this, 1 ); return new SingleColorPanel( m_xContext, m_xControllerManager->getConfigurationController(), i_rResourceId ); } diff --git a/sd/workben/custompanel/ctp_factory.hxx b/sd/workben/custompanel/ctp_factory.hxx index 8f9ff523f5ec..ab6cb3f6a9db 100644 --- a/sd/workben/custompanel/ctp_factory.hxx +++ b/sd/workben/custompanel/ctp_factory.hxx @@ -62,7 +62,7 @@ namespace sd { namespace colortoolpanel ~ResourceFactory(); // XResourceFactory - virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::framework::XResource > SAL_CALL createResource( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::framework::XResourceId >& xResourceId ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::framework::XResource > SAL_CALL createResource( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::framework::XResourceId >& xResourceId ) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException); virtual void SAL_CALL releaseResource( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::framework::XResource >& xResource ) throw (::com::sun::star::uno::RuntimeException); // XServiceInfo -- cgit From 9ed58bc68aa05888237e3b82051bd2fc4d4d6685 Mon Sep 17 00:00:00 2001 From: Christian Lippka Date: Sun, 21 Mar 2010 20:01:33 +0100 Subject: Adding PopupMenuController to allow PopupMenuControllerBase dervivates to be used in toolbars --- sd/source/ui/app/sddll2.cxx | 12 +++--------- sd/uiconfig/sdraw/toolbar/extrusionobjectbar.xml | 10 +++++----- sd/uiconfig/sdraw/toolbar/fontworkobjectbar.xml | 6 +++--- sd/uiconfig/simpress/toolbar/extrusionobjectbar.xml | 10 +++++----- sd/uiconfig/simpress/toolbar/fontworkobjectbar.xml | 6 +++--- 5 files changed, 19 insertions(+), 25 deletions(-) (limited to 'sd') diff --git a/sd/source/ui/app/sddll2.cxx b/sd/source/ui/app/sddll2.cxx index b0d10ab4c5fe..ee12bda8286f 100644 --- a/sd/source/ui/app/sddll2.cxx +++ b/sd/source/ui/app/sddll2.cxx @@ -57,10 +57,10 @@ #include #include #include -#include #include #include -#include +#include +#include #include #include #include @@ -195,15 +195,9 @@ void SdDLL::RegisterControllers() SvxClipBoardControl::RegisterControl( SID_PASTE, pMod ); - svx::ExtrusionDepthControl::RegisterControl( SID_EXTRUSION_DEPTH_FLOATER, pMod ); - svx::ExtrusionDirectionControl::RegisterControl( SID_EXTRUSION_DIRECTION_FLOATER, pMod ); - svx::ExtrusionLightingControl::RegisterControl( SID_EXTRUSION_LIGHTING_FLOATER, pMod ); - svx::ExtrusionSurfaceControl::RegisterControl( SID_EXTRUSION_SURFACE_FLOATER, pMod ); svx::ExtrusionColorControl::RegisterControl( SID_EXTRUSION_3D_COLOR, pMod ); - svx::FontWorkShapeTypeControl::RegisterControl( SID_FONTWORK_SHAPE_TYPE, pMod ); - svx::FontWorkAlignmentControl::RegisterControl( SID_FONTWORK_ALIGNMENT_FLOATER, pMod ); - svx::FontWorkCharacterSpacingControl::RegisterControl( SID_FONTWORK_CHARACTER_SPACING_FLOATER, pMod ); + ::avmedia::MediaToolBoxControl::RegisterControl( SID_AVMEDIA_TOOLBOX, pMod ); XmlSecStatusBarControl::RegisterControl( SID_SIGNATURE, pMod ); SdTemplateControl::RegisterControl( SID_STATUS_LAYOUT, pMod ); diff --git a/sd/uiconfig/sdraw/toolbar/extrusionobjectbar.xml b/sd/uiconfig/sdraw/toolbar/extrusionobjectbar.xml index 1f212226cf52..148849db6ee7 100644 --- a/sd/uiconfig/sdraw/toolbar/extrusionobjectbar.xml +++ b/sd/uiconfig/sdraw/toolbar/extrusionobjectbar.xml @@ -8,9 +8,9 @@ - - - - - + + + + + \ No newline at end of file diff --git a/sd/uiconfig/sdraw/toolbar/fontworkobjectbar.xml b/sd/uiconfig/sdraw/toolbar/fontworkobjectbar.xml index 3ac334e0e920..32de621477dc 100644 --- a/sd/uiconfig/sdraw/toolbar/fontworkobjectbar.xml +++ b/sd/uiconfig/sdraw/toolbar/fontworkobjectbar.xml @@ -3,9 +3,9 @@ - + - - + + \ No newline at end of file diff --git a/sd/uiconfig/simpress/toolbar/extrusionobjectbar.xml b/sd/uiconfig/simpress/toolbar/extrusionobjectbar.xml index 1f212226cf52..148849db6ee7 100644 --- a/sd/uiconfig/simpress/toolbar/extrusionobjectbar.xml +++ b/sd/uiconfig/simpress/toolbar/extrusionobjectbar.xml @@ -8,9 +8,9 @@ - - - - - + + + + + \ No newline at end of file diff --git a/sd/uiconfig/simpress/toolbar/fontworkobjectbar.xml b/sd/uiconfig/simpress/toolbar/fontworkobjectbar.xml index 3ac334e0e920..f4168c62cc2c 100644 --- a/sd/uiconfig/simpress/toolbar/fontworkobjectbar.xml +++ b/sd/uiconfig/simpress/toolbar/fontworkobjectbar.xml @@ -3,9 +3,9 @@ - + - - + + \ No newline at end of file -- 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 --- .../ui/framework/factories/BasicViewFactory.cxx | 2 +- .../ui/framework/factories/TaskPanelFactory.cxx | 3 - .../ui/framework/factories/ViewShellWrapper.cxx | 100 ++++++++- sd/source/ui/framework/tools/FrameworkHelper.cxx | 85 +++++--- sd/source/ui/inc/framework/ViewShellWrapper.hxx | 63 +++--- sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx | 25 ++- sd/source/ui/toolpanel/CustomToolPanel.cxx | 116 ++++++++--- sd/source/ui/toolpanel/CustomToolPanel.hxx | 22 +- sd/source/ui/toolpanel/StandardToolPanel.cxx | 40 +++- sd/source/ui/toolpanel/StandardToolPanel.hxx | 8 +- sd/source/ui/toolpanel/TaskPaneToolPanel.cxx | 33 --- sd/source/ui/toolpanel/TaskPaneToolPanel.hxx | 10 +- sd/source/ui/toolpanel/ToolPanelDrawer.cxx | 5 +- sd/source/ui/toolpanel/ToolPanelDrawer.hxx | 1 + sd/source/ui/toolpanel/ToolPanelViewShell.cxx | 226 ++++++++++++++++++--- sd/workben/custompanel/Impress.xcu | 4 +- sd/workben/custompanel/ctp_factory.cxx | 14 +- sd/workben/custompanel/ctp_panel.cxx | 161 ++++++++++++++- sd/workben/custompanel/ctp_panel.hxx | 25 ++- sd/workben/custompanel/makefile.mk | 7 +- 20 files changed, 759 insertions(+), 191 deletions(-) (limited to 'sd') diff --git a/sd/source/ui/framework/factories/BasicViewFactory.cxx b/sd/source/ui/framework/factories/BasicViewFactory.cxx index d6ae0fea249d..8663b8676138 100644 --- a/sd/source/ui/framework/factories/BasicViewFactory.cxx +++ b/sd/source/ui/framework/factories/BasicViewFactory.cxx @@ -377,7 +377,7 @@ void SAL_CALL BasicViewFactory::initialize (const Sequence& aArguments) pDescriptor->mpViewShell, rxViewId, rxPane->getWindow()); - pDescriptor->mxView = Reference(pDescriptor->mpWrapper); + pDescriptor->mxView.set( pDescriptor->mpWrapper->queryInterface( XResource::static_type() ), UNO_QUERY_THROW ); } return pDescriptor; diff --git a/sd/source/ui/framework/factories/TaskPanelFactory.cxx b/sd/source/ui/framework/factories/TaskPanelFactory.cxx index 0ff2893507c7..43a1a0280ba4 100644 --- a/sd/source/ui/framework/factories/TaskPanelFactory.cxx +++ b/sd/source/ui/framework/factories/TaskPanelFactory.cxx @@ -266,10 +266,7 @@ Reference SAL_CALL TaskPanelFactory::createResource ( toolpanel::ToolPanelViewShell* pToolPanel = dynamic_cast< toolpanel::ToolPanelViewShell* >( pPaneViewShell.get() ); if ( pToolPanel != NULL ) - { xResource = new TaskPanelResource( rxResourceId ); - pToolPanel->ActivatePanel( ePanelId ); - } OSL_POSTCOND( xResource.is(), "TaskPanelFactory::createResource: did not find the given resource!" ); } diff --git a/sd/source/ui/framework/factories/ViewShellWrapper.cxx b/sd/source/ui/framework/factories/ViewShellWrapper.cxx index b2d64ebeccad..e2fa7ff570e6 100644 --- a/sd/source/ui/framework/factories/ViewShellWrapper.cxx +++ b/sd/source/ui/framework/factories/ViewShellWrapper.cxx @@ -33,22 +33,32 @@ #include "framework/ViewShellWrapper.hxx" #include "framework/Pane.hxx" +#include "taskpane/ToolPanelViewShell.hxx" #include "ViewShell.hxx" #include "Window.hxx" #include +#include #include #include +#include +#include #include #include +#include using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; +using ::com::sun::star::awt::XWindow; +using ::com::sun::star::rendering::XCanvas; +using ::com::sun::star::lang::DisposedException; + using ::rtl::OUString; +using ::sd::toolpanel::ToolPanelViewShell; namespace sd { namespace framework { @@ -59,7 +69,8 @@ ViewShellWrapper::ViewShellWrapper ( : ViewShellWrapperInterfaceBase(MutexOwner::maMutex), mpViewShell(pViewShell), mxViewId(rxViewId), - mxWindow(rxWindow) + mxWindow(rxWindow), + mbIsPane( pViewShell == NULL ? false : ( pViewShell->GetShellType() == ViewShell::ST_TASK_PANE ) ) { if (rxWindow.is()) { @@ -83,6 +94,8 @@ ViewShellWrapper::~ViewShellWrapper (void) void SAL_CALL ViewShellWrapper::disposing (void) { + ::osl::MutexGuard aGuard( maMutex ); + OSL_TRACE("disposing ViewShellWrapper %x", this); Reference xWindow (mxWindow); if (xWindow.is()) @@ -105,13 +118,92 @@ void SAL_CALL ViewShellWrapper::disposing (void) -bool ViewShellWrapper::IsUnique (void) +//----- XInterface ------------------------------------------------------------ + +Any SAL_CALL ViewShellWrapper::queryInterface( const Type& i_rType ) throw (RuntimeException) { - return m_refCount==1; + Any aInterface( ViewShellWrapperInterfaceBase::queryInterface( i_rType ) ); + if ( !aInterface.hasValue() ) + { + if ( mbIsPane ) + aInterface = ViewShellWrapper_PaneBase::queryInterface( i_rType ); + else + aInterface = ViewShellWrapper_ViewBase::queryInterface( i_rType ); + } + return aInterface; } +void SAL_CALL ViewShellWrapper::acquire() throw () +{ + ViewShellWrapperInterfaceBase::acquire(); +} +void SAL_CALL ViewShellWrapper::release() throw () +{ + ViewShellWrapperInterfaceBase::release(); +} +//----- XTypeProvider --------------------------------------------------------- + +Sequence< Type > SAL_CALL ViewShellWrapper::getTypes( ) throw (RuntimeException) +{ + const Sequence< Type > aCommonTypes( ViewShellWrapperInterfaceBase::getTypes() ); + const Sequence< Type > aSpecialTypes( + mbIsPane + ? ViewShellWrapper_PaneBase::getTypes() + : ViewShellWrapper_ViewBase::getTypes() + ); + return ::comphelper::concatSequences( aCommonTypes, aSpecialTypes ); +} + +Sequence< ::sal_Int8 > SAL_CALL ViewShellWrapper::getImplementationId( ) throw (RuntimeException) +{ + static ::cppu::OImplementationId* pViewId = NULL; + static ::cppu::OImplementationId* pPaneId = NULL; + if ( !pViewId ) + { + ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); + if ( !pViewId ) + { + static ::cppu::OImplementationId aViewId; + static ::cppu::OImplementationId aPaneId; + pViewId = &aViewId; + pPaneId = &aPaneId; + } + } + + return ( mbIsPane ? pPaneId : pViewId )->getImplementationId(); +} + +//----- XPane ----------------------------------------------------------------- + +Reference< XInterface > ViewShellWrapper::impl_getPaneWindowOrCanvas( const bool i_bWindow ) +{ + ::vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + ::osl::MutexGuard aGuard( maMutex ); + if ( !mpViewShell.get() ) + throw DisposedException( ::rtl::OUString(), *this ); + + ToolPanelViewShell* pToolPanelShell = dynamic_cast< ToolPanelViewShell* >( mpViewShell.get() ); + ENSURE_OR_RETURN( pToolPanelShell != NULL, "XPane should be accessible for a ToolPanelViewShell only", NULL ); + + ::Window* pPaneWindow = pToolPanelShell->GetToolPanelParentWindow(); + ENSURE_OR_RETURN( pPaneWindow, "shell is not able to provide a panel parent", NULL ); + + if ( i_bWindow ) + return VCLUnoHelper::GetInterface( pPaneWindow ); + return pPaneWindow->GetCanvas(); +} + +Reference< XWindow > SAL_CALL ViewShellWrapper::getWindow() throw (RuntimeException) +{ + return Reference< XWindow >( impl_getPaneWindowOrCanvas( true ), UNO_QUERY ); +} + +Reference< XCanvas > SAL_CALL ViewShellWrapper::getCanvas() throw (RuntimeException) +{ + return Reference< XCanvas >( impl_getPaneWindowOrCanvas( false ), UNO_QUERY ); +} //----- XResource ------------------------------------------------------------- @@ -181,7 +273,7 @@ const Sequence& ViewShellWrapper::getUnoTunnelId (void) static Sequence* pSequence = NULL; if (pSequence == NULL) { - const ::vos::OGuard aSolarGuard (Application::GetSolarMutex()); + const ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); if (pSequence == NULL) { static ::com::sun::star::uno::Sequence aSequence (16); diff --git a/sd/source/ui/framework/tools/FrameworkHelper.cxx b/sd/source/ui/framework/tools/FrameworkHelper.cxx index 9a49aa88876d..cc68f79535ba 100644 --- a/sd/source/ui/framework/tools/FrameworkHelper.cxx +++ b/sd/source/ui/framework/tools/FrameworkHelper.cxx @@ -222,7 +222,7 @@ const OUString FrameworkHelper::msViewTabBarURL( // Task panel URLs. const ::rtl::OUString FrameworkHelper::msTaskPanelURLPrefix( - OUString::createFromAscii("private:resource/taskpanel/")); + OUString::createFromAscii("private:resource/toolpanel/")); const ::rtl::OUString FrameworkHelper::msMasterPagesTaskPanelURL( msTaskPanelURLPrefix + OUString::createFromAscii("MasterPages")); const ::rtl::OUString FrameworkHelper::msLayoutTaskPanelURL( @@ -256,6 +256,46 @@ const OUString FrameworkHelper::msModuleControllerService( const OUString FrameworkHelper::msConfigurationControllerService( OUString::createFromAscii("com.sun.star.drawing.framework.ConfigurationController")); +//----- helper ---------------------------------------------------------------- +namespace +{ + static ::boost::shared_ptr< ViewShell > lcl_getViewShell( const Reference< XResource >& i_rViewShellWrapper ) + { + ::boost::shared_ptr< ViewShell > pViewShell; + if ( !i_rViewShellWrapper.is() ) + return pViewShell; + + try + { + Reference xViewTunnel( i_rViewShellWrapper, UNO_QUERY_THROW ); + pViewShell = reinterpret_cast< ViewShellWrapper* >( + xViewTunnel->getSomething( ViewShellWrapper::getUnoTunnelId() ) )->GetViewShell(); + } + catch( const Exception& ) + { + DBG_UNHANDLED_EXCEPTION(); + } + return pViewShell; + } + Reference< XResource > lcl_getFirstViewInPane( const Reference< XConfigurationController >& i_rConfigController, + const Reference< XResourceId >& i_rPaneId ) + { + try + { + Reference< XConfiguration > xConfiguration( i_rConfigController->getRequestedConfiguration(), UNO_SET_THROW ); + Sequence< Reference< XResourceId > > aViewIds( xConfiguration->getResources( + i_rPaneId, FrameworkHelper::msViewURLPrefix, AnchorBindingMode_DIRECT ) ); + if ( aViewIds.getLength() > 0 ) + return i_rConfigController->getResource( aViewIds[0] ); + } + catch( const Exception& ) + { + DBG_UNHANDLED_EXCEPTION(); + } + return NULL; + } +} + //----- FrameworkHelper::ViewURLMap ------------------------------------------- @@ -442,8 +482,11 @@ bool FrameworkHelper::IsValid (void) ::boost::shared_ptr FrameworkHelper::GetViewShell (const OUString& rsPaneURL) { - Reference xPaneId (CreateResourceId(rsPaneURL)); - return GetViewShell(GetView(xPaneId)); + if ( !mxConfigurationController.is() ) + return ::boost::shared_ptr(); + + Reference xPaneId( CreateResourceId( rsPaneURL ) ); + return lcl_getViewShell( lcl_getFirstViewInPane( mxConfigurationController, xPaneId ) ); } @@ -451,22 +494,7 @@ bool FrameworkHelper::IsValid (void) ::boost::shared_ptr FrameworkHelper::GetViewShell (const Reference& rxView) { - ::boost::shared_ptr pViewShell; - - try - { - Reference xViewTunnel (rxView, UNO_QUERY); - if (xViewTunnel.is()) - { - pViewShell = reinterpret_cast(xViewTunnel->getSomething( - ViewShellWrapper::getUnoTunnelId()))->GetViewShell(); - } - } - catch (RuntimeException&) - { - } - - return pViewShell; + return lcl_getViewShell( rxView.get() ); } @@ -483,21 +511,11 @@ Reference FrameworkHelper::GetView (const Reference& rxPaneO { if (rxPaneOrViewId->getResourceURL().match(msViewURLPrefix)) { - xView = Reference( - mxConfigurationController->getResource(rxPaneOrViewId), UNO_QUERY); + xView.set( mxConfigurationController->getResource( rxPaneOrViewId ), UNO_QUERY ); } else { - Reference xConfiguration ( - mxConfigurationController->getRequestedConfiguration()); - if (xConfiguration.is()) - { - Sequence > aViewIds (xConfiguration->getResources( - rxPaneOrViewId, msViewURLPrefix, AnchorBindingMode_DIRECT)); - if (aViewIds.getLength() >= 1) - xView = Reference( - mxConfigurationController->getResource(aViewIds[0]), UNO_QUERY); - } + xView.set( lcl_getFirstViewInPane( mxConfigurationController, rxPaneOrViewId ), UNO_QUERY ); } } catch (lang::DisposedException&) @@ -505,7 +523,8 @@ Reference FrameworkHelper::GetView (const Reference& rxPaneO Dispose(); } catch (RuntimeException&) - {} + { + } return xView; } @@ -804,7 +823,7 @@ void FrameworkHelper::WaitForEvent (const OUString& rsEventType) const if( (osl_getGlobalTimer() - nStartTime) > 60000 ) { - DBG_ERROR("FrameworkHelper::WaitForEvent(), no event since a minute? giving up!"); + DBG_ERROR("FrameworkHelper::WaitForEvent(), no event for a minute? giving up!"); break; } } 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(); diff --git a/sd/source/ui/toolpanel/CustomToolPanel.cxx b/sd/source/ui/toolpanel/CustomToolPanel.cxx index 33ee1270ab1d..b09b03725c58 100644 --- a/sd/source/ui/toolpanel/CustomToolPanel.cxx +++ b/sd/source/ui/toolpanel/CustomToolPanel.cxx @@ -31,6 +31,7 @@ /** === begin UNO includes === **/ #include +#include /** === end UNO includes === **/ #include @@ -62,7 +63,9 @@ namespace sd { namespace toolpanel using ::com::sun::star::drawing::framework::XResourceId; using ::com::sun::star::drawing::framework::ResourceId; using ::com::sun::star::drawing::framework::XResource; + using ::com::sun::star::awt::XWindow; /** === end UNO using === **/ + namespace PosSize = ::com::sun::star::awt::PosSize; //================================================================================================================== //= helper @@ -98,8 +101,10 @@ namespace sd { namespace toolpanel :TaskPaneToolPanel( i_rPanelDeck, lcl_getPanelConfig( i_rPanelConfig, "DisplayTitle" ), Image() /* TODO */, SmartId() /* TODO */ ) ,m_pFrameworkHelper( i_pFrameworkHelper ) ,m_xPanelResourceId() - ,m_xPanel() + ,m_xResource() + ,m_xToolPanel() ,m_bAttemptedPanelCreation( false ) + ,m_nResourceAccessLock( 0 ) { ENSURE_OR_THROW( m_pFrameworkHelper.get() != NULL, "invalid framework helper" ); ENSURE_OR_THROW( i_rPaneResourceId.is(), "invalid pane resource id" ); @@ -126,56 +131,121 @@ namespace sd { namespace toolpanel } //------------------------------------------------------------------------------------------------------------------ - void CustomToolPanel::Dispose() + void CustomToolPanel::Activate( ::Window& i_rParentWindow ) + { + OSL_ENSURE( &getPanelWindowAnchor() == &i_rParentWindow, + "CustomToolPanel::Activate: invalid new parent window" ); + // getPanelWindowAnchor() is what is returned in the TaskPane's XPane::getWindow method. So, + // any custom panel which is loaded into the TaskPane will use this window as parent window. + // Consequently, this is the window which shall be passed here, since this method is intended to + // re-create the panel with the given parent. + + // we do not need to do anything here. The XResourceFactory::createResource method of the custom + // tool panel already created and showed the window. + } + + //------------------------------------------------------------------------------------------------------------------ + void CustomToolPanel::Deactivate() + { + // When a certain tool panel is activated, this is routed through the drawing framework, which ensures + // that the resource associated with the previously active panel is deactivated, which calls the + // XResourceFactory::destroyResource at our custom panel's factory. + + // So, we do not have to do anything here - except forgetting the XResource, at it might (or might not, + // if cached by the factory) be re-created next time. + m_xResource.clear(); + m_xToolPanel.clear(); + m_bAttemptedPanelCreation = false; + } + + //------------------------------------------------------------------------------------------------------------------ + void CustomToolPanel::SetSizePixel( const Size& i_rPanelWindowSize ) { - if ( m_xPanel.is() ) + impl_ensurePanel(); + if ( !m_xToolPanel.is() ) + // if the custom panel does not support XPanel, this just means it is its own responsibility + // to resize/layout everything within the pane window. + return; + + try { - try - { - // TODO: obtain the factory for our panel, and invoke its destroyResource method - } - catch ( const Exception& ) - { - DBG_UNHANDLED_EXCEPTION(); - } + Reference< XWindow > xPanelWindow( m_xToolPanel->getWindow(), UNO_SET_THROW ); + xPanelWindow->setPosSize( 0, 0, i_rPanelWindowSize.Width(), i_rPanelWindowSize.Height(), + PosSize::POSSIZE ); + } + catch( const Exception& ) + { + DBG_UNHANDLED_EXCEPTION(); + } + } + + //------------------------------------------------------------------------------------------------------------------ + void CustomToolPanel::GrabFocus() + { + impl_ensurePanel(); + if ( !m_xToolPanel.is() ) + // if the custom panel does not support XPanel, this just means it is its own responsibility + // to care for focus handling + return; + + try + { + Reference< XWindow > xPanelWindow( m_xToolPanel->getWindow(), UNO_SET_THROW ); + xPanelWindow->setFocus(); } + catch( const Exception& ) + { + DBG_UNHANDLED_EXCEPTION(); + } + } + + //------------------------------------------------------------------------------------------------------------------ + void CustomToolPanel::Dispose() + { + // nothing to do here. Lifetime handling of the XResource which this panel represents is done by + // the drawing framework, we ourself do not have resources to release. TaskPaneToolPanel::Dispose(); } //------------------------------------------------------------------------------------------------------------------ - const Reference< XResourceId >& CustomToolPanel::getResourceId() const + void CustomToolPanel::LockResourceAccess() { - return m_xPanelResourceId; + ++m_nResourceAccessLock; } //------------------------------------------------------------------------------------------------------------------ - ::Window* CustomToolPanel::getPanelWindow() const + void CustomToolPanel::UnlockResourceAccess() { - ENSURE_OR_RETURN( impl_ensurePanel(), "could not create the panel", NULL ); - // TODO - return NULL; + OSL_ENSURE( m_nResourceAccessLock > 0, "CustomToolPanel::UnlockResourceAccess: not locked!" ); + --m_nResourceAccessLock; + } + + //------------------------------------------------------------------------------------------------------------------ + const Reference< XResourceId >& CustomToolPanel::getResourceId() const + { + return m_xPanelResourceId; } //------------------------------------------------------------------------------------------------------------------ - bool CustomToolPanel::impl_ensurePanel() const + void CustomToolPanel::impl_ensurePanel() { - ENSURE_OR_RETURN_FALSE( !isDisposed(), "already disposed" ); + ENSURE_OR_RETURN_VOID( !isDisposed(), "already disposed" ); - if ( !m_bAttemptedPanelCreation ) + if ( ( m_nResourceAccessLock == 0 ) && !m_bAttemptedPanelCreation ) { - const_cast< CustomToolPanel* >( this )->m_bAttemptedPanelCreation = true; + m_bAttemptedPanelCreation = true; try { Reference< XConfigurationController > xConfigController( m_pFrameworkHelper->GetConfigurationController(), UNO_QUERY_THROW ); - Reference< XResource > xToolPanelResource( xConfigController->getResource( m_xPanelResourceId ) ); + m_xResource.set( xConfigController->getResource( m_xPanelResourceId ), UNO_QUERY_THROW ); + m_xToolPanel.set( m_xResource, UNO_QUERY ); } catch( const Exception& ) { DBG_UNHANDLED_EXCEPTION(); } } - return m_xPanel.is(); } //...................................................................................................................... diff --git a/sd/source/ui/toolpanel/CustomToolPanel.hxx b/sd/source/ui/toolpanel/CustomToolPanel.hxx index 23a3dcbb3cfc..fe5865150063 100644 --- a/sd/source/ui/toolpanel/CustomToolPanel.hxx +++ b/sd/source/ui/toolpanel/CustomToolPanel.hxx @@ -30,8 +30,10 @@ #include "TaskPaneToolPanel.hxx" /** === begin UNO includes === **/ -#include +#include #include +#include +#include /** === end UNO includes === **/ #include @@ -71,21 +73,33 @@ namespace sd { namespace toolpanel ~CustomToolPanel(); // IToolPanel overridables + virtual void Activate( ::Window& i_rParentWindow ); + virtual void Deactivate(); + virtual void SetSizePixel( const Size& i_rPanelWindowSize ); + virtual void GrabFocus(); virtual void Dispose(); + /** locks (aka prevents) the access to the associated XResource object + */ + void LockResourceAccess(); + /** unlocks (aka allows) the access to the associated XResource object + */ + void UnlockResourceAccess(); + protected: // TaskPaneToolPanel overridables virtual const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::framework::XResourceId >& getResourceId() const; - virtual ::Window* getPanelWindow() const; private: - bool impl_ensurePanel() const; + void impl_ensurePanel(); private: ::boost::shared_ptr< framework::FrameworkHelper > m_pFrameworkHelper; ::com::sun::star::uno::Reference< ::com::sun::star::drawing::framework::XResourceId > m_xPanelResourceId; - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::framework::XPane2 > m_xPanel; + ::com::sun::star::uno::Reference< ::com::sun::star::drawing::framework::XResource > m_xResource; + ::com::sun::star::uno::Reference< ::com::sun::star::view::XToolPanel > m_xToolPanel; bool m_bAttemptedPanelCreation; + sal_uInt32 m_nResourceAccessLock; }; //...................................................................................................................... diff --git a/sd/source/ui/toolpanel/StandardToolPanel.cxx b/sd/source/ui/toolpanel/StandardToolPanel.cxx index 1e2ba8f6308e..f83f811fde28 100644 --- a/sd/source/ui/toolpanel/StandardToolPanel.cxx +++ b/sd/source/ui/toolpanel/StandardToolPanel.cxx @@ -75,6 +75,39 @@ namespace sd { namespace toolpanel m_pControl.reset(); } + //------------------------------------------------------------------------------------------------------------------ + void StandardToolPanel::Activate( ::Window& i_rParentWindow ) + { + Window* pPanelWindow( impl_getPanelWindow() ); + ENSURE_OR_RETURN_VOID( pPanelWindow, "no window to show" ); + pPanelWindow->SetPosSizePixel( Point(), i_rParentWindow.GetSizePixel() ); + pPanelWindow->Show(); + } + + //------------------------------------------------------------------------------------------------------------------ + void StandardToolPanel::Deactivate() + { + Window* pPanelWindow( impl_getPanelWindow() ); + ENSURE_OR_RETURN_VOID( pPanelWindow, "no window to hide" ); + pPanelWindow->Hide(); + } + + //------------------------------------------------------------------------------------------------------------------ + void StandardToolPanel::SetSizePixel( const Size& i_rPanelWindowSize ) + { + Window* pPanelWindow( impl_getPanelWindow() ); + ENSURE_OR_RETURN_VOID( pPanelWindow, "no window to resize" ); + pPanelWindow->SetSizePixel( i_rPanelWindowSize ); + } + + //------------------------------------------------------------------------------------------------------------------ + void StandardToolPanel::GrabFocus() + { + Window* pPanelWindow( impl_getPanelWindow() ); + ENSURE_OR_RETURN_VOID( pPanelWindow, "no window to focus" ); + pPanelWindow->GrabFocus(); + } + //------------------------------------------------------------------------------------------------------------------ void StandardToolPanel::Dispose() { @@ -89,10 +122,11 @@ namespace sd { namespace toolpanel } //------------------------------------------------------------------------------------------------------------------ - ::Window* StandardToolPanel::getPanelWindow() const + ::Window* StandardToolPanel::impl_getPanelWindow() const { - ENSURE_OR_RETURN( const_cast< StandardToolPanel* >( this )->impl_ensureControl(), "StandardToolPanel::getPanelWindow: no control!", NULL ); - return m_pControl->GetWindow(); + if ( const_cast< StandardToolPanel* >( this )->impl_ensureControl() ) + return m_pControl->GetWindow(); + return NULL; } //------------------------------------------------------------------------------------------------------------------ diff --git a/sd/source/ui/toolpanel/StandardToolPanel.hxx b/sd/source/ui/toolpanel/StandardToolPanel.hxx index 8e4ad7e8eeea..1f3fd8ff7a90 100644 --- a/sd/source/ui/toolpanel/StandardToolPanel.hxx +++ b/sd/source/ui/toolpanel/StandardToolPanel.hxx @@ -53,14 +53,18 @@ namespace sd { namespace toolpanel ~StandardToolPanel(); // IToolPanel overridables + virtual void Activate( ::Window& i_rParentWindow ); + virtual void Deactivate(); + virtual void SetSizePixel( const Size& i_rPanelWindowSize ); + virtual void GrabFocus(); virtual void Dispose(); // TaskPaneToolPanel overridables virtual const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::framework::XResourceId >& getResourceId() const; - virtual ::Window* getPanelWindow() const; private: - bool impl_ensureControl(); + bool impl_ensureControl(); + ::Window* impl_getPanelWindow() const; private: ::std::auto_ptr< ControlFactory > m_pControlFactory; diff --git a/sd/source/ui/toolpanel/TaskPaneToolPanel.cxx b/sd/source/ui/toolpanel/TaskPaneToolPanel.cxx index 5dc8498abbe4..4d0103086932 100644 --- a/sd/source/ui/toolpanel/TaskPaneToolPanel.cxx +++ b/sd/source/ui/toolpanel/TaskPaneToolPanel.cxx @@ -89,39 +89,6 @@ namespace sd { namespace toolpanel return m_aPanelImage; } - //------------------------------------------------------------------------------------------------------------------ - void TaskPaneToolPanel::Activate( ::Window& i_rParentWindow ) - { - Window* pPanelWindow( getPanelWindow() ); - ENSURE_OR_RETURN_VOID( pPanelWindow, "no window to show" ); - pPanelWindow->SetPosSizePixel( Point(), i_rParentWindow.GetSizePixel() ); - pPanelWindow->Show(); - } - - //------------------------------------------------------------------------------------------------------------------ - void TaskPaneToolPanel::Deactivate() - { - Window* pPanelWindow( getPanelWindow() ); - ENSURE_OR_RETURN_VOID( pPanelWindow, "no window to hide" ); - pPanelWindow->Hide(); - } - - //------------------------------------------------------------------------------------------------------------------ - void TaskPaneToolPanel::SetSizePixel( const Size& i_rPanelWindowSize ) - { - Window* pPanelWindow( getPanelWindow() ); - ENSURE_OR_RETURN_VOID( pPanelWindow, "no window to resize" ); - pPanelWindow->SetSizePixel( i_rPanelWindowSize ); - } - - //------------------------------------------------------------------------------------------------------------------ - void TaskPaneToolPanel::GrabFocus() - { - Window* pPanelWindow( getPanelWindow() ); - ENSURE_OR_RETURN_VOID( pPanelWindow, "no window to focus" ); - pPanelWindow->GrabFocus(); - } - //------------------------------------------------------------------------------------------------------------------ void TaskPaneToolPanel::Dispose() { diff --git a/sd/source/ui/toolpanel/TaskPaneToolPanel.hxx b/sd/source/ui/toolpanel/TaskPaneToolPanel.hxx index 7cf60b10325e..f62e0b7a8fb1 100644 --- a/sd/source/ui/toolpanel/TaskPaneToolPanel.hxx +++ b/sd/source/ui/toolpanel/TaskPaneToolPanel.hxx @@ -65,15 +65,15 @@ namespace sd { namespace toolpanel // IToolPanel overridables virtual ::rtl::OUString GetDisplayName() const; virtual Image GetImage() const; - virtual void Activate( ::Window& i_rParentWindow ); - virtual void Deactivate(); - virtual void SetSizePixel( const Size& i_rPanelWindowSize ); - virtual void GrabFocus(); virtual void Dispose(); + // those are still abstract, and waiting to be overloaded + virtual void Activate( ::Window& i_rParentWindow ) = 0; + virtual void Deactivate() = 0; + virtual void SetSizePixel( const Size& i_rPanelWindowSize ) = 0; + virtual void GrabFocus() = 0; // own overridables virtual const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::framework::XResourceId >& getResourceId() const = 0; - virtual ::Window* getPanelWindow() const = 0; protected: bool isDisposed() const { return m_pPanelDeck == NULL; } diff --git a/sd/source/ui/toolpanel/ToolPanelDrawer.cxx b/sd/source/ui/toolpanel/ToolPanelDrawer.cxx index c071e5e611c1..a52771650a04 100644 --- a/sd/source/ui/toolpanel/ToolPanelDrawer.cxx +++ b/sd/source/ui/toolpanel/ToolPanelDrawer.cxx @@ -44,6 +44,7 @@ namespace sd { namespace toolpanel :m_rParentWindow( i_rParentWindow ) ,m_rPanelDeck( i_rPanels ) ,m_aDrawers() + ,m_aLastKnownActivePanel() { m_rPanelDeck.AddListener( *this ); @@ -68,7 +69,9 @@ namespace sd { namespace toolpanel return i_rDeckPlayground; const int nWidth( i_rDeckPlayground.GetWidth() ); - const ::boost::optional< size_t > aActivePanel( m_rPanelDeck.GetActivePanel() ); + ::boost::optional< size_t > aActivePanel( m_rPanelDeck.GetActivePanel() ); + if ( !aActivePanel ) + aActivePanel = m_aLastKnownActivePanel; // arrange the title bars which are *above* the active panel (or *all* if there is no active panel), plus // the title bar of the active panel itself diff --git a/sd/source/ui/toolpanel/ToolPanelDrawer.hxx b/sd/source/ui/toolpanel/ToolPanelDrawer.hxx index 7972255b3a56..005194ab6a2b 100644 --- a/sd/source/ui/toolpanel/ToolPanelDrawer.hxx +++ b/sd/source/ui/toolpanel/ToolPanelDrawer.hxx @@ -84,6 +84,7 @@ private: Window& m_rParentWindow; ::svt::IToolPanelDeck& m_rPanelDeck; ::std::vector< PTitleBar > m_aDrawers; + ::boost::optional< size_t > m_aLastKnownActivePanel; }; //...................................................................................................................... diff --git a/sd/source/ui/toolpanel/ToolPanelViewShell.cxx b/sd/source/ui/toolpanel/ToolPanelViewShell.cxx index 276cc5a83fec..d8af5aae2b53 100644 --- a/sd/source/ui/toolpanel/ToolPanelViewShell.cxx +++ b/sd/source/ui/toolpanel/ToolPanelViewShell.cxx @@ -79,6 +79,8 @@ #include #include #include +#include +#include #include @@ -103,6 +105,11 @@ using ::com::sun::star::accessibility::XAccessible; using ::com::sun::star::drawing::XDrawSubController; using ::com::sun::star::frame::XFrame; using ::com::sun::star::drawing::framework::XResourceId; +using ::com::sun::star::drawing::framework::XConfigurationChangeListener; +using ::com::sun::star::drawing::framework::ConfigurationChangeEvent; +using ::com::sun::star::lang::EventObject; +using ::com::sun::star::lang::DisposedException; +using ::com::sun::star::drawing::framework::XConfigurationControllerBroadcaster; /** === end UNO using === **/ using ::sd::framework::FrameworkHelper; @@ -112,7 +119,7 @@ namespace sd { namespace toolpanel { // ===================================================================================================================== // = PanelDescriptor // ===================================================================================================================== -/** is a helper class for ToolPanelViewShell::Implementation, holding the details about a single panel which is not +/** is a helper class for ToolPanelViewShell_Impl, holding the details about a single panel which is not contained in the IToolPanel implementation itself. */ struct PanelDescriptor @@ -149,17 +156,53 @@ enum PanelSelectorLayout }; // ===================================================================================================================== -// = ToolPanelViewShell::Implementation - declaration +// = ConfigurationListener - declaration +// ===================================================================================================================== +typedef ::cppu::WeakImplHelper1 < XConfigurationChangeListener + > ConfigurationListener_Base; + +class ConfigurationListener :public ::cppu::BaseMutex + ,public ConfigurationListener_Base +{ +public: + ConfigurationListener( ToolPanelViewShell_Impl& i_rShellImpl ); + + // XConfigurationChangeListener + virtual void SAL_CALL notifyConfigurationChange( const ConfigurationChangeEvent& aEvent ) throw (RuntimeException); + + // XEventListener + virtual void SAL_CALL disposing( const EventObject& Source ) throw (RuntimeException); + + // XComponent equivalents (not available per UNO interface) + void dispose(); + +protected: + ~ConfigurationListener(); + + void impl_checkDisposed_throw() + { + if ( !m_pShellImpl ) + throw DisposedException( ::rtl::OUString(), *this ); + } + +private: + ToolPanelViewShell_Impl* m_pShellImpl; +}; + +// ===================================================================================================================== +// = ToolPanelViewShell_Impl - declaration // ===================================================================================================================== /** Inner implementation class of ToolPanelViewShell. */ -class ToolPanelViewShell::Implementation : public ::svt::IToolPanelDeckListener +class ToolPanelViewShell_Impl : public ::svt::IToolPanelDeckListener { public: static const size_t mnInvalidId = static_cast< size_t >( -1 ); - Implementation( ToolPanelViewShell& i_rPanelViewShell, ::Window& i_rPanelDeckParent ); - ~Implementation(); + ToolPanelViewShell_Impl( ToolPanelViewShell& i_rPanelViewShell, ::Window& i_rPanelDeckParent ); + ~ToolPanelViewShell_Impl(); + + ToolPanelViewShell& GetAntiImpl() { return m_rPanelViewShell; } /** Here the panels are created that are shown in the task pane. */ @@ -178,11 +221,17 @@ public: PanelSelectorLayout GetLayout() const { return m_eCurrentLayout; } + /** called by our configuration controller listener when the request to activate a tool panel has been observed. + */ + void OnToolPanelActivationRequest( const ::rtl::OUString& i_rResourceURL ); + /** provides access to the the VCL window of the panel deck */ ::Window& GetPanelDeck() { return *m_pPanelDeck.get(); } const ::Window& GetPanelDeck() const { return *m_pPanelDeck.get(); } + ::Window* GetToolPanelParentWindow() { return m_pPanelDeck.get() ? &m_pPanelDeck->GetPanelWindowAnchor() : NULL; } + /** returns the logical number of panels. This is greater than or equal to the number of panels displayed in the panel deck */ @@ -231,10 +280,88 @@ private: PanelDescriptors m_aPanels; ToolPanelViewShell& m_rPanelViewShell; ::boost::scoped_ptr< ToolPanelDeck > m_pPanelDeck; + ::rtl::Reference< ConfigurationListener > m_pConfigListener; PanelSelectorLayout m_eCurrentLayout; bool m_bInitialized; }; +// ===================================================================================================================== +// = ConfigurationListener - implementation +// ===================================================================================================================== +// --------------------------------------------------------------------------------------------------------------------- +ConfigurationListener::ConfigurationListener( ToolPanelViewShell_Impl& i_rShellImpl ) + :m_pShellImpl( &i_rShellImpl ) +{ + ::boost::shared_ptr< FrameworkHelper > pFrameworkHelper( FrameworkHelper::Instance( i_rShellImpl.GetAntiImpl().GetViewShellBase() ) ); + Reference< XConfigurationControllerBroadcaster > xBroadcaster; + if ( pFrameworkHelper.get() ) + xBroadcaster.set( pFrameworkHelper->GetConfigurationController().get() ); + ENSURE_OR_THROW( pFrameworkHelper.get(), "no access to the config controller" ); + + osl_incrementInterlockedCount( &m_refCount ); + { + xBroadcaster->addConfigurationChangeListener( this, ::rtl::OUString(), Any() ); + } + osl_decrementInterlockedCount( &m_refCount ); +} + +// --------------------------------------------------------------------------------------------------------------------- +ConfigurationListener::~ConfigurationListener() +{ +} + +// --------------------------------------------------------------------------------------------------------------------- +void SAL_CALL ConfigurationListener::notifyConfigurationChange( const ConfigurationChangeEvent& i_rEvent ) throw (RuntimeException) +{ + ::osl::MutexGuard aGuard( m_aMutex ); + impl_checkDisposed_throw(); + +// if ( i_rEvent.Type == FrameworkHelper::msConfigurationUpdateStartEvent ) +// { +// m_pShellImpl->GetPanelDeck().SetUpdateMode( FALSE ); +// return; +// } +// if ( i_rEvent.Type == FrameworkHelper::msConfigurationUpdateEndEvent ) +// { +// m_pShellImpl->GetPanelDeck().SetUpdateMode( TRUE ); +// return; +// } +// + // is this an event we're interested in? + if ( i_rEvent.Type != FrameworkHelper::msResourceActivationEvent ) + return; + + // is this a resource we're interested in? Must be anchored in the task pane ... + Reference< XResourceId > xAnchorId; + if ( i_rEvent.ResourceId.is() ) + xAnchorId = i_rEvent.ResourceId->getAnchor(); + if ( !xAnchorId.is() ) + return; + const ::rtl::OUString sAnchorURL( xAnchorId->getResourceURL() ); + if ( sAnchorURL != FrameworkHelper::msTaskPaneURL ) + return; + + m_pShellImpl->OnToolPanelActivationRequest( i_rEvent.ResourceId->getResourceURL() ); +} + +// --------------------------------------------------------------------------------------------------------------------- +void SAL_CALL ConfigurationListener::disposing( const EventObject& i_rEvent ) throw (RuntimeException) +{ + { + ::osl::MutexGuard aGuard( m_aMutex ); + impl_checkDisposed_throw(); + } + + dispose(); +} + +// --------------------------------------------------------------------------------------------------------------------- +void ConfigurationListener::dispose() +{ + ::osl::MutexGuard aGuard( m_aMutex ); + m_pShellImpl = NULL; +} + // ===================================================================================================================== // = helpers // ===================================================================================================================== @@ -263,7 +390,7 @@ SFX_IMPL_INTERFACE(ToolPanelViewShell, SfxShell, SdResId(STR_TASKPANEVIEWSHELL)) TYPEINIT1(ToolPanelViewShell, ViewShell); // --------------------------------------------------------------------------------------------------------------------- -size_t ToolPanelViewShell::Implementation::SetupDefaultPanels() +size_t ToolPanelViewShell_Impl::SetupDefaultPanels() { typedef std::auto_ptr (*ControlFactoryFactory)( ToolPanelViewShell& i_rToolPanelShell ); @@ -365,7 +492,7 @@ size_t ToolPanelViewShell::Implementation::SetupDefaultPanels() } // --------------------------------------------------------------------------------------------------------------------- -void ToolPanelViewShell::Implementation::SetupCustomPanels() +void ToolPanelViewShell_Impl::SetupCustomPanels() { // compose the resource ID for the ToolPanel view ::boost::shared_ptr< FrameworkHelper > pFrameworkHelper( FrameworkHelper::Instance( m_rPanelViewShell.GetViewShellBase() ) ); @@ -396,7 +523,7 @@ void ToolPanelViewShell::Implementation::SetupCustomPanels() } // --------------------------------------------------------------------------------------------------------------------- -void ToolPanelViewShell::Implementation::Setup() +void ToolPanelViewShell_Impl::Setup() { if ( m_bInitialized ) return; @@ -417,11 +544,14 @@ void ToolPanelViewShell::Implementation::Setup() // initialize panel selector SetLayout( LAYOUT_DRAWERS, true ); + // listen at the configuration + m_pConfigListener.set( new ConfigurationListener( *this ) ); + m_pPanelDeck->Show(); } // --------------------------------------------------------------------------------------------------------------------- -void ToolPanelViewShell::Implementation::SetLayout( const PanelSelectorLayout i_eLayout, const bool i_bForce ) +void ToolPanelViewShell_Impl::SetLayout( const PanelSelectorLayout i_eLayout, const bool i_bForce ) { if ( !i_bForce && ( m_eCurrentLayout == i_eLayout ) ) return; @@ -449,9 +579,9 @@ void ToolPanelViewShell::Implementation::SetLayout( const PanelSelectorLayout i_ } // --------------------------------------------------------------------------------------------------------------------- -void ToolPanelViewShell::Implementation::Cleanup() +void ToolPanelViewShell_Impl::Cleanup() { - if ( !m_bInitialized ) + if ( m_bInitialized ) { m_pPanelDeck->RemoveListener( *this ); // remove the panels which are not under the control of the panel deck currently @@ -464,10 +594,48 @@ void ToolPanelViewShell::Implementation::Cleanup() panelPos->pPanel->Dispose(); } m_aPanels.clear(); + + if ( m_pConfigListener.is() ) + m_pConfigListener->dispose(); } m_pPanelDeck.reset(); } +// --------------------------------------------------------------------------------------------------------------------- +void ToolPanelViewShell_Impl::OnToolPanelActivationRequest( const ::rtl::OUString& i_rResourceURL ) +{ + // look up the panel which belongs to the given resource + for ( size_t i=0; i( rPanel.pPanel.get() ) ); + ENSURE_OR_CONTINUE( pPanel != NULL, "ToolPanelViewShell::OnToolPanelActivationRequest: illegal panel implementation!" ); + + Reference< XResourceId > xPanelId( pPanel->getResourceId() ); + ::rtl::OUString sPanelURL( xPanelId.is() ? xPanelId->getResourceURL() : ::rtl::OUString() ); + ENSURE_OR_CONTINUE( sPanelURL.getLength(), "illegal panel resource!" ); + + if ( sPanelURL == i_rResourceURL ) + { + CustomToolPanel* pCustomPanel = dynamic_cast< CustomToolPanel* >( rPanel.pPanel.get() ); + OSL_ENSURE( ( pCustomPanel != NULL ) == ( rPanel.nId >= PID_FIRST_CUSTOM_PANEL ), + "ToolPanelViewShell::OnToolPanelActivationRequest: inconsistency!" ); + if ( pCustomPanel != NULL ) + { + // if that's a custom tool panel, then temporarily disable the access of the tool panel implementation + // to the XPane object. Otherwise, it would request this resource from the configuration controller during + // the below ActivatePanelDirectly call, which would fail, since the resource is just to be created. + pCustomPanel->LockResourceAccess(); + } + ActivatePanelDirectly( rPanel.nId ); + if ( pCustomPanel != NULL ) + { + pCustomPanel->UnlockResourceAccess(); + } + } + } +} + // --------------------------------------------------------------------------------------------------------------------- void ToolPanelViewShell::Initialize() { @@ -478,7 +646,7 @@ void ToolPanelViewShell::Initialize() ToolPanelViewShell::ToolPanelViewShell( SfxViewFrame* pFrame, ViewShellBase& rViewShellBase, ::Window* pParentWindow, FrameView* pFrameViewArgument ) :ViewShell(pFrame, pParentWindow, rViewShellBase) - ,mpImpl( new Implementation( *this, *mpContentWindow.get() ) ) + ,mpImpl( new ToolPanelViewShell_Impl( *this, *mpContentWindow.get() ) ) ,mpSubShellManager() ,mnMenuId(0) { @@ -852,6 +1020,12 @@ bool ToolPanelViewShell::RelocateToParentWindow( ::Window* pParentWindow ) } // --------------------------------------------------------------------------------------------------------------------- +::Window* ToolPanelViewShell::GetToolPanelParentWindow() +{ + return mpImpl->GetToolPanelParentWindow(); +} + +//--------------------------------------------------------------------------------------------------------------------- void ToolPanelViewShell::DeactivatePanel( const PanelId i_ePanelId ) { mpImpl->DeactivatePanelDirectly( i_ePanelId ); @@ -865,10 +1039,10 @@ void ToolPanelViewShell::ActivatePanel( const PanelId i_ePanelId ) // ===================================================================================================================== -// = ToolPanelViewShell:Implementation - implementation +// = ToolPanelViewShell_Impl - implementation // ===================================================================================================================== // --------------------------------------------------------------------------------------------------------------------- -ToolPanelViewShell::Implementation::Implementation( ToolPanelViewShell& i_rPanelViewShell, ::Window& i_rPanelDeckParent ) +ToolPanelViewShell_Impl::ToolPanelViewShell_Impl( ToolPanelViewShell& i_rPanelViewShell, ::Window& i_rPanelDeckParent ) :m_aPanels() ,m_rPanelViewShell( i_rPanelViewShell ) ,m_pPanelDeck( new ToolPanelDeck( i_rPanelDeckParent, i_rPanelViewShell ) ) @@ -878,12 +1052,12 @@ ToolPanelViewShell::Implementation::Implementation( ToolPanelViewShell& i_rPanel } // --------------------------------------------------------------------------------------------------------------------- -ToolPanelViewShell::Implementation::~Implementation() +ToolPanelViewShell_Impl::~ToolPanelViewShell_Impl() { } // --------------------------------------------------------------------------------------------------------------------- -void ToolPanelViewShell::Implementation::TogglePanelVisibility( const size_t i_nLogicalPanelIndex ) +void ToolPanelViewShell_Impl::TogglePanelVisibility( const size_t i_nLogicalPanelIndex ) { ENSURE_OR_RETURN_VOID( i_nLogicalPanelIndex < m_aPanels.size(), "illegal index" ); @@ -910,7 +1084,7 @@ void ToolPanelViewShell::Implementation::TogglePanelVisibility( const size_t i_n } // --------------------------------------------------------------------------------------------------------------------- -void ToolPanelViewShell::Implementation::DeactivatePanelDirectly( const PanelId i_nPanelId ) +void ToolPanelViewShell_Impl::DeactivatePanelDirectly( const PanelId i_nPanelId ) { for ( size_t i=0; i= m_aPanels.size() ) m_aPanels.resize( i_nPosition + 1 ); - OSL_PRECOND( m_aPanels[ i_nPosition ].nId == PID_UNKNOWN, "ToolPanelViewShell::Implementation::RegisterPanel: " + OSL_PRECOND( m_aPanels[ i_nPosition ].nId == PID_UNKNOWN, "ToolPanelViewShell_Impl::RegisterPanel: " "already registered a panel for this ID!" ); m_aPanels[ i_nPosition ] = PanelDescriptor( i_nPanelId, i_rPanel ); } // --------------------------------------------------------------------------------------------------------------------- -void ToolPanelViewShell::Implementation::PanelInserted( const ::svt::PToolPanel& i_pPanel, const size_t i_nPosition ) +void ToolPanelViewShell_Impl::PanelInserted( const ::svt::PToolPanel& i_pPanel, const size_t i_nPosition ) { (void)i_pPanel; (void)i_nPosition; } // --------------------------------------------------------------------------------------------------------------------- -void ToolPanelViewShell::Implementation::PanelRemoved( const size_t i_nPosition ) +void ToolPanelViewShell_Impl::PanelRemoved( const size_t i_nPosition ) { (void)i_nPosition; } // --------------------------------------------------------------------------------------------------------------------- -void ToolPanelViewShell::Implementation::UpdateDockingWindowTitle() +void ToolPanelViewShell_Impl::UpdateDockingWindowTitle() { PaneDockingWindow* pDockingWindow = dynamic_cast< PaneDockingWindow* >( m_rPanelViewShell.GetDockingWindow() ); - ENSURE_OR_RETURN_VOID( pDockingWindow, "ToolPanelViewShell::Implementation::UpdateDockingWindowTitle: no PaneDockingWindow!?" ); + ENSURE_OR_RETURN_VOID( pDockingWindow, "ToolPanelViewShell_Impl::UpdateDockingWindowTitle: no PaneDockingWindow!?" ); ::boost::optional< size_t > aActivePanel( m_pPanelDeck->GetActivePanel() ); if ( !aActivePanel || ( GetLayout() == LAYOUT_DRAWERS ) ) @@ -994,7 +1168,7 @@ void ToolPanelViewShell::Implementation::UpdateDockingWindowTitle() } // --------------------------------------------------------------------------------------------------------------------- -void ToolPanelViewShell::Implementation::ActivePanelChanged( const ::boost::optional< size_t >& i_rOldActive, const ::boost::optional< size_t >& i_rNewActive ) +void ToolPanelViewShell_Impl::ActivePanelChanged( const ::boost::optional< size_t >& i_rOldActive, const ::boost::optional< size_t >& i_rNewActive ) { if ( GetLayout() == LAYOUT_DRAWERS ) // no adjustment of the title when we use the classical "drawers" layout @@ -1006,7 +1180,7 @@ void ToolPanelViewShell::Implementation::ActivePanelChanged( const ::boost::opti } // --------------------------------------------------------------------------------------------------------------------- -void ToolPanelViewShell::Implementation::Dying() +void ToolPanelViewShell_Impl::Dying() { } diff --git a/sd/workben/custompanel/Impress.xcu b/sd/workben/custompanel/Impress.xcu index 1c7bb5f6b102..6f8ced4924f3 100644 --- a/sd/workben/custompanel/Impress.xcu +++ b/sd/workben/custompanel/Impress.xcu @@ -6,7 +6,7 @@ - private:resource/view/SingleColorView + private:resource/toolpanel/SingleColorView Single Color Panel @@ -23,7 +23,7 @@ - private:resource/view/SingleColorView + private:resource/toolpanel/SingleColorView diff --git a/sd/workben/custompanel/ctp_factory.cxx b/sd/workben/custompanel/ctp_factory.cxx index caa19170ca59..f63e487fdc3e 100644 --- a/sd/workben/custompanel/ctp_factory.cxx +++ b/sd/workben/custompanel/ctp_factory.cxx @@ -33,6 +33,7 @@ #include #include #include +#include /** === end UNO includes === **/ //...................................................................................................................... @@ -59,6 +60,7 @@ namespace sd { namespace colortoolpanel using ::com::sun::star::lang::IllegalArgumentException; using ::com::sun::star::drawing::framework::XResourceFactoryManager; using ::com::sun::star::lang::WrappedTargetException; + using ::com::sun::star::lang::XComponent; /** === end UNO using === **/ //================================================================================================================== @@ -68,7 +70,7 @@ namespace sd { namespace colortoolpanel { const ::rtl::OUString& lcl_getSingleColorViewURL() { - static ::rtl::OUString s_sSingleColorViewURL( RTL_CONSTASCII_USTRINGPARAM( "private:resource/view/SingleColorView" ) ); + static ::rtl::OUString s_sSingleColorViewURL( RTL_CONSTASCII_USTRINGPARAM( "private:resource/toolpanel/SingleColorView" ) ); return s_sSingleColorViewURL; } } @@ -105,8 +107,14 @@ namespace sd { namespace colortoolpanel void SAL_CALL ResourceFactory::releaseResource( const Reference< XResource >& i_rResource ) throw (RuntimeException) { FactoryGuard aGuard( *this ); - // TODO: place your code here - (void)i_rResource; + + // here, we could decide to actually not destroy the resource, but cache it. In this case, we would need + // to re-parent the VCL window to another, temporary window, or *at least* hide it. + + // However, for the simplicity of this example, we will simply dispose the component here, which will destroy + // all associated resources, including the VCL window. + Reference< XComponent > xComponent( i_rResource, UNO_QUERY_THROW ); + xComponent->dispose(); } //------------------------------------------------------------------------------------------------------------------ diff --git a/sd/workben/custompanel/ctp_panel.cxx b/sd/workben/custompanel/ctp_panel.cxx index dbbbb8c6f273..7fb8ed8aeabe 100644 --- a/sd/workben/custompanel/ctp_panel.cxx +++ b/sd/workben/custompanel/ctp_panel.cxx @@ -29,8 +29,19 @@ #include "ctp_panel.hxx" /** === begin UNO includes === **/ +#include +#include +#include +#include +#include +#include +#include +#include +#include /** === end UNO includes === **/ +#include + //...................................................................................................................... namespace sd { namespace colortoolpanel { @@ -51,20 +62,98 @@ namespace sd { namespace colortoolpanel using ::com::sun::star::drawing::framework::XConfigurationController; using ::com::sun::star::drawing::framework::XResourceId; using ::com::sun::star::uno::XComponentContext; + using ::com::sun::star::drawing::framework::XPane; + using ::com::sun::star::awt::XWindow; + using ::com::sun::star::rendering::XCanvas; + using ::com::sun::star::lang::DisposedException; + using ::com::sun::star::awt::XWindowPeer; + using ::com::sun::star::lang::XMultiComponentFactory; + using ::com::sun::star::awt::XToolkit; + using ::com::sun::star::awt::WindowDescriptor; + using ::com::sun::star::awt::WindowClass_SIMPLE; + using ::com::sun::star::awt::Rectangle; + using ::com::sun::star::awt::PaintEvent; + using ::com::sun::star::lang::EventObject; + using ::com::sun::star::awt::XDevice; + using ::com::sun::star::awt::XGraphics; /** === end UNO using === **/ + namespace WindowAttribute = ::com::sun::star::awt::WindowAttribute; + namespace PosSize = ::com::sun::star::awt::PosSize; + //================================================================================================================== + //= helpers + //================================================================================================================== + namespace + { + Reference< XWindow > lcl_createPlainWindow_nothrow( const Reference< XComponentContext >& i_rContext, + const Reference< XWindowPeer >& i_rParentWindow ) + { + try + { + ENSURE_OR_THROW( i_rContext.is(), "illegal component context" ); + Reference< XMultiComponentFactory > xFactory( i_rContext->getServiceManager(), UNO_SET_THROW ); + Reference< XToolkit > xToolkit( xFactory->createInstanceWithContext( + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.Toolkit" ) ), + i_rContext + ), UNO_QUERY_THROW ); + + WindowDescriptor aWindow; + aWindow.Type = WindowClass_SIMPLE; + aWindow.WindowServiceName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "window" ) ); + aWindow.Parent = i_rParentWindow; + aWindow.WindowAttributes = WindowAttribute::BORDER; + + Reference< XWindowPeer > xWindow( xToolkit->createWindow( aWindow ), UNO_SET_THROW ); + return Reference< XWindow >( xWindow, UNO_QUERY_THROW ); + } + catch( const Exception& ) + { + DBG_UNHANDLED_EXCEPTION(); + } + return NULL; + } + } //================================================================================================================== //= class SingleColorPanel //================================================================================================================== //------------------------------------------------------------------------------------------------------------------ SingleColorPanel::SingleColorPanel( const Reference< XComponentContext >& i_rContext, const Reference< XConfigurationController >& i_rConfigController, const Reference< XResourceId >& i_rResourceId ) - :m_xContext( i_rContext ) + :SingleColorPanel_Base( m_aMutex ) + ,m_xContext( i_rContext ) ,m_xResourceId( i_rResourceId ) + ,m_xWindow() { - // TODO: retrieve the resource object for the anchor, ask it for its XPane interface, retrieve the window - // associated with it, create our own window as child of the pane's window - (void)i_rConfigController; + ENSURE_OR_THROW( i_rConfigController.is(), "invalid configuration controller" ); + ENSURE_OR_THROW( m_xResourceId.is(), "invalid resource id" ); + + // retrieve the parent window for our to-be-created pane window + Reference< XWindow > xParentWindow; + Reference< XWindowPeer > xParentPeer; + try + { + Reference< XResource > xAnchor( i_rConfigController->getResource( m_xResourceId->getAnchor() ), UNO_SET_THROW ); + Reference< XPane > xAnchorPane( xAnchor, UNO_QUERY_THROW ); + xParentWindow.set( xAnchorPane->getWindow(), UNO_SET_THROW ); + xParentPeer.set( xParentWindow, UNO_QUERY_THROW ); + } + catch( const Exception& ) + { + DBG_UNHANDLED_EXCEPTION(); + } + osl_incrementInterlockedCount( &m_refCount ); + if ( xParentWindow.is() ) + { + m_xWindow = lcl_createPlainWindow_nothrow( m_xContext, xParentPeer ); + m_xWindow->addPaintListener( this ); + if ( m_xWindow.is() ) + { + const Rectangle aPanelAnchorSize( xParentWindow->getPosSize() ); + m_xWindow->setPosSize( 0, 0, aPanelAnchorSize.Width, aPanelAnchorSize.Height, PosSize::POSSIZE ); + m_xWindow->setVisible( sal_True ); + } + } + osl_decrementInterlockedCount( &m_refCount ); } //------------------------------------------------------------------------------------------------------------------ @@ -72,18 +161,78 @@ namespace sd { namespace colortoolpanel { } - //-------------------------------------------------------------------- + //------------------------------------------------------------------------------------------------------------------ + Reference< XWindow > SAL_CALL SingleColorPanel::getWindow( ) throw (RuntimeException) + { + ::osl::MutexGuard aGuard( m_aMutex ); + if ( !m_xWindow.get() ) + throw DisposedException( ::rtl::OUString(), *this ); + return m_xWindow; + } + + //------------------------------------------------------------------------------------------------------------------ Reference< XResourceId > SAL_CALL SingleColorPanel::getResourceId( ) throw (RuntimeException) { + ::osl::MutexGuard aGuard( m_aMutex ); + if ( !m_xWindow.is() ) + throw DisposedException( ::rtl::OUString(), *this ); return m_xResourceId; } - //-------------------------------------------------------------------- + //------------------------------------------------------------------------------------------------------------------ ::sal_Bool SAL_CALL SingleColorPanel::isAnchorOnly( ) throw (RuntimeException) { + ::osl::MutexGuard aGuard( m_aMutex ); + if ( !m_xWindow.is() ) + throw DisposedException( ::rtl::OUString(), *this ); return sal_False; } + //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL SingleColorPanel::windowPaint( const PaintEvent& i_rEvent ) throw (RuntimeException) + { + try + { + const Reference< XDevice > xDevice( i_rEvent.Source, UNO_QUERY_THROW ); + const Reference< XGraphics > xGraphics( xDevice->createGraphics(), UNO_SET_THROW ); + xGraphics->setFillColor( 0x80 << 8 ); + xGraphics->setLineColor( 0x80 << 16 ); + + const Reference< XWindow > xWindow( i_rEvent.Source, UNO_QUERY_THROW ); + const Rectangle aWindowRect( xWindow->getPosSize() ); + xGraphics->drawRect( 0, 0, aWindowRect.Width - 1, aWindowRect.Height - 1 ); + } + catch( const Exception& ) + { + DBG_UNHANDLED_EXCEPTION(); + } + } + + //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL SingleColorPanel::disposing( const EventObject& i_rSource ) throw (RuntimeException) + { + (void)i_rSource; + } + + //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL SingleColorPanel::disposing() + { + ::osl::MutexGuard aGuard( m_aMutex ); + if ( !m_xWindow.is() ) + // already disposed + return; + m_xWindow->removePaintListener( this ); + try + { + Reference< XComponent > xWindowComp( m_xWindow, UNO_QUERY_THROW ); + xWindowComp->dispose(); + } + catch( const Exception& ) + { + DBG_UNHANDLED_EXCEPTION(); + } + m_xWindow.clear(); + } //...................................................................................................................... } } // namespace sd::colortoolpanel diff --git a/sd/workben/custompanel/ctp_panel.hxx b/sd/workben/custompanel/ctp_panel.hxx index c7ecb7c19795..f991cc80516c 100644 --- a/sd/workben/custompanel/ctp_panel.hxx +++ b/sd/workben/custompanel/ctp_panel.hxx @@ -29,14 +29,18 @@ /** === begin UNO includes === **/ #include +#include #include #include #include +#include /** === end UNO includes === **/ -#include +#include #include +#include + //...................................................................................................................... namespace sd { namespace colortoolpanel { @@ -45,8 +49,10 @@ namespace sd { namespace colortoolpanel //================================================================================================================== //= class SingleColorPanel //================================================================================================================== - typedef ::cppu::WeakImplHelper1 < ::com::sun::star::drawing::framework::XView - > SingleColorPanel_Base; + typedef ::cppu::WeakComponentImplHelper3 < ::com::sun::star::drawing::framework::XView + , ::com::sun::star::view::XToolPanel + , ::com::sun::star::awt::XPaintListener + > SingleColorPanel_Base; class SingleColorPanel :public ::cppu::BaseMutex ,public SingleColorPanel_Base { @@ -57,6 +63,9 @@ namespace sd { namespace colortoolpanel const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::framework::XResourceId >& i_rResourceId ); + // XToolPanel + virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > SAL_CALL getWindow( ) throw (::com::sun::star::uno::RuntimeException); + // XView // (no methods) @@ -64,12 +73,22 @@ namespace sd { namespace colortoolpanel virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::framework::XResourceId > SAL_CALL getResourceId( ) throw (::com::sun::star::uno::RuntimeException); virtual ::sal_Bool SAL_CALL isAnchorOnly( ) throw (::com::sun::star::uno::RuntimeException); + // XPaintListener + virtual void SAL_CALL windowPaint( const ::com::sun::star::awt::PaintEvent& e ) throw (::com::sun::star::uno::RuntimeException); + + // XEventListener + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException); + + // XComponent equivalents + virtual void SAL_CALL disposing(); + protected: ~SingleColorPanel(); private: ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; ::com::sun::star::uno::Reference< ::com::sun::star::drawing::framework::XResourceId > m_xResourceId; + ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > m_xWindow; }; //...................................................................................................................... diff --git a/sd/workben/custompanel/makefile.mk b/sd/workben/custompanel/makefile.mk index 7703b7163fa3..6c20c5a4df15 100644 --- a/sd/workben/custompanel/makefile.mk +++ b/sd/workben/custompanel/makefile.mk @@ -62,9 +62,10 @@ LIB1OBJFILES= \ $(SLO)/ctp_panel.obj SHL1STDLIBS= \ - $(CPPULIB) \ - $(SALLIB) \ - $(SALHELPERLIB) \ + $(TOOLSLIB) \ + $(CPPULIB) \ + $(SALLIB) \ + $(SALHELPERLIB) \ $(CPPUHELPERLIB) SHL1VERSIONMAP=$(TARGET).map -- 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 +--- sd/source/ui/toolpanel/LayoutMenu.cxx | 79 +--------------------- sd/source/ui/toolpanel/LayoutMenu.hxx | 25 ++----- sd/source/ui/toolpanel/ScrollPanel.cxx | 2 +- sd/source/ui/toolpanel/SlideSorterCacheDisplay.cxx | 41 ----------- sd/source/ui/toolpanel/StandardToolPanel.cxx | 2 +- sd/source/ui/toolpanel/TaskPaneControlFactory.cxx | 13 +--- sd/source/ui/toolpanel/TestMenu.cxx | 17 ++--- sd/source/ui/toolpanel/TestMenu.hxx | 2 +- sd/source/ui/toolpanel/TestPanel.cxx | 13 ++-- sd/source/ui/toolpanel/TestPanel.hxx | 2 +- sd/source/ui/toolpanel/TitledControl.cxx | 76 ++++----------------- .../ui/toolpanel/controls/CustomAnimationPanel.cxx | 14 ---- .../ui/toolpanel/controls/CustomAnimationPanel.hxx | 4 -- .../ui/toolpanel/controls/MasterPagesPanel.cxx | 14 ---- .../ui/toolpanel/controls/MasterPagesPanel.hxx | 4 -- .../ui/toolpanel/controls/SlideTransitionPanel.cxx | 15 ---- .../ui/toolpanel/controls/SlideTransitionPanel.hxx | 4 -- .../ui/toolpanel/controls/TableDesignPanel.cxx | 14 ---- .../ui/toolpanel/controls/TableDesignPanel.hxx | 4 -- 22 files changed, 40 insertions(+), 373 deletions(-) (limited to 'sd') 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 diff --git a/sd/source/ui/toolpanel/LayoutMenu.cxx b/sd/source/ui/toolpanel/LayoutMenu.cxx index 16d2e1592444..2e1555bacfa2 100644 --- a/sd/source/ui/toolpanel/LayoutMenu.cxx +++ b/sd/source/ui/toolpanel/LayoutMenu.cxx @@ -88,45 +88,6 @@ using ::sd::framework::FrameworkHelper; namespace sd { namespace toolpanel { -/** This factory class stores references to ViewShellBase and DrawDocShell - and passes them to new LayoutMenu objects. -*/ -class LayoutMenuFactory - : public ControlFactory -{ -public: - LayoutMenuFactory (ViewShellBase& rBase, DrawDocShell& rDocShell) - : mrBase(rBase), - mrDocShell(rDocShell) - {} - -protected: - virtual TreeNode* InternalCreateControl (TreeNode* pTreeNode) - { - ScrollPanel* pScrollPanel = new ScrollPanel (pTreeNode); - ::std::auto_ptr pMenu ( - new LayoutMenu ( - pScrollPanel, - mrDocShell, - mrBase, - false)); - pScrollPanel->AddControl(pMenu); - return pScrollPanel; - } - - virtual TreeNode* InternalCreateRootControl( ::Window& /*i_rParent*/ ) - { - OSL_ENSURE( false, "LayoutMenuFactory::InternalCreateRootControl: not implemented!" ); - return NULL; - } - -private: - ViewShellBase& mrBase; - DrawDocShell& mrDocShell; -}; - - - class LayoutMenuRootFactory : public ControlFactory { @@ -137,13 +98,7 @@ public: } protected: - virtual TreeNode* InternalCreateControl (TreeNode* pTreeNode) - { - OSL_ENSURE( false, "LayoutMenuRootFactory::InternalCreateControl: not implemented!" ); - return NULL; - } - - virtual TreeNode* InternalCreateRootControl( ::Window& i_rParent ) + virtual TreeNode* InternalCreateControl( ::Window& i_rParent ) { ScrollPanel* pScrollPanel = new ScrollPanel (i_rParent); ::std::auto_ptr pMenu ( @@ -263,28 +218,6 @@ static snewfoil_value_info standard[] = -LayoutMenu::LayoutMenu ( - TreeNode* pParent, - DrawDocShell& rDocumentShell, - ViewShellBase& rViewShellBase, - bool bUseOwnScrollBar) - : ValueSet (pParent->GetWindow()), - TreeNode(pParent), - DragSourceHelper(this), - DropTargetHelper(this), - mrBase (rViewShellBase), - mpShellManager (NULL), - mbUseOwnScrollBar (bUseOwnScrollBar), - mnPreferredColumnCount(3), - mxListener(NULL), - mbSelectionUpdatePending(true), - mbIsMainViewChangePending(false) -{ - ImplConstruct( rDocumentShell ); -} - - - LayoutMenu::LayoutMenu( TreeNode* pParent, ToolPanelViewShell& i_rPanelViewShell ) : ValueSet (pParent->GetWindow()), TreeNode(pParent), @@ -364,16 +297,6 @@ LayoutMenu::~LayoutMenu (void) -::std::auto_ptr LayoutMenu::CreateControlFactory ( - ViewShellBase& rBase, - DrawDocShell& rDocShell) -{ - return ::std::auto_ptr(new LayoutMenuFactory(rBase, rDocShell)); -} - - - - ::std::auto_ptr LayoutMenu::CreateControlFactory ( ToolPanelViewShell& i_rPanelViewShell ) { diff --git a/sd/source/ui/toolpanel/LayoutMenu.hxx b/sd/source/ui/toolpanel/LayoutMenu.hxx index 7fa5d42a1f76..c7a1fef7907d 100644 --- a/sd/source/ui/toolpanel/LayoutMenu.hxx +++ b/sd/source/ui/toolpanel/LayoutMenu.hxx @@ -80,31 +80,16 @@ public: /** Create a new layout menu. Depending on the given flag it displays its own scroll bar or lets a surrounding window handle that. - @param rDocumentShell - Used to determine writing direction. - @param rViewShellBase - Gives access to the view shell at whose active page the - layout will be set. - @param bUseOwnScrollBar - When then we will show our own scroll bar when not - all icons can be displayed in the visible window area. - When then rely on an outer scroll bar. In this - case we will set the height of the window so that all - icons are visible. + @param i_pParent + the parent node in the control tree + @param i_rPanelViewShell + the view shell of the task pane. */ LayoutMenu ( - TreeNode* pParent, - DrawDocShell& rDocumentShell, - ViewShellBase& rViewShellBase, - bool bUseOwnScrollBar); - LayoutMenu ( - TreeNode* pParent, + TreeNode* i_pParent, ToolPanelViewShell& i_rPanelViewShell); virtual ~LayoutMenu (void); - static std::auto_ptr CreateControlFactory ( - ViewShellBase& rBase, - DrawDocShell& rDocShell); static std::auto_ptr CreateControlFactory ( ToolPanelViewShell& i_rPanelViewShell ); diff --git a/sd/source/ui/toolpanel/ScrollPanel.cxx b/sd/source/ui/toolpanel/ScrollPanel.cxx index e5023131e908..9df1adef871b 100644 --- a/sd/source/ui/toolpanel/ScrollPanel.cxx +++ b/sd/source/ui/toolpanel/ScrollPanel.cxx @@ -122,7 +122,7 @@ ScrollPanel::~ScrollPanel (void) // control instead of pNode directly. TitledControl* pTitledControl = static_cast(pNode); if (pTitledControl != NULL) - pControl = pTitledControl->GetControl(false); + pControl = pTitledControl->GetControl(); // Remove this object as listener from the control. if (pControl != NULL && pControl->GetWindow()!=NULL) diff --git a/sd/source/ui/toolpanel/SlideSorterCacheDisplay.cxx b/sd/source/ui/toolpanel/SlideSorterCacheDisplay.cxx index 5129f40620df..4a42eb9b31d5 100644 --- a/sd/source/ui/toolpanel/SlideSorterCacheDisplay.cxx +++ b/sd/source/ui/toolpanel/SlideSorterCacheDisplay.cxx @@ -74,38 +74,6 @@ namespace sd { namespace toolpanel { ::std::map SlideSorterCacheDisplay::maDisplays; -/** This factory class is used to create instances of TestPanel. It can be - extended so that its constructor stores arguments that later are passed - to new TestPanel objects. -*/ -class SlideSorterCacheDisplayFactory - : public ControlFactory -{ -public: - SlideSorterCacheDisplayFactory (const SdDrawDocument* pDocument) - : mpDocument(pDocument) - { - } - -protected: - virtual TreeNode* InternalCreateControl (TreeNode* pTreeNode) - { - SlideSorterCacheDisplay* pDisplay = SlideSorterCacheDisplay::Instance(mpDocument); - pDisplay->SetParentWindow(pTreeNode->GetWindow()); - pDisplay->SetParentNode(pTreeNode); - return pDisplay; - } - -private: - const SdDrawDocument* mpDocument; -}; - - - - - - - SlideSorterCacheDisplay::SlideSorterCacheDisplay (const SdDrawDocument* pDocument) : TreeNode(NULL), mpWindow(NULL), @@ -140,15 +108,6 @@ void SlideSorterCacheDisplay::SetParentWindow (::Window* pParentWindow) -std::auto_ptr SlideSorterCacheDisplay::CreateControlFactory ( - const SdDrawDocument* pDocument) -{ - return std::auto_ptr(new SlideSorterCacheDisplayFactory(pDocument)); -} - - - - void SlideSorterCacheDisplay::Paint (const Rectangle& rBoundingBox) { if (maCellSize.Width()>0 && maCellSize.Height()>0 && mpWindow!=NULL) diff --git a/sd/source/ui/toolpanel/StandardToolPanel.cxx b/sd/source/ui/toolpanel/StandardToolPanel.cxx index f83f811fde28..9d5eaa46c101 100644 --- a/sd/source/ui/toolpanel/StandardToolPanel.cxx +++ b/sd/source/ui/toolpanel/StandardToolPanel.cxx @@ -136,7 +136,7 @@ namespace sd { namespace toolpanel return true; if ( isDisposed() ) return false; - m_pControl = m_pControlFactory->CreateRootControl( getPanelWindowAnchor() ); + m_pControl = m_pControlFactory->CreateControl( getPanelWindowAnchor() ); return ( m_pControl.get() != NULL ); } diff --git a/sd/source/ui/toolpanel/TaskPaneControlFactory.cxx b/sd/source/ui/toolpanel/TaskPaneControlFactory.cxx index e9ea53d4c7b7..0dfe96262a43 100644 --- a/sd/source/ui/toolpanel/TaskPaneControlFactory.cxx +++ b/sd/source/ui/toolpanel/TaskPaneControlFactory.cxx @@ -51,18 +51,9 @@ ControlFactory::~ControlFactory (void) -::std::auto_ptr ControlFactory::CreateControl (TreeNode* pTreeNode) +::std::auto_ptr ControlFactory::CreateControl( ::Window& i_rParent ) { - // Create a new control by using the protected virtual hook. - TreeNode* pNewNode = InternalCreateControl(pTreeNode); - - return ::std::auto_ptr(pNewNode); -} - - -::std::auto_ptr ControlFactory::CreateRootControl( ::Window& i_rParent ) -{ - TreeNode* pNewNode = InternalCreateRootControl( i_rParent ); + TreeNode* pNewNode = InternalCreateControl( i_rParent ); return ::std::auto_ptr( pNewNode ); } diff --git a/sd/source/ui/toolpanel/TestMenu.cxx b/sd/source/ui/toolpanel/TestMenu.cxx index 3e90a56a00fe..feea0ba337ef 100644 --- a/sd/source/ui/toolpanel/TestMenu.cxx +++ b/sd/source/ui/toolpanel/TestMenu.cxx @@ -48,21 +48,16 @@ class ColorMenuFactory : public ControlFactory { protected: - virtual TreeNode* InternalCreateControl (TreeNode* pTreeNode) + virtual TreeNode* InternalCreateControl( ::Window& i_rParent ) { - return new ColorMenu (pTreeNode); - } - virtual TreeNode* InternalCreateRootControl( ::Window& /*i_rParent*/ ) - { - OSL_ENSURE( false, "ColorMenuFactory::InternalCreateRootControl: not implemented!" ); - return NULL; + return new ColorMenu (&i_rParent); } }; -ColorMenu::ColorMenu (TreeNode* pParent) - : Window (pParent->GetWindow()), - TreeNode(pParent), +ColorMenu::ColorMenu (::Window* i_pParent) + : Window (i_pParent), + TreeNode(NULL), maSet (this), mnPreferredColumnCount(2) { @@ -79,7 +74,7 @@ ColorMenu::ColorMenu (TreeNode* pParent) Fill (); maSet.Show(); - pParent->RequestResize(); + i_pParent->Resize(); } diff --git a/sd/source/ui/toolpanel/TestMenu.hxx b/sd/source/ui/toolpanel/TestMenu.hxx index 58cb9b1d4ccd..c73d4b89a70f 100644 --- a/sd/source/ui/toolpanel/TestMenu.hxx +++ b/sd/source/ui/toolpanel/TestMenu.hxx @@ -50,7 +50,7 @@ class ColorMenu public TreeNode { public: - ColorMenu (TreeNode* pParent); + ColorMenu (::Window* i_pParent); virtual ~ColorMenu (void); static ::std::auto_ptr CreateControlFactory (void); diff --git a/sd/source/ui/toolpanel/TestPanel.cxx b/sd/source/ui/toolpanel/TestPanel.cxx index 8b14eb5d0234..5076033a89ec 100644 --- a/sd/source/ui/toolpanel/TestPanel.cxx +++ b/sd/source/ui/toolpanel/TestPanel.cxx @@ -48,14 +48,9 @@ class TestPanelFactory : public ControlFactory { protected: - virtual TreeNode* InternalCreateControl (TreeNode* pTreeNode) + virtual TreeNode* InternalCreateControl( ::Window& i_rParent ) { - return new TestPanel (pTreeNode); - } - virtual TreeNode* InternalCreateRootControl( ::Window& i_rParent ) - { - OSL_ENSURE( false, "TestPanelFactory::InternalCreateRootControl: not implemented!" ); - return NULL; + return new TestPanel (i_rParent); } }; @@ -117,8 +112,8 @@ private: }; -TestPanel::TestPanel (TreeNode* pParent) - : SubToolPanel (pParent) +TestPanel::TestPanel (::Window& i_rParent) + : SubToolPanel (i_rParent) { // Create a scrollable panel with two list boxes. ScrollPanel* pScrollPanel = new ScrollPanel (this); diff --git a/sd/source/ui/toolpanel/TestPanel.hxx b/sd/source/ui/toolpanel/TestPanel.hxx index 202525dd8b16..c767f2d6dba7 100644 --- a/sd/source/ui/toolpanel/TestPanel.hxx +++ b/sd/source/ui/toolpanel/TestPanel.hxx @@ -45,7 +45,7 @@ class TestPanel : public SubToolPanel { public: - TestPanel (TreeNode* pParent); + TestPanel (::Window& i_rParent); virtual ~TestPanel (void); static std::auto_ptr CreateControlFactory (void); diff --git a/sd/source/ui/toolpanel/TitledControl.cxx b/sd/source/ui/toolpanel/TitledControl.cxx index 07a6a7f7082c..921b37335048 100644 --- a/sd/source/ui/toolpanel/TitledControl.cxx +++ b/sd/source/ui/toolpanel/TitledControl.cxx @@ -55,7 +55,6 @@ TitledControl::TitledControl ( msTitle(rTitle), mbVisible(true), mpUserData(NULL), - mpControlFactory(NULL), mpClickHandler(new ClickHandler(rClickHandler)), mbExpansionModeIsToggle(eType!=TitleBar::TBT_CONTROL_TITLE) { @@ -82,39 +81,6 @@ TitledControl::TitledControl ( -TitledControl::TitledControl ( - TreeNode* pParent, - ::std::auto_ptr pControlFactory, - const String& rTitle, - const ClickHandler& rClickHandler, - TitleBar::TitleBarType eType) - : ::Window (pParent->GetWindow(), WB_TABSTOP), - TreeNode(pParent), - msTitle (rTitle), - mbVisible (true), - mpUserData (NULL), - mpControlFactory(pControlFactory), - mpClickHandler(new ClickHandler(rClickHandler)), - mbExpansionModeIsToggle(eType!=TitleBar::TBT_CONTROL_TITLE) -{ - mpControlContainer->AddControl (::std::auto_ptr ( - new TitleBar (this, rTitle, eType, true))); - - // The second control is created on demand, i.e. when GetControl(true) - // is called the first time. - - SetBackground (Wallpaper()); - - GetTitleBar()->GetWindow()->Show (); - GetTitleBar()->GetWindow()->AddEventListener ( - LINK(this,TitledControl,WindowEventListener)); - - UpdateStates (); -} - - - - TitledControl::~TitledControl (void) { GetTitleBar()->GetWindow()->RemoveEventListener ( @@ -127,7 +93,7 @@ TitledControl::~TitledControl (void) Size TitledControl::GetPreferredSize (void) { Size aPreferredSize; - if (GetControl(false) != NULL) + if (GetControl() != NULL) { aPreferredSize = GetControl()->GetPreferredSize(); if ( ! IsExpanded()) @@ -149,7 +115,7 @@ Size TitledControl::GetPreferredSize (void) sal_Int32 TitledControl::GetPreferredWidth (sal_Int32 nHeight) { int nPreferredWidth = 0; - if (GetControl(false) != NULL) + if (GetControl() != NULL) nPreferredWidth = GetControl()->GetPreferredWidth( nHeight - GetTitleBar()->GetWindow()->GetSizePixel().Height()); else @@ -166,7 +132,7 @@ sal_Int32 TitledControl::GetPreferredWidth (sal_Int32 nHeight) sal_Int32 TitledControl::GetPreferredHeight (sal_Int32 nWidth) { int nPreferredHeight = 0; - if (IsExpanded() && GetControl(false)!=NULL) + if (IsExpanded() && GetControl()!=NULL) nPreferredHeight = GetControl()->GetPreferredHeight(nWidth); nPreferredHeight += GetTitleBar()->GetPreferredHeight(nWidth); @@ -204,7 +170,7 @@ void TitledControl::Resize (void) Size (aWindowSize.Width(), nTitleBarHeight)); - TreeNode* pControl = GetControl(false); + TreeNode* pControl = GetControl(); if (pControl != NULL && pControl->GetWindow() != NULL && pControl->GetWindow()->IsVisible()) @@ -251,7 +217,7 @@ void TitledControl::KeyInput (const KeyEvent& rEvent) if ( ! FocusManager::Instance().TransferFocus(this,nCode)) { // When already expanded then put focus on first child. - TreeNode* pControl = GetControl(false); + TreeNode* pControl = GetControl(); if (pControl!=NULL && IsExpanded()) if (pControl->GetWindow() != NULL) pControl->GetWindow()->GrabFocus(); @@ -289,7 +255,7 @@ bool TitledControl::Expand (bool bExpanded) // Get the control. Use the bExpanded parameter as argument to // indicate that a control is created via its factory only when it // is to be expanded. When it is collapsed this is not necessary. - TreeNode* pControl = GetControl(bExpanded); + TreeNode* pControl = GetControl(); if (pControl != NULL && GetControl()->IsExpanded() != bExpanded) { @@ -307,7 +273,7 @@ bool TitledControl::Expand (bool bExpanded) bool TitledControl::IsExpandable (void) const { - const TreeNode* pControl = GetConstControl(false); + const TreeNode* pControl = GetConstControl(); if (pControl != NULL) return pControl->IsExpandable(); else @@ -321,7 +287,7 @@ bool TitledControl::IsExpandable (void) const bool TitledControl::IsExpanded (void) const { - const TreeNode* pControl = GetConstControl(false); + const TreeNode* pControl = GetConstControl(); if (pControl != NULL) return pControl->IsExpanded(); else @@ -395,7 +361,7 @@ void TitledControl::UpdateStates (void) else GetWindow()->Hide(); - TreeNode* pControl = GetControl(false); + TreeNode* pControl = GetControl(); if (pControl!=NULL && pControl->GetWindow() != NULL) { if (IsVisible() && IsExpanded()) @@ -428,33 +394,17 @@ IMPL_LINK(TitledControl, WindowEventListener, -TreeNode* TitledControl::GetControl (bool bCreate) +TreeNode* TitledControl::GetControl (void) { - TreeNode* pNode = mpControlContainer->GetControl(1); - if (pNode==NULL && mpControlFactory.get()!=NULL && bCreate) - { - // We have to create the control with the factory object. - ::std::auto_ptr pControl (mpControlFactory->CreateControl(this));//GetParentNode())); - if (pControl.get() != NULL) - { - pControl->SetParentNode(this); - mpControlContainer->AddControl(pControl); - - pNode = mpControlContainer->GetControl(1); - FocusManager::Instance().RegisterDownLink(this, pNode->GetWindow()); - FocusManager::Instance().RegisterUpLink(pNode->GetWindow(), this); - } - } - - return pNode; + return mpControlContainer->GetControl(1); } -const TreeNode* TitledControl::GetConstControl (bool bCreate) const +const TreeNode* TitledControl::GetConstControl () const { - return const_cast(this)->GetControl(bCreate); + return const_cast(this)->GetControl(); } diff --git a/sd/source/ui/toolpanel/controls/CustomAnimationPanel.cxx b/sd/source/ui/toolpanel/controls/CustomAnimationPanel.cxx index a745aeb79bb3..3871200da1f0 100644 --- a/sd/source/ui/toolpanel/controls/CustomAnimationPanel.cxx +++ b/sd/source/ui/toolpanel/controls/CustomAnimationPanel.cxx @@ -48,14 +48,6 @@ namespace sd namespace toolpanel { namespace controls { -CustomAnimationPanel::CustomAnimationPanel(TreeNode* pParent, ViewShellBase& rBase) - : SubToolPanel (pParent) - , m_pPanelViewShell (NULL) -{ - mpWrappedControl = createCustomAnimationPanel( pParent->GetWindow(), rBase ); - mpWrappedControl->Show(); -} - CustomAnimationPanel::CustomAnimationPanel(Window& i_rParentWindow, ToolPanelViewShell& i_rPanelViewShell) :SubToolPanel( i_rParentWindow ) ,m_pPanelViewShell( &i_rPanelViewShell ) @@ -69,12 +61,6 @@ CustomAnimationPanel::~CustomAnimationPanel() delete mpWrappedControl; } -std::auto_ptr CustomAnimationPanel::CreateControlFactory (ViewShellBase& rBase) -{ - return std::auto_ptr( - new ControlFactoryWithArgs1(rBase)); -} - std::auto_ptr< ControlFactory > CustomAnimationPanel::CreateControlFactory( ToolPanelViewShell& i_rToolPanelShell ) { return std::auto_ptr< ControlFactory >( diff --git a/sd/source/ui/toolpanel/controls/CustomAnimationPanel.hxx b/sd/source/ui/toolpanel/controls/CustomAnimationPanel.hxx index 292c9842bc2c..f9635be2c92e 100644 --- a/sd/source/ui/toolpanel/controls/CustomAnimationPanel.hxx +++ b/sd/source/ui/toolpanel/controls/CustomAnimationPanel.hxx @@ -49,15 +49,11 @@ class CustomAnimationPanel : public SubToolPanel { public: - CustomAnimationPanel ( - TreeNode* pParent, - ViewShellBase& rBase); CustomAnimationPanel ( Window& i_rParentWindow, ToolPanelViewShell& i_rPanelViewShell); virtual ~CustomAnimationPanel (void); - static std::auto_ptr CreateControlFactory (ViewShellBase& rBase); static std::auto_ptr CreateControlFactory (ToolPanelViewShell& i_rPanelViewShell); // TreeNode overridables diff --git a/sd/source/ui/toolpanel/controls/MasterPagesPanel.cxx b/sd/source/ui/toolpanel/controls/MasterPagesPanel.cxx index 0862010f1bb6..979f3cb3783d 100644 --- a/sd/source/ui/toolpanel/controls/MasterPagesPanel.cxx +++ b/sd/source/ui/toolpanel/controls/MasterPagesPanel.cxx @@ -52,13 +52,6 @@ namespace sd { namespace toolpanel { namespace controls { -MasterPagesPanel::MasterPagesPanel (TreeNode* pParent, ViewShellBase& rBase) - : ScrollPanel (pParent) - , m_pPanelViewShell (NULL) -{ - impl_construct( rBase ); -} - MasterPagesPanel::MasterPagesPanel (::Window& i_rParentWindow, ToolPanelViewShell& i_rPanelViewShell) :ScrollPanel (i_rParentWindow) ,m_pPanelViewShell( &i_rPanelViewShell ) @@ -158,13 +151,6 @@ TaskPaneShellManager* MasterPagesPanel::GetShellManager() -std::auto_ptr MasterPagesPanel::CreateControlFactory (ViewShellBase& rBase) -{ - return std::auto_ptr( - new ControlFactoryWithArgs1(rBase)); -} - - std::auto_ptr< ControlFactory > MasterPagesPanel::CreateControlFactory( ToolPanelViewShell& i_rToolPanelShell ) { return std::auto_ptr< ControlFactory >( diff --git a/sd/source/ui/toolpanel/controls/MasterPagesPanel.hxx b/sd/source/ui/toolpanel/controls/MasterPagesPanel.hxx index fd64a81d9df0..3481c084427d 100644 --- a/sd/source/ui/toolpanel/controls/MasterPagesPanel.hxx +++ b/sd/source/ui/toolpanel/controls/MasterPagesPanel.hxx @@ -53,9 +53,6 @@ class MasterPagesPanel : public ScrollPanel { public: - MasterPagesPanel ( - TreeNode* pParent, - ViewShellBase& rBase); MasterPagesPanel ( ::Window& i_rParentWindow, ToolPanelViewShell& i_rPanelViewShell); @@ -64,7 +61,6 @@ public: // TreeNode overridables virtual TaskPaneShellManager* GetShellManager (void); - static std::auto_ptr CreateControlFactory (ViewShellBase& rBase); static std::auto_ptr CreateControlFactory (ToolPanelViewShell& i_rToolPanelShell); private: diff --git a/sd/source/ui/toolpanel/controls/SlideTransitionPanel.cxx b/sd/source/ui/toolpanel/controls/SlideTransitionPanel.cxx index cfef2ad7cb09..a61f2b83db33 100644 --- a/sd/source/ui/toolpanel/controls/SlideTransitionPanel.cxx +++ b/sd/source/ui/toolpanel/controls/SlideTransitionPanel.cxx @@ -49,15 +49,6 @@ namespace toolpanel { namespace controls { -SlideTransitionPanel::SlideTransitionPanel(TreeNode* pParent, ViewShellBase& rBase) - : SubToolPanel (pParent), - maPreferredSize( 100, 200 ), - m_pPanelViewShell( NULL ) -{ - mpWrappedControl = createSlideTransitionPanel( pParent->GetWindow(), rBase ); - mpWrappedControl->Show(); -} - SlideTransitionPanel::SlideTransitionPanel(Window& i_rParentWindow, ToolPanelViewShell& i_rToolPanelShell) :SubToolPanel( i_rParentWindow ) ,maPreferredSize( 100, 200 ) @@ -72,12 +63,6 @@ SlideTransitionPanel::~SlideTransitionPanel() delete mpWrappedControl; } -std::auto_ptr SlideTransitionPanel::CreateControlFactory (ViewShellBase& rBase) -{ - return std::auto_ptr( - new ControlFactoryWithArgs1(rBase)); -} - std::auto_ptr< ControlFactory > SlideTransitionPanel::CreateControlFactory( ToolPanelViewShell& i_rToolPanelShell ) { return std::auto_ptr< ControlFactory >( diff --git a/sd/source/ui/toolpanel/controls/SlideTransitionPanel.hxx b/sd/source/ui/toolpanel/controls/SlideTransitionPanel.hxx index a8eb59facf7c..dadbdf08e680 100644 --- a/sd/source/ui/toolpanel/controls/SlideTransitionPanel.hxx +++ b/sd/source/ui/toolpanel/controls/SlideTransitionPanel.hxx @@ -48,15 +48,11 @@ class SlideTransitionPanel : public SubToolPanel { public: - SlideTransitionPanel ( - TreeNode* pParent, - ViewShellBase& rBase); SlideTransitionPanel ( Window& i_rParentWindow, ToolPanelViewShell& i_rToolPanelShell); virtual ~SlideTransitionPanel (void); - static std::auto_ptr CreateControlFactory (ViewShellBase& rBase); static std::auto_ptr CreateControlFactory (ToolPanelViewShell& i_rToolPanelShell); // TreeNode overridables diff --git a/sd/source/ui/toolpanel/controls/TableDesignPanel.cxx b/sd/source/ui/toolpanel/controls/TableDesignPanel.cxx index cd314eb4ba03..15237ee19085 100644 --- a/sd/source/ui/toolpanel/controls/TableDesignPanel.cxx +++ b/sd/source/ui/toolpanel/controls/TableDesignPanel.cxx @@ -48,14 +48,6 @@ namespace sd namespace toolpanel { namespace controls { -TableDesignPanel::TableDesignPanel(TreeNode* pParent, ViewShellBase& rBase) - : SubToolPanel (pParent) - ,m_pPanelViewShell( NULL ) -{ - mpWrappedControl = createTableDesignPanel( pParent->GetWindow(), rBase ); - mpWrappedControl->Show(); -} - TableDesignPanel::TableDesignPanel( ::Window& i_rParentWindow, ToolPanelViewShell& i_rPanelViewShell ) :SubToolPanel( i_rParentWindow ) ,m_pPanelViewShell( &i_rPanelViewShell ) @@ -69,12 +61,6 @@ TableDesignPanel::~TableDesignPanel() delete mpWrappedControl; } -std::auto_ptr TableDesignPanel::CreateControlFactory (ViewShellBase& rBase) -{ - return std::auto_ptr( - new ControlFactoryWithArgs1(rBase)); -} - std::auto_ptr< ControlFactory > TableDesignPanel::CreateControlFactory( ToolPanelViewShell& i_rToolPanelShell ) { return std::auto_ptr< ControlFactory >( diff --git a/sd/source/ui/toolpanel/controls/TableDesignPanel.hxx b/sd/source/ui/toolpanel/controls/TableDesignPanel.hxx index a99b34df21bc..eb56ac6ed645 100644 --- a/sd/source/ui/toolpanel/controls/TableDesignPanel.hxx +++ b/sd/source/ui/toolpanel/controls/TableDesignPanel.hxx @@ -49,15 +49,11 @@ class TableDesignPanel : public SubToolPanel { public: - TableDesignPanel ( - TreeNode* pParent, - ViewShellBase& rBase); TableDesignPanel ( ::Window& i_rParentWindow, ToolPanelViewShell& i_rPanelViewShell); virtual ~TableDesignPanel (void); - static std::auto_ptr CreateControlFactory (ViewShellBase& rBase); static std::auto_ptr CreateControlFactory (ToolPanelViewShell& i_rToolPanelShell); // TreeNode overridables -- cgit From 23ab0b9a03eaa9e63122c693be312e6be8e24c56 Mon Sep 17 00:00:00 2001 From: "Frank Schoenheit [fs]" Date: Tue, 23 Mar 2010 10:44:01 +0100 Subject: slidecopy: make compile on unxlngi6 --- sd/source/ui/toolpanel/ToolPanelViewShell.cxx | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'sd') diff --git a/sd/source/ui/toolpanel/ToolPanelViewShell.cxx b/sd/source/ui/toolpanel/ToolPanelViewShell.cxx index d8af5aae2b53..8a068cad1dd4 100644 --- a/sd/source/ui/toolpanel/ToolPanelViewShell.cxx +++ b/sd/source/ui/toolpanel/ToolPanelViewShell.cxx @@ -347,6 +347,7 @@ void SAL_CALL ConfigurationListener::notifyConfigurationChange( const Configurat // --------------------------------------------------------------------------------------------------------------------- void SAL_CALL ConfigurationListener::disposing( const EventObject& i_rEvent ) throw (RuntimeException) { + (void)i_rEvent; { ::osl::MutexGuard aGuard( m_aMutex ); impl_checkDisposed_throw(); @@ -471,9 +472,10 @@ size_t ToolPanelViewShell_Impl::SetupDefaultPanels() const Reference< XResourceId > xPanelId( pFrameworkHelper->CreateResourceId( aPanels[i].sResourceURL, xToolPanelId ) ); // create and insert the panel + ::std::auto_ptr< ControlFactory > pControlFactory( (*aPanels[i].pFactory)( m_rPanelViewShell ) ); ::svt::PToolPanel pNewPanel( new StandardToolPanel( *m_pPanelDeck, - (*aPanels[i].pFactory)( m_rPanelViewShell ), + pControlFactory, aPanels[i].nTitleResourceID, aPanelImage, aPanels[i].nHelpID, @@ -964,6 +966,7 @@ Reference< XAccessible > ToolPanelViewShell::CreateAccessibleDocumentView( ::sd: // xAccessible = mpTaskPane->CreateAccessibleObject( // pParentWindow->GetAccessible()); // } + (void)pWindow; return xAccessible; } -- cgit From 24def11cfb667187a4b92c1e9a710281dcf2bef6 Mon Sep 17 00:00:00 2001 From: "Frank Schoenheit [fs]" Date: Tue, 23 Mar 2010 12:47:40 +0100 Subject: slidecopy: don't link the example extension against the tools lib, (which is non-URE), this won't work on Mac --- sd/workben/custompanel/makefile.mk | 1 - 1 file changed, 1 deletion(-) (limited to 'sd') diff --git a/sd/workben/custompanel/makefile.mk b/sd/workben/custompanel/makefile.mk index 586d3a43cc9c..6df3190892f8 100644 --- a/sd/workben/custompanel/makefile.mk +++ b/sd/workben/custompanel/makefile.mk @@ -62,7 +62,6 @@ LIB1OBJFILES= \ $(SLO)/ctp_panel.obj SHL1STDLIBS= \ - $(TOOLSLIB) \ $(CPPULIB) \ $(SALLIB) \ $(SALHELPERLIB) \ -- cgit From f258dffe023a459eda7d7dec9fd6be778653d624 Mon Sep 17 00:00:00 2001 From: Mikhail Voytenko Date: Tue, 23 Mar 2010 14:31:39 +0100 Subject: fwk138: #i47279# integrate the patch --- sd/source/ui/view/drviews1.cxx | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) (limited to 'sd') diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx index 4b9aecb02ac5..55ba07c3fa23 100644 --- a/sd/source/ui/view/drviews1.cxx +++ b/sd/source/ui/view/drviews1.cxx @@ -154,12 +154,32 @@ void DrawViewShell::Deactivate(BOOL bIsMDIActivate) ViewShell::Deactivate(bIsMDIActivate); } +namespace +{ + class LockUI + { + private: + void Lock(bool bLock); + SfxViewFrame *mpFrame; + public: + LockUI(SfxViewFrame *pFrame) : mpFrame(pFrame) { Lock(true); } + ~LockUI() { Lock(false); } + + }; + + void LockUI::Lock(bool bLock) + { + if (!mpFrame) + return; + mpFrame->Enable( !bLock ); + } +} + /************************************************************************* |* |* Wird gerufen, wenn sich der Selektionszustand der View aendert |* \************************************************************************/ - void DrawViewShell::SelectionHasChanged (void) { Invalidate(); @@ -213,6 +233,8 @@ void DrawViewShell::SelectionHasChanged (void) // we need to deselect it now if (!pOleObj) { + //#i47279# disable frame until after object has completed unload + LockUI aUILock(GetViewFrame()); pIPClient->DeactivateObject(); //HMHmpDrView->ShowMarkHdl(); } -- 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 --- .../ui/framework/factories/TaskPanelFactory.cxx | 38 +-------- sd/source/ui/inc/taskpane/PanelId.hxx | 2 + sd/source/ui/toolpanel/ToolPanelViewShell.cxx | 99 +++++++++++++++++++--- 3 files changed, 92 insertions(+), 47 deletions(-) (limited to 'sd') diff --git a/sd/source/ui/framework/factories/TaskPanelFactory.cxx b/sd/source/ui/framework/factories/TaskPanelFactory.cxx index 43a1a0280ba4..89bb417fde25 100644 --- a/sd/source/ui/framework/factories/TaskPanelFactory.cxx +++ b/sd/source/ui/framework/factories/TaskPanelFactory.cxx @@ -202,40 +202,6 @@ namespace sResourceURL = xResourceId->getResourceURL(); } } - - toolpanel::PanelId lcl_getPanelId( const ::rtl::OUString& i_rResourceURL ) - { - toolpanel::PanelId ePanelId( toolpanel::PID_UNKNOWN ); - - // TODO: this translation table PanelId<->PanelResourceURL is used in multiple files, - // perhaps it is worth putting this into a dedicated helper/meta-data class. - if ( i_rResourceURL.equals( FrameworkHelper::msMasterPagesTaskPanelURL ) ) - { - ePanelId = toolpanel::PID_MASTER_PAGES; - } - else if ( i_rResourceURL.equals( FrameworkHelper::msLayoutTaskPanelURL ) ) - { - ePanelId = toolpanel::PID_LAYOUT; - } - else if ( i_rResourceURL.equals( FrameworkHelper::msTableDesignPanelURL ) ) - { - ePanelId = toolpanel::PID_TABLE_DESIGN; - } - else if ( i_rResourceURL.equals( FrameworkHelper::msCustomAnimationTaskPanelURL ) ) - { - ePanelId = toolpanel::PID_CUSTOM_ANIMATION; - } - else if ( i_rResourceURL.equals( FrameworkHelper::msSlideTransitionTaskPanelURL ) ) - { - ePanelId = toolpanel::PID_SLIDE_TRANSITION; - } - else - { - OSL_ENSURE( false, "lcl_getPanelId: cannot translate the given resource URL!" ); - } - - return ePanelId; - } } Reference SAL_CALL TaskPanelFactory::createResource ( @@ -251,7 +217,7 @@ Reference SAL_CALL TaskPanelFactory::createResource ( if ( sResourceURL.match( FrameworkHelper::msTaskPanelURLPrefix ) ) { - toolpanel::PanelId ePanelId( lcl_getPanelId( sResourceURL ) ); + toolpanel::PanelId ePanelId( toolpanel::GetStandardPanelId( sResourceURL ) ); if ( ( ePanelId != toolpanel::PID_UNKNOWN ) && ( mpViewShellBase != NULL ) ) { @@ -297,7 +263,7 @@ void SAL_CALL TaskPanelFactory::releaseResource ( const ::boost::shared_ptr< ViewShell > pPaneViewShell( pFrameworkHelper->GetViewShell( sPaneURL ) ); if ( pPaneViewShell != NULL ) { - toolpanel::PanelId ePanelId( lcl_getPanelId( xResourceId->getResourceURL() ) ); + toolpanel::PanelId ePanelId( toolpanel::GetStandardPanelId( xResourceId->getResourceURL() ) ); toolpanel::ToolPanelViewShell* pToolPanel = dynamic_cast< toolpanel::ToolPanelViewShell* >( pPaneViewShell.get() ); if ( ( ePanelId != toolpanel::PID_UNKNOWN ) 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 //...................................................................................................................... diff --git a/sd/source/ui/toolpanel/ToolPanelViewShell.cxx b/sd/source/ui/toolpanel/ToolPanelViewShell.cxx index 8a068cad1dd4..6217924c5c71 100644 --- a/sd/source/ui/toolpanel/ToolPanelViewShell.cxx +++ b/sd/source/ui/toolpanel/ToolPanelViewShell.cxx @@ -55,6 +55,7 @@ /** === begin UNO includes === **/ #include #include +#include #include /** === end UNO includes === **/ @@ -110,6 +111,9 @@ using ::com::sun::star::drawing::framework::ConfigurationChangeEvent; using ::com::sun::star::lang::EventObject; using ::com::sun::star::lang::DisposedException; using ::com::sun::star::drawing::framework::XConfigurationControllerBroadcaster; +using ::com::sun::star::drawing::framework::XConfigurationController; +using ::com::sun::star::drawing::framework::XConfiguration; +using ::com::sun::star::drawing::framework::AnchorBindingMode_DIRECT; /** === end UNO using === **/ using ::sd::framework::FrameworkHelper; @@ -268,9 +272,20 @@ private: void RegisterPanel( size_t i_nPosition, PanelId i_nPanelId, const ::svt::PToolPanel& i_rPanel ); void UpdateDockingWindowTitle(); - /** creates the built-in panels, returns the position of the panel to activate initially + /** creates the built-in panels, returns the position of the panel to initially activate */ - size_t SetupDefaultPanels(); + struct PanelActivation + { + size_t nPanelPos; + bool bActivateAsResource; + + PanelActivation() + :nPanelPos( size_t( -1 ) ) + ,bActivateAsResource( true ) + { + } + }; + PanelActivation SetupDefaultPanels(); /** creates the custom panels */ @@ -391,7 +406,7 @@ SFX_IMPL_INTERFACE(ToolPanelViewShell, SfxShell, SdResId(STR_TASKPANEVIEWSHELL)) TYPEINIT1(ToolPanelViewShell, ViewShell); // --------------------------------------------------------------------------------------------------------------------- -size_t ToolPanelViewShell_Impl::SetupDefaultPanels() +ToolPanelViewShell_Impl::PanelActivation ToolPanelViewShell_Impl::SetupDefaultPanels() { typedef std::auto_ptr (*ControlFactoryFactory)( ToolPanelViewShell& i_rToolPanelShell ); @@ -453,9 +468,35 @@ size_t ToolPanelViewShell_Impl::SetupDefaultPanels() ::boost::shared_ptr< FrameworkHelper > pFrameworkHelper( FrameworkHelper::Instance( m_rPanelViewShell.GetViewShellBase() ) ); const Reference< XResourceId > xToolPanelId( pFrameworkHelper->CreateResourceId( FrameworkHelper::msTaskPaneURL, FrameworkHelper::msRightPaneURL ) ); - // want to activate the "Layout" panel later on, need to translate its PanelId to an actual position - const PanelId nPanelIdToActivate = PID_LAYOUT; - size_t nPanelPosToActivate = size_t( -1 ); + // determine which panel should be activated initially. + // Default to PID_LAYOUT, but check whether the requested configuration already contains a tool panel, in this case, + // use that one. + PanelId nPanelToActivate = PID_LAYOUT; + PanelActivation aPanelToActivate; + try + { + ::boost::shared_ptr< FrameworkHelper > pFrameworkHelper( FrameworkHelper::Instance( m_rPanelViewShell.GetViewShellBase() ) ); + Reference< XConfigurationController > xCC( pFrameworkHelper->GetConfigurationController(), UNO_QUERY_THROW ); + Reference< XConfiguration > xConfiguration( xCC->getRequestedConfiguration(), UNO_QUERY_THROW ); + Sequence< Reference< XResourceId > > aViewIds( xConfiguration->getResources( + FrameworkHelper::CreateResourceId( FrameworkHelper::msTaskPaneURL, FrameworkHelper::msRightPaneURL ), + FrameworkHelper::msTaskPanelURLPrefix, AnchorBindingMode_DIRECT ) ); + + if ( aViewIds.getLength() > 0 ) + { + const ::rtl::OUString sResourceURL( aViewIds[0]->getResourceURL() ); + PanelId nRequestedPanel = GetStandardPanelId( sResourceURL ); + if ( nRequestedPanel != PID_UNKNOWN ) + { + nPanelToActivate = nRequestedPanel; + aPanelToActivate.bActivateAsResource = false; + } + } + } + catch( const Exception& ) + { + DBG_UNHANDLED_EXCEPTION(); + } // create the panels Reference< XFrame > xFrame( m_rPanelViewShell.GetViewShellBase().GetViewFrame()->GetFrame()->GetFrameInterface() ); @@ -486,11 +527,11 @@ size_t ToolPanelViewShell_Impl::SetupDefaultPanels() // remember it RegisterPanel( nPanelPos, aPanels[i].nPanelID, pNewPanel ); - if ( nPanelIdToActivate == aPanels[i].nPanelID ) - nPanelPosToActivate = nPanelPos; + if ( nPanelToActivate == aPanels[i].nPanelID ) + aPanelToActivate.nPanelPos = nPanelPos; } - return nPanelPosToActivate; + return aPanelToActivate; } // --------------------------------------------------------------------------------------------------------------------- @@ -532,13 +573,16 @@ void ToolPanelViewShell_Impl::Setup() m_bInitialized = true; // standard (built-in) panels - const size_t nPanelPosToActivate = SetupDefaultPanels(); + const PanelActivation aPanelToActivate = SetupDefaultPanels(); // custom panels SetupCustomPanels(); // activate default panel - m_pPanelDeck->ActivatePanelResource( nPanelPosToActivate ); + if ( aPanelToActivate.bActivateAsResource ) + m_pPanelDeck->ActivatePanelResource( aPanelToActivate.nPanelPos ); + else + m_pPanelDeck->ActivatePanelDirectly( aPanelToActivate.nPanelPos ); // add as listener to the panel deck m_pPanelDeck->AddListener( *this ); @@ -1187,4 +1231,37 @@ void ToolPanelViewShell_Impl::Dying() { } +// --------------------------------------------------------------------------------------------------------------------- +PanelId GetStandardPanelId( const ::rtl::OUString& i_rTaskPanelResourceURL ) +{ + PanelId ePanelId( PID_UNKNOWN ); + + if ( i_rTaskPanelResourceURL.equals( FrameworkHelper::msMasterPagesTaskPanelURL ) ) + { + ePanelId = PID_MASTER_PAGES; + } + else if ( i_rTaskPanelResourceURL.equals( FrameworkHelper::msLayoutTaskPanelURL ) ) + { + ePanelId = PID_LAYOUT; + } + else if ( i_rTaskPanelResourceURL.equals( FrameworkHelper::msTableDesignPanelURL ) ) + { + ePanelId = PID_TABLE_DESIGN; + } + else if ( i_rTaskPanelResourceURL.equals( FrameworkHelper::msCustomAnimationTaskPanelURL ) ) + { + ePanelId = PID_CUSTOM_ANIMATION; + } + else if ( i_rTaskPanelResourceURL.equals( FrameworkHelper::msSlideTransitionTaskPanelURL ) ) + { + ePanelId = PID_SLIDE_TRANSITION; + } + else + { + OSL_ENSURE( false, "GetStandardPanelId: cannot translate the given resource URL!" ); + } + + return ePanelId; +} + } } // end of namespace ::sd::toolpanel -- cgit From 616465a10358e47bec139e318d77e24a06d3d566 Mon Sep 17 00:00:00 2001 From: Christian Lippka Date: Thu, 25 Mar 2010 12:28:31 +0100 Subject: set title layout to first page --- sd/source/core/drawdoc2.cxx | 1 + 1 file changed, 1 insertion(+) (limited to 'sd') diff --git a/sd/source/core/drawdoc2.cxx b/sd/source/core/drawdoc2.cxx index 092549428a42..b94afa066a41 100644 --- a/sd/source/core/drawdoc2.cxx +++ b/sd/source/core/drawdoc2.cxx @@ -660,6 +660,7 @@ void SdDrawDocument::CreateFirstPages( SdDrawDocument* pRefDocument /* = 0 */ ) Size aSz( SvxPaperInfo::GetPaperSize(PAPER_SCREEN, MAP_100TH_MM) ); pPage->SetSize( Size( aSz.Height(), aSz.Width() ) ); pPage->SetBorder(0, 0, 0, 0); + pPage->SetAutoLayout( AUTOLAYOUT_TITLE, TRUE, TRUE ); } InsertPage(pPage, 1); -- cgit From 09fb1f6065961c81e33cdc3a1e7544bbea0ef87e Mon Sep 17 00:00:00 2001 From: Christian Lippka Date: Thu, 25 Mar 2010 12:28:58 +0100 Subject: do not open layouts pane after inserting new slide --- sd/source/ui/view/viewshe3.cxx | 2 ++ 1 file changed, 2 insertions(+) (limited to 'sd') diff --git a/sd/source/ui/view/viewshe3.cxx b/sd/source/ui/view/viewshe3.cxx index 31a25091a920..29e727d6360d 100644 --- a/sd/source/ui/view/viewshe3.cxx +++ b/sd/source/ui/view/viewshe3.cxx @@ -246,6 +246,7 @@ SdPage* ViewShell::CreateOrDuplicatePage ( const SfxItemSet* pArgs = rRequest.GetArgs(); if (! pArgs) { +/* // Make the layout menu visible in the tool pane. const ViewShellBase& rBase (GetViewShellBase()); if (rBase.GetMainViewShell()!=NULL @@ -255,6 +256,7 @@ SdPage* ViewShell::CreateOrDuplicatePage ( framework::FrameworkHelper::Instance(GetViewShellBase())->RequestTaskPanel( framework::FrameworkHelper::msLayoutTaskPanelURL); } +*/ // AutoLayouts muessen fertig sein pDocument->StopWorkStartupDelay(); -- 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/app/res_bmp.src | 66 ++++++++++++++----- sd/source/ui/controller/slidelayoutcontroller.cxx | 7 +-- sd/source/ui/inc/res_bmp.hrc | 35 +++++++---- sd/source/ui/inc/view/viewoverlaymanager.hxx | 6 +- sd/source/ui/view/viewoverlaymanager.cxx | 77 +++++++++-------------- 5 files changed, 109 insertions(+), 82 deletions(-) (limited to 'sd') diff --git a/sd/source/ui/app/res_bmp.src b/sd/source/ui/app/res_bmp.src index d0a8afdb0c19..8b214a2fbc2a 100644 --- a/sd/source/ui/app/res_bmp.src +++ b/sd/source/ui/app/res_bmp.src @@ -194,38 +194,72 @@ Bitmap BMP_FOILH_09_H }; -Bitmap BMP_PLACEHOLDER_CHART_57X71 +Bitmap BMP_PLACEHOLDER_CHART_SMALL { - File = "placeholder_chart_57x71.png"; + File = "placeholder_chart_small.png"; }; -Bitmap BMP_PLACEHOLDER_CHART_57X71_H +Bitmap BMP_PLACEHOLDER_CHART_SMALL_HOVER { - File = "placeholder_chart_57x71_h.png"; + File = "placeholder_chart_small_hover.png"; }; -Bitmap BMP_PLACEHOLDER_IMAGE_57X71 +Bitmap BMP_PLACEHOLDER_IMAGE_SMALL { - File = "placeholder_image_57x71.png"; + File = "placeholder_image_small.png"; }; -Bitmap BMP_PLACEHOLDER_IMAGE_57X71_H +Bitmap BMP_PLACEHOLDER_IMAGE_SMALL_HOVER { - File = "placeholder_image_57x71_h.png"; + File = "placeholder_image_small_hover.png"; }; -Bitmap BMP_PLACEHOLDER_MOVIE_57X71 +Bitmap BMP_PLACEHOLDER_MOVIE_SMALL { - File = "placeholder_movie_57x71.png"; + File = "placeholder_movie_small.png"; }; -Bitmap BMP_PLACEHOLDER_MOVIE_57X71_H +Bitmap BMP_PLACEHOLDER_MOVIE_SMALL_HOVER { - File = "placeholder_movie_57x71_h.png"; + File = "placeholder_movie_small_hover.png"; }; -Bitmap BMP_PLACEHOLDER_TABLE_57X71 +Bitmap BMP_PLACEHOLDER_TABLE_SMALL { - File = "placeholder_table_57x71.png"; + File = "placeholder_table_small.png"; }; -Bitmap BMP_PLACEHOLDER_TABLE_57X71_H +Bitmap BMP_PLACEHOLDER_TABLE_SMALL_HOVER { - File = "placeholder_table_57x71_h.png"; + File = "placeholder_table_small_hover.png"; }; + +Bitmap BMP_PLACEHOLDER_CHART_LARGE +{ + File = "placeholder_chart_large.png"; +}; +Bitmap BMP_PLACEHOLDER_CHART_LARGE_HOVER +{ + File = "placeholder_chart_large_hover.png"; +}; +Bitmap BMP_PLACEHOLDER_IMAGE_LARGE +{ + File = "placeholder_image_large.png"; +}; +Bitmap BMP_PLACEHOLDER_IMAGE_LARGE_HOVER +{ + File = "placeholder_image_large_hover.png"; +}; +Bitmap BMP_PLACEHOLDER_MOVIE_LARGE +{ + File = "placeholder_movie_large.png"; +}; +Bitmap BMP_PLACEHOLDER_MOVIE_LARGE_HOVER +{ + File = "placeholder_movie_large_hover.png"; +}; +Bitmap BMP_PLACEHOLDER_TABLE_LARGE +{ + File = "placeholder_table_large.png"; +}; +Bitmap BMP_PLACEHOLDER_TABLE_LARGE_HOVER +{ + File = "placeholder_table_large_hover.png"; +}; + Bitmap BMP_FOILN_01 { File = "foiln01.bmp" ; diff --git a/sd/source/ui/controller/slidelayoutcontroller.cxx b/sd/source/ui/controller/slidelayoutcontroller.cxx index 57fafdc7c8c0..65f05d39cfb6 100644 --- a/sd/source/ui/controller/slidelayoutcontroller.cxx +++ b/sd/source/ui/controller/slidelayoutcontroller.cxx @@ -164,11 +164,6 @@ LayoutToolbarMenu::LayoutToolbarMenu( SlideLayoutController& rController, const String aTitle1( SdResId( STR_GLUE_ESCDIR_HORZ ) ); String aTitle2( SdResId( STR_GLUE_ESCDIR_VERT ) ); - const Color aMenuColor( GetSettings().GetStyleSettings().GetMenuColor() ); - const Color aMenuBarColor( GetSettings().GetStyleSettings().GetMenuBarColor() ); - const Color aMenuTextColor( GetSettings().GetStyleSettings().GetMenuBarColor() ); - const Color aMenuBarTextColor( GetSettings().GetStyleSettings().GetMenuBarTextColor() ); - const bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode(); SvtLanguageOptions aLanguageOptions; const bool bVerticalEnabled = aLanguageOptions.IsVerticalTextEnabled(); @@ -205,6 +200,8 @@ LayoutToolbarMenu::LayoutToolbarMenu( SlideLayoutController& rController, const appendEntry( 1, mpLayoutSet2 ); } + appendSeparator(); + OUString sSlotStr; Image aSlotImage; if( mxFrame.is() ) 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(); diff --git a/sd/source/ui/view/viewoverlaymanager.cxx b/sd/source/ui/view/viewoverlaymanager.cxx index d42c3a986f7f..5e086215f1d8 100644 --- a/sd/source/ui/view/viewoverlaymanager.cxx +++ b/sd/source/ui/view/viewoverlaymanager.cxx @@ -78,12 +78,10 @@ class ImageButtonHdl; // -------------------------------------------------------------------- -Image ViewOverlayManager::maSmallButtonImages[ViewOverlayManager::ButtonCount]; -Image ViewOverlayManager::maLargeButtonImages[ViewOverlayManager::ButtonCount]; +Image ViewOverlayManager::maSmallButtonImages[BMP_PLACEHOLDER_SMALL_END - BMP_PLACEHOLDER_SMALL_START]; +Image ViewOverlayManager::maLargeButtonImages[BMP_PLACEHOLDER_LARGE_END - BMP_PLACEHOLDER_LARGE_START]; -static USHORT gButtonSlots[ViewOverlayManager::ButtonCount] = { SID_INSERT_TABLE, SID_INSERT_DIAGRAM, SID_INSERT_GRAPHIC, SID_INSERT_AVMEDIA }; -static USHORT gButtonResId[ViewOverlayManager::ButtonCount] = { BMP_PLACEHOLDER_TABLE_57X71, BMP_PLACEHOLDER_CHART_57X71, BMP_PLACEHOLDER_IMAGE_57X71, BMP_PLACEHOLDER_MOVIE_57X71 }; -//static USHORT gButtonResIdHc[ViewOverlayManager::ButtonCount] = { BMP_PLACEHOLDER_TABLE_57X71_H, BMP_PLACEHOLDER_CHART_57X71_H, BMP_PLACEHOLDER_IMAGE_57X71_H, BMP_PLACEHOLDER_MOVIE_57X71_H }; +static USHORT gButtonSlots[] = { SID_INSERT_TABLE, SID_INSERT_DIAGRAM, SID_INSERT_GRAPHIC, SID_INSERT_AVMEDIA }; // -------------------------------------------------------------------- @@ -138,7 +136,7 @@ private: class ImageButtonHdl : public SmartHdl { public: - ImageButtonHdl( const SmartTagReference& xTag, USHORT nSID, const Image& rImage, const Point& rPnt ); + ImageButtonHdl( const SmartTagReference& xTag, USHORT nSID, const Image& rImage, const Image& rImageMO, const Point& rPnt ); virtual ~ImageButtonHdl(); virtual void CreateB2dIAObject(); virtual BOOL IsFocusHdl() const; @@ -153,15 +151,17 @@ public: private: rtl::Reference< ChangePlaceholderTag > mxTag; Image maImage; + Image maImageMO; USHORT mnSID; }; // -------------------------------------------------------------------- -ImageButtonHdl::ImageButtonHdl( const SmartTagReference& xTag, USHORT nSID, const Image& rImage, const Point& rPnt ) +ImageButtonHdl::ImageButtonHdl( const SmartTagReference& xTag, USHORT nSID, const Image& rImage, const Image& rImageMO, const Point& rPnt ) : SmartHdl( xTag, rPnt ) , mxTag( dynamic_cast< ChangePlaceholderTag* >( xTag.get() ) ) , maImage( rImage ) +, maImageMO( rImageMO ) , mnSID( nSID ) { } @@ -193,16 +193,10 @@ void ImageButtonHdl::CreateB2dIAObject() // first throw away old one GetRidOfIAObject(); -// const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings(); - const Point aTagPos( GetPos() ); basegfx::B2DPoint aPosition( aTagPos.X(), aTagPos.Y() ); -// const bool bFocused = IsFocusHdl() && pHdlList && (pHdlList->GetFocusHdl() == this); - - BitmapEx aBitmapEx( maImage.GetBitmapEx() ); - - const double fAlpha = isMouseOver() ? 0.0 : 0.6; + BitmapEx aBitmapEx( isMouseOver() ? maImageMO.GetBitmapEx() : maImage.GetBitmapEx() ); if(pHdlList) { @@ -223,8 +217,7 @@ void ImageButtonHdl::CreateB2dIAObject() { ::sdr::overlay::OverlayObject* pOverlayObject = 0; - // animate focused handles - pOverlayObject = new ::sdr::overlay::OverlayBitmapEx( aPosition, aBitmapEx, 0, 0, fAlpha ); + pOverlayObject = new ::sdr::overlay::OverlayBitmapEx( aPosition, aBitmapEx, 0, 0 ); rPageWindow.GetOverlayManager()->add(*pOverlayObject); maOverlayGroup.append(*pOverlayObject); } @@ -329,6 +322,8 @@ void ChangePlaceholderTag::addCustomHandles( SdrHdlList& rHandlerList ) { if( mxPlaceholderObj.is() ) { + const bool bHighContrast = Application::GetSettings().GetStyleSettings().GetHighContrastMode(); + SdrObject* pPlaceholder = mxPlaceholderObj.get(); SmartTagReference xThis( this ); const Rectangle& rSnapRect = pPlaceholder->GetSnapRect(); @@ -343,7 +338,7 @@ void ChangePlaceholderTag::addCustomHandles( SdrHdlList& rHandlerList ) if( 50 > nShapeSizePix ) return; - Image* pImages = &ViewOverlayManager::maSmallButtonImages[0]; //(nShapeSizePix > 300) ? &ViewOverlayManager::maLargeButtonImages[0] : &ViewOverlayManager::maSmallButtonImages[0]; + Image* pImages = (nShapeSizePix > 300) ? &ViewOverlayManager::maLargeButtonImages[0] : &ViewOverlayManager::maSmallButtonImages[0]; Size aButtonSize( pDev->PixelToLogic(pImages[0].GetSizePixel()) ); if( 100 > nShapeSizePix ) @@ -351,14 +346,11 @@ void ChangePlaceholderTag::addCustomHandles( SdrHdlList& rHandlerList ) aButtonSize.Width() >>= 1; aButtonSize.Height() >>= 1; } - const long nBorderPix = (nShapeSizePix > 100) ? 4 : (nShapeSizePix > 50) ? 2 : 1; - Size aBorder( pDev->PixelToLogic(Size(nBorderPix,nBorderPix)) ); - - const int nColumns = (ViewOverlayManager::ButtonCount+1) >> 1; - const int nRows = (ViewOverlayManager::ButtonCount + nColumns - 1) / nColumns; + const int nColumns = 2; + const int nRows = 2; - long all_width = (nColumns * aButtonSize.Width()) + ((nColumns-1) * aBorder.Width()); - long all_height = (nRows * aButtonSize.Height()) + ((nRows-1) * aBorder.Height()); + long all_width = nColumns * aButtonSize.Width(); + long all_height = nRows * aButtonSize.Height(); Point aPos( rSnapRect.Center() ); aPos.X() -= all_width >> 1; @@ -366,18 +358,24 @@ void ChangePlaceholderTag::addCustomHandles( SdrHdlList& rHandlerList ) long nStartX = aPos.X(); - for( int i = 0, c = 0; i < ViewOverlayManager::ButtonCount; i++ ) + for( int i = 0, c = 0; i < 8; i++ ) { Image aImg( pImages[i] ); + Image aImgMO( pImages[i+4] ); + if( 100 > nShapeSizePix ) { BitmapEx b( aImg.GetBitmapEx() ); const double scale = 0.5; b.Scale( scale, scale ); aImg = Image(b); + + b = aImgMO.GetBitmapEx(); + b.Scale( scale, scale ); + aImgMO = Image(b); } - ImageButtonHdl* pHdl = new ImageButtonHdl( xThis, gButtonSlots[i], aImg, aPoint ); + ImageButtonHdl* pHdl = new ImageButtonHdl( xThis, gButtonSlots[i>>1], aImg, aImgMO, aPoint ); pHdl->SetObjHdlNum( SMART_TAG_HDL_NUM ); pHdl->SetPageView( mrView.GetSdrPageView() ); @@ -388,12 +386,12 @@ void ChangePlaceholderTag::addCustomHandles( SdrHdlList& rHandlerList ) if( ++c == nColumns ) { aPos.X() = nStartX; - aPos.Y() += aButtonSize.Height() + aBorder.Height(); + aPos.Y() += aButtonSize.Height(); c = 0; } else { - aPos.X() += aButtonSize.Width() + aBorder.Width(); + aPos.X() += aButtonSize.Width(); } } } @@ -421,14 +419,7 @@ void ChangePlaceholderTag::deselect() } // -------------------------------------------------------------------- -/* -static Image lcl_getslotimage( ::com::sun::star::uno::Reference& xFrame, USHORT nSID, BOOL b1, BOOL b2 ) -{ - rtl::OUString aSlotURL( RTL_CONSTASCII_USTRINGPARAM( "slot:" )); - aSlotURL += rtl::OUString::valueOf( sal_Int32( nSID )); - return ::GetImage( xFrame, aSlotURL, b1, b2 ); -} -*/ + ViewOverlayManager::ViewOverlayManager( ViewShellBase& rViewShellBase ) : mrBase( rViewShellBase ) , mnUpdateTagsEvent( 0 ) @@ -459,18 +450,10 @@ ViewOverlayManager::~ViewOverlayManager() void ViewOverlayManager::UpdateImages() { - try - { - Reference xFrame(mrBase.GetFrame()->GetTopFrame()->GetFrameInterface(), UNO_QUERY_THROW); - for( int i = 0; i < ButtonCount; i++ ) - { - maSmallButtonImages[i] = loadImageResource( gButtonResId[i] ); -// maLargeButtonImages[i] = lcl_getslotimage( xFrame, mnButtonSlots[i], TRUE, FALSE ); - } - } - catch( Exception& ) + for( sal_uInt16 i = 0; i < (BMP_PLACEHOLDER_SMALL_END-BMP_PLACEHOLDER_SMALL_START); i++ ) { - DBG_ERROR( "ViewOverlayManager::ViewOverlayManager(), exception caught!" ); + maSmallButtonImages[i] = loadImageResource( BMP_PLACEHOLDER_SMALL_START + i ); + maLargeButtonImages[i] = loadImageResource( BMP_PLACEHOLDER_LARGE_START + i ); } } -- cgit From b61bafa17838507eeed86c47fe307ca3333c3f34 Mon Sep 17 00:00:00 2001 From: Christian Lippka Date: Thu, 25 Mar 2010 12:47:02 +0100 Subject: fixing unix compile warning --- sd/source/ui/view/viewoverlaymanager.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sd') diff --git a/sd/source/ui/view/viewoverlaymanager.cxx b/sd/source/ui/view/viewoverlaymanager.cxx index 5e086215f1d8..47bc5cef6f8f 100644 --- a/sd/source/ui/view/viewoverlaymanager.cxx +++ b/sd/source/ui/view/viewoverlaymanager.cxx @@ -303,7 +303,7 @@ bool ChangePlaceholderTag::KeyInput( const KeyEvent& rKEvt ) } /** returns true if the SmartTag consumes this event. */ -bool ChangePlaceholderTag::RequestHelp( const HelpEvent& rHEvt ) +bool ChangePlaceholderTag::RequestHelp( const HelpEvent& /*rHEvt*/ ) { /* Rectangle aItemRect( rHEvt.GetMousePosPixel(), Size(1,1) ); -- cgit From e2f5459c646062d5c60f263bc03b190b080fd4df Mon Sep 17 00:00:00 2001 From: Christian Lippka Date: Thu, 25 Mar 2010 13:20:49 +0100 Subject: fixed crash --- sd/source/core/drawdoc2.cxx | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'sd') diff --git a/sd/source/core/drawdoc2.cxx b/sd/source/core/drawdoc2.cxx index b94afa066a41..e12ee30552e7 100644 --- a/sd/source/core/drawdoc2.cxx +++ b/sd/source/core/drawdoc2.cxx @@ -660,7 +660,6 @@ void SdDrawDocument::CreateFirstPages( SdDrawDocument* pRefDocument /* = 0 */ ) Size aSz( SvxPaperInfo::GetPaperSize(PAPER_SCREEN, MAP_100TH_MM) ); pPage->SetSize( Size( aSz.Height(), aSz.Width() ) ); pPage->SetBorder(0, 0, 0, 0); - pPage->SetAutoLayout( AUTOLAYOUT_TITLE, TRUE, TRUE ); } InsertPage(pPage, 1); @@ -732,6 +731,10 @@ void SdDrawDocument::CreateFirstPages( SdDrawDocument* pRefDocument /* = 0 */ ) if( bClipboard ) pNotesMPage->SetLayoutName( pPage->GetLayoutName() ); + + if( !pRefPage && (meDocType != DOCUMENT_TYPE_DRAW) ) + pPage->SetAutoLayout( AUTOLAYOUT_TITLE, TRUE, TRUE ); + mpWorkStartupTimer = new Timer(); mpWorkStartupTimer->SetTimeoutHdl( LINK(this, SdDrawDocument, WorkStartupHdl) ); mpWorkStartupTimer->SetTimeout(2000); -- cgit From 253b274905471b5390574f0071f1e4b362e55e8c Mon Sep 17 00:00:00 2001 From: Christian Lippka Date: Thu, 25 Mar 2010 13:52:29 +0100 Subject: finetuning placeholder scaling --- sd/source/ui/view/viewoverlaymanager.cxx | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'sd') diff --git a/sd/source/ui/view/viewoverlaymanager.cxx b/sd/source/ui/view/viewoverlaymanager.cxx index 47bc5cef6f8f..0ca1ed04677f 100644 --- a/sd/source/ui/view/viewoverlaymanager.cxx +++ b/sd/source/ui/view/viewoverlaymanager.cxx @@ -338,14 +338,15 @@ void ChangePlaceholderTag::addCustomHandles( SdrHdlList& rHandlerList ) if( 50 > nShapeSizePix ) return; - Image* pImages = (nShapeSizePix > 300) ? &ViewOverlayManager::maLargeButtonImages[0] : &ViewOverlayManager::maSmallButtonImages[0]; + Image* pImages = (nShapeSizePix > 250) ? &ViewOverlayManager::maLargeButtonImages[0] : &ViewOverlayManager::maSmallButtonImages[0]; Size aButtonSize( pDev->PixelToLogic(pImages[0].GetSizePixel()) ); +/* if( 100 > nShapeSizePix ) { aButtonSize.Width() >>= 1; aButtonSize.Height() >>= 1; } - +*/ const int nColumns = 2; const int nRows = 2; @@ -358,11 +359,11 @@ void ChangePlaceholderTag::addCustomHandles( SdrHdlList& rHandlerList ) long nStartX = aPos.X(); - for( int i = 0, c = 0; i < 8; i++ ) + for( int i = 0, c = 0; i < 4; i++ ) { Image aImg( pImages[i] ); Image aImgMO( pImages[i+4] ); - +/* if( 100 > nShapeSizePix ) { BitmapEx b( aImg.GetBitmapEx() ); @@ -374,7 +375,7 @@ void ChangePlaceholderTag::addCustomHandles( SdrHdlList& rHandlerList ) b.Scale( scale, scale ); aImgMO = Image(b); } - +*/ ImageButtonHdl* pHdl = new ImageButtonHdl( xThis, gButtonSlots[i>>1], aImg, aImgMO, aPoint ); pHdl->SetObjHdlNum( SMART_TAG_HDL_NUM ); pHdl->SetPageView( mrView.GetSdrPageView() ); -- cgit From fc9d2b013fe73e9abbb39fdcf44746a564d418ac Mon Sep 17 00:00:00 2001 From: "Frank Schoenheit [fs]" Date: Thu, 25 Mar 2010 15:08:23 +0100 Subject: slidecopy: removed useless (shadowing) variable --- sd/source/ui/toolpanel/ToolPanelViewShell.cxx | 1 - 1 file changed, 1 deletion(-) (limited to 'sd') diff --git a/sd/source/ui/toolpanel/ToolPanelViewShell.cxx b/sd/source/ui/toolpanel/ToolPanelViewShell.cxx index 6217924c5c71..f4050cff9de1 100644 --- a/sd/source/ui/toolpanel/ToolPanelViewShell.cxx +++ b/sd/source/ui/toolpanel/ToolPanelViewShell.cxx @@ -475,7 +475,6 @@ ToolPanelViewShell_Impl::PanelActivation ToolPanelViewShell_Impl::SetupDefaultPa PanelActivation aPanelToActivate; try { - ::boost::shared_ptr< FrameworkHelper > pFrameworkHelper( FrameworkHelper::Instance( m_rPanelViewShell.GetViewShellBase() ) ); Reference< XConfigurationController > xCC( pFrameworkHelper->GetConfigurationController(), UNO_QUERY_THROW ); Reference< XConfiguration > xConfiguration( xCC->getRequestedConfiguration(), UNO_QUERY_THROW ); Sequence< Reference< XResourceId > > aViewIds( xConfiguration->getResources( -- cgit From 790c58e573aa17e3c0782246d82fb30a643c3f3c Mon Sep 17 00:00:00 2001 From: Christian Lippka Date: Fri, 26 Mar 2010 15:37:28 +0100 Subject: renamed 'Click to add an outline' to 'Click to add text' --- sd/source/core/glob.src | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sd') diff --git a/sd/source/core/glob.src b/sd/source/core/glob.src index e235ad266c3c..f1c7058ddf79 100644 --- a/sd/source/core/glob.src +++ b/sd/source/core/glob.src @@ -130,7 +130,7 @@ String STR_PRESOBJ_TITLE }; String STR_PRESOBJ_OUTLINE { - Text [ en-US ] = "Click to add an outline" ; + Text [ en-US ] = "Click to add text" ; }; String STR_PRESOBJ_TEXT { -- cgit From e1e14230c49fbf1b88c6639b7f245559f915cff7 Mon Sep 17 00:00:00 2001 From: Christian Lippka Date: Fri, 26 Mar 2010 15:37:54 +0100 Subject: fixed a type in configuration --- sd/uiconfig/simpress/toolbar/fontworkobjectbar.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'sd') diff --git a/sd/uiconfig/simpress/toolbar/fontworkobjectbar.xml b/sd/uiconfig/simpress/toolbar/fontworkobjectbar.xml index f4168c62cc2c..28687d66eb6f 100644 --- a/sd/uiconfig/simpress/toolbar/fontworkobjectbar.xml +++ b/sd/uiconfig/simpress/toolbar/fontworkobjectbar.xml @@ -6,6 +6,6 @@ - - + + \ No newline at end of file -- cgit From 43bddaee08638fa321cd7e16b6de90413149de03 Mon Sep 17 00:00:00 2001 From: Christian Lippka Date: Fri, 26 Mar 2010 15:39:26 +0100 Subject: added more spacing to the layout toolbar menu --- sd/source/ui/controller/slidelayoutcontroller.cxx | 31 ++++++++++------------- 1 file changed, 13 insertions(+), 18 deletions(-) (limited to 'sd') diff --git a/sd/source/ui/controller/slidelayoutcontroller.cxx b/sd/source/ui/controller/slidelayoutcontroller.cxx index 65f05d39cfb6..3c9a10de97f5 100644 --- a/sd/source/ui/controller/slidelayoutcontroller.cxx +++ b/sd/source/ui/controller/slidelayoutcontroller.cxx @@ -161,6 +161,8 @@ LayoutToolbarMenu::LayoutToolbarMenu( SlideLayoutController& rController, const , mpLayoutSet1( 0 ) , mpLayoutSet2( 0 ) { + const sal_Int32 LAYOUT_BORDER_PIX = 7; + String aTitle1( SdResId( STR_GLUE_ESCDIR_HORZ ) ); String aTitle2( SdResId( STR_GLUE_ESCDIR_VERT ) ); @@ -180,6 +182,12 @@ LayoutToolbarMenu::LayoutToolbarMenu( SlideLayoutController& rController, const fillLayoutValueSet( mpLayoutSet1, &standard[0], bHighContrast ); + Size aSize( mpLayoutSet1->GetOutputSizePixel() ); + aSize.Width() += (mpLayoutSet1->GetColCount() + 1) * LAYOUT_BORDER_PIX; + aSize.Height() += (mpLayoutSet1->GetLineCount() +1) * LAYOUT_BORDER_PIX; + mpLayoutSet1->SetOutputSizePixel( aSize ); + + if( bVerticalEnabled ) appendEntry( -1, aTitle1 ); appendEntry( 0, mpLayoutSet1 ); @@ -196,6 +204,11 @@ LayoutToolbarMenu::LayoutToolbarMenu( SlideLayoutController& rController, const fillLayoutValueSet( mpLayoutSet2, &v_standard[0], bHighContrast ); + aSize = mpLayoutSet2->GetOutputSizePixel(); + aSize.Width() += (mpLayoutSet2->GetColCount() + 1) * LAYOUT_BORDER_PIX; + aSize.Height() += (mpLayoutSet2->GetLineCount() + 1) * LAYOUT_BORDER_PIX; + mpLayoutSet2->SetOutputSizePixel( aSize ); + appendEntry( -1, aTitle2 ); appendEntry( 1, mpLayoutSet2 ); } @@ -229,24 +242,6 @@ LayoutToolbarMenu::~LayoutToolbarMenu() { } - -// ----------------------------------------------------------------------- - - -/* -void LayoutToolbarMenu::DataChanged( const DataChangedEvent& rDCEvt ) -{ - SfxDockingWindow::DataChanged( rDCEvt ); - - if( ( rDCEvt.GetType() == DATACHANGED_SETTINGS ) && ( rDCEvt.GetFlags() & SETTINGS_STYLE ) ) - { - // const bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode(); - - // todo switch images - } -} -*/ - // ----------------------------------------------------------------------- IMPL_LINK( LayoutToolbarMenu, SelectHdl, void *, pControl ) -- cgit From 8add6851259b5112e90bcb810c90e2a990003f3c Mon Sep 17 00:00:00 2001 From: Christian Lippka Date: Fri, 26 Mar 2010 15:39:43 +0100 Subject: made the layout placeholder appear after load and on text edit --- sd/source/ui/view/viewoverlaymanager.cxx | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'sd') diff --git a/sd/source/ui/view/viewoverlaymanager.cxx b/sd/source/ui/view/viewoverlaymanager.cxx index 0ca1ed04677f..a9df2a1baf94 100644 --- a/sd/source/ui/view/viewoverlaymanager.cxx +++ b/sd/source/ui/view/viewoverlaymanager.cxx @@ -376,7 +376,7 @@ void ChangePlaceholderTag::addCustomHandles( SdrHdlList& rHandlerList ) aImgMO = Image(b); } */ - ImageButtonHdl* pHdl = new ImageButtonHdl( xThis, gButtonSlots[i>>1], aImg, aImgMO, aPoint ); + ImageButtonHdl* pHdl = new ImageButtonHdl( xThis, gButtonSlots[i], aImg, aImgMO, aPoint ); pHdl->SetObjHdlNum( SMART_TAG_HDL_NUM ); pHdl->SetPageView( mrView.GetSdrPageView() ); @@ -426,7 +426,11 @@ ViewOverlayManager::ViewOverlayManager( ViewShellBase& rViewShellBase ) , mnUpdateTagsEvent( 0 ) { Link aLink( LINK(this,ViewOverlayManager,EventMultiplexerListener) ); - mrBase.GetEventMultiplexer()->AddEventListener(aLink, tools::EventMultiplexerEvent::EID_CURRENT_PAGE); + mrBase.GetEventMultiplexer()->AddEventListener(aLink, tools::EventMultiplexerEvent::EID_CURRENT_PAGE + | tools::EventMultiplexerEvent::EID_MAIN_VIEW_ADDED + | tools::EventMultiplexerEvent::EID_VIEW_ADDED + | tools::EventMultiplexerEvent::EID_BEGIN_TEXT_EDIT + | tools::EventMultiplexerEvent::EID_END_TEXT_EDIT ); StartListening( *mrBase.GetDocShell() ); } @@ -514,7 +518,7 @@ bool ViewOverlayManager::CreateTags() for( std::list< SdrObject* >::const_iterator iter( rShapes.begin() ); iter != rShapes.end(); iter++ ) { - if( (*iter)->IsEmptyPresObj() && ((*iter)->GetObjIdentifier() == OBJ_OUTLINETEXT) && !static_cast((*iter))->HasEditText() ) + if( (*iter)->IsEmptyPresObj() && ((*iter)->GetObjIdentifier() == OBJ_OUTLINETEXT) && (mrBase.GetDrawView()->GetTextEditObject() != (*iter)) ) { rtl::Reference< SmartTag > xTag( new ChangePlaceholderTag( *this, *mrBase.GetMainViewShell()->GetView(), *(*iter) ) ); maTagVector.push_back(xTag); @@ -554,6 +558,10 @@ IMPL_LINK(ViewOverlayManager,EventMultiplexerListener, { switch (pEvent->meEventId) { + case tools::EventMultiplexerEvent::EID_MAIN_VIEW_ADDED: + case tools::EventMultiplexerEvent::EID_VIEW_ADDED: + case tools::EventMultiplexerEvent::EID_BEGIN_TEXT_EDIT: + case tools::EventMultiplexerEvent::EID_END_TEXT_EDIT: case tools::EventMultiplexerEvent::EID_CURRENT_PAGE: UpdateTags(); break; -- cgit From c42b82815584eb2c4a980d167d03a1be4e4e9ef0 Mon Sep 17 00:00:00 2001 From: Christian Lippka Date: Tue, 30 Mar 2010 10:07:55 +0200 Subject: fixed compile warnings --- sd/source/ui/view/viewoverlaymanager.cxx | 2 -- 1 file changed, 2 deletions(-) (limited to 'sd') diff --git a/sd/source/ui/view/viewoverlaymanager.cxx b/sd/source/ui/view/viewoverlaymanager.cxx index a9df2a1baf94..a3b667217bc9 100644 --- a/sd/source/ui/view/viewoverlaymanager.cxx +++ b/sd/source/ui/view/viewoverlaymanager.cxx @@ -322,8 +322,6 @@ void ChangePlaceholderTag::addCustomHandles( SdrHdlList& rHandlerList ) { if( mxPlaceholderObj.is() ) { - const bool bHighContrast = Application::GetSettings().GetStyleSettings().GetHighContrastMode(); - SdrObject* pPlaceholder = mxPlaceholderObj.get(); SmartTagReference xThis( this ); const Rectangle& rSnapRect = pPlaceholder->GetSnapRect(); -- 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/dlg/PaneChildWindows.cxx | 2 +- sd/source/ui/inc/taskpane/ControlContainer.hxx | 1 - sd/source/ui/toolpanel/ToolPanelDeck.cxx | 8 ++- sd/source/ui/toolpanel/ToolPanelDrawer.cxx | 48 ++++++++++++++++++ sd/source/ui/toolpanel/ToolPanelDrawer.hxx | 8 +++ sd/source/ui/toolpanel/ToolPanelViewShell.cxx | 39 +++++++------- sd/source/ui/view/sdwindow.cxx | 70 +++++++++++++------------- 7 files changed, 121 insertions(+), 55 deletions(-) mode change 100644 => 100755 sd/source/ui/dlg/PaneChildWindows.cxx mode change 100644 => 100755 sd/source/ui/inc/taskpane/ControlContainer.hxx mode change 100644 => 100755 sd/source/ui/toolpanel/ToolPanelDeck.cxx mode change 100644 => 100755 sd/source/ui/toolpanel/ToolPanelDrawer.cxx mode change 100644 => 100755 sd/source/ui/toolpanel/ToolPanelDrawer.hxx mode change 100644 => 100755 sd/source/ui/toolpanel/ToolPanelViewShell.cxx mode change 100644 => 100755 sd/source/ui/view/sdwindow.cxx (limited to 'sd') diff --git a/sd/source/ui/dlg/PaneChildWindows.cxx b/sd/source/ui/dlg/PaneChildWindows.cxx old mode 100644 new mode 100755 index 552428bfd13e..a06af1a0467d --- a/sd/source/ui/dlg/PaneChildWindows.cxx +++ b/sd/source/ui/dlg/PaneChildWindows.cxx @@ -147,7 +147,7 @@ LeftPaneDrawChildWindow::LeftPaneDrawChildWindow ( ToolPanelChildWindow::ToolPanelChildWindow( ::Window* i_pParentWindow, USHORT i_nId, SfxBindings* i_pBindings, SfxChildWinInfo* i_pChildWindowInfo ) :PaneChildWindow( i_pParentWindow, i_nId, i_pBindings, i_pChildWindowInfo, - FLT_TOOL_PANEL_DOCKING_WINDOW, STR_RIGHT_PANE_TITLE, SFX_ALIGN_NOALIGNMENT ) + FLT_TOOL_PANEL_DOCKING_WINDOW, STR_RIGHT_PANE_TITLE, SFX_ALIGN_RIGHT ) { } 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 diff --git a/sd/source/ui/toolpanel/ToolPanelDeck.cxx b/sd/source/ui/toolpanel/ToolPanelDeck.cxx old mode 100644 new mode 100755 index 25d8bb45c012..a6fc04ded305 --- a/sd/source/ui/toolpanel/ToolPanelDeck.cxx +++ b/sd/source/ui/toolpanel/ToolPanelDeck.cxx @@ -32,6 +32,8 @@ #include "taskpane/ControlContainer.hxx" #include "framework/FrameworkHelper.hxx" #include "TaskPaneToolPanel.hxx" +#include "strings.hrc" +#include "sdresid.hxx" /** === begin UNO includes === **/ #include @@ -71,6 +73,10 @@ namespace sd { namespace toolpanel ,m_rViewShell( i_rViewShell ) { SetDrawersLayout(); + + const String sPaneTitle( SdResId( STR_RIGHT_PANE_TITLE ) ); + SetAccessibleName( sPaneTitle ); + SetAccessibleDescription( sPaneTitle ); } //------------------------------------------------------------------------------------------------------------------ @@ -140,7 +146,7 @@ namespace sd { namespace toolpanel // this is a de-activate request. Quite improbable that this really happens: We're within the overloaded // version of IToolPanelDeck::ActivatePanel. The only instance which has access to this IToolPanel // interface is the panel layouter, which is not expected to call us with a NULL panel position. - // All other instances should now have access to this method, as it is protected in this class here. + // All other instances should not have access to this method, as it is protected in this class here. OSL_ENSURE( false, "ToolPanelDeck::ActivatePanel: is this legitimate?" ); // well, handle it nonetheless. ActivatePanelDirectly( i_rPanel ); diff --git a/sd/source/ui/toolpanel/ToolPanelDrawer.cxx b/sd/source/ui/toolpanel/ToolPanelDrawer.cxx old mode 100644 new mode 100755 index a52771650a04..065f1b3a5011 --- a/sd/source/ui/toolpanel/ToolPanelDrawer.cxx +++ b/sd/source/ui/toolpanel/ToolPanelDrawer.cxx @@ -36,6 +36,11 @@ namespace sd { namespace toolpanel { //...................................................................................................................... + /** === begin UNO using === **/ + using ::com::sun::star::uno::Reference; + using ::com::sun::star::accessibility::XAccessible; + /** === end UNO using === **/ + //================================================================================================================== //= ToolPanelDrawer //================================================================================================================== @@ -126,6 +131,42 @@ namespace sd { namespace toolpanel m_aDrawers[ *aActivePanel ]->GetWindow()->GrabFocus(); } + //------------------------------------------------------------------------------------------------------------------ + ::boost::optional< size_t > ToolPanelDrawer::GetPanelItemFromScreenPos( const ::Point& i_rScreenPos ) + { + for ( ::std::vector< PTitleBar >::const_iterator drawer = m_aDrawers.begin(); + drawer != m_aDrawers.end(); + ++drawer + ) + { + const Rectangle aDrawerBounds( + m_rParentWindow.OutputToScreenPixel( (*drawer)->GetWindow()->GetPosPixel() ), + (*drawer)->GetWindow()->GetSizePixel() + ); + if ( aDrawerBounds.IsInside( i_rScreenPos ) ) + return ::boost::optional< size_t >( drawer - m_aDrawers.begin() ); + } + return ::boost::optional< size_t >(); + } + + //------------------------------------------------------------------------------------------------------------------ + Reference< XAccessible > ToolPanelDrawer::GetPanelItemAccessible( const size_t i_nItemPos, const Reference< XAccessible >& i_rParentAccessible ) + { + ENSURE_OR_RETURN( i_nItemPos < m_aDrawers.size(), "illegal index", NULL ); + + const PTitleBar pTitleBar( m_aDrawers[ i_nItemPos ] ); + Window* pItemWindow( pTitleBar->GetWindow() ); + + Reference< XAccessible > xItemAccessible( pItemWindow->GetAccessible( FALSE ) ); + if ( !xItemAccessible.is() ) + { + xItemAccessible = pTitleBar->CreateAccessibleObject( i_rParentAccessible ); + pItemWindow->SetAccessible( xItemAccessible ); + } + + return xItemAccessible; + } + //------------------------------------------------------------------------------------------------------------------ void ToolPanelDrawer::PanelInserted( const ::svt::PToolPanel& i_pPanel, const size_t i_nPosition ) { @@ -171,6 +212,13 @@ namespace sd { namespace toolpanel impl_triggerRearrange(); } + //------------------------------------------------------------------------------------------------------------------ + void ToolPanelDrawer::LayouterChanged( const ::svt::PDeckLayouter& i_rNewLayouter ) + { + // not interested in + (void)i_rNewLayouter; + } + //------------------------------------------------------------------------------------------------------------------ size_t ToolPanelDrawer::impl_getPanelPositionFromWindow( const Window* i_pTitleBarWindow ) const { diff --git a/sd/source/ui/toolpanel/ToolPanelDrawer.hxx b/sd/source/ui/toolpanel/ToolPanelDrawer.hxx old mode 100644 new mode 100755 index 005194ab6a2b..8c31e66ede92 --- a/sd/source/ui/toolpanel/ToolPanelDrawer.hxx +++ b/sd/source/ui/toolpanel/ToolPanelDrawer.hxx @@ -65,11 +65,19 @@ namespace sd { namespace toolpanel virtual Rectangle Layout( const Rectangle& i_rDeckPlayground ); virtual void Destroy(); virtual void SetFocusToPanelSelector(); + ::boost::optional< size_t > + GetPanelItemFromScreenPos( const ::Point& i_rScreenPos ); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > + GetPanelItemAccessible( + const size_t i_nItemPos, + const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& i_rParentAccessible + ); // IToolPanelDeckListener virtual void PanelInserted( const ::svt::PToolPanel& i_pPanel, const size_t i_nPosition ); virtual void PanelRemoved( const size_t i_nPosition ); virtual void ActivePanelChanged( const ::boost::optional< size_t >& i_rOldActive, const ::boost::optional< size_t >& i_rNewActive ); + virtual void LayouterChanged( const ::svt::PDeckLayouter& i_rNewLayouter ); virtual void Dying(); private: diff --git a/sd/source/ui/toolpanel/ToolPanelViewShell.cxx b/sd/source/ui/toolpanel/ToolPanelViewShell.cxx old mode 100644 new mode 100755 index f4050cff9de1..dc3d0a48c2e7 --- a/sd/source/ui/toolpanel/ToolPanelViewShell.cxx +++ b/sd/source/ui/toolpanel/ToolPanelViewShell.cxx @@ -261,11 +261,15 @@ public: */ void DeactivatePanelDirectly( const PanelId i_nPanelId ); + Reference< XAccessible > + CreateAccessible( ::sd::Window& i_rWindow ); + protected: // IToolPanelDeckListener overridables virtual void PanelInserted( const ::svt::PToolPanel& i_pPanel, const size_t i_nPosition ); virtual void PanelRemoved( const size_t i_nPosition ); virtual void ActivePanelChanged( const ::boost::optional< size_t >& i_rOldActive, const ::boost::optional< size_t >& i_rNewActive ); + virtual void LayouterChanged( const ::svt::PDeckLayouter& i_rNewLayouter ); virtual void Dying(); private: @@ -994,24 +998,10 @@ DockingWindow* ToolPanelViewShell::GetDockingWindow() } // --------------------------------------------------------------------------------------------------------------------- -Reference< XAccessible > ToolPanelViewShell::CreateAccessibleDocumentView( ::sd::Window* pWindow ) +Reference< XAccessible > ToolPanelViewShell::CreateAccessibleDocumentView( ::sd::Window* i_pWindow ) { - ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible> xAccessible; - - OSL_ENSURE( false, "ToolPanelViewShell::CreateAccessibleDocumentView: missing implementation!" ); -// if (mpTaskPane.get()!=NULL && pWindow!=NULL) -// { -// // We have to call CreateAccessible directly so that we can specify -// // the correct accessible parent. -// ::Window* pParentWindow = pWindow->GetAccessibleParentWindow(); -// if (pParentWindow != NULL) -// xAccessible = mpTaskPane->CreateAccessibleObject( -// pParentWindow->GetAccessible()); -// } - (void)pWindow; - - return xAccessible; + ENSURE_OR_RETURN( i_pWindow, "ToolPanelViewShell::CreateAccessibleDocumentView: illegal window!", NULL ); + return mpImpl->CreateAccessible( *i_pWindow ); } // --------------------------------------------------------------------------------------------------------------------- @@ -1225,11 +1215,26 @@ void ToolPanelViewShell_Impl::ActivePanelChanged( const ::boost::optional< size_ (void)i_rNewActive; } +// --------------------------------------------------------------------------------------------------------------------- +void ToolPanelViewShell_Impl::LayouterChanged( const ::svt::PDeckLayouter& i_rNewLayouter ) +{ + // not interested in + (void)i_rNewLayouter; +} + // --------------------------------------------------------------------------------------------------------------------- void ToolPanelViewShell_Impl::Dying() { } +// --------------------------------------------------------------------------------------------------------------------- +Reference< XAccessible > ToolPanelViewShell_Impl::CreateAccessible( ::sd::Window& i_rWindow ) +{ + ::Window* pAccessibleParent = i_rWindow.GetAccessibleParentWindow(); + m_pPanelDeck->SetAccessibleParentWindow( pAccessibleParent ); + return m_pPanelDeck->GetAccessible(); +} + // --------------------------------------------------------------------------------------------------------------------- PanelId GetStandardPanelId( const ::rtl::OUString& i_rTaskPanelResourceURL ) { diff --git a/sd/source/ui/view/sdwindow.cxx b/sd/source/ui/view/sdwindow.cxx old mode 100644 new mode 100755 index e3c3ab3a7e95..6da9c3437eb9 --- a/sd/source/ui/view/sdwindow.cxx +++ b/sd/source/ui/view/sdwindow.cxx @@ -37,8 +37,8 @@ #include -#include - +#include + #include #include "app.hrc" @@ -1209,38 +1209,38 @@ void Window::DropScroll(const Point& rMousePos) } } -XubString Window::GetSurroundingText() const -{ - if ( mpViewShell->GetShellType() == ViewShell::ST_OUTLINE ) - { - return XubString(); - } - else if ( mpViewShell->GetView()->IsTextEdit() ) - { - OutlinerView *pOLV = mpViewShell->GetView()->GetTextEditOutlinerView(); - return pOLV->GetEditView().GetSurroundingText(); - } - else - { - return XubString(); - } -} - -Selection Window::GetSurroundingTextSelection() const -{ - if ( mpViewShell->GetShellType() == ViewShell::ST_OUTLINE ) - { - return Selection( 0, 0 ); - } - else if ( mpViewShell->GetView()->IsTextEdit() ) - { - OutlinerView *pOLV = mpViewShell->GetView()->GetTextEditOutlinerView(); - return pOLV->GetEditView().GetSurroundingTextSelection(); - } - else - { - return Selection( 0, 0 ); - } -} +XubString Window::GetSurroundingText() const +{ + if ( mpViewShell->GetShellType() == ViewShell::ST_OUTLINE ) + { + return XubString(); + } + else if ( mpViewShell->GetView()->IsTextEdit() ) + { + OutlinerView *pOLV = mpViewShell->GetView()->GetTextEditOutlinerView(); + return pOLV->GetEditView().GetSurroundingText(); + } + else + { + return XubString(); + } +} + +Selection Window::GetSurroundingTextSelection() const +{ + if ( mpViewShell->GetShellType() == ViewShell::ST_OUTLINE ) + { + return Selection( 0, 0 ); + } + else if ( mpViewShell->GetView()->IsTextEdit() ) + { + OutlinerView *pOLV = mpViewShell->GetView()->GetTextEditOutlinerView(); + return pOLV->GetEditView().GetSurroundingTextSelection(); + } + else + { + return Selection( 0, 0 ); + } +} } // end of namespace sd -- cgit From 2f81fe520e4f778fd03fe7503f44565e500ad88a Mon Sep 17 00:00:00 2001 From: "Frank Schoenheit [fs]" Date: Tue, 30 Mar 2010 16:00:37 +0200 Subject: slidecopy: more A11Y implementations for the ToolPanelDeck --- sd/source/ui/toolpanel/CustomToolPanel.cxx | 35 ++++++++++++++++++++++++++++ sd/source/ui/toolpanel/CustomToolPanel.hxx | 4 ++++ sd/source/ui/toolpanel/StandardToolPanel.cxx | 18 ++++++++++++++ sd/source/ui/toolpanel/StandardToolPanel.hxx | 4 ++++ sd/source/ui/toolpanel/TaskPaneToolPanel.hxx | 4 ++++ sd/source/ui/toolpanel/ToolPanelDrawer.cxx | 1 + 6 files changed, 66 insertions(+) (limited to 'sd') diff --git a/sd/source/ui/toolpanel/CustomToolPanel.cxx b/sd/source/ui/toolpanel/CustomToolPanel.cxx index b09b03725c58..12ffe484a22f 100644 --- a/sd/source/ui/toolpanel/CustomToolPanel.cxx +++ b/sd/source/ui/toolpanel/CustomToolPanel.cxx @@ -32,6 +32,7 @@ /** === begin UNO includes === **/ #include #include +#include /** === end UNO includes === **/ #include @@ -64,6 +65,8 @@ namespace sd { namespace toolpanel using ::com::sun::star::drawing::framework::ResourceId; using ::com::sun::star::drawing::framework::XResource; using ::com::sun::star::awt::XWindow; + using ::com::sun::star::accessibility::XAccessible; + using ::com::sun::star::drawing::framework::XPane2; /** === end UNO using === **/ namespace PosSize = ::com::sun::star::awt::PosSize; @@ -207,6 +210,38 @@ namespace sd { namespace toolpanel TaskPaneToolPanel::Dispose(); } + //------------------------------------------------------------------------------------------------------------------ + Reference< XAccessible > CustomToolPanel::CreatePanelAccessible( const Reference< XAccessible >& i_rParentAccessible ) + { + ENSURE_OR_RETURN( !isDisposed(), "CustomToolPanel::CreatePanelAccessible: already disposed!", NULL ); + + // an XResource might also be an XPane2, which can provide an XAccessible. Check this first. + const Reference< XPane2 > xPane( m_xResource, UNO_QUERY ); + if ( xPane.is() ) + { + const Reference< XAccessible > xPaneAccessible( xPane->getAccessible() ); + if ( xPaneAccessible.is() ) + return xPaneAccessible; + } + + // if we have an XToolPanel, ask it for its XWindow, and query it + impl_ensurePanel(); + if ( !m_xToolPanel.is() ) + return NULL; + + const Reference< XAccessible > xPanelWindowAccessible( m_xToolPanel->getWindow(), UNO_QUERY ); + if ( xPanelWindowAccessible.is() ) + return xPanelWindowAccessible; + + // maybe the XToolPanel itself can provide an XAccessible? + const Reference< XAccessible > xPanelAccessible( m_xToolPanel, UNO_QUERY ); + if ( xPanelAccessible.is() ) + return xPanelAccessible; + + OSL_ENSURE( false, "CustomToolPanel::CreatePanelAccessible: no XAccessible for the custom panel!" ); + return NULL; + } + //------------------------------------------------------------------------------------------------------------------ void CustomToolPanel::LockResourceAccess() { diff --git a/sd/source/ui/toolpanel/CustomToolPanel.hxx b/sd/source/ui/toolpanel/CustomToolPanel.hxx index fe5865150063..ee10c6748bbd 100644 --- a/sd/source/ui/toolpanel/CustomToolPanel.hxx +++ b/sd/source/ui/toolpanel/CustomToolPanel.hxx @@ -78,6 +78,10 @@ namespace sd { namespace toolpanel virtual void SetSizePixel( const Size& i_rPanelWindowSize ); virtual void GrabFocus(); virtual void Dispose(); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > + CreatePanelAccessible( + const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& i_rParentAccessible + ); /** locks (aka prevents) the access to the associated XResource object */ diff --git a/sd/source/ui/toolpanel/StandardToolPanel.cxx b/sd/source/ui/toolpanel/StandardToolPanel.cxx index 9d5eaa46c101..ede20ea3404c 100644 --- a/sd/source/ui/toolpanel/StandardToolPanel.cxx +++ b/sd/source/ui/toolpanel/StandardToolPanel.cxx @@ -53,6 +53,7 @@ namespace sd { namespace toolpanel using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::Type; using ::com::sun::star::drawing::framework::XResourceId; + using ::com::sun::star::accessibility::XAccessible; /** === end UNO using === **/ //================================================================================================================== @@ -115,6 +116,23 @@ namespace sd { namespace toolpanel TaskPaneToolPanel::Dispose(); } + //------------------------------------------------------------------------------------------------------------------ + Reference< XAccessible > StandardToolPanel::CreatePanelAccessible( const Reference< XAccessible >& i_rParentAccessible ) + { + ENSURE_OR_RETURN( !isDisposed(), "already disposed!", NULL ); + + Window* pControlWindow( m_pControl->GetWindow() ); + + Reference< XAccessible > xControlAccessible( pControlWindow->GetAccessible( FALSE ) ); + if ( !xControlAccessible.is() ) + { + xControlAccessible = m_pControl->CreateAccessibleObject( i_rParentAccessible ); + OSL_ENSURE( xControlAccessible.is(), "StandardToolPanel::CreatePanelAccessible: invalid XAccessible returned by CreateAccessibleObject!" ); + pControlWindow->SetAccessible( xControlAccessible ); + } + return xControlAccessible; + } + //------------------------------------------------------------------------------------------------------------------ const Reference< XResourceId >& StandardToolPanel::getResourceId() const { diff --git a/sd/source/ui/toolpanel/StandardToolPanel.hxx b/sd/source/ui/toolpanel/StandardToolPanel.hxx index 1f3fd8ff7a90..a40c3d4af5f2 100644 --- a/sd/source/ui/toolpanel/StandardToolPanel.hxx +++ b/sd/source/ui/toolpanel/StandardToolPanel.hxx @@ -58,6 +58,10 @@ namespace sd { namespace toolpanel virtual void SetSizePixel( const Size& i_rPanelWindowSize ); virtual void GrabFocus(); virtual void Dispose(); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > + CreatePanelAccessible( + const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& i_rParentAccessible + ); // TaskPaneToolPanel overridables virtual const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::framework::XResourceId >& getResourceId() const; diff --git a/sd/source/ui/toolpanel/TaskPaneToolPanel.hxx b/sd/source/ui/toolpanel/TaskPaneToolPanel.hxx index f62e0b7a8fb1..d92b1c14bf27 100644 --- a/sd/source/ui/toolpanel/TaskPaneToolPanel.hxx +++ b/sd/source/ui/toolpanel/TaskPaneToolPanel.hxx @@ -71,6 +71,10 @@ namespace sd { namespace toolpanel virtual void Deactivate() = 0; virtual void SetSizePixel( const Size& i_rPanelWindowSize ) = 0; virtual void GrabFocus() = 0; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > + CreatePanelAccessible( + const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& i_rParentAccessible + ) = 0; // own overridables virtual const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::framework::XResourceId >& getResourceId() const = 0; diff --git a/sd/source/ui/toolpanel/ToolPanelDrawer.cxx b/sd/source/ui/toolpanel/ToolPanelDrawer.cxx index 065f1b3a5011..aa3af47535f4 100755 --- a/sd/source/ui/toolpanel/ToolPanelDrawer.cxx +++ b/sd/source/ui/toolpanel/ToolPanelDrawer.cxx @@ -161,6 +161,7 @@ namespace sd { namespace toolpanel if ( !xItemAccessible.is() ) { xItemAccessible = pTitleBar->CreateAccessibleObject( i_rParentAccessible ); + OSL_ENSURE( xItemAccessible.is(), "ToolPanelDrawer::GetPanelItemAccessible: invalid XAccessible returned by CreateAccessibleObject!" ); pItemWindow->SetAccessible( xItemAccessible ); } -- cgit From ef9fac0f7d3d55f7032a97684a0f209c267dcf65 Mon Sep 17 00:00:00 2001 From: Mikhail Voytenko Date: Tue, 30 Mar 2010 16:34:51 +0200 Subject: tl78: #i110383# support password to modify --- sd/source/ui/unoidl/UnoDocumentSettings.cxx | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) (limited to 'sd') diff --git a/sd/source/ui/unoidl/UnoDocumentSettings.cxx b/sd/source/ui/unoidl/UnoDocumentSettings.cxx index ed47e57b2130..aa41dfc54bb0 100644 --- a/sd/source/ui/unoidl/UnoDocumentSettings.cxx +++ b/sd/source/ui/unoidl/UnoDocumentSettings.cxx @@ -152,7 +152,7 @@ enum SdDocumentSettingsPropertyHandles // --> PB 2004-08-23 #i33095# ,HANDLE_LOAD_READONLY, HANDLE_SAVE_VERSION // <-- - ,HANDLE_SLIDESPERHANDOUT, HANDLE_HANDOUTHORIZONTAL + ,HANDLE_SLIDESPERHANDOUT, HANDLE_HANDOUTHORIZONTAL, HANDLE_MODIFYPASSWORDHASH }; #define MID_PRINTER 1 @@ -216,6 +216,7 @@ enum SdDocumentSettingsPropertyHandles { MAP_LEN("LoadReadonly"), HANDLE_LOAD_READONLY, &::getBooleanCppuType(), 0, 0 }, { MAP_LEN("SaveVersionOnClose"), HANDLE_SAVE_VERSION, &::getBooleanCppuType(), 0, 0 }, // <-- + { MAP_LEN("ModifyPasswordHash"), HANDLE_MODIFYPASSWORDHASH, &getCppuType((sal_Int32*)0), 0, 0 }, { NULL, 0, 0, NULL, 0, 0 } }; @@ -863,6 +864,25 @@ void DocumentSettings::_setPropertyValues( const PropertyMapEntry** ppEntries, c } break; + case HANDLE_MODIFYPASSWORDHASH: + { + sal_Int32 nHash = 0; + if ( ( *pValues >>= nHash ) && nHash >= 0 && nHash <= SAL_MAX_UINT16 ) + { + bChanged = ( pDocSh->GetModifyPasswordHash() != nHash ); + if ( bChanged ) + { + if ( !pDocSh->SetModifyPasswordHash( static_cast< sal_uInt16 >( nHash ) ) ) + throw beans::PropertyVetoException( + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "The hash is not allowed to be changed now!" ) ), + uno::Reference< uno::XInterface >() ); + } + + bOk = sal_True; + } + } + break; + default: throw UnknownPropertyException(); } @@ -1122,6 +1142,12 @@ void DocumentSettings::_getPropertyValues( const PropertyMapEntry** ppEntries, A } break; + case HANDLE_MODIFYPASSWORDHASH: + { + *pValue <<= static_cast< sal_Int32 >( pDocSh->GetModifyPasswordHash() ); + } + break; + default: throw UnknownPropertyException(); } -- cgit From 851fa3b48ac78b8b50e2ecc110d30ed2a3e8dfbd Mon Sep 17 00:00:00 2001 From: Christian Lippka Date: Tue, 30 Mar 2010 16:49:01 +0200 Subject: adding new images for placeholders --- sd/source/ui/controller/slidelayoutcontroller.cxx | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'sd') diff --git a/sd/source/ui/controller/slidelayoutcontroller.cxx b/sd/source/ui/controller/slidelayoutcontroller.cxx index 3c9a10de97f5..ade37086827c 100644 --- a/sd/source/ui/controller/slidelayoutcontroller.cxx +++ b/sd/source/ui/controller/slidelayoutcontroller.cxx @@ -172,13 +172,9 @@ LayoutToolbarMenu::LayoutToolbarMenu( SlideLayoutController& rController, const SetSelectHdl( LINK( this, LayoutToolbarMenu, SelectHdl ) ); - mpLayoutSet1 = new ValueSet( this, WB_TABSTOP | WB_MENUSTYLEVALUESET | WB_FLATVALUESET | WB_NOBORDER | WB_NO_DIRECTSELECT ); -// mpLayoutSet1->SetHelpId( HID_VALUESET_EXTRUSION_LIGHTING ); - + mpLayoutSet1 = createEmptyValueSetControl(); mpLayoutSet1->SetSelectHdl( LINK( this, LayoutToolbarMenu, SelectHdl ) ); mpLayoutSet1->SetColCount( 4 ); - mpLayoutSet1->EnableFullItemMode( FALSE ); - mpLayoutSet1->SetColor( GetControlBackground() ); fillLayoutValueSet( mpLayoutSet1, &standard[0], bHighContrast ); -- cgit From df6a8731cffd3c160cb3c4bcfd12689e751ae470 Mon Sep 17 00:00:00 2001 From: "Frank Schoenheit [fs]" Date: Wed, 31 Mar 2010 13:21:17 +0200 Subject: slidecopy: mark the Tab-Layout as experimental --- sd/source/ui/toolpanel/ToolPanelViewShell.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sd') diff --git a/sd/source/ui/toolpanel/ToolPanelViewShell.cxx b/sd/source/ui/toolpanel/ToolPanelViewShell.cxx index dc3d0a48c2e7..a4c060efc559 100755 --- a/sd/source/ui/toolpanel/ToolPanelViewShell.cxx +++ b/sd/source/ui/toolpanel/ToolPanelViewShell.cxx @@ -931,7 +931,7 @@ IMPL_LINK(ToolPanelViewShell, MenuSelectHandler, Menu*, pMenu) pMenu->InsertSeparator(); #if OSL_DEBUG_LEVEL > 0 - pMenu->InsertItem( MID_LAYOUT_TABS, String::CreateFromAscii( "Tab-Layout" ), MIB_CHECKABLE ); + pMenu->InsertItem( MID_LAYOUT_TABS, String::CreateFromAscii( "Tab-Layout (exp.)" ), MIB_CHECKABLE ); pMenu->CheckItem( MID_LAYOUT_TABS, mpImpl->GetLayout() != LAYOUT_DRAWERS ); pMenu->InsertItem( MID_LAYOUT_DRAWERS, String::CreateFromAscii( "Drawer-Layout" ), MIB_CHECKABLE ); pMenu->CheckItem( MID_LAYOUT_DRAWERS, mpImpl->GetLayout() == LAYOUT_DRAWERS ); -- cgit From aea4ea94ba339963261b458f178f0a8338c62f3b Mon Sep 17 00:00:00 2001 From: "Frank Schoenheit [fs]" Date: Thu, 1 Apr 2010 09:26:27 +0200 Subject: slidecopy: #i10000# (unxlngi6) --- sd/source/ui/toolpanel/CustomToolPanel.cxx | 1 + 1 file changed, 1 insertion(+) (limited to 'sd') diff --git a/sd/source/ui/toolpanel/CustomToolPanel.cxx b/sd/source/ui/toolpanel/CustomToolPanel.cxx index 12ffe484a22f..1515bf09104f 100644 --- a/sd/source/ui/toolpanel/CustomToolPanel.cxx +++ b/sd/source/ui/toolpanel/CustomToolPanel.cxx @@ -214,6 +214,7 @@ namespace sd { namespace toolpanel Reference< XAccessible > CustomToolPanel::CreatePanelAccessible( const Reference< XAccessible >& i_rParentAccessible ) { ENSURE_OR_RETURN( !isDisposed(), "CustomToolPanel::CreatePanelAccessible: already disposed!", NULL ); + (void)i_rParentAccessible; // an XResource might also be an XPane2, which can provide an XAccessible. Check this first. const Reference< XPane2 > xPane( m_xResource, UNO_QUERY ); -- 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/controller/slidelayoutcontroller.cxx | 98 ++++++++++++++++++----- 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 ++ sd/source/ui/unoidl/DrawController.cxx | 6 ++ sd/source/ui/unoidl/SdUnoDrawView.cxx | 41 +++++++++- sd/source/ui/unoidl/SdUnoOutlineView.cxx | 20 +++++ sd/source/ui/unoidl/SdUnoPresView.cxx | 54 ------------- sd/source/ui/unoidl/SdUnoSlideView.cxx | 27 ++++++- sd/source/ui/unoidl/makefile.mk | 1 - sd/source/ui/view/ViewShellImplementation.cxx | 17 +++- 14 files changed, 219 insertions(+), 142 deletions(-) delete mode 100644 sd/source/ui/inc/SdUnoPresView.hxx delete mode 100644 sd/source/ui/unoidl/SdUnoPresView.cxx (limited to 'sd') diff --git a/sd/source/ui/controller/slidelayoutcontroller.cxx b/sd/source/ui/controller/slidelayoutcontroller.cxx index ade37086827c..1c2815087c98 100644 --- a/sd/source/ui/controller/slidelayoutcontroller.cxx +++ b/sd/source/ui/controller/slidelayoutcontroller.cxx @@ -33,6 +33,8 @@ #include #include #include +#include +#include #include #include @@ -68,6 +70,7 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::text; using namespace ::com::sun::star::frame; +using namespace ::com::sun::star::drawing; using namespace ::com::sun::star::beans; namespace sd @@ -104,6 +107,31 @@ struct snewfoil_value_info WritingMode meWritingMode; AutoLayout maAutoLayout; }; + +static snewfoil_value_info notes[] = +{ + {BMP_FOILN_01, BMP_FOILN_01_H, STR_AUTOLAYOUT_NOTES, WritingMode_LR_TB, + AUTOLAYOUT_NOTES}, + {0, 0, 0, WritingMode_LR_TB, AUTOLAYOUT_NONE}, +}; + +static snewfoil_value_info handout[] = +{ + {BMP_FOILH_01, BMP_FOILH_01_H, STR_AUTOLAYOUT_HANDOUT1, WritingMode_LR_TB, + AUTOLAYOUT_HANDOUT1}, + {BMP_FOILH_02, BMP_FOILH_02_H, STR_AUTOLAYOUT_HANDOUT2, WritingMode_LR_TB, + AUTOLAYOUT_HANDOUT2}, + {BMP_FOILH_03, BMP_FOILH_03_H, STR_AUTOLAYOUT_HANDOUT3, WritingMode_LR_TB, + AUTOLAYOUT_HANDOUT3}, + {BMP_FOILH_04, BMP_FOILH_04_H, STR_AUTOLAYOUT_HANDOUT4, WritingMode_LR_TB, + AUTOLAYOUT_HANDOUT4}, + {BMP_FOILH_06, BMP_FOILH_06_H, STR_AUTOLAYOUT_HANDOUT6, WritingMode_LR_TB, + AUTOLAYOUT_HANDOUT6}, + {BMP_FOILH_09, BMP_FOILH_09_H, STR_AUTOLAYOUT_HANDOUT9, WritingMode_LR_TB, + AUTOLAYOUT_HANDOUT9}, + {0, 0, 0, WritingMode_LR_TB, AUTOLAYOUT_NONE}, +}; + static snewfoil_value_info standard[] = { {BMP_LAYOUT_EMPTY, BMP_LAYOUT_EMPTY_H, STR_AUTOLAYOUT_NONE, WritingMode_LR_TB, AUTOLAYOUT_NONE}, @@ -161,6 +189,20 @@ LayoutToolbarMenu::LayoutToolbarMenu( SlideLayoutController& rController, const , mpLayoutSet1( 0 ) , mpLayoutSet2( 0 ) { + DrawViewMode eMode = DrawViewMode_DRAW; + + // find out which view is running + if( xFrame.is() ) try + { + Reference< XPropertySet > xControllerSet( xFrame->getController(), UNO_QUERY_THROW ); + xControllerSet->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "DrawViewMode" ) ) ) >>= eMode; + } + catch( Exception& e ) + { + (void)e; + OSL_ASSERT(false); + } + const sal_Int32 LAYOUT_BORDER_PIX = 7; String aTitle1( SdResId( STR_GLUE_ESCDIR_HORZ ) ); @@ -174,21 +216,30 @@ LayoutToolbarMenu::LayoutToolbarMenu( SlideLayoutController& rController, const mpLayoutSet1 = createEmptyValueSetControl(); mpLayoutSet1->SetSelectHdl( LINK( this, LayoutToolbarMenu, SelectHdl ) ); - mpLayoutSet1->SetColCount( 4 ); - fillLayoutValueSet( mpLayoutSet1, &standard[0], bHighContrast ); + snewfoil_value_info* pInfo = 0; + sal_Int16 nColCount = 4; + switch( eMode ) + { + case DrawViewMode_DRAW: pInfo = &standard[0]; break; + case DrawViewMode_HANDOUT: pInfo = &handout[0]; nColCount = 2; break; + case DrawViewMode_NOTES: pInfo = ¬es[0]; nColCount = 1; break; + } + + mpLayoutSet1->SetColCount( nColCount ); + + fillLayoutValueSet( mpLayoutSet1, pInfo, bHighContrast ); Size aSize( mpLayoutSet1->GetOutputSizePixel() ); aSize.Width() += (mpLayoutSet1->GetColCount() + 1) * LAYOUT_BORDER_PIX; aSize.Height() += (mpLayoutSet1->GetLineCount() +1) * LAYOUT_BORDER_PIX; mpLayoutSet1->SetOutputSizePixel( aSize ); - - if( bVerticalEnabled ) + if( bVerticalEnabled && (eMode == DrawViewMode_DRAW) ) appendEntry( -1, aTitle1 ); appendEntry( 0, mpLayoutSet1 ); - if( bVerticalEnabled ) + if( bVerticalEnabled && (eMode == DrawViewMode_DRAW) ) { mpLayoutSet2 = new ValueSet( this, WB_TABSTOP | WB_MENUSTYLEVALUESET | WB_FLATVALUESET | WB_NOBORDER | WB_NO_DIRECTSELECT ); // mpLayoutSet2->SetHelpId( HID_VALUESET_EXTRUSION_LIGHTING ); @@ -209,24 +260,27 @@ LayoutToolbarMenu::LayoutToolbarMenu( SlideLayoutController& rController, const appendEntry( 1, mpLayoutSet2 ); } - appendSeparator(); - - OUString sSlotStr; - Image aSlotImage; - if( mxFrame.is() ) + if( eMode == DrawViewMode_DRAW ) { - if( bInsertPage ) - sSlotStr = OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:DuplicatePage" ) ); - else - sSlotStr = OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:Undo" ) ); - aSlotImage = ::GetImage( mxFrame, sSlotStr, FALSE, FALSE ); - - String sSlotTitle; - if( bInsertPage ) - sSlotTitle = ImplRetrieveLabelFromCommand( mxFrame, sSlotStr ); - else - sSlotTitle = String( SdResId( STR_RESET_LAYOUT ) ); - appendEntry( 2, sSlotTitle, aSlotImage); + appendSeparator(); + + OUString sSlotStr; + Image aSlotImage; + if( mxFrame.is() ) + { + if( bInsertPage ) + sSlotStr = OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:DuplicatePage" ) ); + else + sSlotStr = OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:Undo" ) ); + aSlotImage = ::GetImage( mxFrame, sSlotStr, FALSE, FALSE ); + + String sSlotTitle; + if( bInsertPage ) + sSlotTitle = ImplRetrieveLabelFromCommand( mxFrame, sSlotStr ); + else + sSlotTitle = String( SdResId( STR_RESET_LAYOUT ) ); + appendEntry( 2, sSlotTitle, aSlotImage); + } } SetOutputSizePixel( getMenuSize() ); 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; diff --git a/sd/source/ui/unoidl/DrawController.cxx b/sd/source/ui/unoidl/DrawController.cxx index acd57f18d85c..230feabe956a 100644 --- a/sd/source/ui/unoidl/DrawController.cxx +++ b/sd/source/ui/unoidl/DrawController.cxx @@ -699,6 +699,11 @@ void DrawController::FillPropertyTable ( PROPERTY_VIEWOFFSET, ::getCppuType((const ::com::sun::star::awt::Point*)0), beans::PropertyAttribute::BOUND )); + rProperties.push_back( + beans::Property( OUString( RTL_CONSTASCII_USTRINGPARAM("DrawViewMode") ), + PROPERTY_DRAWVIEWMODE, + ::getCppuType((const ::com::sun::star::awt::Point*)0), + beans::PropertyAttribute::BOUND|beans::PropertyAttribute::READONLY|beans::PropertyAttribute::MAYBEVOID )); } @@ -928,3 +933,4 @@ void DrawController::ThrowIfDisposed (void) const } // end of namespace sd + diff --git a/sd/source/ui/unoidl/SdUnoDrawView.cxx b/sd/source/ui/unoidl/SdUnoDrawView.cxx index 5a497231158d..8594d4e0ebf9 100644 --- a/sd/source/ui/unoidl/SdUnoDrawView.cxx +++ b/sd/source/ui/unoidl/SdUnoDrawView.cxx @@ -38,21 +38,27 @@ #include "unomodel.hxx" #include "unopage.hxx" #include "Window.hxx" +#include "pres.hxx" #include +#include #include #include #include #include #include #include +#include #include #include #include +using rtl::OUString; + using namespace ::com::sun::star; using namespace ::com::sun::star::uno; +using namespace ::com::sun::star::drawing; namespace sd { @@ -416,7 +422,6 @@ void SdUnoDrawView::setFastPropertyValue ( SetViewOffset( aOffset ); } break; - default: throw beans::UnknownPropertyException(); } @@ -460,6 +465,10 @@ Any SAL_CALL SdUnoDrawView::getFastPropertyValue ( aValue <<= GetViewOffset(); break; + case DrawController::PROPERTY_DRAWVIEWMODE: + aValue = getDrawViewMode(); + break; + default: throw beans::UnknownPropertyException(); } @@ -601,5 +610,35 @@ SdXImpressDocument* SdUnoDrawView::GetModel (void) const throw() return NULL; } +Any SdUnoDrawView::getDrawViewMode() const +{ + Any aRet; + switch( mrDrawViewShell.GetPageKind() ) + { + case PK_NOTES: aRet <<= DrawViewMode_NOTES; break; + case PK_HANDOUT: aRet <<= DrawViewMode_HANDOUT; break; + case PK_STANDARD: aRet <<= DrawViewMode_DRAW; break; + } + return aRet; +} + +// XServiceInfo +OUString SAL_CALL SdUnoDrawView::getImplementationName( ) throw (RuntimeException) +{ + return OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.sd.SdUnoDrawView") ); +} + +sal_Bool SAL_CALL SdUnoDrawView::supportsService( const OUString& ServiceName ) throw (RuntimeException) +{ + return comphelper::ServiceInfoHelper::supportsService( ServiceName, getSupportedServiceNames() ); +} + +Sequence< OUString > SAL_CALL SdUnoDrawView::getSupportedServiceNames( ) throw (RuntimeException) +{ + OUString aSN( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.DrawingDocumentDrawView") ); + uno::Sequence< OUString > aSeq( &aSN, 1 ); + return aSeq; +} } // end of namespace sd + diff --git a/sd/source/ui/unoidl/SdUnoOutlineView.cxx b/sd/source/ui/unoidl/SdUnoOutlineView.cxx index 5804765d633c..ff3e5dd501fb 100644 --- a/sd/source/ui/unoidl/SdUnoOutlineView.cxx +++ b/sd/source/ui/unoidl/SdUnoOutlineView.cxx @@ -28,6 +28,8 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sd.hxx" +#include + #include "SdUnoOutlineView.hxx" #include "DrawController.hxx" @@ -237,6 +239,8 @@ Any SAL_CALL SdUnoOutlineView::getFastPropertyValue ( aValue <<= pPage->getUnoPage(); } break; + case DrawController::PROPERTY_VIEWOFFSET: + break; default: throw beans::UnknownPropertyException(); @@ -246,6 +250,22 @@ Any SAL_CALL SdUnoOutlineView::getFastPropertyValue ( } +// XServiceInfo +OUString SAL_CALL SdUnoOutlineView::getImplementationName( ) throw (RuntimeException) +{ + return OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.sd.SdUnoOutlineView") ); +} +sal_Bool SAL_CALL SdUnoOutlineView::supportsService( const OUString& ServiceName ) throw (RuntimeException) +{ + return comphelper::ServiceInfoHelper::supportsService( ServiceName, getSupportedServiceNames() ); +} + +Sequence< OUString > SAL_CALL SdUnoOutlineView::getSupportedServiceNames( ) throw (RuntimeException) +{ + OUString aSN( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.presentation.OutlineView") ); + uno::Sequence< OUString > aSeq( &aSN, 1 ); + return aSeq; +} } // end of namespace sd diff --git a/sd/source/ui/unoidl/SdUnoPresView.cxx b/sd/source/ui/unoidl/SdUnoPresView.cxx deleted file mode 100644 index dcd5001ace38..000000000000 --- a/sd/source/ui/unoidl/SdUnoPresView.cxx +++ /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. - * - ************************************************************************/ - -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_sd.hxx" - -#include "SdUnoPresView.hxx" - - -namespace sd { - - -SdUnoPresView::SdUnoPresView ( - DrawController& rController, - DrawViewShell& rViewShell, - View& rView) throw() - : SdUnoDrawView (rController, rViewShell, rView) -{ -} - - - - -SdUnoPresView::~SdUnoPresView (void) throw() -{ -} - - - -} // end of namespace sd diff --git a/sd/source/ui/unoidl/SdUnoSlideView.cxx b/sd/source/ui/unoidl/SdUnoSlideView.cxx index 34121dc5ac4b..a6502711ee72 100644 --- a/sd/source/ui/unoidl/SdUnoSlideView.cxx +++ b/sd/source/ui/unoidl/SdUnoSlideView.cxx @@ -27,6 +27,9 @@ #include "precompiled_sd.hxx" +#include + +#include "DrawController.hxx" #include "SdUnoSlideView.hxx" #include "SlideSorter.hxx" @@ -39,6 +42,8 @@ #include "sdpage.hxx" #include +using ::rtl::OUString; + using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -202,10 +207,30 @@ Any SAL_CALL SdUnoSlideView::getFastPropertyValue ( { (void)nHandle; - throw beans::UnknownPropertyException(); + if( nHandle != DrawController::PROPERTY_VIEWOFFSET ) + throw beans::UnknownPropertyException(); + + return Any(); +} + + +// XServiceInfo +OUString SAL_CALL SdUnoSlideView::getImplementationName( ) throw (RuntimeException) +{ + return OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.sd.SdUnoSlideView") ); } +sal_Bool SAL_CALL SdUnoSlideView::supportsService( const OUString& ServiceName ) throw (RuntimeException) +{ + return comphelper::ServiceInfoHelper::supportsService( ServiceName, getSupportedServiceNames() ); +} +Sequence< OUString > SAL_CALL SdUnoSlideView::getSupportedServiceNames( ) throw (RuntimeException) +{ + OUString aSN( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.presentation.SlidesView") ); + uno::Sequence< OUString > aSeq( &aSN, 1 ); + return aSeq; +} /* diff --git a/sd/source/ui/unoidl/makefile.mk b/sd/source/ui/unoidl/makefile.mk index b3e71df86740..66d80e1a529a 100644 --- a/sd/source/ui/unoidl/makefile.mk +++ b/sd/source/ui/unoidl/makefile.mk @@ -50,7 +50,6 @@ NOOPTFILES= $(SLO)$/unowcntr.obj SLO1FILES = \ $(SLO)$/DrawController.obj \ - $(SLO)$/SdUnoPresView.obj\ $(SLO)$/SdUnoSlideView.obj\ $(SLO)$/SdUnoOutlineView.obj\ $(SLO)$/SdUnoDrawView.obj \ diff --git a/sd/source/ui/view/ViewShellImplementation.cxx b/sd/source/ui/view/ViewShellImplementation.cxx index 6f4460cb5b47..a5975b9f6ffa 100644 --- a/sd/source/ui/view/ViewShellImplementation.cxx +++ b/sd/source/ui/view/ViewShellImplementation.cxx @@ -324,12 +324,14 @@ void ViewShell::Implementation::AssignLayout ( SfxRequest& rRequest, PageKind eP const SfxUInt32Item* pWhatPage = static_cast< const SfxUInt32Item* > ( rRequest.GetArg( ID_VAL_WHATPAGE, FALSE, TYPE(SfxUInt32Item) ) ); const SfxUInt32Item* pWhatLayout = static_cast< const SfxUInt32Item* > ( rRequest.GetArg( ID_VAL_WHATLAYOUT, FALSE, TYPE(SfxUInt32Item) ) ); + SdDrawDocument* pDocument = mrViewShell.GetDoc(); + if( !pDocument ) + return; + SdPage* pPage = 0; if( pWhatPage ) { - SdDrawDocument* pDocument = mrViewShell.GetDoc(); - if( pDocument ) - pPage = pDocument->GetSdPage(static_cast(pWhatPage->GetValue()), ePageKind); + pPage = pDocument->GetSdPage(static_cast(pWhatPage->GetValue()), ePageKind); } if( pPage == 0 ) @@ -347,7 +349,14 @@ void ViewShell::Implementation::AssignLayout ( SfxRequest& rRequest, PageKind eP SdrLayerAdmin& rLayerAdmin (mrViewShell.GetViewShellBase().GetDocument()->GetLayerAdmin()); BYTE aBackground (rLayerAdmin.GetLayerID(String(SdResId(STR_LAYER_BCKGRND)), FALSE)); BYTE aBackgroundObject (rLayerAdmin.GetLayerID(String(SdResId(STR_LAYER_BCKGRNDOBJ)), FALSE)); - SetOfByte aVisibleLayers (pPage->TRG_GetMasterPageVisibleLayers()); + + SetOfByte aVisibleLayers; + + if( pPage->GetPageKind() == PK_HANDOUT ) + aVisibleLayers.SetAll(); + else + pPage->TRG_GetMasterPageVisibleLayers(); + SfxRequest aRequest (mrViewShell.GetViewShellBase().GetViewFrame(), SID_MODIFYPAGE); aRequest.AppendItem(SfxStringItem (ID_VAL_PAGENAME, pPage->GetName())); aRequest.AppendItem(SfxUInt32Item (ID_VAL_WHATLAYOUT, eLayout)); -- cgit From 17d7bf8f871c2b2e04a14c3d9cca27e7e6c84cac Mon Sep 17 00:00:00 2001 From: "Frank Schoenheit [fs]" Date: Thu, 1 Apr 2010 17:52:36 +0200 Subject: slidecopy: improved A11Y API implementations for the ToolPanelDeck items left: - A11Y representation of the scroll buttons of the PanelTabBar - AccessibleToolPanelTabBar event notifications - consolidate AccessibleToolPanelDeck/TabBar/Item? --- sd/source/ui/toolpanel/ToolPanelDrawer.cxx | 24 ++++++------------------ sd/source/ui/toolpanel/ToolPanelDrawer.hxx | 7 +++---- 2 files changed, 9 insertions(+), 22 deletions(-) (limited to 'sd') diff --git a/sd/source/ui/toolpanel/ToolPanelDrawer.cxx b/sd/source/ui/toolpanel/ToolPanelDrawer.cxx index aa3af47535f4..86406fdff5b4 100755 --- a/sd/source/ui/toolpanel/ToolPanelDrawer.cxx +++ b/sd/source/ui/toolpanel/ToolPanelDrawer.cxx @@ -132,36 +132,24 @@ namespace sd { namespace toolpanel } //------------------------------------------------------------------------------------------------------------------ - ::boost::optional< size_t > ToolPanelDrawer::GetPanelItemFromScreenPos( const ::Point& i_rScreenPos ) + size_t ToolPanelDrawer::GetAccessibleChildCount() const { - for ( ::std::vector< PTitleBar >::const_iterator drawer = m_aDrawers.begin(); - drawer != m_aDrawers.end(); - ++drawer - ) - { - const Rectangle aDrawerBounds( - m_rParentWindow.OutputToScreenPixel( (*drawer)->GetWindow()->GetPosPixel() ), - (*drawer)->GetWindow()->GetSizePixel() - ); - if ( aDrawerBounds.IsInside( i_rScreenPos ) ) - return ::boost::optional< size_t >( drawer - m_aDrawers.begin() ); - } - return ::boost::optional< size_t >(); + return m_aDrawers.size(); } //------------------------------------------------------------------------------------------------------------------ - Reference< XAccessible > ToolPanelDrawer::GetPanelItemAccessible( const size_t i_nItemPos, const Reference< XAccessible >& i_rParentAccessible ) + Reference< XAccessible > ToolPanelDrawer::GetAccessibleChild( const size_t i_nChildIndex, const Reference< XAccessible >& i_rParentAccessible ) { - ENSURE_OR_RETURN( i_nItemPos < m_aDrawers.size(), "illegal index", NULL ); + ENSURE_OR_RETURN( i_nChildIndex < m_aDrawers.size(), "illegal index", NULL ); - const PTitleBar pTitleBar( m_aDrawers[ i_nItemPos ] ); + const PTitleBar pTitleBar( m_aDrawers[ i_nChildIndex ] ); Window* pItemWindow( pTitleBar->GetWindow() ); Reference< XAccessible > xItemAccessible( pItemWindow->GetAccessible( FALSE ) ); if ( !xItemAccessible.is() ) { xItemAccessible = pTitleBar->CreateAccessibleObject( i_rParentAccessible ); - OSL_ENSURE( xItemAccessible.is(), "ToolPanelDrawer::GetPanelItemAccessible: invalid XAccessible returned by CreateAccessibleObject!" ); + OSL_ENSURE( xItemAccessible.is(), "ToolPanelDrawer::GetAccessibleChild: invalid XAccessible returned by CreateAccessibleObject!" ); pItemWindow->SetAccessible( xItemAccessible ); } diff --git a/sd/source/ui/toolpanel/ToolPanelDrawer.hxx b/sd/source/ui/toolpanel/ToolPanelDrawer.hxx index 8c31e66ede92..0d850ab1d7a2 100755 --- a/sd/source/ui/toolpanel/ToolPanelDrawer.hxx +++ b/sd/source/ui/toolpanel/ToolPanelDrawer.hxx @@ -65,11 +65,10 @@ namespace sd { namespace toolpanel virtual Rectangle Layout( const Rectangle& i_rDeckPlayground ); virtual void Destroy(); virtual void SetFocusToPanelSelector(); - ::boost::optional< size_t > - GetPanelItemFromScreenPos( const ::Point& i_rScreenPos ); + virtual size_t GetAccessibleChildCount() const; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > - GetPanelItemAccessible( - const size_t i_nItemPos, + GetAccessibleChild( + const size_t i_nChildIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& i_rParentAccessible ); -- 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/accessibility/AccessibleTreeNode.cxx | 1 + sd/source/ui/app/res_bmp.src | 16 -- sd/source/ui/inc/res_bmp.hrc | 8 +- sd/source/ui/inc/taskpane/TitleBar.hxx | 24 +- sd/source/ui/inc/taskpane/TitledControl.hxx | 6 - sd/source/ui/toolpanel/TitleBar.cxx | 103 +------- sd/source/ui/toolpanel/TitleToolBox.cxx | 49 ---- sd/source/ui/toolpanel/TitleToolBox.hxx | 18 -- sd/source/ui/toolpanel/TitledControl.cxx | 3 +- sd/source/ui/toolpanel/ToolPanelDeck.cxx | 6 +- sd/source/ui/toolpanel/ToolPanelDrawer.cxx | 282 ---------------------- sd/source/ui/toolpanel/ToolPanelDrawer.hxx | 101 -------- sd/source/ui/toolpanel/makefile.mk | 1 - 13 files changed, 12 insertions(+), 606 deletions(-) delete mode 100755 sd/source/ui/toolpanel/ToolPanelDrawer.cxx delete mode 100755 sd/source/ui/toolpanel/ToolPanelDrawer.hxx (limited to 'sd') diff --git a/sd/source/ui/accessibility/AccessibleTreeNode.cxx b/sd/source/ui/accessibility/AccessibleTreeNode.cxx index e4626711df82..f7b7b4d3b7db 100644 --- a/sd/source/ui/accessibility/AccessibleTreeNode.cxx +++ b/sd/source/ui/accessibility/AccessibleTreeNode.cxx @@ -717,6 +717,7 @@ IMPL_LINK(AccessibleTreeNode, WindowEventListener, VclWindowEvent*, pEvent) case VCLEVENT_WINDOW_GETFOCUS: case VCLEVENT_WINDOW_LOSEFOCUS: UpdateStateSet(); + break; } return 1; } diff --git a/sd/source/ui/app/res_bmp.src b/sd/source/ui/app/res_bmp.src index 77ef817e4c44..1f8712369637 100644 --- a/sd/source/ui/app/res_bmp.src +++ b/sd/source/ui/app/res_bmp.src @@ -530,22 +530,6 @@ Bitmap BMP_CLOSE_DOC_H { File = "closedochc.bmp"; }; -Bitmap BMP_TRIANGLE_RIGHT -{ - File = "triangle_right.bmp"; -}; -Bitmap BMP_TRIANGLE_RIGHT_H -{ - File = "triangle_right_hc.bmp"; -}; -Bitmap BMP_TRIANGLE_DOWN -{ - File = "triangle_down.bmp"; -}; -Bitmap BMP_TRIANGLE_DOWN_H -{ - File = "triangle_down_hc.bmp"; -}; Bitmap BMP_FADE_EFFECT_INDICATOR { File = "fade_effect_indicator.bmp"; 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); diff --git a/sd/source/ui/toolpanel/TitleBar.cxx b/sd/source/ui/toolpanel/TitleBar.cxx index e54c98428065..a81d478c068c 100644 --- a/sd/source/ui/toolpanel/TitleBar.cxx +++ b/sd/source/ui/toolpanel/TitleBar.cxx @@ -69,7 +69,6 @@ TitleBar::TitleBar ( ::Window* pParent, const String& rsTitle, TitleBarType eTyp , msTitle(rsTitle) , mbExpanded(false) , mbFocused(false) -, mbMouseOver(false) , mpDevice(new VirtualDevice (*this)) , mbIsExpandable (bIsExpandable) { @@ -80,7 +79,6 @@ TitleBar::TitleBar ( ::Window* pParent, const String& rsTitle, TitleBarType eTyp // Change the mouse pointer shape so that it acts as a mouse over effect. switch (meType) { - case TBT_CONTROL_TITLE: case TBT_SUB_CONTROL_HEADLINE: if (mbIsExpandable) SetPointer (POINTER_REFHAND); @@ -170,10 +168,6 @@ void TitleBar::Paint (const Rectangle& rBoundingBox) switch (meType) { - case TBT_CONTROL_TITLE: - PaintPanelControlTitle (); - break; - case TBT_SUB_CONTROL_HEADLINE: PaintSubPanelHeadLineBar (); break; @@ -239,18 +233,6 @@ void TitleBar::LoseFocus() -void TitleBar::SetMouseOver (bool bFlag) -{ - if (bFlag != mbMouseOver) - { - mbMouseOver = bFlag; - // Invalidate(); - } -} - - - - bool TitleBar::HasExpansionIndicator (void) const { bool bHasExpansionIndicator (false); @@ -258,7 +240,6 @@ bool TitleBar::HasExpansionIndicator (void) const { switch (meType) { - case TBT_CONTROL_TITLE: case TBT_SUB_CONTROL_HEADLINE: bHasExpansionIndicator = true; break; @@ -279,21 +260,6 @@ Image TitleBar::GetExpansionIndicator (void) const USHORT nResourceId = 0; switch (meType) { - case TBT_CONTROL_TITLE: - if (mbExpanded) - if (bHighContrastMode) - nResourceId = BMP_TRIANGLE_DOWN_H; - else - nResourceId = BMP_TRIANGLE_DOWN; - else - if (bHighContrastMode) - nResourceId = BMP_TRIANGLE_RIGHT_H; - else - nResourceId = BMP_TRIANGLE_RIGHT; - - aIndicator = IconCache::Instance().GetIcon(nResourceId); - break; - case TBT_SUB_CONTROL_HEADLINE: if (mbExpanded) if (bHighContrastMode) @@ -317,22 +283,6 @@ Image TitleBar::GetExpansionIndicator (void) const -void TitleBar::PaintPanelControlTitle (void) -{ - int nWidth (GetOutputSizePixel().Width()); - Rectangle aTextBox (CalculateTextBoundingBox (nWidth, true)); - PaintBackground(CalculateTitleBarBox(aTextBox, nWidth)); - Rectangle aFocusBox (PaintExpansionIndicator (aTextBox)); - PaintText (aTextBox); - aFocusBox.Union (aTextBox); - aFocusBox.Left() += 2; - PaintFocusIndicator (aFocusBox); - PaintMouseOverIndicator (aTextBox); -} - - - - void TitleBar::PaintSubPanelHeadLineBar (void) { int nWidth (GetOutputSizePixel().Width()); @@ -353,7 +303,6 @@ void TitleBar::PaintSubPanelHeadLineBar (void) aFocusBox.Left() -= 2; aFocusBox.Right() += 1; PaintFocusIndicator (aFocusBox); - PaintMouseOverIndicator (aTextBox); } @@ -390,21 +339,6 @@ void TitleBar::PaintFocusIndicator (const Rectangle& rTextBox) -void TitleBar::PaintMouseOverIndicator (const Rectangle& rTextBox) -{ - if (mbMouseOver) - { - Rectangle aBox (rTextBox); - // Show the line below the focus rectangle (which is painted - // after and over the mouse over indicator.) - // aBox.Bottom() += 2; - // DrawLine (aBox.BottomLeft(), aBox.BottomRight()); - } -} - - - - Rectangle TitleBar::PaintExpansionIndicator (const Rectangle& rTextBox) { Rectangle aExpansionIndicatorArea; @@ -466,29 +400,6 @@ void TitleBar::PaintBackground (const Rectangle& rTitleBarBox) switch (meType) { - case TBT_CONTROL_TITLE: - { - mpDevice->SetFillColor ( - GetSettings().GetStyleSettings().GetDialogColor()); - mpDevice->DrawRect(rTitleBarBox); - - mpDevice->SetFillColor(); - mpDevice->SetLineColor ( - GetSettings().GetStyleSettings().GetLightColor()); - mpDevice->DrawLine( - rTitleBarBox.TopLeft(),rTitleBarBox.TopRight()); - mpDevice->DrawLine( - rTitleBarBox.TopLeft(),rTitleBarBox.BottomLeft()); - - mpDevice->SetLineColor ( - GetSettings().GetStyleSettings().GetShadowColor()); - mpDevice-> DrawLine( - rTitleBarBox.BottomLeft(), rTitleBarBox.BottomRight()); - mpDevice->DrawLine( - rTitleBarBox.TopRight(), rTitleBarBox.BottomRight()); - } - break; - case TBT_SUB_CONTROL_HEADLINE: { Color aColor (GetSettings().GetStyleSettings().GetDialogColor()); @@ -568,11 +479,6 @@ Rectangle TitleBar::CalculateTitleBarBox ( switch (meType) { - case TBT_CONTROL_TITLE: - aTitleBarBox.Bottom() += aTitleBarBox.Top(); - aTitleBarBox.Top() = 0; - break; - case TBT_SUB_CONTROL_HEADLINE: aTitleBarBox.Top() -= 3; aTitleBarBox.Bottom() += 3; @@ -589,15 +495,8 @@ Rectangle TitleBar::CalculateTitleBarBox ( -void TitleBar::MouseMove (const MouseEvent& rEvent) +void TitleBar::MouseMove (const MouseEvent& ) { - Point aRelativePosition = rEvent.GetPosPixel() - GetPosPixel(); - Size aSize = GetSizePixel(); - SetMouseOver ( - aRelativePosition.X() >= 0 - && aRelativePosition.Y() >= 0 - && aRelativePosition.X() < aSize.Width() - && aRelativePosition.Y() < aSize.Height()); } diff --git a/sd/source/ui/toolpanel/TitleToolBox.cxx b/sd/source/ui/toolpanel/TitleToolBox.cxx index d108724f03d4..c6d69c7d494a 100644 --- a/sd/source/ui/toolpanel/TitleToolBox.cxx +++ b/sd/source/ui/toolpanel/TitleToolBox.cxx @@ -45,18 +45,6 @@ namespace sd { namespace toolpanel { TitleToolBox::TitleToolBox (::Window* pParent, WinBits nStyle ) : ToolBox( pParent, nStyle ) { - lastSize = -1; - - Bitmap aBitmap (SdResId (BMP_CLOSE_DOC)); - Bitmap aBitmapHC (SdResId (BMP_CLOSE_DOC_H)); - Bitmap aTriangleRight (SdResId (BMP_TRIANGLE_RIGHT)); - Bitmap aTriangleDown (SdResId (BMP_TRIANGLE_DOWN)); - - maImage = Image (aBitmap, Color (COL_LIGHTMAGENTA)); - maImageHC = Image (aBitmapHC, Color (BMP_COLOR_HIGHCONTRAST)); - maTriangleRight = Image (aTriangleRight, Color (COL_LIGHTMAGENTA)); - maTriangleDown = Image (aTriangleDown, Color (COL_LIGHTMAGENTA)); - SetOutStyle (TOOLBOX_STYLE_FLAT); SetBackground (Wallpaper ( GetSettings().GetStyleSettings().GetDialogColor())); @@ -65,43 +53,6 @@ TitleToolBox::TitleToolBox (::Window* pParent, WinBits nStyle ) -void TitleToolBox::AddItem (ToolBoxId aId) -{ - switch (aId) - { - case TBID_PANEL_MENU: - InsertItem (TBID_PANEL_MENU, - String::CreateFromAscii ("Panel"), - TIB_DROPDOWN); - break; - - case TBID_DOCUMENT_CLOSE: - InsertItem (TBID_DOCUMENT_CLOSE, - GetSettings().GetStyleSettings().GetHighContrastMode() - ? maImageHC : maImage, 0 ); - break; - - case TBID_TRIANGLE_RIGHT: - InsertItem (TBID_TRIANGLE_RIGHT, - maTriangleRight, 0); - break; - - case TBID_TRIANGLE_DOWN: - InsertItem (TBID_TRIANGLE_DOWN, - maTriangleDown, 0); - break; - - case TBID_TEST: - InsertItem (TBID_TEST, - String::CreateFromAscii ("Test"), - TIB_DROPDOWN); - break; - } -} - - - - void TitleToolBox::DataChanged (const DataChangedEvent& rDCEvt) { Window::DataChanged (rDCEvt); diff --git a/sd/source/ui/toolpanel/TitleToolBox.hxx b/sd/source/ui/toolpanel/TitleToolBox.hxx index eef202ad7d72..5cdd14c46020 100644 --- a/sd/source/ui/toolpanel/TitleToolBox.hxx +++ b/sd/source/ui/toolpanel/TitleToolBox.hxx @@ -45,27 +45,9 @@ class TitleToolBox : public ToolBox { public: - enum ToolBoxId { - TBID_DOCUMENT_CLOSE = 1, - TBID_PANEL_MENU = 2, - TBID_TRIANGLE_RIGHT = 3, - TBID_TRIANGLE_DOWN = 4, - TBID_TEST - }; - TitleToolBox (::Window* pParent, WinBits nStyle = 0); - void AddItem (ToolBoxId aId); - void DataChanged (const DataChangedEvent& rDCEvt); - -private: - Image maImage; - Image maImageHC; - Image maTriangleRight; - Image maTriangleDown; - - long lastSize; }; } } // end of namespace ::sd::toolbox diff --git a/sd/source/ui/toolpanel/TitledControl.cxx b/sd/source/ui/toolpanel/TitledControl.cxx index 921b37335048..4c62d1dea178 100644 --- a/sd/source/ui/toolpanel/TitledControl.cxx +++ b/sd/source/ui/toolpanel/TitledControl.cxx @@ -55,8 +55,7 @@ TitledControl::TitledControl ( msTitle(rTitle), mbVisible(true), mpUserData(NULL), - mpClickHandler(new ClickHandler(rClickHandler)), - mbExpansionModeIsToggle(eType!=TitleBar::TBT_CONTROL_TITLE) + mpClickHandler(new ClickHandler(rClickHandler)) { if (pControl.get() != NULL) { diff --git a/sd/source/ui/toolpanel/ToolPanelDeck.cxx b/sd/source/ui/toolpanel/ToolPanelDeck.cxx index a6fc04ded305..53a1caff73d9 100755 --- a/sd/source/ui/toolpanel/ToolPanelDeck.cxx +++ b/sd/source/ui/toolpanel/ToolPanelDeck.cxx @@ -28,7 +28,6 @@ #include "ToolPanelDeck.hxx" #include "taskpane/ToolPanelViewShell.hxx" -#include "ToolPanelDrawer.hxx" #include "taskpane/ControlContainer.hxx" #include "framework/FrameworkHelper.hxx" #include "TaskPaneToolPanel.hxx" @@ -40,6 +39,7 @@ /** === end UNO includes === **/ #include +#include #include //...................................................................................................................... @@ -88,11 +88,11 @@ namespace sd { namespace toolpanel void ToolPanelDeck::SetDrawersLayout() { const ::svt::PDeckLayouter pLayouter( GetLayouter() ); - const ToolPanelDrawer* pDrawerLayouter = dynamic_cast< const ToolPanelDrawer* >( pLayouter.get() ); + const ::svt::DrawerDeckLayouter* pDrawerLayouter = dynamic_cast< const ::svt::DrawerDeckLayouter* >( pLayouter.get() ); if ( pDrawerLayouter != NULL ) // already have the proper layout return; - SetLayouter( new ToolPanelDrawer( *this, *this ) ); + SetLayouter( new ::svt::DrawerDeckLayouter( *this, *this ) ); } //------------------------------------------------------------------------------------------------------------------ diff --git a/sd/source/ui/toolpanel/ToolPanelDrawer.cxx b/sd/source/ui/toolpanel/ToolPanelDrawer.cxx deleted file mode 100755 index 86406fdff5b4..000000000000 --- a/sd/source/ui/toolpanel/ToolPanelDrawer.cxx +++ /dev/null @@ -1,282 +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. - * -************************************************************************/ - -#include "precompiled_sd.hxx" - -#include "ToolPanelDrawer.hxx" -#include "taskpane/TitleBar.hxx" - -#include - -//...................................................................................................................... -namespace sd { namespace toolpanel -{ -//...................................................................................................................... - - /** === begin UNO using === **/ - using ::com::sun::star::uno::Reference; - using ::com::sun::star::accessibility::XAccessible; - /** === end UNO using === **/ - - //================================================================================================================== - //= ToolPanelDrawer - //================================================================================================================== - //------------------------------------------------------------------------------------------------------------------ - ToolPanelDrawer::ToolPanelDrawer( ::Window& i_rParentWindow, ::svt::IToolPanelDeck& i_rPanels ) - :m_rParentWindow( i_rParentWindow ) - ,m_rPanelDeck( i_rPanels ) - ,m_aDrawers() - ,m_aLastKnownActivePanel() - { - m_rPanelDeck.AddListener( *this ); - - // simulate PanelInserted events for the panels which are already there - for ( size_t i=0; i aActivePanel( m_rPanelDeck.GetActivePanel() ); - if ( !aActivePanel ) - aActivePanel = m_aLastKnownActivePanel; - - // arrange the title bars which are *above* the active panel (or *all* if there is no active panel), plus - // the title bar of the active panel itself - Point aUpperDrawerPos( i_rDeckPlayground.TopLeft() ); - const size_t nUpperBound = !!aActivePanel ? *aActivePanel : nPanelCount - 1; - for ( size_t i=0; i<=nUpperBound; ++i ) - { - sal_uInt32 nDrawerHeight = m_aDrawers[i]->GetPreferredHeight( nWidth ); - m_aDrawers[i]->GetWindow()->SetPosSizePixel( - aUpperDrawerPos, Size( nWidth, nDrawerHeight ) ); - aUpperDrawerPos.Move( 0, nDrawerHeight ); - } - - // arrange title bars which are below the active panel (or *none* if there is no active panel) - Point aLowerDrawerPos( i_rDeckPlayground.BottomLeft() ); - for ( size_t j = nPanelCount - 1; j > nUpperBound; --j ) - { - sal_uInt32 nDrawerHeight = m_aDrawers[j]->GetPreferredHeight( nWidth ); - m_aDrawers[j]->GetWindow()->SetPosSizePixel( - Point( aLowerDrawerPos.X(), aLowerDrawerPos.Y() - nDrawerHeight + 1 ), - Size( nWidth, nDrawerHeight ) - ); - aLowerDrawerPos.Move( 0, -nDrawerHeight ); - } - - // fincally calculate the rectangle for the active panel - return Rectangle( - aUpperDrawerPos, - Size( nWidth, aLowerDrawerPos.Y() - aUpperDrawerPos.Y() + 1 ) - ); - } - - //------------------------------------------------------------------------------------------------------------------ - void ToolPanelDrawer::Destroy() - { - while ( !m_aDrawers.empty() ) - impl_removeTitleBar( 0 ); - m_rPanelDeck.RemoveListener( *this ); - } - - //------------------------------------------------------------------------------------------------------------------ - void ToolPanelDrawer::SetFocusToPanelSelector() - { - const size_t nPanelCount( m_rPanelDeck.GetPanelCount() ); - if ( !nPanelCount ) - // nothing to focus - return; - ::boost::optional< size_t > aActivePanel( m_rPanelDeck.GetActivePanel() ); - if ( !aActivePanel ) - aActivePanel = 0; - ENSURE_OR_RETURN_VOID( *aActivePanel < m_aDrawers.size(), "ToolPanelDrawer::SetFocusToPanelSelector: invalid active panel, or inconsistent drawers!" ); - m_aDrawers[ *aActivePanel ]->GetWindow()->GrabFocus(); - } - - //------------------------------------------------------------------------------------------------------------------ - size_t ToolPanelDrawer::GetAccessibleChildCount() const - { - return m_aDrawers.size(); - } - - //------------------------------------------------------------------------------------------------------------------ - Reference< XAccessible > ToolPanelDrawer::GetAccessibleChild( const size_t i_nChildIndex, const Reference< XAccessible >& i_rParentAccessible ) - { - ENSURE_OR_RETURN( i_nChildIndex < m_aDrawers.size(), "illegal index", NULL ); - - const PTitleBar pTitleBar( m_aDrawers[ i_nChildIndex ] ); - Window* pItemWindow( pTitleBar->GetWindow() ); - - Reference< XAccessible > xItemAccessible( pItemWindow->GetAccessible( FALSE ) ); - if ( !xItemAccessible.is() ) - { - xItemAccessible = pTitleBar->CreateAccessibleObject( i_rParentAccessible ); - OSL_ENSURE( xItemAccessible.is(), "ToolPanelDrawer::GetAccessibleChild: invalid XAccessible returned by CreateAccessibleObject!" ); - pItemWindow->SetAccessible( xItemAccessible ); - } - - return xItemAccessible; - } - - //------------------------------------------------------------------------------------------------------------------ - void ToolPanelDrawer::PanelInserted( const ::svt::PToolPanel& i_pPanel, const size_t i_nPosition ) - { - OSL_PRECOND( i_nPosition <= m_aDrawers.size(), "ToolPanelDrawer::PanelInserted: inconsistency!" ); - - ::boost::shared_ptr< TitleBar > pTitleBar( new TitleBar( &m_rParentWindow, i_pPanel->GetDisplayName(), TitleBar::TBT_CONTROL_TITLE, true ) ); - pTitleBar->GetWindow()->Show(); - pTitleBar->GetWindow()->AddEventListener( LINK( this, ToolPanelDrawer, OnWindowEvent ) ); - m_aDrawers.insert( m_aDrawers.begin() + i_nPosition, pTitleBar ); - impl_triggerRearrange(); - } - - //------------------------------------------------------------------------------------------------------------------ - void ToolPanelDrawer::PanelRemoved( const size_t i_nPosition ) - { - impl_removeTitleBar( i_nPosition ); - impl_triggerRearrange(); - } - - //------------------------------------------------------------------------------------------------------------------ - void ToolPanelDrawer::impl_triggerRearrange() const - { - // this is somewhat hacky, it assumes that the parent of our panels is a tool panel deck, which, in its - // Resize implementation, rearrances all elements. - m_rParentWindow.Resize(); - } - - //------------------------------------------------------------------------------------------------------------------ - void ToolPanelDrawer::ActivePanelChanged( const ::boost::optional< size_t >& i_rOldActive, const ::boost::optional< size_t >& i_rNewActive ) - { - if ( !!i_rOldActive ) - { - OSL_ENSURE( *i_rOldActive < m_aDrawers.size(), "ToolPanelDrawer::ActivePanelChanged: illegal old index!" ); - m_aDrawers[ *i_rOldActive ]->Expand( false ); - } - - if ( !!i_rNewActive ) - { - OSL_ENSURE( *i_rNewActive < m_aDrawers.size(), "ToolPanelDrawer::ActivePanelChanged: illegal new index!" ); - m_aDrawers[ *i_rNewActive ]->Expand( true ); - } - - impl_triggerRearrange(); - } - - //------------------------------------------------------------------------------------------------------------------ - void ToolPanelDrawer::LayouterChanged( const ::svt::PDeckLayouter& i_rNewLayouter ) - { - // not interested in - (void)i_rNewLayouter; - } - - //------------------------------------------------------------------------------------------------------------------ - size_t ToolPanelDrawer::impl_getPanelPositionFromWindow( const Window* i_pTitleBarWindow ) const - { - for ( ::std::vector< PTitleBar >::const_iterator drawerPos = m_aDrawers.begin(); - drawerPos != m_aDrawers.end(); - ++drawerPos - ) - { - if ( (*drawerPos)->GetWindow() == i_pTitleBarWindow ) - return drawerPos - m_aDrawers.begin(); - } - return m_aDrawers.size(); - } - - //------------------------------------------------------------------------------------------------------------------ - void ToolPanelDrawer::impl_removeTitleBar( const size_t i_nPosition ) - { - OSL_PRECOND( i_nPosition < m_aDrawers.size(), "ToolPanelDrawer::impl_removeTitleBar: invalid panel position!" ); - m_aDrawers[ i_nPosition ]->GetWindow()->RemoveEventListener( LINK( this, ToolPanelDrawer, OnWindowEvent ) ); - OSL_ENSURE( m_aDrawers[ i_nPosition ].unique(), "ToolPanelDrawer::impl_removeTitleBar: somebody else is still holding a reference!" ); - m_aDrawers.erase( m_aDrawers.begin() + i_nPosition ); - } - - //------------------------------------------------------------------------------------------------------------------ - IMPL_LINK( ToolPanelDrawer, OnWindowEvent, VclSimpleEvent*, i_pEvent ) - { - const VclWindowEvent* pWindowEvent = PTR_CAST( VclWindowEvent, i_pEvent ); - ENSURE_OR_RETURN( pWindowEvent, "no WindowEvent", 0L ); - - bool bActivatePanel = false; - switch ( pWindowEvent->GetId() ) - { - case VCLEVENT_WINDOW_MOUSEBUTTONUP: - { - const MouseEvent* pMouseEvent = static_cast< const MouseEvent* >( pWindowEvent->GetData() ); - ENSURE_OR_RETURN( pMouseEvent, "no mouse event with MouseButtonUp", 0L ); - if ( pMouseEvent->GetButtons() == MOUSE_LEFT ) - { - bActivatePanel = true; - } - } - break; - case VCLEVENT_WINDOW_KEYINPUT: - { - const KeyEvent* pKeyEvent = static_cast< const KeyEvent* >( pWindowEvent->GetData() ); - ENSURE_OR_RETURN( pKeyEvent, "no key event with KeyInput", 0L ); - const KeyCode& rKeyCode( pKeyEvent->GetKeyCode() ); - if ( ( rKeyCode.GetModifier() == 0 ) && ( rKeyCode.GetCode() == KEY_RETURN ) ) - { - bActivatePanel = true; - } - } - break; - } - if ( bActivatePanel ) - { - const size_t nPanelPos = impl_getPanelPositionFromWindow( pWindowEvent->GetWindow() ); - m_rPanelDeck.ActivatePanel( nPanelPos ); - return 1L; - } - return 0L; - } - - //------------------------------------------------------------------------------------------------------------------ - void ToolPanelDrawer::Dying() - { - Destroy(); - } - -//...................................................................................................................... -} } // namespace sd::toolpanel -//...................................................................................................................... diff --git a/sd/source/ui/toolpanel/ToolPanelDrawer.hxx b/sd/source/ui/toolpanel/ToolPanelDrawer.hxx deleted file mode 100755 index 0d850ab1d7a2..000000000000 --- a/sd/source/ui/toolpanel/ToolPanelDrawer.hxx +++ /dev/null @@ -1,101 +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_TOOLPANEL_TOOLPANELDRAWER_HXX -#define SD_TOOLPANEL_TOOLPANELDRAWER_HXX - -#include -#include -#include - -#include - -//...................................................................................................................... -namespace sd { namespace toolpanel -{ -//...................................................................................................................... - - class ToolPanelViewShell; - class TitleBar; - typedef ::boost::shared_ptr< TitleBar > PTitleBar; - - //================================================================================================================== - //= ToolPanelDrawer - //================================================================================================================== - /** a class which implements a tool panel selector in the form of the classical drawers - */ - class ToolPanelDrawer :public ::svt::RefBase - ,public ::svt::IDeckLayouter - ,public ::svt::IToolPanelDeckListener - { - public: - ToolPanelDrawer( - ::Window& i_rParentWindow, - ::svt::IToolPanelDeck& i_rPanels - ); - ~ToolPanelDrawer(); - - // IReference - DECLARE_IREFERENCE() - - // IDeckLayouter - virtual Rectangle Layout( const Rectangle& i_rDeckPlayground ); - virtual void Destroy(); - virtual void SetFocusToPanelSelector(); - virtual size_t GetAccessibleChildCount() const; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > - GetAccessibleChild( - const size_t i_nChildIndex, - const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& i_rParentAccessible - ); - - // IToolPanelDeckListener - virtual void PanelInserted( const ::svt::PToolPanel& i_pPanel, const size_t i_nPosition ); - virtual void PanelRemoved( const size_t i_nPosition ); - virtual void ActivePanelChanged( const ::boost::optional< size_t >& i_rOldActive, const ::boost::optional< size_t >& i_rNewActive ); - virtual void LayouterChanged( const ::svt::PDeckLayouter& i_rNewLayouter ); - virtual void Dying(); - - private: - // triggers a re-arrance of the panel deck elements - void impl_triggerRearrange() const; - size_t impl_getPanelPositionFromWindow( const Window* i_pTitleBarWindow ) const; - void impl_removeTitleBar( const size_t i_nPosition ); - - DECL_LINK( OnWindowEvent, VclSimpleEvent* ); - -private: - Window& m_rParentWindow; - ::svt::IToolPanelDeck& m_rPanelDeck; - ::std::vector< PTitleBar > m_aDrawers; - ::boost::optional< size_t > m_aLastKnownActivePanel; - }; - -//...................................................................................................................... -} } // namespace sd::toolpanel -//...................................................................................................................... - -#endif // SD_TOOLPANEL_TOOLPANELDRAWER_HXX diff --git a/sd/source/ui/toolpanel/makefile.mk b/sd/source/ui/toolpanel/makefile.mk index 837ffb710499..f9cd156855d0 100644 --- a/sd/source/ui/toolpanel/makefile.mk +++ b/sd/source/ui/toolpanel/makefile.mk @@ -60,7 +60,6 @@ SLOFILES = \ $(SLO)$/TaskPaneTreeNode.obj \ $(SLO)$/ToolPanelViewShell.obj \ $(SLO)$/ToolPanelDeck.obj \ - $(SLO)$/ToolPanelDrawer.obj \ $(SLO)$/TaskPaneToolPanel.obj \ $(SLO)$/CustomToolPanel.obj \ $(SLO)$/StandardToolPanel.obj \ -- cgit From 1bd51ec880300f8c6d3b4827e5bfbc9bedf43672 Mon Sep 17 00:00:00 2001 From: "Frank Schoenheit [fs]" Date: Thu, 8 Apr 2010 13:19:44 +0200 Subject: slidecopy: added SID_TASKPANE to Draw --- sd/source/ui/view/drvwshrg.cxx | 1 + sd/uiconfig/sdraw/menubar/menubar.xml | 605 +++++++++++++++++----------------- 2 files changed, 304 insertions(+), 302 deletions(-) (limited to 'sd') diff --git a/sd/source/ui/view/drvwshrg.cxx b/sd/source/ui/view/drvwshrg.cxx index 13d710bd4286..5366c5c1668b 100644 --- a/sd/source/ui/view/drvwshrg.cxx +++ b/sd/source/ui/view/drvwshrg.cxx @@ -109,6 +109,7 @@ SFX_IMPL_INTERFACE(GraphicViewShell, SfxShell, SdResId(STR_DRAWVIEWSHELL)) //SOH { SFX_POPUPMENU_REGISTRATION( SdResId(RID_DRAW_TEXTOBJ_INSIDE_POPUP) ); SFX_CHILDWINDOW_CONTEXT_REGISTRATION( SID_NAVIGATOR ); + SFX_CHILDWINDOW_REGISTRATION( SID_TASKPANE ); SFX_CHILDWINDOW_REGISTRATION( SfxTemplateDialogWrapper::GetChildWindowId() ); SFX_CHILDWINDOW_REGISTRATION( SvxFontWorkChildWindow::GetChildWindowId() ); SFX_CHILDWINDOW_REGISTRATION( SvxColorChildWindow::GetChildWindowId() ); diff --git a/sd/uiconfig/sdraw/menubar/menubar.xml b/sd/uiconfig/sdraw/menubar/menubar.xml index 9e5d927b263e..e7471902ac9c 100644 --- a/sd/uiconfig/sdraw/menubar/menubar.xml +++ b/sd/uiconfig/sdraw/menubar/menubar.xml @@ -1,330 +1,331 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - - + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - + + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + - - - - - - + + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + - - + + - - - + + + + + + + - - + + + + + + + + + + + + + + - - - - - - - + + + - + + + + + + + + + + + + + + + + + + + + + + + + -- 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/dlg/PaneDockingWindow.src | 16 ---------------- sd/source/ui/inc/PaneDockingWindow.hrc | 3 +-- 2 files changed, 1 insertion(+), 18 deletions(-) (limited to 'sd') diff --git a/sd/source/ui/dlg/PaneDockingWindow.src b/sd/source/ui/dlg/PaneDockingWindow.src index e99105f456a4..616b8a159f85 100644 --- a/sd/source/ui/dlg/PaneDockingWindow.src +++ b/sd/source/ui/dlg/PaneDockingWindow.src @@ -62,22 +62,6 @@ DockingWindow FLT_LEFT_PANE_DRAW_DOCKING_WINDOW Text [ en-US ] = "Page Pane" ; }; -DockingWindow FLT_RIGHT_PANE_DOCKING_WINDOW -{ - // HelpID = SID_EFFECT_WIN ; - Border = TRUE ; - Hide = TRUE ; - SVLook = TRUE ; - Sizeable = TRUE ; - Moveable = TRUE ; - Closeable = TRUE ; - Zoomable = TRUE ; - Dockable = TRUE ; - EnableResizing = TRUE ; - Size = MAP_APPFONT (100,200) ; - Text [ en-US ] = "Task Pane" ; -}; - DockingWindow FLT_TOOL_PANEL_DOCKING_WINDOW { // HelpID = SID_EFFECT_WIN ; 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/app/res_bmp.src | 8 - sd/source/ui/dlg/PaneDockingWindow.cxx | 341 +-------------------- .../ui/framework/factories/ChildWindowPane.cxx | 2 +- sd/source/ui/inc/PaneDockingWindow.hxx | 79 +---- sd/source/ui/inc/res_bmp.hrc | 6 - .../ui/slidesorter/controller/SlsFocusManager.cxx | 2 +- sd/source/ui/toolpanel/ToolPanelViewShell.cxx | 4 +- 7 files changed, 18 insertions(+), 424 deletions(-) (limited to 'sd') diff --git a/sd/source/ui/app/res_bmp.src b/sd/source/ui/app/res_bmp.src index 1f8712369637..8148d474a316 100644 --- a/sd/source/ui/app/res_bmp.src +++ b/sd/source/ui/app/res_bmp.src @@ -522,14 +522,6 @@ Bitmap BMP_WAIT_ICON // ---------------------------------------- -Bitmap BMP_CLOSE_DOC -{ - File = "closedoc.bmp"; -}; -Bitmap BMP_CLOSE_DOC_H -{ - File = "closedochc.bmp"; -}; Bitmap BMP_FADE_EFFECT_INDICATOR { File = "fade_effect_indicator.bmp"; diff --git a/sd/source/ui/dlg/PaneDockingWindow.cxx b/sd/source/ui/dlg/PaneDockingWindow.cxx index 2b9ed848d60a..6d20090f21a7 100644 --- a/sd/source/ui/dlg/PaneDockingWindow.cxx +++ b/sd/source/ui/dlg/PaneDockingWindow.cxx @@ -44,297 +44,26 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; +using ::sfx2::TitledDockingWindow; namespace sd { -PaneDockingWindow::PaneDockingWindow ( - SfxBindings *_pBindings, - SfxChildWindow *pChildWindow, - ::Window* pParent, - const ResId& rResId, - const ::rtl::OUString& rsTitle) - : SfxDockingWindow ( - _pBindings, - pChildWindow, - pParent, - rResId - ), - msTitle(rsTitle), - mpTitleToolBox(), - maBorder (3,1,3,3), - mnChildWindowId(pChildWindow->GetType()), - mpContentWindow(new ::Window(this)), - mbIsLayoutPending(false) +PaneDockingWindow::PaneDockingWindow( + SfxBindings *_pBindings, SfxChildWindow *pChildWindow, ::Window* pParent, + const ResId& rResId, const ::rtl::OUString& rsTitle ) + :TitledDockingWindow( _pBindings, pChildWindow, pParent, rResId ) { - SetBackground (Wallpaper()); - - InitializeTitleToolBox(); - - // Tell the system window about the new docking window so that it can be - // reached via the keyboard. - SystemWindow* pSystemWindow = GetSystemWindow(); - if (pSystemWindow != NULL) - pSystemWindow->GetTaskPaneList()->AddWindow(this); - - mpContentWindow->Show(); + SetTitle( rsTitle ); } - - - PaneDockingWindow::~PaneDockingWindow (void) { - // Tell the next system window that the docking window is no longer - // available. - SystemWindow* pSystemWindow = GetSystemWindow(); - if (pSystemWindow != NULL) - pSystemWindow->GetTaskPaneList()->RemoveWindow(this); - mpTitleToolBox.reset(); -} - - - - -void PaneDockingWindow::SetTitle (const String& rsTitle) -{ - msTitle = rsTitle; - Invalidate(); -} - - - - -void PaneDockingWindow::Resize (void) -{ - SfxDockingWindow::Resize(); - mbIsLayoutPending = true; -} - - - - -void PaneDockingWindow::Layout (void) -{ - mbIsLayoutPending = false; - - Size aWindowSize (GetOutputSizePixel()); - Size aToolBoxSize (0,0); - int nTitleBarHeight (GetSettings().GetStyleSettings().GetTitleHeight()); - - // Place the title tool box. - if (mpTitleToolBox.get() != NULL) - { - if (IsFloatingMode()) - mpTitleToolBox->HideItem (1); - else - mpTitleToolBox->ShowItem (1); - - aToolBoxSize = mpTitleToolBox->CalcWindowSizePixel(); - if (aToolBoxSize.Height() > nTitleBarHeight) - nTitleBarHeight = aToolBoxSize.Height(); - mpTitleToolBox->SetPosSizePixel ( - Point(aWindowSize.Width()-aToolBoxSize.Width(), - (nTitleBarHeight-aToolBoxSize.Height())/2), - aToolBoxSize); - } - - // Place the content window. - if (nTitleBarHeight < aToolBoxSize.Height()) - nTitleBarHeight = aToolBoxSize.Height(); - aWindowSize.Height() -= nTitleBarHeight; - mpContentWindow->SetPosSizePixel( - Point(maBorder.Left(),nTitleBarHeight+maBorder.Top()), - Size (aWindowSize.Width()-maBorder.Left()-maBorder.Right(), - aWindowSize.Height()-maBorder.Top()-maBorder.Bottom())); -} - - - - -void PaneDockingWindow::Paint (const Rectangle& rRectangle) -{ - if (mbIsLayoutPending) - Layout(); - - SfxDockingWindow::Paint (rRectangle); - int nTitleBarHeight (GetSettings().GetStyleSettings().GetTitleHeight()); - Size aToolBoxSize = mpTitleToolBox->CalcWindowSizePixel(); - if (aToolBoxSize.Height() > nTitleBarHeight) - nTitleBarHeight = aToolBoxSize.Height(); - Color aOriginalLineColor (GetLineColor()); - Color aOriginalFillColor (GetFillColor()); - SetFillColor (GetSettings().GetStyleSettings().GetDialogColor()); - SetLineColor (); - - // Make font bold. - const Font& rOriginalFont (GetFont()); - Font aFont (rOriginalFont); - aFont.SetWeight (WEIGHT_BOLD); - SetFont (aFont); - - // Set border values. - Size aWindowSize (GetOutputSizePixel()); - int nOuterLeft = 0; - int nInnerLeft = nOuterLeft + maBorder.Left() - 1; - int nOuterRight = aWindowSize.Width() - 1; - int nInnerRight = nOuterRight - maBorder.Right() + 1; - int nInnerTop = nTitleBarHeight + maBorder.Top() - 1; - int nOuterBottom = aWindowSize.Height() - 1; - int nInnerBottom = nOuterBottom - maBorder.Bottom() + 1; - - // Paint title bar background. - Rectangle aTitleBarBox (Rectangle( - nOuterLeft, - 0, - nOuterRight, - nInnerTop-1)); - DrawRect (aTitleBarBox); - - if (nInnerLeft > nOuterLeft) - DrawRect ( - Rectangle (nOuterLeft, nInnerTop, nInnerLeft, nInnerBottom)); - if (nOuterRight > nInnerRight) - DrawRect ( - Rectangle (nInnerRight, nInnerTop, nOuterRight, nInnerBottom)); - if (nInnerBottom < nOuterBottom) - DrawRect ( - Rectangle (nOuterLeft, nInnerBottom, nOuterRight, nOuterBottom)); - - // Paint bevel border. - SetFillColor (); - SetLineColor (GetSettings().GetStyleSettings().GetShadowColor()); - if (maBorder.Top() > 0) - DrawLine ( - Point(nInnerLeft,nInnerTop), - Point(nInnerLeft,nInnerBottom)); - if (maBorder.Left() > 0) - DrawLine ( - Point(nInnerLeft,nInnerTop), - Point(nInnerRight,nInnerTop)); - SetLineColor (GetSettings().GetStyleSettings().GetLightColor()); - if (maBorder.Bottom() > 0) - DrawLine ( - Point(nInnerRight,nInnerBottom), - Point(nInnerLeft,nInnerBottom)); - if (maBorder.Right() > 0) - DrawLine ( - Point(nInnerRight,nInnerBottom), - Point(nInnerRight,nInnerTop)); - - // Paint title bar text. - SetLineColor (GetSettings().GetStyleSettings().GetActiveTextColor()); - SetFillColor (); - aTitleBarBox.Left() += 3; - DrawText (aTitleBarBox, msTitle, - TEXT_DRAW_LEFT - | TEXT_DRAW_VCENTER - | TEXT_DRAW_MULTILINE - | TEXT_DRAW_WORDBREAK); - - // Restore original values of the output device. - SetFont (rOriginalFont); - SetFillColor (aOriginalFillColor); -} - - - - -void PaneDockingWindow::InitializeTitleToolBox (void) -{ - if (mpTitleToolBox.get() == NULL) - { - // Initialize the title tool box. - mpTitleToolBox.reset (new ToolBox(this)); - mpTitleToolBox->SetSelectHdl ( - LINK(this, PaneDockingWindow, ToolboxSelectHandler)); - mpTitleToolBox->SetOutStyle (TOOLBOX_STYLE_FLAT); - mpTitleToolBox->SetBackground (Wallpaper ( - GetSettings().GetStyleSettings().GetDialogColor())); - mpTitleToolBox->Show(); - } - else - mpTitleToolBox->Clear(); - - // Get the closer bitmap and set it as right most button. - Bitmap aBitmap (SdResId (BMP_CLOSE_DOC)); - Bitmap aBitmapHC (SdResId (BMP_CLOSE_DOC_H)); - Image aImage = Image (aBitmap, Color (COL_LIGHTMAGENTA)); - Image aImageHC = Image (aBitmapHC, Color (BMP_COLOR_HIGHCONTRAST)); - mpTitleToolBox->InsertItem (1, - GetSettings().GetStyleSettings().GetHighContrastMode() - ? aImageHC - : aImage); - mpTitleToolBox->ShowItem (1); -} - - - - -USHORT PaneDockingWindow::AddMenu ( - const String& rsMenuName, - ULONG nHelpId, - const Link& rCallback) -{ - // Add the menu before the closer button. - USHORT nItemCount (mpTitleToolBox->GetItemCount()); - USHORT nItemId (nItemCount+1); - mpTitleToolBox->InsertItem ( - nItemId, - rsMenuName, - TIB_DROPDOWNONLY, - nItemCount>0 ? nItemCount-1 : (USHORT)-1); - mpTitleToolBox->SetHelpId( nItemId, nHelpId ); - mpTitleToolBox->SetClickHdl (rCallback); - mpTitleToolBox->SetDropdownClickHdl (rCallback); - - // The tool box has likely changed its size. The title bar has to be - // resized. - Resize(); - Invalidate(); - - return nItemCount+1; } - - - -IMPL_LINK(PaneDockingWindow, ToolboxSelectHandler, ToolBox*, pToolBox) -{ - USHORT nId = pToolBox->GetCurItemId(); - - if (nId == 1) - { - EndTracking(); - SfxBoolItem aVisibility (mnChildWindowId, FALSE); - GetBindings().GetDispatcher()->Execute ( - mnChildWindowId, - SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, - &aVisibility, - NULL); - } - - return 0; -} - - - - -long PaneDockingWindow::Notify( NotifyEvent& rNEvt ) -{ - return SfxDockingWindow::Notify (rNEvt); -} - - - - void PaneDockingWindow::StateChanged( StateChangedType nType ) { switch (nType) { - case STATE_CHANGE_INITSHOW: - Resize(); - break; - case STATE_CHANGE_VISIBLE: // The visibility of the docking window has changed. Tell the // ConfigurationController so that it can activate or deactivate @@ -352,49 +81,6 @@ void PaneDockingWindow::StateChanged( StateChangedType nType ) SfxDockingWindow::StateChanged (nType); } - - - -void PaneDockingWindow::DataChanged (const DataChangedEvent& rEvent) -{ - SfxDockingWindow::DataChanged (rEvent); - - switch (rEvent.GetType()) - { - case DATACHANGED_SETTINGS: - if ((rEvent.GetFlags() & SETTINGS_STYLE) == 0) - break; - // else fall through. - case DATACHANGED_FONTS: - case DATACHANGED_FONTSUBSTITUTION: - { - const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings(); - - // Font. - Font aFont = rStyleSettings.GetAppFont(); - if (IsControlFont()) - aFont.Merge(GetControlFont()); - SetZoomedPointFont(aFont); - - // Color. - Color aColor; - if (IsControlForeground()) - aColor = GetControlForeground(); - else - aColor = rStyleSettings.GetButtonTextColor(); - SetTextColor(aColor); - SetTextFillColor(); - - Resize(); - Invalidate(); - } - break; - } -} - - - - void PaneDockingWindow::EndDocking( const Rectangle& rRect, BOOL bFloatMode ) { SfxDockingWindow::EndDocking( rRect, bFloatMode ); @@ -403,20 +89,9 @@ void PaneDockingWindow::EndDocking( const Rectangle& rRect, BOOL bFloatMode ) maEndDockingHdl.Call( this ); } - - -::Window* PaneDockingWindow::GetContentWindow (void) +void PaneDockingWindow::ResetToolBox() { - return mpContentWindow.get(); + impl_resetToolBox(); } - - - -::boost::shared_ptr PaneDockingWindow::GetTitleToolBox (void) const -{ - return mpTitleToolBox; -} - - } // end of namespace ::sd diff --git a/sd/source/ui/framework/factories/ChildWindowPane.cxx b/sd/source/ui/framework/factories/ChildWindowPane.cxx index 5ecdc8b65ebe..c72d4e08da48 100644 --- a/sd/source/ui/framework/factories/ChildWindowPane.cxx +++ b/sd/source/ui/framework/factories/ChildWindowPane.cxx @@ -195,7 +195,7 @@ void SAL_CALL ChildWindowPane::disposing (void) break; // At last, we have access to the window and its UNO wrapper. - mpWindow = pDockingWindow->GetContentWindow(); + mpWindow = &pDockingWindow->GetContentWindow(); mxWindow = VCLUnoHelper::GetInterface(mpWindow); // Register as window listener to be informed when the child window 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 diff --git a/sd/source/ui/slidesorter/controller/SlsFocusManager.cxx b/sd/source/ui/slidesorter/controller/SlsFocusManager.cxx index 1077184b7db7..1f8ca847757a 100644 --- a/sd/source/ui/slidesorter/controller/SlsFocusManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsFocusManager.cxx @@ -320,7 +320,7 @@ void FocusManager::SetFocusToToolBox (void) { PaneDockingWindow* pPaneDockingWindow = dynamic_cast(pDockingWindow); if (pPaneDockingWindow != NULL) - pPaneDockingWindow->GetTitleToolBox()->GrabFocus(); + pPaneDockingWindow->GetToolBox().GrabFocus(); } } } diff --git a/sd/source/ui/toolpanel/ToolPanelViewShell.cxx b/sd/source/ui/toolpanel/ToolPanelViewShell.cxx index a4c060efc559..429d1564ad1f 100755 --- a/sd/source/ui/toolpanel/ToolPanelViewShell.cxx +++ b/sd/source/ui/toolpanel/ToolPanelViewShell.cxx @@ -1018,8 +1018,8 @@ void ToolPanelViewShell::ConnectToDockingWindow() PaneDockingWindow* pDockingWindow = dynamic_cast(GetDockingWindow()); if (pDockingWindow != NULL) { - pDockingWindow->InitializeTitleToolBox(); - mnMenuId = pDockingWindow->AddMenu ( + pDockingWindow->ResetToolBox(); + mnMenuId = pDockingWindow->AddDropDownToolBoxItem ( String(SdResId(STR_TASKPANEL_MASTER_PAGE_MENU_TITLE)), HID_SD_TASK_PANE_VIEW_MENU, LINK(this, ToolPanelViewShell, ToolboxClickHandler)); -- cgit From 409b6bcfcc3c8baa285d1bcb16f8063682a952a9 Mon Sep 17 00:00:00 2001 From: "Frank Schoenheit [fs]" Date: Fri, 9 Apr 2010 11:28:30 +0200 Subject: slidecopy: moved XToolPanel from css.view to css.ui, now that it is an XUIElement --- sd/source/ui/toolpanel/CustomToolPanel.hxx | 4 ++-- sd/workben/custompanel/ctp_panel.hxx | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'sd') diff --git a/sd/source/ui/toolpanel/CustomToolPanel.hxx b/sd/source/ui/toolpanel/CustomToolPanel.hxx index ee10c6748bbd..7f7f5ec3417d 100644 --- a/sd/source/ui/toolpanel/CustomToolPanel.hxx +++ b/sd/source/ui/toolpanel/CustomToolPanel.hxx @@ -33,7 +33,7 @@ #include #include #include -#include +#include /** === end UNO includes === **/ #include @@ -101,7 +101,7 @@ namespace sd { namespace toolpanel ::boost::shared_ptr< framework::FrameworkHelper > m_pFrameworkHelper; ::com::sun::star::uno::Reference< ::com::sun::star::drawing::framework::XResourceId > m_xPanelResourceId; ::com::sun::star::uno::Reference< ::com::sun::star::drawing::framework::XResource > m_xResource; - ::com::sun::star::uno::Reference< ::com::sun::star::view::XToolPanel > m_xToolPanel; + ::com::sun::star::uno::Reference< ::com::sun::star::ui::XToolPanel > m_xToolPanel; bool m_bAttemptedPanelCreation; sal_uInt32 m_nResourceAccessLock; }; diff --git a/sd/workben/custompanel/ctp_panel.hxx b/sd/workben/custompanel/ctp_panel.hxx index f991cc80516c..b42f17e67aae 100644 --- a/sd/workben/custompanel/ctp_panel.hxx +++ b/sd/workben/custompanel/ctp_panel.hxx @@ -29,7 +29,7 @@ /** === begin UNO includes === **/ #include -#include +#include #include #include #include @@ -50,7 +50,7 @@ namespace sd { namespace colortoolpanel //= class SingleColorPanel //================================================================================================================== typedef ::cppu::WeakComponentImplHelper3 < ::com::sun::star::drawing::framework::XView - , ::com::sun::star::view::XToolPanel + , ::com::sun::star::ui::XToolPanel , ::com::sun::star::awt::XPaintListener > SingleColorPanel_Base; class SingleColorPanel :public ::cppu::BaseMutex -- cgit From c88455c9782248b48bf897aa66cb5c1a4a4e3bfb Mon Sep 17 00:00:00 2001 From: "Frank Schoenheit [fs]" Date: Fri, 9 Apr 2010 12:25:00 +0200 Subject: slidecopy: resolved post-rebase build breakers (method signature changed in MWS) --- sd/source/ui/toolpanel/ToolPanelViewShell.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sd') diff --git a/sd/source/ui/toolpanel/ToolPanelViewShell.cxx b/sd/source/ui/toolpanel/ToolPanelViewShell.cxx index a4c060efc559..e3b6a3462f4f 100755 --- a/sd/source/ui/toolpanel/ToolPanelViewShell.cxx +++ b/sd/source/ui/toolpanel/ToolPanelViewShell.cxx @@ -502,7 +502,7 @@ ToolPanelViewShell_Impl::PanelActivation ToolPanelViewShell_Impl::SetupDefaultPa } // create the panels - Reference< XFrame > xFrame( m_rPanelViewShell.GetViewShellBase().GetViewFrame()->GetFrame()->GetFrameInterface() ); + Reference< XFrame > xFrame( m_rPanelViewShell.GetViewShellBase().GetViewFrame()->GetFrame().GetFrameInterface() ); const BOOL bHiContrast( m_pPanelDeck->GetSettings().GetStyleSettings().GetHighContrastMode() ); for ( size_t i=0; i < sizeof( aPanels ) / sizeof( aPanels[0] ); ++i ) { -- cgit From b405ae53ad7bf65d43383f8338df9cd2daa96aba Mon Sep 17 00:00:00 2001 From: sj Date: Fri, 9 Apr 2010 18:04:50 +0200 Subject: impress190: #110673# applied patch (removed some Boundchecker warnings) --- sd/source/filter/ppt/pptatom.cpp | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'sd') diff --git a/sd/source/filter/ppt/pptatom.cpp b/sd/source/filter/ppt/pptatom.cpp index 21a0c3c3f9f8..35c17692c5eb 100644 --- a/sd/source/filter/ppt/pptatom.cpp +++ b/sd/source/filter/ppt/pptatom.cpp @@ -49,7 +49,15 @@ Atom::Atom( const DffRecordHeader& rRecordHeader, SvStream& rStream ) Atom* pLastAtom = NULL; - while( (mrStream.GetError() == 0 ) && ( mrStream.Tell() < maRecordHeader.GetRecEndFilePos() ) ) + // retrieve file size (to allow sanity checks) + const sal_Size nStreamPos = mrStream.Tell(); + mrStream.Seek( STREAM_SEEK_TO_END ); + const sal_Size nStreamSize = mrStream.Tell(); + mrStream.Seek( nStreamPos ); + + while( (mrStream.GetError() == 0 ) + && ( mrStream.Tell() < nStreamSize ) + && ( mrStream.Tell() < maRecordHeader.GetRecEndFilePos() ) ) { mrStream >> aChildHeader; -- 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') 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 e0b8a71c2131f90e1fbb442693c7124ce7d86597 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Mon, 12 Apr 2010 15:34:14 +0100 Subject: cmcfixes74: #i110565 use radio buttons for mutually exclusive options in menus --- sd/uiconfig/sdraw/menubar/menubar.xml | 10 +++++----- sd/uiconfig/simpress/menubar/menubar.xml | 16 ++++++++-------- 2 files changed, 13 insertions(+), 13 deletions(-) (limited to 'sd') diff --git a/sd/uiconfig/sdraw/menubar/menubar.xml b/sd/uiconfig/sdraw/menubar/menubar.xml index 9e5d927b263e..20ca059b16d5 100644 --- a/sd/uiconfig/sdraw/menubar/menubar.xml +++ b/sd/uiconfig/sdraw/menubar/menubar.xml @@ -75,14 +75,14 @@ - - + + - - - + + + diff --git a/sd/uiconfig/simpress/menubar/menubar.xml b/sd/uiconfig/simpress/menubar/menubar.xml index c1dacd33e0c0..03d4c238e360 100644 --- a/sd/uiconfig/simpress/menubar/menubar.xml +++ b/sd/uiconfig/simpress/menubar/menubar.xml @@ -76,12 +76,12 @@ - - - + + + - - + + @@ -93,9 +93,9 @@ - - - + + + -- cgit From f4773f56d7861bd5354ceb93d35ffda50276bcd7 Mon Sep 17 00:00:00 2001 From: "Frank Schoenheit [fs]" Date: Tue, 13 Apr 2010 09:17:28 +0200 Subject: slidecopy: adjusted to new XToolPanel --- sd/workben/custompanel/ctp_panel.cxx | 10 ++++++++++ sd/workben/custompanel/ctp_panel.hxx | 1 + 2 files changed, 11 insertions(+) (limited to 'sd') diff --git a/sd/workben/custompanel/ctp_panel.cxx b/sd/workben/custompanel/ctp_panel.cxx index 7fb8ed8aeabe..f36dd897736c 100644 --- a/sd/workben/custompanel/ctp_panel.cxx +++ b/sd/workben/custompanel/ctp_panel.cxx @@ -76,6 +76,7 @@ namespace sd { namespace colortoolpanel using ::com::sun::star::lang::EventObject; using ::com::sun::star::awt::XDevice; using ::com::sun::star::awt::XGraphics; + using ::com::sun::star::accessibility::XAccessible; /** === end UNO using === **/ namespace WindowAttribute = ::com::sun::star::awt::WindowAttribute; namespace PosSize = ::com::sun::star::awt::PosSize; @@ -170,6 +171,15 @@ namespace sd { namespace colortoolpanel return m_xWindow; } + //------------------------------------------------------------------------------------------------------------------ + Reference< XAccessible > SAL_CALL SingleColorPanel::createAccessible( const Reference< XAccessible >& i_rParentAccessible ) throw (RuntimeException) + { + (void)i_rParentAccessible; + return Reference< XAccessible >( m_xWindow, UNO_QUERY ); + // TODO: this is, strictly, not correct, as we ignore i_ParentAccessible here. If you are not doing a sample + // extension only, you'll want to do this correctly .... + } + //------------------------------------------------------------------------------------------------------------------ Reference< XResourceId > SAL_CALL SingleColorPanel::getResourceId( ) throw (RuntimeException) { diff --git a/sd/workben/custompanel/ctp_panel.hxx b/sd/workben/custompanel/ctp_panel.hxx index b42f17e67aae..e82d33ea1b4d 100644 --- a/sd/workben/custompanel/ctp_panel.hxx +++ b/sd/workben/custompanel/ctp_panel.hxx @@ -65,6 +65,7 @@ namespace sd { namespace colortoolpanel // XToolPanel 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::accessibility::XAccessible > SAL_CALL createAccessible( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& ParentAccessible ) throw (::com::sun::star::uno::RuntimeException); // XView // (no methods) -- 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/inc/CustomAnimationCloner.hxx | 0 sd/inc/CustomAnimationEffect.hxx | 0 sd/inc/CustomAnimationPreset.hxx | 0 sd/inc/EffectMigration.hxx | 0 sd/inc/FactoryIds.hxx | 0 sd/inc/Outliner.hxx | 0 sd/inc/OutlinerIterator.hxx | 0 sd/inc/SdShapeTypes.hxx | 0 sd/inc/TransitionPreset.hxx | 0 sd/inc/animations.hxx | 0 sd/inc/anmdef.hxx | 0 sd/inc/anminfo.hxx | 0 sd/inc/app.hrc | 0 sd/inc/app.hxx | 0 sd/inc/cusshow.hxx | 0 sd/inc/diadef.h | 0 sd/inc/drawdoc.hxx | 0 sd/inc/eetext.hxx | 0 sd/inc/fadedef.h | 0 sd/inc/glob.hrc | 0 sd/inc/glob.hxx | 0 sd/inc/helper/simplereferencecomponent.hxx | 0 sd/inc/helpids.h | 0 sd/inc/imapinfo.hxx | 0 sd/inc/makefile.mk | 0 sd/inc/misc.hxx | 0 sd/inc/misc/scopelock.hxx | 0 sd/inc/movedef.hxx | 0 sd/inc/pch/precompiled_sd.cxx | 0 sd/inc/pch/precompiled_sd.hxx | 0 sd/inc/pglink.hxx | 0 sd/inc/pres.hxx | 0 sd/inc/prlayout.hxx | 0 sd/inc/resltn.hxx | 0 sd/inc/sd_primitivetypes2d.hxx | 0 sd/inc/sdabstdlg.hxx | 0 sd/inc/sdattr.hrc | 0 sd/inc/sdattr.hxx | 0 sd/inc/sdcgmfilter.hxx | 0 sd/inc/sddll.hxx | 0 sd/inc/sddllapi.h | 0 sd/inc/sdenumdef.hxx | 0 sd/inc/sderror.hxx | 0 sd/inc/sdfilter.hxx | 0 sd/inc/sdgrffilter.hxx | 0 sd/inc/sdhtmlfilter.hxx | 0 sd/inc/sdiocmpt.hxx | 0 sd/inc/sdmod.hxx | 0 sd/inc/sdobjfac.hxx | 0 sd/inc/sdpage.hxx | 0 sd/inc/sdpptwrp.hxx | 0 sd/inc/sdresid.hxx | 0 sd/inc/sduiks.hrc | 0 sd/inc/sdundo.hxx | 0 sd/inc/sdxmlwrp.hxx | 0 sd/inc/segdefs.hxx | 0 sd/inc/segdefs_.hxx | 0 sd/inc/shapelist.hxx | 0 sd/inc/stlfamily.hxx | 0 sd/inc/stlpool.hxx | 0 sd/inc/stlsheet.hxx | 0 sd/inc/strmname.h | 0 sd/inc/textapi.hxx | 0 sd/inc/undo/undofactory.hxx | 0 sd/inc/undo/undomanager.hxx | 0 sd/inc/undo/undoobjects.hxx | 0 sd/inc/undoanim.hxx | 0 sd/prj/d.lst | 0 sd/prj/make.bat | 0 sd/prj/postdlv.btm | 0 sd/prj/stree.bat | 0 sd/prj/struct.txt | 0 sd/qa/unoapi/knownissues.xcl | 0 sd/qa/unoapi/makefile.mk | 0 sd/qa/unoapi/sd.sce | 0 sd/res/buttons/glas-blue.zip | Bin sd/res/buttons/glas-green.zip | Bin sd/res/buttons/glas-red.zip | Bin sd/res/buttons/round-gorilla.zip | Bin sd/res/buttons/round-white.zip | Bin sd/res/buttons/simple.zip | Bin sd/res/buttons/square-blue.zip | Bin sd/res/buttons/square-gray.zip | Bin sd/res/buttons/square-green.zip | Bin sd/res/buttons/square-red.zip | Bin sd/res/buttons/square-yellow.zip | Bin sd/res/webview/common.inc | 0 sd/res/webview/common.pl | 0 sd/res/webview/edit.asp | 0 sd/res/webview/edit.pl | 0 sd/res/webview/editpic.asp | 0 sd/res/webview/editpic.pl | 0 sd/res/webview/index.pl | 0 sd/res/webview/poll.asp | 0 sd/res/webview/poll.pl | 0 sd/res/webview/savepic.asp | 0 sd/res/webview/savepic.pl | 0 sd/res/webview/show.asp | 0 sd/res/webview/show.pl | 0 sd/res/webview/webview.asp | 0 sd/res/webview/webview.pl | 0 sd/sdi/SlideSorterController.sdi | 0 sd/sdi/TaskPaneViewShell.sdi | 0 sd/sdi/ViewShellBase.sdi | 0 sd/sdi/_docsh.sdi | 0 sd/sdi/_drvwsh.sdi | 0 sd/sdi/app.sdi | 0 sd/sdi/docshell.sdi | 0 sd/sdi/drbezob.sdi | 0 sd/sdi/drgrfob.sdi | 0 sd/sdi/drtxtob.sdi | 0 sd/sdi/drviewsh.sdi | 0 sd/sdi/grdocsh.sdi | 0 sd/sdi/grviewsh.sdi | 0 sd/sdi/makefile.mk | 0 sd/sdi/mediaob.sdi | 0 sd/sdi/outlnvsh.sdi | 0 sd/sdi/sdgslots.sdi | 0 sd/sdi/sdnew.sdi | 0 sd/sdi/sdraw.sdi | 0 sd/sdi/sdslots.hrc | 0 sd/sdi/sdslots.sdi | 0 sd/sdi/tables.sdi | 0 sd/source/core/CustomAnimationCloner.cxx | 0 sd/source/core/CustomAnimationEffect.cxx | 0 sd/source/core/CustomAnimationPreset.cxx | 0 sd/source/core/EffectMigration.cxx | 0 sd/source/core/PageListWatcher.cxx | 0 sd/source/core/PageListWatcher.hxx | 0 sd/source/core/TransitionPreset.cxx | 0 sd/source/core/anminfo.cxx | 0 sd/source/core/annotations/Annotation.cxx | 0 sd/source/core/annotations/AnnotationAccess.cxx | 0 sd/source/core/annotations/AnnotationEnumeration.cxx | 0 sd/source/core/annotations/makefile.mk | 0 sd/source/core/cusshow.cxx | 0 sd/source/core/drawdoc.cxx | 0 sd/source/core/drawdoc2.cxx | 0 sd/source/core/drawdoc3.cxx | 0 sd/source/core/drawdoc4.cxx | 0 sd/source/core/drawdoc_animations.cxx | 0 sd/source/core/glob.src | 0 sd/source/core/makefile.mk | 0 sd/source/core/pglink.cxx | 0 sd/source/core/sdattr.cxx | 0 sd/source/core/sdiocmpt.cxx | 0 sd/source/core/sdobjfac.cxx | 0 sd/source/core/sdpage.cxx | 0 sd/source/core/sdpage2.cxx | 0 sd/source/core/sdpage_animations.cxx | 0 sd/source/core/shapelist.cxx | 0 sd/source/core/stlfamily.cxx | 0 sd/source/core/stlpool.cxx | 0 sd/source/core/stlsheet.cxx | 0 sd/source/core/text/makefile.mk | 0 sd/source/core/text/textapi.cxx | 0 sd/source/core/typemap.cxx | 0 sd/source/core/undo/makefile.mk | 0 sd/source/core/undo/undofactory.cxx | 0 sd/source/core/undo/undomanager.cxx | 0 sd/source/core/undo/undoobjects.cxx | 0 sd/source/core/undoanim.cxx | 0 sd/source/filter/cgm/makefile.mk | 0 sd/source/filter/cgm/sdcgmfilter.cxx | 0 sd/source/filter/eppt/eppt.cxx | 0 sd/source/filter/eppt/eppt.hxx | 0 sd/source/filter/eppt/epptdef.hxx | 0 sd/source/filter/eppt/epptso.cxx | 0 sd/source/filter/eppt/escherex.cxx | 0 sd/source/filter/eppt/escherex.hxx | 0 sd/source/filter/eppt/makefile.mk | 0 sd/source/filter/eppt/pptexanimations.cxx | 0 sd/source/filter/eppt/pptexanimations.hxx | 0 sd/source/filter/eppt/pptexsoundcollection.cxx | 0 sd/source/filter/eppt/pptexsoundcollection.hxx | 0 sd/source/filter/grf/makefile.mk | 0 sd/source/filter/grf/sdgrffilter.cxx | 0 sd/source/filter/html/HtmlOptionsDialog.cxx | 0 sd/source/filter/html/buttonset.cxx | 0 sd/source/filter/html/buttonset.hxx | 0 sd/source/filter/html/htmlattr.cxx | 0 sd/source/filter/html/htmlattr.hxx | 0 sd/source/filter/html/htmlex.cxx | 0 sd/source/filter/html/htmlex.hxx | 0 sd/source/filter/html/makefile.mk | 0 sd/source/filter/html/pubdlg.cxx | 0 sd/source/filter/html/pubdlg.src | 0 sd/source/filter/html/sdhtmlfilter.cxx | 0 sd/source/filter/makefile.mk | 0 sd/source/filter/ppt/makefile.mk | 0 sd/source/filter/ppt/ppt97animations.cxx | 0 sd/source/filter/ppt/ppt97animations.hxx | 0 sd/source/filter/ppt/pptanimations.hxx | 0 sd/source/filter/ppt/pptatom.cpp | 0 sd/source/filter/ppt/pptatom.hxx | 0 sd/source/filter/ppt/pptin.cxx | 0 sd/source/filter/ppt/pptin.hxx | 0 sd/source/filter/ppt/pptinanimations.cxx | 0 sd/source/filter/ppt/pptinanimations.hxx | 0 sd/source/filter/ppt/propread.cxx | 0 sd/source/filter/ppt/propread.hxx | 0 sd/source/filter/sdfilter.cxx | 0 sd/source/filter/sdpptwrp.cxx | 0 sd/source/filter/xml/makefile.mk | 0 sd/source/filter/xml/sdtransform.cxx | 0 sd/source/filter/xml/sdxmlwrp.cxx | 0 sd/source/helper/makefile.mk | 0 sd/source/helper/simplereferencecomponent.cxx | 0 sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx | 0 sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx | 0 sd/source/ui/accessibility/AccessibleOutlineEditSource.cxx | 0 sd/source/ui/accessibility/AccessibleOutlineView.cxx | 0 sd/source/ui/accessibility/AccessiblePageShape.cxx | 0 .../ui/accessibility/AccessiblePresentationGraphicShape.cxx | 0 .../ui/accessibility/AccessiblePresentationOLEShape.cxx | 0 sd/source/ui/accessibility/AccessiblePresentationShape.cxx | 0 sd/source/ui/accessibility/AccessibleScrollPanel.cxx | 0 sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx | 0 sd/source/ui/accessibility/AccessibleSlideSorterView.cxx | 0 sd/source/ui/accessibility/AccessibleTaskPane.cxx | 0 sd/source/ui/accessibility/AccessibleTreeNode.cxx | 0 sd/source/ui/accessibility/AccessibleViewForwarder.cxx | 0 sd/source/ui/accessibility/SdShapeTypes.cxx | 0 sd/source/ui/accessibility/accessibility.hrc | 0 sd/source/ui/accessibility/accessibility.src | 0 sd/source/ui/animations/AnimationSchemesPane.cxx | 0 sd/source/ui/animations/AnimationSchemesPane.hrc | 0 sd/source/ui/animations/AnimationSchemesPane.hxx | 0 sd/source/ui/animations/AnimationSchemesPane.src | 0 sd/source/ui/animations/CustomAnimation.hrc | 0 sd/source/ui/animations/CustomAnimation.src | 0 sd/source/ui/animations/CustomAnimationCreateDialog.cxx | 0 sd/source/ui/animations/CustomAnimationCreateDialog.hrc | 0 sd/source/ui/animations/CustomAnimationCreateDialog.hxx | 0 sd/source/ui/animations/CustomAnimationCreateDialog.src | 0 sd/source/ui/animations/CustomAnimationDialog.cxx | 0 sd/source/ui/animations/CustomAnimationDialog.hrc | 0 sd/source/ui/animations/CustomAnimationDialog.hxx | 0 sd/source/ui/animations/CustomAnimationDialog.src | 0 sd/source/ui/animations/CustomAnimationList.cxx | 0 sd/source/ui/animations/CustomAnimationList.hxx | 0 sd/source/ui/animations/CustomAnimationPane.cxx | 0 sd/source/ui/animations/CustomAnimationPane.hrc | 0 sd/source/ui/animations/CustomAnimationPane.hxx | 0 sd/source/ui/animations/CustomAnimationPane.src | 0 sd/source/ui/animations/CustomAnimationSchemesPane.hrc | 0 sd/source/ui/animations/CustomAnimationSchemesPane.src | 0 sd/source/ui/animations/DialogListBox.cxx | 0 sd/source/ui/animations/STLPropertySet.cxx | 0 sd/source/ui/animations/STLPropertySet.hxx | 0 sd/source/ui/animations/SlideTransitionPane.cxx | 0 sd/source/ui/animations/SlideTransitionPane.hrc | 0 sd/source/ui/animations/SlideTransitionPane.hxx | 0 sd/source/ui/animations/SlideTransitionPane.src | 0 sd/source/ui/animations/makefile.mk | 0 sd/source/ui/animations/motionpathtag.cxx | 0 sd/source/ui/animations/motionpathtag.hxx | 0 sd/source/ui/annotations/annotationmanager.cxx | 0 sd/source/ui/annotations/annotations.hrc | 0 sd/source/ui/annotations/annotations.src | 0 sd/source/ui/annotations/annotationtag.cxx | 0 sd/source/ui/annotations/annotationtag.hxx | 0 sd/source/ui/annotations/annotationwindow.cxx | 0 sd/source/ui/annotations/annotationwindow.hxx | 0 sd/source/ui/annotations/makefile.mk | 0 sd/source/ui/app/_app.hrc | 0 sd/source/ui/app/accel_tmpl.src | 0 sd/source/ui/app/accelids_tmpl.src | 0 sd/source/ui/app/app.img | 0 sd/source/ui/app/app.src | 0 sd/source/ui/app/makefile.mk | 0 sd/source/ui/app/menu_tmpl.src | 0 sd/source/ui/app/menuids2_tmpl.src | 0 sd/source/ui/app/menuids3_tmpl.src | 0 sd/source/ui/app/menuids4_tmpl.src | 0 sd/source/ui/app/menuids_tmpl.src | 0 sd/source/ui/app/menuportal_tmpl.src | 0 sd/source/ui/app/popup.src | 0 sd/source/ui/app/popup2_tmpl.src | 0 sd/source/ui/app/res_bmp.src | 0 sd/source/ui/app/sddll.cxx | 0 sd/source/ui/app/sddll1.cxx | 0 sd/source/ui/app/sddll2.cxx | 0 sd/source/ui/app/sdmod.cxx | 0 sd/source/ui/app/sdmod1.cxx | 0 sd/source/ui/app/sdmod2.cxx | 0 sd/source/ui/app/sdpopup.cxx | 0 sd/source/ui/app/sdresid.cxx | 0 sd/source/ui/app/sdstring.src | 0 sd/source/ui/app/sdxfer.cxx | 0 sd/source/ui/app/strings.src | 0 sd/source/ui/app/tbx_ww.src | 0 sd/source/ui/app/tbxids_tmpl.src | 0 sd/source/ui/app/tbxww.cxx | 0 sd/source/ui/app/tmplctrl.cxx | 0 sd/source/ui/app/toolbox.src | 0 sd/source/ui/app/toolbox2_tmpl.src | 0 sd/source/ui/controller/makefile.mk | 0 sd/source/ui/controller/slidelayoutcontroller.cxx | 1 + sd/source/ui/controller/slidelayoutcontroller.hxx | 0 sd/source/ui/dlg/AnimationChildWindow.cxx | 0 sd/source/ui/dlg/LayerDialog.src | 0 sd/source/ui/dlg/LayerDialogChildWindow.cxx | 0 sd/source/ui/dlg/LayerDialogContent.cxx | 0 sd/source/ui/dlg/LayerTabBar.cxx | 0 sd/source/ui/dlg/NavigatorChildWindow.cxx | 0 sd/source/ui/dlg/PaneChildWindows.cxx | 0 sd/source/ui/dlg/PaneDockingWindow.cxx | 0 sd/source/ui/dlg/PaneDockingWindow.src | 0 sd/source/ui/dlg/PaneShells.cxx | 0 sd/source/ui/dlg/SpellDialogChildWindow.cxx | 0 sd/source/ui/dlg/TemplateScanner.cxx | 0 sd/source/ui/dlg/animobjs.cxx | 0 sd/source/ui/dlg/animobjs.src | 0 sd/source/ui/dlg/assclass.cxx | 0 sd/source/ui/dlg/brkdlg.cxx | 0 sd/source/ui/dlg/brkdlg.src | 0 sd/source/ui/dlg/celltempl.cxx | 0 sd/source/ui/dlg/celltempl.src | 0 sd/source/ui/dlg/copydlg.cxx | 0 sd/source/ui/dlg/copydlg.src | 0 sd/source/ui/dlg/custsdlg.cxx | 0 sd/source/ui/dlg/custsdlg.src | 0 sd/source/ui/dlg/diactrl.cxx | 0 sd/source/ui/dlg/dlg_char.src | 0 sd/source/ui/dlg/dlgass.cxx | 0 sd/source/ui/dlg/dlgass.src | 0 sd/source/ui/dlg/dlgassim.cxx | 0 sd/source/ui/dlg/dlgassim.hxx | 0 sd/source/ui/dlg/dlgchar.cxx | 0 sd/source/ui/dlg/dlgctrls.cxx | 0 sd/source/ui/dlg/dlgfield.cxx | 0 sd/source/ui/dlg/dlgfield.src | 0 sd/source/ui/dlg/dlgolbul.cxx | 0 sd/source/ui/dlg/dlgolbul.src | 0 sd/source/ui/dlg/dlgpage.cxx | 0 sd/source/ui/dlg/dlgpage.src | 0 sd/source/ui/dlg/dlgsnap.cxx | 0 sd/source/ui/dlg/dlgsnap.src | 0 sd/source/ui/dlg/docprev.cxx | 0 sd/source/ui/dlg/filedlg.cxx | 0 sd/source/ui/dlg/gluectrl.cxx | 0 sd/source/ui/dlg/headerfooterdlg.cxx | 0 sd/source/ui/dlg/headerfooterdlg.src | 0 sd/source/ui/dlg/ins_paste.cxx | 0 sd/source/ui/dlg/ins_paste.src | 0 sd/source/ui/dlg/inspagob.cxx | 0 sd/source/ui/dlg/inspagob.src | 0 sd/source/ui/dlg/layeroptionsdlg.cxx | 0 sd/source/ui/dlg/layeroptionsdlg.src | 0 sd/source/ui/dlg/makefile.mk | 0 sd/source/ui/dlg/masterlayoutdlg.cxx | 0 sd/source/ui/dlg/masterlayoutdlg.src | 0 sd/source/ui/dlg/morphdlg.cxx | 0 sd/source/ui/dlg/morphdlg.src | 0 sd/source/ui/dlg/navigatr.cxx | 0 sd/source/ui/dlg/navigatr.src | 0 sd/source/ui/dlg/paragr.cxx | 0 sd/source/ui/dlg/paragr.src | 0 sd/source/ui/dlg/present.cxx | 0 sd/source/ui/dlg/present.src | 0 sd/source/ui/dlg/printdialog.cxx | 0 sd/source/ui/dlg/printdialog.hrc | 0 sd/source/ui/dlg/printdialog.src | 0 sd/source/ui/dlg/printdlg.cxx | 0 sd/source/ui/dlg/printdlg.src | 0 sd/source/ui/dlg/prltempl.cxx | 0 sd/source/ui/dlg/prltempl.src | 0 sd/source/ui/dlg/prntopts.cxx | 0 sd/source/ui/dlg/prntopts.src | 0 sd/source/ui/dlg/sdabstdlg.cxx | 0 sd/source/ui/dlg/sddlgfact.cxx | 0 sd/source/ui/dlg/sddlgfact.hxx | 0 sd/source/ui/dlg/sdpreslt.cxx | 0 sd/source/ui/dlg/sdpreslt.src | 0 sd/source/ui/dlg/sdtreelb.cxx | 0 sd/source/ui/dlg/sduiexp.cxx | 0 sd/source/ui/dlg/tabtempl.cxx | 0 sd/source/ui/dlg/tabtempl.src | 0 sd/source/ui/dlg/tpaction.cxx | 0 sd/source/ui/dlg/tpaction.src | 0 sd/source/ui/dlg/tpoption.cxx | 0 sd/source/ui/dlg/tpoption.src | 0 sd/source/ui/dlg/unchss.cxx | 0 sd/source/ui/dlg/vectdlg.cxx | 0 sd/source/ui/dlg/vectdlg.src | 0 sd/source/ui/docshell/docshel2.cxx | 0 sd/source/ui/docshell/docshel3.cxx | 0 sd/source/ui/docshell/docshel4.cxx | 0 sd/source/ui/docshell/docshell.cxx | 0 sd/source/ui/docshell/grdocsh.cxx | 0 sd/source/ui/docshell/makefile.mk | 0 sd/source/ui/docshell/sdclient.cxx | 0 sd/source/ui/framework/configuration/ChangeRequestQueue.cxx | 0 sd/source/ui/framework/configuration/ChangeRequestQueue.hxx | 0 .../framework/configuration/ChangeRequestQueueProcessor.cxx | 0 .../framework/configuration/ChangeRequestQueueProcessor.hxx | 0 sd/source/ui/framework/configuration/Configuration.cxx | 0 .../ui/framework/configuration/ConfigurationClassifier.cxx | 0 .../ui/framework/configuration/ConfigurationClassifier.hxx | 0 .../ui/framework/configuration/ConfigurationController.cxx | 0 .../configuration/ConfigurationControllerBroadcaster.cxx | 0 .../configuration/ConfigurationControllerBroadcaster.hxx | 0 .../ConfigurationControllerResourceManager.cxx | 0 .../ConfigurationControllerResourceManager.hxx | 0 .../ui/framework/configuration/ConfigurationTracer.cxx | 0 .../ui/framework/configuration/ConfigurationTracer.hxx | 0 .../ui/framework/configuration/ConfigurationUpdater.cxx | 0 .../ui/framework/configuration/ConfigurationUpdater.hxx | 0 .../configuration/GenericConfigurationChangeRequest.cxx | 0 .../configuration/GenericConfigurationChangeRequest.hxx | 0 .../ui/framework/configuration/ResourceFactoryManager.cxx | 0 .../ui/framework/configuration/ResourceFactoryManager.hxx | 0 sd/source/ui/framework/configuration/ResourceId.cxx | 0 sd/source/ui/framework/configuration/UpdateRequest.cxx | 0 sd/source/ui/framework/configuration/UpdateRequest.hxx | 0 sd/source/ui/framework/configuration/makefile.mk | 0 sd/source/ui/framework/factories/BasicPaneFactory.cxx | 0 sd/source/ui/framework/factories/BasicPaneFactory.hxx | 0 sd/source/ui/framework/factories/BasicToolBarFactory.cxx | 0 sd/source/ui/framework/factories/BasicToolBarFactory.hxx | 0 sd/source/ui/framework/factories/BasicViewFactory.cxx | 0 sd/source/ui/framework/factories/BasicViewFactory.hxx | 0 sd/source/ui/framework/factories/ChildWindowPane.cxx | 0 sd/source/ui/framework/factories/ChildWindowPane.hxx | 0 sd/source/ui/framework/factories/FrameWindowPane.cxx | 0 sd/source/ui/framework/factories/FrameWindowPane.hxx | 0 sd/source/ui/framework/factories/FullScreenPane.cxx | 0 sd/source/ui/framework/factories/FullScreenPane.hxx | 0 sd/source/ui/framework/factories/Pane.cxx | 0 sd/source/ui/framework/factories/PresentationFactory.cxx | 0 sd/source/ui/framework/factories/TaskPanelFactory.cxx | 0 sd/source/ui/framework/factories/TaskPanelFactory.hxx | 0 sd/source/ui/framework/factories/ViewShellWrapper.cxx | 0 sd/source/ui/framework/factories/makefile.mk | 0 sd/source/ui/framework/module/CenterViewFocusModule.cxx | 0 sd/source/ui/framework/module/CenterViewFocusModule.hxx | 0 sd/source/ui/framework/module/DrawModule.cxx | 0 sd/source/ui/framework/module/ImpressModule.cxx | 0 sd/source/ui/framework/module/ModuleController.cxx | 0 sd/source/ui/framework/module/PresentationModule.cxx | 0 sd/source/ui/framework/module/ReadOnlyModeObserver.cxx | 0 sd/source/ui/framework/module/ReadOnlyModeObserver.hxx | 0 sd/source/ui/framework/module/ResourceManager.cxx | 0 sd/source/ui/framework/module/ResourceManager.hxx | 0 sd/source/ui/framework/module/ShellStackGuard.cxx | 0 sd/source/ui/framework/module/ShellStackGuard.hxx | 0 sd/source/ui/framework/module/SlideSorterModule.cxx | 0 sd/source/ui/framework/module/SlideSorterModule.hxx | 0 sd/source/ui/framework/module/TaskPaneModule.cxx | 0 sd/source/ui/framework/module/TaskPaneModule.hxx | 0 sd/source/ui/framework/module/ToolBarModule.cxx | 0 sd/source/ui/framework/module/ToolBarModule.hxx | 0 sd/source/ui/framework/module/ViewTabBarModule.cxx | 0 sd/source/ui/framework/module/ViewTabBarModule.hxx | 0 sd/source/ui/framework/module/makefile.mk | 0 sd/source/ui/framework/tools/FrameworkHelper.cxx | 0 sd/source/ui/framework/tools/makefile.mk | 0 sd/source/ui/func/bulmaper.cxx | 0 sd/source/ui/func/fuarea.cxx | 0 sd/source/ui/func/fubullet.cxx | 0 sd/source/ui/func/fuchar.cxx | 0 sd/source/ui/func/fucon3d.cxx | 0 sd/source/ui/func/fuconarc.cxx | 0 sd/source/ui/func/fuconbez.cxx | 0 sd/source/ui/func/fuconcs.cxx | 0 sd/source/ui/func/fuconnct.cxx | 0 sd/source/ui/func/fuconrec.cxx | 0 sd/source/ui/func/fuconstr.cxx | 0 sd/source/ui/func/fuconuno.cxx | 0 sd/source/ui/func/fucopy.cxx | 0 sd/source/ui/func/fucushow.cxx | 0 sd/source/ui/func/fudraw.cxx | 0 sd/source/ui/func/fudspord.cxx | 0 sd/source/ui/func/fuediglu.cxx | 0 sd/source/ui/func/fuexpand.cxx | 0 sd/source/ui/func/fuformatpaintbrush.cxx | 0 sd/source/ui/func/fuhhconv.cxx | 0 sd/source/ui/func/fuinsert.cxx | 0 sd/source/ui/func/fuinsfil.cxx | 0 sd/source/ui/func/fuline.cxx | 0 sd/source/ui/func/fulinend.cxx | 0 sd/source/ui/func/fulink.cxx | 0 sd/source/ui/func/fumeasur.cxx | 0 sd/source/ui/func/fumorph.cxx | 0 sd/source/ui/func/fuoaprms.cxx | 0 sd/source/ui/func/fuolbull.cxx | 0 sd/source/ui/func/fuoltext.cxx | 0 sd/source/ui/func/fuoutl.cxx | 0 sd/source/ui/func/fupage.cxx | 0 sd/source/ui/func/fuparagr.cxx | 0 sd/source/ui/func/fupoor.cxx | 0 sd/source/ui/func/fuprlout.cxx | 0 sd/source/ui/func/fuprobjs.cxx | 0 sd/source/ui/func/fuscale.cxx | 0 sd/source/ui/func/fusearch.cxx | 0 sd/source/ui/func/fusel.cxx | 0 sd/source/ui/func/fusldlg.cxx | 0 sd/source/ui/func/fusnapln.cxx | 0 sd/source/ui/func/fuspell.cxx | 0 sd/source/ui/func/fusumry.cxx | 0 sd/source/ui/func/futempl.cxx | 0 sd/source/ui/func/futext.cxx | 0 sd/source/ui/func/futext2.cxx | 0 sd/source/ui/func/futhes.cxx | 0 sd/source/ui/func/futransf.cxx | 0 sd/source/ui/func/futxtatt.cxx | 0 sd/source/ui/func/fuvect.cxx | 0 sd/source/ui/func/fuzoom.cxx | 0 sd/source/ui/func/makefile.mk | 0 sd/source/ui/func/outlinfo.cxx | 0 sd/source/ui/func/sdundo.cxx | 0 sd/source/ui/func/sdundogr.cxx | 0 sd/source/ui/func/smarttag.cxx | 0 sd/source/ui/func/undoback.cxx | 0 sd/source/ui/func/undoheaderfooter.cxx | 0 sd/source/ui/func/undolayer.cxx | 0 sd/source/ui/func/undopage.cxx | 0 sd/source/ui/func/unmovss.cxx | 0 sd/source/ui/func/unoaprms.cxx | 0 sd/source/ui/func/unprlout.cxx | 0 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 sd/source/ui/presenter/CanvasUpdateRequester.cxx | 0 sd/source/ui/presenter/CanvasUpdateRequester.hxx | 0 sd/source/ui/presenter/PresenterCanvas.cxx | 0 sd/source/ui/presenter/PresenterCanvas.hxx | 0 sd/source/ui/presenter/PresenterCanvasFactory.cxx | 0 sd/source/ui/presenter/PresenterHelper.cxx | 0 sd/source/ui/presenter/PresenterHelper.hxx | 0 sd/source/ui/presenter/PresenterPreviewCache.cxx | 0 sd/source/ui/presenter/PresenterPreviewCache.hxx | 0 sd/source/ui/presenter/PresenterTextView.cxx | 0 sd/source/ui/presenter/PresenterTextView.hxx | 0 sd/source/ui/presenter/SlideRenderer.cxx | 0 sd/source/ui/presenter/SlideRenderer.hxx | 0 sd/source/ui/presenter/makefile.mk | 0 sd/source/ui/slideshow/PaneHider.cxx | 0 sd/source/ui/slideshow/PaneHider.hxx | 0 sd/source/ui/slideshow/SlideShowRestarter.cxx | 0 sd/source/ui/slideshow/SlideShowRestarter.hxx | 0 sd/source/ui/slideshow/makefile.mk | 0 sd/source/ui/slideshow/showwin.cxx | 0 sd/source/ui/slideshow/showwindow.hxx | 0 sd/source/ui/slideshow/slideshow.cxx | 0 sd/source/ui/slideshow/slideshow.hrc | 0 sd/source/ui/slideshow/slideshow.src | 0 sd/source/ui/slideshow/slideshowimpl.cxx | 0 sd/source/ui/slideshow/slideshowimpl.hxx | 0 sd/source/ui/slideshow/slideshowviewimpl.cxx | 0 sd/source/ui/slideshow/slideshowviewimpl.hxx | 0 sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx | 0 sd/source/ui/slidesorter/cache/SlsBitmapCache.hxx | 0 sd/source/ui/slidesorter/cache/SlsBitmapCompressor.cxx | 0 sd/source/ui/slidesorter/cache/SlsBitmapCompressor.hxx | 0 sd/source/ui/slidesorter/cache/SlsBitmapFactory.cxx | 0 sd/source/ui/slidesorter/cache/SlsBitmapFactory.hxx | 0 sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx | 0 sd/source/ui/slidesorter/cache/SlsCacheCompactor.hxx | 0 sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx | 0 sd/source/ui/slidesorter/cache/SlsCacheConfiguration.hxx | 0 sd/source/ui/slidesorter/cache/SlsGenericPageCache.cxx | 0 sd/source/ui/slidesorter/cache/SlsGenericPageCache.hxx | 0 sd/source/ui/slidesorter/cache/SlsIdleDetector.cxx | 0 sd/source/ui/slidesorter/cache/SlsIdleDetector.hxx | 0 sd/source/ui/slidesorter/cache/SlsPageCache.cxx | 0 sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx | 0 sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx | 0 sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx | 0 sd/source/ui/slidesorter/cache/SlsQueueProcessorThread.hxx | 0 sd/source/ui/slidesorter/cache/SlsRequestFactory.cxx | 0 sd/source/ui/slidesorter/cache/SlsRequestFactory.hxx | 0 sd/source/ui/slidesorter/cache/SlsRequestPriorityClass.hxx | 0 sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx | 0 sd/source/ui/slidesorter/cache/SlsRequestQueue.hxx | 0 sd/source/ui/slidesorter/cache/makefile.mk | 0 .../ui/slidesorter/controller/SlideSorterController.cxx | 0 sd/source/ui/slidesorter/controller/SlsAnimator.cxx | 0 sd/source/ui/slidesorter/controller/SlsClipboard.cxx | 0 sd/source/ui/slidesorter/controller/SlsCommand.hxx | 0 .../ui/slidesorter/controller/SlsCurrentSlideManager.cxx | 0 sd/source/ui/slidesorter/controller/SlsFocusManager.cxx | 0 .../ui/slidesorter/controller/SlsHideSlideFunction.cxx | 0 .../ui/slidesorter/controller/SlsHideSlideFunction.hxx | 0 sd/source/ui/slidesorter/controller/SlsListener.cxx | 0 sd/source/ui/slidesorter/controller/SlsListener.hxx | 0 .../ui/slidesorter/controller/SlsPageObjectFactory.cxx | 0 sd/source/ui/slidesorter/controller/SlsPageSelector.cxx | 0 sd/source/ui/slidesorter/controller/SlsProperties.cxx | 0 sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx | 0 sd/source/ui/slidesorter/controller/SlsSelectionCommand.cxx | 0 sd/source/ui/slidesorter/controller/SlsSelectionCommand.hxx | 0 .../ui/slidesorter/controller/SlsSelectionFunction.cxx | 0 sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx | 0 sd/source/ui/slidesorter/controller/SlsSlideFunction.cxx | 0 sd/source/ui/slidesorter/controller/SlsSlotManager.cxx | 0 sd/source/ui/slidesorter/controller/SlsTransferable.cxx | 0 sd/source/ui/slidesorter/controller/SlsTransferable.hxx | 0 sd/source/ui/slidesorter/controller/makefile.mk | 0 sd/source/ui/slidesorter/inc/cache/SlsCacheContext.hxx | 0 sd/source/ui/slidesorter/inc/cache/SlsPageCache.hxx | 0 sd/source/ui/slidesorter/inc/cache/SlsPageCacheManager.hxx | 0 .../ui/slidesorter/inc/controller/SlideSorterController.hxx | 0 sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx | 0 sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx | 0 .../slidesorter/inc/controller/SlsCurrentSlideManager.hxx | 0 sd/source/ui/slidesorter/inc/controller/SlsFocusManager.hxx | 0 .../ui/slidesorter/inc/controller/SlsPageObjectFactory.hxx | 0 sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx | 0 sd/source/ui/slidesorter/inc/controller/SlsProperties.hxx | 0 .../ui/slidesorter/inc/controller/SlsScrollBarManager.hxx | 0 .../ui/slidesorter/inc/controller/SlsSelectionFunction.hxx | 0 .../ui/slidesorter/inc/controller/SlsSelectionManager.hxx | 0 .../ui/slidesorter/inc/controller/SlsSlideFunction.hxx | 0 sd/source/ui/slidesorter/inc/controller/SlsSlotManager.hxx | 0 sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx | 0 sd/source/ui/slidesorter/inc/model/SlsEnumeration.hxx | 0 sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx | 0 sd/source/ui/slidesorter/inc/model/SlsPageEnumeration.hxx | 0 .../ui/slidesorter/inc/model/SlsPageEnumerationProvider.hxx | 0 .../ui/slidesorter/inc/model/SlsSharedPageDescriptor.hxx | 0 sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx | 0 sd/source/ui/slidesorter/inc/view/SlsFontProvider.hxx | 0 sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx | 0 sd/source/ui/slidesorter/inc/view/SlsPageObject.hxx | 0 .../ui/slidesorter/inc/view/SlsPageObjectViewContact.hxx | 0 .../slidesorter/inc/view/SlsPageObjectViewObjectContact.hxx | 0 sd/source/ui/slidesorter/inc/view/SlsViewOverlay.hxx | 0 sd/source/ui/slidesorter/makefile.mk | 0 sd/source/ui/slidesorter/model/SlideSorterModel.cxx | 0 sd/source/ui/slidesorter/model/SlsPageDescriptor.cxx | 0 sd/source/ui/slidesorter/model/SlsPageEnumeration.cxx | 0 .../ui/slidesorter/model/SlsPageEnumerationProvider.cxx | 0 sd/source/ui/slidesorter/model/makefile.mk | 0 sd/source/ui/slidesorter/shell/SlideSorter.cxx | 0 sd/source/ui/slidesorter/shell/SlideSorterChildWindow.cxx | 0 sd/source/ui/slidesorter/shell/SlideSorterChildWindow.src | 0 sd/source/ui/slidesorter/shell/SlideSorterService.cxx | 0 sd/source/ui/slidesorter/shell/SlideSorterService.hxx | 0 sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx | 0 sd/source/ui/slidesorter/shell/makefile.mk | 0 sd/source/ui/slidesorter/view/SlideSorterView.cxx | 0 sd/source/ui/slidesorter/view/SlsFontProvider.cxx | 0 sd/source/ui/slidesorter/view/SlsLayouter.cxx | 0 sd/source/ui/slidesorter/view/SlsPageObject.cxx | 0 sd/source/ui/slidesorter/view/SlsPageObjectViewContact.cxx | 0 .../ui/slidesorter/view/SlsPageObjectViewObjectContact.cxx | 0 sd/source/ui/slidesorter/view/SlsViewCacheContext.cxx | 0 sd/source/ui/slidesorter/view/SlsViewCacheContext.hxx | 0 sd/source/ui/slidesorter/view/SlsViewOverlay.cxx | 0 sd/source/ui/slidesorter/view/makefile.mk | 0 sd/source/ui/table/TableDesignPane.cxx | 0 sd/source/ui/table/TableDesignPane.hrc | 0 sd/source/ui/table/TableDesignPane.hxx | 0 sd/source/ui/table/TableDesignPane.src | 0 sd/source/ui/table/makefile.mk | 0 sd/source/ui/table/tablefunction.cxx | 0 sd/source/ui/table/tableobjectbar.cxx | 0 sd/source/ui/table/tableobjectbar.hxx | 0 sd/source/ui/toolpanel/ConstrainedIterator.cxx | 0 sd/source/ui/toolpanel/ConstrainedIterator.hxx | 0 sd/source/ui/toolpanel/ControlContainer.cxx | 0 sd/source/ui/toolpanel/ControlContainerDescriptor.hxx | 0 sd/source/ui/toolpanel/ControlDescriptorIterator.cxx | 0 sd/source/ui/toolpanel/ControlList.hxx | 0 sd/source/ui/toolpanel/EmptyWindow.cxx | 0 sd/source/ui/toolpanel/EmptyWindow.hxx | 0 sd/source/ui/toolpanel/LayoutMenu.cxx | 0 sd/source/ui/toolpanel/LayoutMenu.hxx | 0 sd/source/ui/toolpanel/LayoutableWindow.hxx | 0 sd/source/ui/toolpanel/ScrollPanel.cxx | 0 sd/source/ui/toolpanel/SimpleLayoutWrapper.cxx | 0 sd/source/ui/toolpanel/SimpleLayoutWrapper.hxx | 0 sd/source/ui/toolpanel/SlideSorterCacheDisplay.cxx | 0 sd/source/ui/toolpanel/SubToolPanel.cxx | 0 sd/source/ui/toolpanel/TaskPaneControlFactory.cxx | 0 sd/source/ui/toolpanel/TaskPaneFocusManager.cxx | 0 sd/source/ui/toolpanel/TaskPaneFocusManager.hxx | 0 sd/source/ui/toolpanel/TaskPaneShellManager.cxx | 0 sd/source/ui/toolpanel/TaskPaneShellManager.hxx | 0 sd/source/ui/toolpanel/TaskPaneTreeNode.cxx | 0 sd/source/ui/toolpanel/TaskPaneViewShell.cxx | 0 sd/source/ui/toolpanel/TestMenu.cxx | 0 sd/source/ui/toolpanel/TestMenu.hxx | 0 sd/source/ui/toolpanel/TestPanel.cxx | 0 sd/source/ui/toolpanel/TestPanel.hxx | 0 sd/source/ui/toolpanel/TitleBar.cxx | 0 sd/source/ui/toolpanel/TitleToolBox.cxx | 0 sd/source/ui/toolpanel/TitleToolBox.hxx | 0 sd/source/ui/toolpanel/TitledControl.cxx | 0 sd/source/ui/toolpanel/ToolPanel.cxx | 0 sd/source/ui/toolpanel/ToolPanelChildWindow.cxx | 0 sd/source/ui/toolpanel/ToolPanelChildWindow.src | 0 sd/source/ui/toolpanel/ToolPanelDescriptor.hxx | 0 sd/source/ui/toolpanel/controls/AllMasterPagesSelector.cxx | 0 sd/source/ui/toolpanel/controls/AllMasterPagesSelector.hxx | 0 sd/source/ui/toolpanel/controls/AnimationSchemesPanel.cxx | 0 sd/source/ui/toolpanel/controls/AnimationSchemesPanel.hxx | 0 .../ui/toolpanel/controls/CurrentMasterPagesSelector.cxx | 0 .../ui/toolpanel/controls/CurrentMasterPagesSelector.hxx | 0 sd/source/ui/toolpanel/controls/CustomAnimationPanel.cxx | 0 sd/source/ui/toolpanel/controls/CustomAnimationPanel.hxx | 0 sd/source/ui/toolpanel/controls/DocumentHelper.cxx | 0 sd/source/ui/toolpanel/controls/DocumentHelper.hxx | 0 sd/source/ui/toolpanel/controls/MasterPageContainer.cxx | 0 sd/source/ui/toolpanel/controls/MasterPageContainer.hxx | 0 .../ui/toolpanel/controls/MasterPageContainerFiller.cxx | 0 .../ui/toolpanel/controls/MasterPageContainerFiller.hxx | 0 .../ui/toolpanel/controls/MasterPageContainerProviders.cxx | 0 .../ui/toolpanel/controls/MasterPageContainerProviders.hxx | 0 .../ui/toolpanel/controls/MasterPageContainerQueue.cxx | 0 .../ui/toolpanel/controls/MasterPageContainerQueue.hxx | 0 sd/source/ui/toolpanel/controls/MasterPageDescriptor.cxx | 0 sd/source/ui/toolpanel/controls/MasterPageDescriptor.hxx | 0 sd/source/ui/toolpanel/controls/MasterPageObserver.cxx | 0 sd/source/ui/toolpanel/controls/MasterPagesPanel.cxx | 0 sd/source/ui/toolpanel/controls/MasterPagesPanel.hxx | 0 sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx | 0 sd/source/ui/toolpanel/controls/MasterPagesSelector.hxx | 0 sd/source/ui/toolpanel/controls/PreviewValueSet.cxx | 0 sd/source/ui/toolpanel/controls/PreviewValueSet.hxx | 0 .../ui/toolpanel/controls/RecentMasterPagesSelector.cxx | 0 .../ui/toolpanel/controls/RecentMasterPagesSelector.hxx | 0 sd/source/ui/toolpanel/controls/RecentlyUsedMasterPages.cxx | 0 sd/source/ui/toolpanel/controls/RecentlyUsedMasterPages.hxx | 0 sd/source/ui/toolpanel/controls/SlideTransitionPanel.cxx | 0 sd/source/ui/toolpanel/controls/SlideTransitionPanel.hxx | 0 sd/source/ui/toolpanel/controls/TableDesignPanel.cxx | 0 sd/source/ui/toolpanel/controls/TableDesignPanel.hxx | 0 sd/source/ui/toolpanel/controls/makefile.mk | 0 sd/source/ui/toolpanel/makefile.mk | 0 sd/source/ui/tools/AsynchronousCall.cxx | 0 sd/source/ui/tools/ConfigurationAccess.cxx | 0 sd/source/ui/tools/EventMultiplexer.cxx | 0 sd/source/ui/tools/IconCache.cxx | 0 sd/source/ui/tools/IdleDetection.cxx | 0 sd/source/ui/tools/PreviewRenderer.cxx | 0 sd/source/ui/tools/PropertySet.cxx | 0 sd/source/ui/tools/SdGlobalResourceContainer.cxx | 0 sd/source/ui/tools/SlotStateListener.cxx | 0 sd/source/ui/tools/TimerBasedTaskExecution.cxx | 0 sd/source/ui/tools/makefile.mk | 0 sd/source/ui/unoidl/DrawController.cxx | 0 sd/source/ui/unoidl/SdUnoDrawView.cxx | 0 sd/source/ui/unoidl/SdUnoOutlineView.cxx | 0 sd/source/ui/unoidl/SdUnoSlideView.cxx | 0 sd/source/ui/unoidl/UnoDocumentSettings.cxx | 0 sd/source/ui/unoidl/UnoDocumentSettings.hxx | 0 sd/source/ui/unoidl/detreg.cxx | 0 sd/source/ui/unoidl/facreg.cxx | 0 sd/source/ui/unoidl/makefile.mk | 0 sd/source/ui/unoidl/randomnode.cxx | 0 sd/source/ui/unoidl/sddetect.cxx | 0 sd/source/ui/unoidl/sddetect.hxx | 0 sd/source/ui/unoidl/unocpres.cxx | 0 sd/source/ui/unoidl/unocpres.hxx | 0 sd/source/ui/unoidl/unodoc.cxx | 0 sd/source/ui/unoidl/unohelp.hxx | 0 sd/source/ui/unoidl/unokywds.cxx | 0 sd/source/ui/unoidl/unolayer.cxx | 0 sd/source/ui/unoidl/unolayer.hxx | 0 sd/source/ui/unoidl/unomodel.cxx | 0 sd/source/ui/unoidl/unomodule.cxx | 0 sd/source/ui/unoidl/unomodule.hxx | 0 sd/source/ui/unoidl/unoobj.cxx | 0 sd/source/ui/unoidl/unoobj.hxx | 0 sd/source/ui/unoidl/unopage.cxx | 0 sd/source/ui/unoidl/unopage.hxx | 0 sd/source/ui/unoidl/unopback.cxx | 0 sd/source/ui/unoidl/unopback.hxx | 0 sd/source/ui/unoidl/unopool.cxx | 0 sd/source/ui/unoidl/unosrch.cxx | 0 sd/source/ui/unoidl/unovwcrs.cxx | 0 sd/source/ui/unoidl/unowcntr.cxx | 0 sd/source/ui/unoidl/unowcntr.hxx | 0 sd/source/ui/view/DocumentRenderer.cxx | 0 sd/source/ui/view/DocumentRenderer.hrc | 0 sd/source/ui/view/DocumentRenderer.src | 0 sd/source/ui/view/FormShellManager.cxx | 0 sd/source/ui/view/GraphicObjectBar.cxx | 0 sd/source/ui/view/GraphicViewShellBase.cxx | 0 sd/source/ui/view/ImpressViewShellBase.cxx | 0 sd/source/ui/view/MediaObjectBar.cxx | 0 sd/source/ui/view/OutlineViewShellBase.cxx | 0 sd/source/ui/view/Outliner.cxx | 0 sd/source/ui/view/OutlinerIterator.cxx | 0 sd/source/ui/view/PresentationViewShellBase.cxx | 0 sd/source/ui/view/SlideSorterViewShellBase.cxx | 0 sd/source/ui/view/ToolBarManager.cxx | 0 sd/source/ui/view/UpdateLockManager.cxx | 0 sd/source/ui/view/ViewShellBase.cxx | 2 +- sd/source/ui/view/ViewShellHint.cxx | 0 sd/source/ui/view/ViewShellImplementation.cxx | 0 sd/source/ui/view/ViewTabBar.cxx | 0 sd/source/ui/view/WindowUpdater.cxx | 0 sd/source/ui/view/bmcache.cxx | 0 sd/source/ui/view/clview.cxx | 0 sd/source/ui/view/drawview.cxx | 0 sd/source/ui/view/drbezob.cxx | 0 sd/source/ui/view/drtxtob.cxx | 0 sd/source/ui/view/drtxtob1.cxx | 0 sd/source/ui/view/drviews1.cxx | 0 sd/source/ui/view/drviews2.cxx | 0 sd/source/ui/view/drviews3.cxx | 0 sd/source/ui/view/drviews4.cxx | 0 sd/source/ui/view/drviews5.cxx | 0 sd/source/ui/view/drviews6.cxx | 0 sd/source/ui/view/drviews7.cxx | 0 sd/source/ui/view/drviews8.cxx | 0 sd/source/ui/view/drviews9.cxx | 0 sd/source/ui/view/drviewsa.cxx | 0 sd/source/ui/view/drviewsb.cxx | 0 sd/source/ui/view/drviewsc.cxx | 0 sd/source/ui/view/drviewsd.cxx | 0 sd/source/ui/view/drviewse.cxx | 0 sd/source/ui/view/drviewsf.cxx | 0 sd/source/ui/view/drviewsg.cxx | 0 sd/source/ui/view/drviewsh.cxx | 0 sd/source/ui/view/drviewsi.cxx | 0 sd/source/ui/view/drviewsj.cxx | 0 sd/source/ui/view/drvwshrg.cxx | 0 sd/source/ui/view/frmview.cxx | 0 sd/source/ui/view/grviewsh.cxx | 0 sd/source/ui/view/makefile.mk | 0 sd/source/ui/view/outlnvs2.cxx | 0 sd/source/ui/view/outlnvsh.cxx | 0 sd/source/ui/view/outlview.cxx | 0 sd/source/ui/view/presvish.cxx | 0 sd/source/ui/view/sdruler.cxx | 0 sd/source/ui/view/sdview.cxx | 0 sd/source/ui/view/sdview2.cxx | 0 sd/source/ui/view/sdview3.cxx | 0 sd/source/ui/view/sdview4.cxx | 0 sd/source/ui/view/sdview5.cxx | 0 sd/source/ui/view/sdwindow.cxx | 0 sd/source/ui/view/showview.cxx | 0 sd/source/ui/view/tabcontr.cxx | 0 sd/source/ui/view/unmodpg.cxx | 0 sd/source/ui/view/viewoverlaymanager.cxx | 0 sd/source/ui/view/viewshe2.cxx | 0 sd/source/ui/view/viewshe3.cxx | 0 sd/source/ui/view/viewshel.cxx | 0 sd/source/ui/view/zoomlist.cxx | 0 sd/source/unotypes/makefile.mk | 0 sd/uiconfig/sdraw/menubar/menubar.xml | 0 sd/uiconfig/sdraw/statusbar/statusbar.xml | 0 sd/uiconfig/sdraw/toolbar/3dobjectsbar.xml | 0 sd/uiconfig/sdraw/toolbar/alignmentbar.xml | 0 sd/uiconfig/sdraw/toolbar/arrowsbar.xml | 0 sd/uiconfig/sdraw/toolbar/arrowshapes.xml | 0 sd/uiconfig/sdraw/toolbar/basicshapes.xml | 0 sd/uiconfig/sdraw/toolbar/bezierobjectbar.xml | 0 sd/uiconfig/sdraw/toolbar/calloutshapes.xml | 0 sd/uiconfig/sdraw/toolbar/choosemodebar.xml | 0 sd/uiconfig/sdraw/toolbar/colorbar.xml | 0 sd/uiconfig/sdraw/toolbar/commentsbar.xml | 0 sd/uiconfig/sdraw/toolbar/connectorsbar.xml | 0 sd/uiconfig/sdraw/toolbar/drawingobjectbar.xml | 0 sd/uiconfig/sdraw/toolbar/ellipsesbar.xml | 0 sd/uiconfig/sdraw/toolbar/extrusionobjectbar.xml | 0 sd/uiconfig/sdraw/toolbar/flowchartshapes.xml | 0 sd/uiconfig/sdraw/toolbar/fontworkobjectbar.xml | 0 sd/uiconfig/sdraw/toolbar/fontworkshapetype.xml | 0 sd/uiconfig/sdraw/toolbar/formcontrols.xml | 0 sd/uiconfig/sdraw/toolbar/formdesign.xml | 0 sd/uiconfig/sdraw/toolbar/formsfilterbar.xml | 0 sd/uiconfig/sdraw/toolbar/formsnavigationbar.xml | 0 sd/uiconfig/sdraw/toolbar/formtextobjectbar.xml | 0 sd/uiconfig/sdraw/toolbar/fullscreenbar.xml | 0 sd/uiconfig/sdraw/toolbar/gluepointsobjectbar.xml | 0 sd/uiconfig/sdraw/toolbar/graffilterbar.xml | 0 sd/uiconfig/sdraw/toolbar/graphicobjectbar.xml | 0 sd/uiconfig/sdraw/toolbar/insertbar.xml | 0 sd/uiconfig/sdraw/toolbar/linesbar.xml | 0 sd/uiconfig/sdraw/toolbar/masterviewtoolbar.xml | 0 sd/uiconfig/sdraw/toolbar/mediaobjectbar.xml | 0 sd/uiconfig/sdraw/toolbar/moreformcontrols.xml | 0 sd/uiconfig/sdraw/toolbar/optimizetablebar.xml | 0 sd/uiconfig/sdraw/toolbar/optionsbar.xml | 0 sd/uiconfig/sdraw/toolbar/positionbar.xml | 0 sd/uiconfig/sdraw/toolbar/rectanglesbar.xml | 0 sd/uiconfig/sdraw/toolbar/standardbar.xml | 0 sd/uiconfig/sdraw/toolbar/starshapes.xml | 0 sd/uiconfig/sdraw/toolbar/symbolshapes.xml | 0 sd/uiconfig/sdraw/toolbar/tableobjectbar.xml | 0 sd/uiconfig/sdraw/toolbar/textbar.xml | 0 sd/uiconfig/sdraw/toolbar/textobjectbar.xml | 0 sd/uiconfig/sdraw/toolbar/toolbar.xml | 0 sd/uiconfig/sdraw/toolbar/viewerbar.xml | 0 sd/uiconfig/sdraw/toolbar/zoombar.xml | 0 sd/uiconfig/simpress/menubar/menubar.xml | 0 sd/uiconfig/simpress/statusbar/statusbar.xml | 0 sd/uiconfig/simpress/toolbar/3dobjectsbar.xml | 0 sd/uiconfig/simpress/toolbar/alignmentbar.xml | 0 sd/uiconfig/simpress/toolbar/arrowsbar.xml | 0 sd/uiconfig/simpress/toolbar/arrowshapes.xml | 0 sd/uiconfig/simpress/toolbar/basicshapes.xml | 0 sd/uiconfig/simpress/toolbar/bezierobjectbar.xml | 0 sd/uiconfig/simpress/toolbar/calloutshapes.xml | 0 sd/uiconfig/simpress/toolbar/choosemodebar.xml | 0 sd/uiconfig/simpress/toolbar/colorbar.xml | 0 sd/uiconfig/simpress/toolbar/commentsbar.xml | 0 sd/uiconfig/simpress/toolbar/commontaskbar.xml | 0 sd/uiconfig/simpress/toolbar/connectorsbar.xml | 0 sd/uiconfig/simpress/toolbar/drawingobjectbar.xml | 0 sd/uiconfig/simpress/toolbar/ellipsesbar.xml | 0 sd/uiconfig/simpress/toolbar/extrusionobjectbar.xml | 0 sd/uiconfig/simpress/toolbar/flowchartshapes.xml | 0 sd/uiconfig/simpress/toolbar/fontworkobjectbar.xml | 0 sd/uiconfig/simpress/toolbar/fontworkshapetype.xml | 0 sd/uiconfig/simpress/toolbar/formcontrols.xml | 0 sd/uiconfig/simpress/toolbar/formdesign.xml | 0 sd/uiconfig/simpress/toolbar/formsfilterbar.xml | 0 sd/uiconfig/simpress/toolbar/formsnavigationbar.xml | 0 sd/uiconfig/simpress/toolbar/formtextobjectbar.xml | 0 sd/uiconfig/simpress/toolbar/fullscreenbar.xml | 0 sd/uiconfig/simpress/toolbar/gluepointsobjectbar.xml | 0 sd/uiconfig/simpress/toolbar/graffilterbar.xml | 0 sd/uiconfig/simpress/toolbar/graphicobjectbar.xml | 0 sd/uiconfig/simpress/toolbar/insertbar.xml | 0 sd/uiconfig/simpress/toolbar/linesbar.xml | 0 sd/uiconfig/simpress/toolbar/masterviewtoolbar.xml | 0 sd/uiconfig/simpress/toolbar/mediaobjectbar.xml | 0 sd/uiconfig/simpress/toolbar/moreformcontrols.xml | 0 sd/uiconfig/simpress/toolbar/optimizetablebar.xml | 0 sd/uiconfig/simpress/toolbar/optionsbar.xml | 0 sd/uiconfig/simpress/toolbar/outlinetoolbar.xml | 0 sd/uiconfig/simpress/toolbar/positionbar.xml | 0 sd/uiconfig/simpress/toolbar/rectanglesbar.xml | 0 sd/uiconfig/simpress/toolbar/slideviewobjectbar.xml | 0 sd/uiconfig/simpress/toolbar/slideviewtoolbar.xml | 0 sd/uiconfig/simpress/toolbar/standardbar.xml | 0 sd/uiconfig/simpress/toolbar/starshapes.xml | 0 sd/uiconfig/simpress/toolbar/symbolshapes.xml | 0 sd/uiconfig/simpress/toolbar/tableobjectbar.xml | 0 sd/uiconfig/simpress/toolbar/textbar.xml | 0 sd/uiconfig/simpress/toolbar/textobjectbar.xml | 0 sd/uiconfig/simpress/toolbar/toolbar.xml | 0 sd/uiconfig/simpress/toolbar/viewerbar.xml | 0 sd/uiconfig/simpress/toolbar/zoombar.xml | 0 sd/util/exports.dxp | 0 sd/util/hidother.hrc | 0 sd/util/hidother.src | 0 sd/util/makefile.mk | 0 sd/util/makefile.pmk | 0 sd/util/sd.flt | 0 sd/util/sd.map | 0 sd/util/sdd.map | 0 sd/util/sdfilt.map | 0 sd/util/sdui.map | 0 sd/workben/testdll/makefile | 0 sd/xml/AccessibleDrawDocumentView.xml | 0 sd/xml/AccessibleOutlineView.xml | 0 sd/xml/AccessiblePageShape.xml | 0 sd/xml/AccessiblePresentationGraphicShape.xml | 0 sd/xml/AccessiblePresentationOLEShape.xml | 0 sd/xml/AccessiblePresentationShape.xml | 0 sd/xml/AccessibleSlideView.xml | 0 sd/xml/AccessibleSlideViewObject.xml | 0 sd/xml/DrawingView.xml | 0 sd/xml/HandoutView.xml | 0 sd/xml/NotesView.xml | 0 sd/xml/OutlineView.xml | 0 sd/xml/PresentationView.xml | 0 sd/xml/SdDocLinkTargets.xml | 0 sd/xml/SdDrawPage.xml | 0 sd/xml/SdDrawPagesAccess.xml | 0 sd/xml/SdGenericDrawPage.xml | 0 sd/xml/SdLayer.xml | 0 sd/xml/SdLayerManager.xml | 0 sd/xml/SdMasterPage.xml | 0 sd/xml/SdMasterPagesAccess.xml | 0 sd/xml/SdPageLinkTargets.xml | 0 sd/xml/SdXCustomPresentation.xml | 0 sd/xml/SdXCustomPresentationAccess.xml | 0 sd/xml/SdXImpressDocument.xml | 0 sd/xml/SdXPresentation.xml | 0 sd/xml/SdXShape.xml | 0 sd/xml/SlidesView.xml | 0 sd/xml/effects.xml | 0 sd/xml/transitions-ogl.xml | 0 sd/xml/transitions.xml | 0 sd/xsl/effect.xsl | 0 1262 files changed, 3 insertions(+), 2 deletions(-) mode change 100644 => 100755 sd/inc/CustomAnimationCloner.hxx mode change 100644 => 100755 sd/inc/CustomAnimationEffect.hxx mode change 100644 => 100755 sd/inc/CustomAnimationPreset.hxx mode change 100644 => 100755 sd/inc/EffectMigration.hxx mode change 100644 => 100755 sd/inc/FactoryIds.hxx mode change 100644 => 100755 sd/inc/Outliner.hxx mode change 100644 => 100755 sd/inc/OutlinerIterator.hxx mode change 100644 => 100755 sd/inc/SdShapeTypes.hxx mode change 100644 => 100755 sd/inc/TransitionPreset.hxx mode change 100644 => 100755 sd/inc/animations.hxx mode change 100644 => 100755 sd/inc/anmdef.hxx mode change 100644 => 100755 sd/inc/anminfo.hxx mode change 100644 => 100755 sd/inc/app.hrc mode change 100644 => 100755 sd/inc/app.hxx mode change 100644 => 100755 sd/inc/cusshow.hxx mode change 100644 => 100755 sd/inc/diadef.h mode change 100644 => 100755 sd/inc/drawdoc.hxx mode change 100644 => 100755 sd/inc/eetext.hxx mode change 100644 => 100755 sd/inc/fadedef.h mode change 100644 => 100755 sd/inc/glob.hrc mode change 100644 => 100755 sd/inc/glob.hxx mode change 100644 => 100755 sd/inc/helper/simplereferencecomponent.hxx mode change 100644 => 100755 sd/inc/helpids.h mode change 100644 => 100755 sd/inc/imapinfo.hxx mode change 100644 => 100755 sd/inc/makefile.mk mode change 100644 => 100755 sd/inc/misc.hxx mode change 100644 => 100755 sd/inc/misc/scopelock.hxx mode change 100644 => 100755 sd/inc/movedef.hxx mode change 100644 => 100755 sd/inc/pch/precompiled_sd.cxx mode change 100644 => 100755 sd/inc/pch/precompiled_sd.hxx mode change 100644 => 100755 sd/inc/pglink.hxx mode change 100644 => 100755 sd/inc/pres.hxx mode change 100644 => 100755 sd/inc/prlayout.hxx mode change 100644 => 100755 sd/inc/resltn.hxx mode change 100644 => 100755 sd/inc/sd_primitivetypes2d.hxx mode change 100644 => 100755 sd/inc/sdabstdlg.hxx mode change 100644 => 100755 sd/inc/sdattr.hrc mode change 100644 => 100755 sd/inc/sdattr.hxx mode change 100644 => 100755 sd/inc/sdcgmfilter.hxx mode change 100644 => 100755 sd/inc/sddll.hxx mode change 100644 => 100755 sd/inc/sddllapi.h mode change 100644 => 100755 sd/inc/sdenumdef.hxx mode change 100644 => 100755 sd/inc/sderror.hxx mode change 100644 => 100755 sd/inc/sdfilter.hxx mode change 100644 => 100755 sd/inc/sdgrffilter.hxx mode change 100644 => 100755 sd/inc/sdhtmlfilter.hxx mode change 100644 => 100755 sd/inc/sdiocmpt.hxx mode change 100644 => 100755 sd/inc/sdmod.hxx mode change 100644 => 100755 sd/inc/sdobjfac.hxx mode change 100644 => 100755 sd/inc/sdpage.hxx mode change 100644 => 100755 sd/inc/sdpptwrp.hxx mode change 100644 => 100755 sd/inc/sdresid.hxx mode change 100644 => 100755 sd/inc/sduiks.hrc mode change 100644 => 100755 sd/inc/sdundo.hxx mode change 100644 => 100755 sd/inc/sdxmlwrp.hxx mode change 100644 => 100755 sd/inc/segdefs.hxx mode change 100644 => 100755 sd/inc/segdefs_.hxx mode change 100644 => 100755 sd/inc/shapelist.hxx mode change 100644 => 100755 sd/inc/stlfamily.hxx mode change 100644 => 100755 sd/inc/stlpool.hxx mode change 100644 => 100755 sd/inc/stlsheet.hxx mode change 100644 => 100755 sd/inc/strmname.h mode change 100644 => 100755 sd/inc/textapi.hxx mode change 100644 => 100755 sd/inc/undo/undofactory.hxx mode change 100644 => 100755 sd/inc/undo/undomanager.hxx mode change 100644 => 100755 sd/inc/undo/undoobjects.hxx mode change 100644 => 100755 sd/inc/undoanim.hxx mode change 100644 => 100755 sd/prj/d.lst mode change 100644 => 100755 sd/prj/make.bat mode change 100644 => 100755 sd/prj/postdlv.btm mode change 100644 => 100755 sd/prj/stree.bat mode change 100644 => 100755 sd/prj/struct.txt mode change 100644 => 100755 sd/qa/unoapi/knownissues.xcl mode change 100644 => 100755 sd/qa/unoapi/makefile.mk mode change 100644 => 100755 sd/qa/unoapi/sd.sce mode change 100644 => 100755 sd/res/buttons/glas-blue.zip mode change 100644 => 100755 sd/res/buttons/glas-green.zip mode change 100644 => 100755 sd/res/buttons/glas-red.zip mode change 100644 => 100755 sd/res/buttons/round-gorilla.zip mode change 100644 => 100755 sd/res/buttons/round-white.zip mode change 100644 => 100755 sd/res/buttons/simple.zip mode change 100644 => 100755 sd/res/buttons/square-blue.zip mode change 100644 => 100755 sd/res/buttons/square-gray.zip mode change 100644 => 100755 sd/res/buttons/square-green.zip mode change 100644 => 100755 sd/res/buttons/square-red.zip mode change 100644 => 100755 sd/res/buttons/square-yellow.zip mode change 100644 => 100755 sd/res/webview/common.inc mode change 100644 => 100755 sd/res/webview/common.pl mode change 100644 => 100755 sd/res/webview/edit.asp mode change 100644 => 100755 sd/res/webview/edit.pl mode change 100644 => 100755 sd/res/webview/editpic.asp mode change 100644 => 100755 sd/res/webview/editpic.pl mode change 100644 => 100755 sd/res/webview/index.pl mode change 100644 => 100755 sd/res/webview/poll.asp mode change 100644 => 100755 sd/res/webview/poll.pl mode change 100644 => 100755 sd/res/webview/savepic.asp mode change 100644 => 100755 sd/res/webview/savepic.pl mode change 100644 => 100755 sd/res/webview/show.asp mode change 100644 => 100755 sd/res/webview/show.pl mode change 100644 => 100755 sd/res/webview/webview.asp mode change 100644 => 100755 sd/res/webview/webview.pl mode change 100644 => 100755 sd/sdi/SlideSorterController.sdi mode change 100644 => 100755 sd/sdi/TaskPaneViewShell.sdi mode change 100644 => 100755 sd/sdi/ViewShellBase.sdi mode change 100644 => 100755 sd/sdi/_docsh.sdi mode change 100644 => 100755 sd/sdi/_drvwsh.sdi mode change 100644 => 100755 sd/sdi/app.sdi mode change 100644 => 100755 sd/sdi/docshell.sdi mode change 100644 => 100755 sd/sdi/drbezob.sdi mode change 100644 => 100755 sd/sdi/drgrfob.sdi mode change 100644 => 100755 sd/sdi/drtxtob.sdi mode change 100644 => 100755 sd/sdi/drviewsh.sdi mode change 100644 => 100755 sd/sdi/grdocsh.sdi mode change 100644 => 100755 sd/sdi/grviewsh.sdi mode change 100644 => 100755 sd/sdi/makefile.mk mode change 100644 => 100755 sd/sdi/mediaob.sdi mode change 100644 => 100755 sd/sdi/outlnvsh.sdi mode change 100644 => 100755 sd/sdi/sdgslots.sdi mode change 100644 => 100755 sd/sdi/sdnew.sdi mode change 100644 => 100755 sd/sdi/sdraw.sdi mode change 100644 => 100755 sd/sdi/sdslots.hrc mode change 100644 => 100755 sd/sdi/sdslots.sdi mode change 100644 => 100755 sd/sdi/tables.sdi mode change 100644 => 100755 sd/source/core/CustomAnimationCloner.cxx mode change 100644 => 100755 sd/source/core/CustomAnimationEffect.cxx mode change 100644 => 100755 sd/source/core/CustomAnimationPreset.cxx mode change 100644 => 100755 sd/source/core/EffectMigration.cxx mode change 100644 => 100755 sd/source/core/PageListWatcher.cxx mode change 100644 => 100755 sd/source/core/PageListWatcher.hxx mode change 100644 => 100755 sd/source/core/TransitionPreset.cxx mode change 100644 => 100755 sd/source/core/anminfo.cxx mode change 100644 => 100755 sd/source/core/annotations/Annotation.cxx mode change 100644 => 100755 sd/source/core/annotations/AnnotationAccess.cxx mode change 100644 => 100755 sd/source/core/annotations/AnnotationEnumeration.cxx mode change 100644 => 100755 sd/source/core/annotations/makefile.mk mode change 100644 => 100755 sd/source/core/cusshow.cxx mode change 100644 => 100755 sd/source/core/drawdoc.cxx mode change 100644 => 100755 sd/source/core/drawdoc2.cxx mode change 100644 => 100755 sd/source/core/drawdoc3.cxx mode change 100644 => 100755 sd/source/core/drawdoc4.cxx mode change 100644 => 100755 sd/source/core/drawdoc_animations.cxx mode change 100644 => 100755 sd/source/core/glob.src mode change 100644 => 100755 sd/source/core/makefile.mk mode change 100644 => 100755 sd/source/core/pglink.cxx mode change 100644 => 100755 sd/source/core/sdattr.cxx mode change 100644 => 100755 sd/source/core/sdiocmpt.cxx mode change 100644 => 100755 sd/source/core/sdobjfac.cxx mode change 100644 => 100755 sd/source/core/sdpage.cxx mode change 100644 => 100755 sd/source/core/sdpage2.cxx mode change 100644 => 100755 sd/source/core/sdpage_animations.cxx mode change 100644 => 100755 sd/source/core/shapelist.cxx mode change 100644 => 100755 sd/source/core/stlfamily.cxx mode change 100644 => 100755 sd/source/core/stlpool.cxx mode change 100644 => 100755 sd/source/core/stlsheet.cxx mode change 100644 => 100755 sd/source/core/text/makefile.mk mode change 100644 => 100755 sd/source/core/text/textapi.cxx mode change 100644 => 100755 sd/source/core/typemap.cxx mode change 100644 => 100755 sd/source/core/undo/makefile.mk mode change 100644 => 100755 sd/source/core/undo/undofactory.cxx mode change 100644 => 100755 sd/source/core/undo/undomanager.cxx mode change 100644 => 100755 sd/source/core/undo/undoobjects.cxx mode change 100644 => 100755 sd/source/core/undoanim.cxx mode change 100644 => 100755 sd/source/filter/cgm/makefile.mk mode change 100644 => 100755 sd/source/filter/cgm/sdcgmfilter.cxx mode change 100644 => 100755 sd/source/filter/eppt/eppt.cxx mode change 100644 => 100755 sd/source/filter/eppt/eppt.hxx mode change 100644 => 100755 sd/source/filter/eppt/epptdef.hxx mode change 100644 => 100755 sd/source/filter/eppt/epptso.cxx mode change 100644 => 100755 sd/source/filter/eppt/escherex.cxx mode change 100644 => 100755 sd/source/filter/eppt/escherex.hxx mode change 100644 => 100755 sd/source/filter/eppt/makefile.mk mode change 100644 => 100755 sd/source/filter/eppt/pptexanimations.cxx mode change 100644 => 100755 sd/source/filter/eppt/pptexanimations.hxx mode change 100644 => 100755 sd/source/filter/eppt/pptexsoundcollection.cxx mode change 100644 => 100755 sd/source/filter/eppt/pptexsoundcollection.hxx mode change 100644 => 100755 sd/source/filter/grf/makefile.mk mode change 100644 => 100755 sd/source/filter/grf/sdgrffilter.cxx mode change 100644 => 100755 sd/source/filter/html/HtmlOptionsDialog.cxx mode change 100644 => 100755 sd/source/filter/html/buttonset.cxx mode change 100644 => 100755 sd/source/filter/html/buttonset.hxx mode change 100644 => 100755 sd/source/filter/html/htmlattr.cxx mode change 100644 => 100755 sd/source/filter/html/htmlattr.hxx mode change 100644 => 100755 sd/source/filter/html/htmlex.cxx mode change 100644 => 100755 sd/source/filter/html/htmlex.hxx mode change 100644 => 100755 sd/source/filter/html/makefile.mk mode change 100644 => 100755 sd/source/filter/html/pubdlg.cxx mode change 100644 => 100755 sd/source/filter/html/pubdlg.src mode change 100644 => 100755 sd/source/filter/html/sdhtmlfilter.cxx mode change 100644 => 100755 sd/source/filter/makefile.mk mode change 100644 => 100755 sd/source/filter/ppt/makefile.mk mode change 100644 => 100755 sd/source/filter/ppt/ppt97animations.cxx mode change 100644 => 100755 sd/source/filter/ppt/ppt97animations.hxx mode change 100644 => 100755 sd/source/filter/ppt/pptanimations.hxx mode change 100644 => 100755 sd/source/filter/ppt/pptatom.cpp mode change 100644 => 100755 sd/source/filter/ppt/pptatom.hxx mode change 100644 => 100755 sd/source/filter/ppt/pptin.cxx mode change 100644 => 100755 sd/source/filter/ppt/pptin.hxx mode change 100644 => 100755 sd/source/filter/ppt/pptinanimations.cxx mode change 100644 => 100755 sd/source/filter/ppt/pptinanimations.hxx mode change 100644 => 100755 sd/source/filter/ppt/propread.cxx mode change 100644 => 100755 sd/source/filter/ppt/propread.hxx mode change 100644 => 100755 sd/source/filter/sdfilter.cxx mode change 100644 => 100755 sd/source/filter/sdpptwrp.cxx mode change 100644 => 100755 sd/source/filter/xml/makefile.mk mode change 100644 => 100755 sd/source/filter/xml/sdtransform.cxx mode change 100644 => 100755 sd/source/filter/xml/sdxmlwrp.cxx mode change 100644 => 100755 sd/source/helper/makefile.mk mode change 100644 => 100755 sd/source/helper/simplereferencecomponent.cxx mode change 100644 => 100755 sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx mode change 100644 => 100755 sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx mode change 100644 => 100755 sd/source/ui/accessibility/AccessibleOutlineEditSource.cxx mode change 100644 => 100755 sd/source/ui/accessibility/AccessibleOutlineView.cxx mode change 100644 => 100755 sd/source/ui/accessibility/AccessiblePageShape.cxx mode change 100644 => 100755 sd/source/ui/accessibility/AccessiblePresentationGraphicShape.cxx mode change 100644 => 100755 sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx mode change 100644 => 100755 sd/source/ui/accessibility/AccessiblePresentationShape.cxx mode change 100644 => 100755 sd/source/ui/accessibility/AccessibleScrollPanel.cxx mode change 100644 => 100755 sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx mode change 100644 => 100755 sd/source/ui/accessibility/AccessibleSlideSorterView.cxx mode change 100644 => 100755 sd/source/ui/accessibility/AccessibleTaskPane.cxx mode change 100644 => 100755 sd/source/ui/accessibility/AccessibleTreeNode.cxx mode change 100644 => 100755 sd/source/ui/accessibility/AccessibleViewForwarder.cxx mode change 100644 => 100755 sd/source/ui/accessibility/SdShapeTypes.cxx mode change 100644 => 100755 sd/source/ui/accessibility/accessibility.hrc mode change 100644 => 100755 sd/source/ui/accessibility/accessibility.src mode change 100644 => 100755 sd/source/ui/animations/AnimationSchemesPane.cxx mode change 100644 => 100755 sd/source/ui/animations/AnimationSchemesPane.hrc mode change 100644 => 100755 sd/source/ui/animations/AnimationSchemesPane.hxx mode change 100644 => 100755 sd/source/ui/animations/AnimationSchemesPane.src mode change 100644 => 100755 sd/source/ui/animations/CustomAnimation.hrc mode change 100644 => 100755 sd/source/ui/animations/CustomAnimation.src mode change 100644 => 100755 sd/source/ui/animations/CustomAnimationCreateDialog.cxx mode change 100644 => 100755 sd/source/ui/animations/CustomAnimationCreateDialog.hrc mode change 100644 => 100755 sd/source/ui/animations/CustomAnimationCreateDialog.hxx mode change 100644 => 100755 sd/source/ui/animations/CustomAnimationCreateDialog.src mode change 100644 => 100755 sd/source/ui/animations/CustomAnimationDialog.cxx mode change 100644 => 100755 sd/source/ui/animations/CustomAnimationDialog.hrc mode change 100644 => 100755 sd/source/ui/animations/CustomAnimationDialog.hxx mode change 100644 => 100755 sd/source/ui/animations/CustomAnimationDialog.src mode change 100644 => 100755 sd/source/ui/animations/CustomAnimationList.cxx mode change 100644 => 100755 sd/source/ui/animations/CustomAnimationList.hxx mode change 100644 => 100755 sd/source/ui/animations/CustomAnimationPane.cxx mode change 100644 => 100755 sd/source/ui/animations/CustomAnimationPane.hrc mode change 100644 => 100755 sd/source/ui/animations/CustomAnimationPane.hxx mode change 100644 => 100755 sd/source/ui/animations/CustomAnimationPane.src mode change 100644 => 100755 sd/source/ui/animations/CustomAnimationSchemesPane.hrc mode change 100644 => 100755 sd/source/ui/animations/CustomAnimationSchemesPane.src mode change 100644 => 100755 sd/source/ui/animations/DialogListBox.cxx mode change 100644 => 100755 sd/source/ui/animations/STLPropertySet.cxx mode change 100644 => 100755 sd/source/ui/animations/STLPropertySet.hxx mode change 100644 => 100755 sd/source/ui/animations/SlideTransitionPane.cxx mode change 100644 => 100755 sd/source/ui/animations/SlideTransitionPane.hrc mode change 100644 => 100755 sd/source/ui/animations/SlideTransitionPane.hxx mode change 100644 => 100755 sd/source/ui/animations/SlideTransitionPane.src mode change 100644 => 100755 sd/source/ui/animations/makefile.mk mode change 100644 => 100755 sd/source/ui/animations/motionpathtag.cxx mode change 100644 => 100755 sd/source/ui/animations/motionpathtag.hxx mode change 100644 => 100755 sd/source/ui/annotations/annotationmanager.cxx mode change 100644 => 100755 sd/source/ui/annotations/annotations.hrc mode change 100644 => 100755 sd/source/ui/annotations/annotations.src mode change 100644 => 100755 sd/source/ui/annotations/annotationtag.cxx mode change 100644 => 100755 sd/source/ui/annotations/annotationtag.hxx mode change 100644 => 100755 sd/source/ui/annotations/annotationwindow.cxx mode change 100644 => 100755 sd/source/ui/annotations/annotationwindow.hxx mode change 100644 => 100755 sd/source/ui/annotations/makefile.mk mode change 100644 => 100755 sd/source/ui/app/_app.hrc mode change 100644 => 100755 sd/source/ui/app/accel_tmpl.src mode change 100644 => 100755 sd/source/ui/app/accelids_tmpl.src mode change 100644 => 100755 sd/source/ui/app/app.img mode change 100644 => 100755 sd/source/ui/app/app.src mode change 100644 => 100755 sd/source/ui/app/makefile.mk mode change 100644 => 100755 sd/source/ui/app/menu_tmpl.src mode change 100644 => 100755 sd/source/ui/app/menuids2_tmpl.src mode change 100644 => 100755 sd/source/ui/app/menuids3_tmpl.src mode change 100644 => 100755 sd/source/ui/app/menuids4_tmpl.src mode change 100644 => 100755 sd/source/ui/app/menuids_tmpl.src mode change 100644 => 100755 sd/source/ui/app/menuportal_tmpl.src mode change 100644 => 100755 sd/source/ui/app/popup.src mode change 100644 => 100755 sd/source/ui/app/popup2_tmpl.src mode change 100644 => 100755 sd/source/ui/app/res_bmp.src mode change 100644 => 100755 sd/source/ui/app/sddll.cxx mode change 100644 => 100755 sd/source/ui/app/sddll1.cxx mode change 100644 => 100755 sd/source/ui/app/sddll2.cxx mode change 100644 => 100755 sd/source/ui/app/sdmod.cxx mode change 100644 => 100755 sd/source/ui/app/sdmod1.cxx mode change 100644 => 100755 sd/source/ui/app/sdmod2.cxx mode change 100644 => 100755 sd/source/ui/app/sdpopup.cxx mode change 100644 => 100755 sd/source/ui/app/sdresid.cxx mode change 100644 => 100755 sd/source/ui/app/sdstring.src mode change 100644 => 100755 sd/source/ui/app/sdxfer.cxx mode change 100644 => 100755 sd/source/ui/app/strings.src mode change 100644 => 100755 sd/source/ui/app/tbx_ww.src mode change 100644 => 100755 sd/source/ui/app/tbxids_tmpl.src mode change 100644 => 100755 sd/source/ui/app/tbxww.cxx mode change 100644 => 100755 sd/source/ui/app/tmplctrl.cxx mode change 100644 => 100755 sd/source/ui/app/toolbox.src mode change 100644 => 100755 sd/source/ui/app/toolbox2_tmpl.src mode change 100644 => 100755 sd/source/ui/controller/makefile.mk mode change 100644 => 100755 sd/source/ui/controller/slidelayoutcontroller.hxx mode change 100644 => 100755 sd/source/ui/dlg/AnimationChildWindow.cxx mode change 100644 => 100755 sd/source/ui/dlg/LayerDialog.src mode change 100644 => 100755 sd/source/ui/dlg/LayerDialogChildWindow.cxx mode change 100644 => 100755 sd/source/ui/dlg/LayerDialogContent.cxx mode change 100644 => 100755 sd/source/ui/dlg/LayerTabBar.cxx mode change 100644 => 100755 sd/source/ui/dlg/NavigatorChildWindow.cxx mode change 100644 => 100755 sd/source/ui/dlg/PaneChildWindows.cxx mode change 100644 => 100755 sd/source/ui/dlg/PaneDockingWindow.cxx mode change 100644 => 100755 sd/source/ui/dlg/PaneDockingWindow.src mode change 100644 => 100755 sd/source/ui/dlg/PaneShells.cxx mode change 100644 => 100755 sd/source/ui/dlg/SpellDialogChildWindow.cxx mode change 100644 => 100755 sd/source/ui/dlg/TemplateScanner.cxx mode change 100644 => 100755 sd/source/ui/dlg/animobjs.cxx mode change 100644 => 100755 sd/source/ui/dlg/animobjs.src mode change 100644 => 100755 sd/source/ui/dlg/assclass.cxx mode change 100644 => 100755 sd/source/ui/dlg/brkdlg.cxx mode change 100644 => 100755 sd/source/ui/dlg/brkdlg.src mode change 100644 => 100755 sd/source/ui/dlg/celltempl.cxx mode change 100644 => 100755 sd/source/ui/dlg/celltempl.src mode change 100644 => 100755 sd/source/ui/dlg/copydlg.cxx mode change 100644 => 100755 sd/source/ui/dlg/copydlg.src mode change 100644 => 100755 sd/source/ui/dlg/custsdlg.cxx mode change 100644 => 100755 sd/source/ui/dlg/custsdlg.src mode change 100644 => 100755 sd/source/ui/dlg/diactrl.cxx mode change 100644 => 100755 sd/source/ui/dlg/dlg_char.src mode change 100644 => 100755 sd/source/ui/dlg/dlgass.cxx mode change 100644 => 100755 sd/source/ui/dlg/dlgass.src mode change 100644 => 100755 sd/source/ui/dlg/dlgassim.cxx mode change 100644 => 100755 sd/source/ui/dlg/dlgassim.hxx mode change 100644 => 100755 sd/source/ui/dlg/dlgchar.cxx mode change 100644 => 100755 sd/source/ui/dlg/dlgctrls.cxx mode change 100644 => 100755 sd/source/ui/dlg/dlgfield.cxx mode change 100644 => 100755 sd/source/ui/dlg/dlgfield.src mode change 100644 => 100755 sd/source/ui/dlg/dlgolbul.cxx mode change 100644 => 100755 sd/source/ui/dlg/dlgolbul.src mode change 100644 => 100755 sd/source/ui/dlg/dlgpage.cxx mode change 100644 => 100755 sd/source/ui/dlg/dlgpage.src mode change 100644 => 100755 sd/source/ui/dlg/dlgsnap.cxx mode change 100644 => 100755 sd/source/ui/dlg/dlgsnap.src mode change 100644 => 100755 sd/source/ui/dlg/docprev.cxx mode change 100644 => 100755 sd/source/ui/dlg/filedlg.cxx mode change 100644 => 100755 sd/source/ui/dlg/gluectrl.cxx mode change 100644 => 100755 sd/source/ui/dlg/headerfooterdlg.cxx mode change 100644 => 100755 sd/source/ui/dlg/headerfooterdlg.src mode change 100644 => 100755 sd/source/ui/dlg/ins_paste.cxx mode change 100644 => 100755 sd/source/ui/dlg/ins_paste.src mode change 100644 => 100755 sd/source/ui/dlg/inspagob.cxx mode change 100644 => 100755 sd/source/ui/dlg/inspagob.src mode change 100644 => 100755 sd/source/ui/dlg/layeroptionsdlg.cxx mode change 100644 => 100755 sd/source/ui/dlg/layeroptionsdlg.src mode change 100644 => 100755 sd/source/ui/dlg/makefile.mk mode change 100644 => 100755 sd/source/ui/dlg/masterlayoutdlg.cxx mode change 100644 => 100755 sd/source/ui/dlg/masterlayoutdlg.src mode change 100644 => 100755 sd/source/ui/dlg/morphdlg.cxx mode change 100644 => 100755 sd/source/ui/dlg/morphdlg.src mode change 100644 => 100755 sd/source/ui/dlg/navigatr.cxx mode change 100644 => 100755 sd/source/ui/dlg/navigatr.src mode change 100644 => 100755 sd/source/ui/dlg/paragr.cxx mode change 100644 => 100755 sd/source/ui/dlg/paragr.src mode change 100644 => 100755 sd/source/ui/dlg/present.cxx mode change 100644 => 100755 sd/source/ui/dlg/present.src mode change 100644 => 100755 sd/source/ui/dlg/printdialog.cxx mode change 100644 => 100755 sd/source/ui/dlg/printdialog.hrc mode change 100644 => 100755 sd/source/ui/dlg/printdialog.src mode change 100644 => 100755 sd/source/ui/dlg/printdlg.cxx mode change 100644 => 100755 sd/source/ui/dlg/printdlg.src mode change 100644 => 100755 sd/source/ui/dlg/prltempl.cxx mode change 100644 => 100755 sd/source/ui/dlg/prltempl.src mode change 100644 => 100755 sd/source/ui/dlg/prntopts.cxx mode change 100644 => 100755 sd/source/ui/dlg/prntopts.src mode change 100644 => 100755 sd/source/ui/dlg/sdabstdlg.cxx mode change 100644 => 100755 sd/source/ui/dlg/sddlgfact.cxx mode change 100644 => 100755 sd/source/ui/dlg/sddlgfact.hxx mode change 100644 => 100755 sd/source/ui/dlg/sdpreslt.cxx mode change 100644 => 100755 sd/source/ui/dlg/sdpreslt.src mode change 100644 => 100755 sd/source/ui/dlg/sdtreelb.cxx mode change 100644 => 100755 sd/source/ui/dlg/sduiexp.cxx mode change 100644 => 100755 sd/source/ui/dlg/tabtempl.cxx mode change 100644 => 100755 sd/source/ui/dlg/tabtempl.src mode change 100644 => 100755 sd/source/ui/dlg/tpaction.cxx mode change 100644 => 100755 sd/source/ui/dlg/tpaction.src mode change 100644 => 100755 sd/source/ui/dlg/tpoption.cxx mode change 100644 => 100755 sd/source/ui/dlg/tpoption.src mode change 100644 => 100755 sd/source/ui/dlg/unchss.cxx mode change 100644 => 100755 sd/source/ui/dlg/vectdlg.cxx mode change 100644 => 100755 sd/source/ui/dlg/vectdlg.src mode change 100644 => 100755 sd/source/ui/docshell/docshel2.cxx mode change 100644 => 100755 sd/source/ui/docshell/docshel3.cxx mode change 100644 => 100755 sd/source/ui/docshell/docshel4.cxx mode change 100644 => 100755 sd/source/ui/docshell/docshell.cxx mode change 100644 => 100755 sd/source/ui/docshell/grdocsh.cxx mode change 100644 => 100755 sd/source/ui/docshell/makefile.mk mode change 100644 => 100755 sd/source/ui/docshell/sdclient.cxx mode change 100644 => 100755 sd/source/ui/framework/configuration/ChangeRequestQueue.cxx mode change 100644 => 100755 sd/source/ui/framework/configuration/ChangeRequestQueue.hxx mode change 100644 => 100755 sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx mode change 100644 => 100755 sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.hxx mode change 100644 => 100755 sd/source/ui/framework/configuration/Configuration.cxx mode change 100644 => 100755 sd/source/ui/framework/configuration/ConfigurationClassifier.cxx mode change 100644 => 100755 sd/source/ui/framework/configuration/ConfigurationClassifier.hxx mode change 100644 => 100755 sd/source/ui/framework/configuration/ConfigurationController.cxx mode change 100644 => 100755 sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.cxx mode change 100644 => 100755 sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.hxx mode change 100644 => 100755 sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx mode change 100644 => 100755 sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.hxx mode change 100644 => 100755 sd/source/ui/framework/configuration/ConfigurationTracer.cxx mode change 100644 => 100755 sd/source/ui/framework/configuration/ConfigurationTracer.hxx mode change 100644 => 100755 sd/source/ui/framework/configuration/ConfigurationUpdater.cxx mode change 100644 => 100755 sd/source/ui/framework/configuration/ConfigurationUpdater.hxx mode change 100644 => 100755 sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.cxx mode change 100644 => 100755 sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.hxx mode change 100644 => 100755 sd/source/ui/framework/configuration/ResourceFactoryManager.cxx mode change 100644 => 100755 sd/source/ui/framework/configuration/ResourceFactoryManager.hxx mode change 100644 => 100755 sd/source/ui/framework/configuration/ResourceId.cxx mode change 100644 => 100755 sd/source/ui/framework/configuration/UpdateRequest.cxx mode change 100644 => 100755 sd/source/ui/framework/configuration/UpdateRequest.hxx mode change 100644 => 100755 sd/source/ui/framework/configuration/makefile.mk mode change 100644 => 100755 sd/source/ui/framework/factories/BasicPaneFactory.cxx mode change 100644 => 100755 sd/source/ui/framework/factories/BasicPaneFactory.hxx mode change 100644 => 100755 sd/source/ui/framework/factories/BasicToolBarFactory.cxx mode change 100644 => 100755 sd/source/ui/framework/factories/BasicToolBarFactory.hxx mode change 100644 => 100755 sd/source/ui/framework/factories/BasicViewFactory.cxx mode change 100644 => 100755 sd/source/ui/framework/factories/BasicViewFactory.hxx mode change 100644 => 100755 sd/source/ui/framework/factories/ChildWindowPane.cxx mode change 100644 => 100755 sd/source/ui/framework/factories/ChildWindowPane.hxx mode change 100644 => 100755 sd/source/ui/framework/factories/FrameWindowPane.cxx mode change 100644 => 100755 sd/source/ui/framework/factories/FrameWindowPane.hxx mode change 100644 => 100755 sd/source/ui/framework/factories/FullScreenPane.cxx mode change 100644 => 100755 sd/source/ui/framework/factories/FullScreenPane.hxx mode change 100644 => 100755 sd/source/ui/framework/factories/Pane.cxx mode change 100644 => 100755 sd/source/ui/framework/factories/PresentationFactory.cxx mode change 100644 => 100755 sd/source/ui/framework/factories/TaskPanelFactory.cxx mode change 100644 => 100755 sd/source/ui/framework/factories/TaskPanelFactory.hxx mode change 100644 => 100755 sd/source/ui/framework/factories/ViewShellWrapper.cxx mode change 100644 => 100755 sd/source/ui/framework/factories/makefile.mk mode change 100644 => 100755 sd/source/ui/framework/module/CenterViewFocusModule.cxx mode change 100644 => 100755 sd/source/ui/framework/module/CenterViewFocusModule.hxx mode change 100644 => 100755 sd/source/ui/framework/module/DrawModule.cxx mode change 100644 => 100755 sd/source/ui/framework/module/ImpressModule.cxx mode change 100644 => 100755 sd/source/ui/framework/module/ModuleController.cxx mode change 100644 => 100755 sd/source/ui/framework/module/PresentationModule.cxx mode change 100644 => 100755 sd/source/ui/framework/module/ReadOnlyModeObserver.cxx mode change 100644 => 100755 sd/source/ui/framework/module/ReadOnlyModeObserver.hxx mode change 100644 => 100755 sd/source/ui/framework/module/ResourceManager.cxx mode change 100644 => 100755 sd/source/ui/framework/module/ResourceManager.hxx mode change 100644 => 100755 sd/source/ui/framework/module/ShellStackGuard.cxx mode change 100644 => 100755 sd/source/ui/framework/module/ShellStackGuard.hxx mode change 100644 => 100755 sd/source/ui/framework/module/SlideSorterModule.cxx mode change 100644 => 100755 sd/source/ui/framework/module/SlideSorterModule.hxx mode change 100644 => 100755 sd/source/ui/framework/module/TaskPaneModule.cxx mode change 100644 => 100755 sd/source/ui/framework/module/TaskPaneModule.hxx mode change 100644 => 100755 sd/source/ui/framework/module/ToolBarModule.cxx mode change 100644 => 100755 sd/source/ui/framework/module/ToolBarModule.hxx mode change 100644 => 100755 sd/source/ui/framework/module/ViewTabBarModule.cxx mode change 100644 => 100755 sd/source/ui/framework/module/ViewTabBarModule.hxx mode change 100644 => 100755 sd/source/ui/framework/module/makefile.mk mode change 100644 => 100755 sd/source/ui/framework/tools/FrameworkHelper.cxx mode change 100644 => 100755 sd/source/ui/framework/tools/makefile.mk mode change 100644 => 100755 sd/source/ui/func/bulmaper.cxx mode change 100644 => 100755 sd/source/ui/func/fuarea.cxx mode change 100644 => 100755 sd/source/ui/func/fubullet.cxx mode change 100644 => 100755 sd/source/ui/func/fuchar.cxx mode change 100644 => 100755 sd/source/ui/func/fucon3d.cxx mode change 100644 => 100755 sd/source/ui/func/fuconarc.cxx mode change 100644 => 100755 sd/source/ui/func/fuconbez.cxx mode change 100644 => 100755 sd/source/ui/func/fuconcs.cxx mode change 100644 => 100755 sd/source/ui/func/fuconnct.cxx mode change 100644 => 100755 sd/source/ui/func/fuconrec.cxx mode change 100644 => 100755 sd/source/ui/func/fuconstr.cxx mode change 100644 => 100755 sd/source/ui/func/fuconuno.cxx mode change 100644 => 100755 sd/source/ui/func/fucopy.cxx mode change 100644 => 100755 sd/source/ui/func/fucushow.cxx mode change 100644 => 100755 sd/source/ui/func/fudraw.cxx mode change 100644 => 100755 sd/source/ui/func/fudspord.cxx mode change 100644 => 100755 sd/source/ui/func/fuediglu.cxx mode change 100644 => 100755 sd/source/ui/func/fuexpand.cxx mode change 100644 => 100755 sd/source/ui/func/fuformatpaintbrush.cxx mode change 100644 => 100755 sd/source/ui/func/fuhhconv.cxx mode change 100644 => 100755 sd/source/ui/func/fuinsert.cxx mode change 100644 => 100755 sd/source/ui/func/fuinsfil.cxx mode change 100644 => 100755 sd/source/ui/func/fuline.cxx mode change 100644 => 100755 sd/source/ui/func/fulinend.cxx mode change 100644 => 100755 sd/source/ui/func/fulink.cxx mode change 100644 => 100755 sd/source/ui/func/fumeasur.cxx mode change 100644 => 100755 sd/source/ui/func/fumorph.cxx mode change 100644 => 100755 sd/source/ui/func/fuoaprms.cxx mode change 100644 => 100755 sd/source/ui/func/fuolbull.cxx mode change 100644 => 100755 sd/source/ui/func/fuoltext.cxx mode change 100644 => 100755 sd/source/ui/func/fuoutl.cxx mode change 100644 => 100755 sd/source/ui/func/fupage.cxx mode change 100644 => 100755 sd/source/ui/func/fuparagr.cxx mode change 100644 => 100755 sd/source/ui/func/fupoor.cxx mode change 100644 => 100755 sd/source/ui/func/fuprlout.cxx mode change 100644 => 100755 sd/source/ui/func/fuprobjs.cxx mode change 100644 => 100755 sd/source/ui/func/fuscale.cxx mode change 100644 => 100755 sd/source/ui/func/fusearch.cxx mode change 100644 => 100755 sd/source/ui/func/fusel.cxx mode change 100644 => 100755 sd/source/ui/func/fusldlg.cxx mode change 100644 => 100755 sd/source/ui/func/fusnapln.cxx mode change 100644 => 100755 sd/source/ui/func/fuspell.cxx mode change 100644 => 100755 sd/source/ui/func/fusumry.cxx mode change 100644 => 100755 sd/source/ui/func/futempl.cxx mode change 100644 => 100755 sd/source/ui/func/futext.cxx mode change 100644 => 100755 sd/source/ui/func/futext2.cxx mode change 100644 => 100755 sd/source/ui/func/futhes.cxx mode change 100644 => 100755 sd/source/ui/func/futransf.cxx mode change 100644 => 100755 sd/source/ui/func/futxtatt.cxx mode change 100644 => 100755 sd/source/ui/func/fuvect.cxx mode change 100644 => 100755 sd/source/ui/func/fuzoom.cxx mode change 100644 => 100755 sd/source/ui/func/makefile.mk mode change 100644 => 100755 sd/source/ui/func/outlinfo.cxx mode change 100644 => 100755 sd/source/ui/func/sdundo.cxx mode change 100644 => 100755 sd/source/ui/func/sdundogr.cxx mode change 100644 => 100755 sd/source/ui/func/smarttag.cxx mode change 100644 => 100755 sd/source/ui/func/undoback.cxx mode change 100644 => 100755 sd/source/ui/func/undoheaderfooter.cxx mode change 100644 => 100755 sd/source/ui/func/undolayer.cxx mode change 100644 => 100755 sd/source/ui/func/undopage.cxx mode change 100644 => 100755 sd/source/ui/func/unmovss.cxx mode change 100644 => 100755 sd/source/ui/func/unoaprms.cxx mode change 100644 => 100755 sd/source/ui/func/unprlout.cxx 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 mode change 100644 => 100755 sd/source/ui/presenter/CanvasUpdateRequester.cxx mode change 100644 => 100755 sd/source/ui/presenter/CanvasUpdateRequester.hxx mode change 100644 => 100755 sd/source/ui/presenter/PresenterCanvas.cxx mode change 100644 => 100755 sd/source/ui/presenter/PresenterCanvas.hxx mode change 100644 => 100755 sd/source/ui/presenter/PresenterCanvasFactory.cxx mode change 100644 => 100755 sd/source/ui/presenter/PresenterHelper.cxx mode change 100644 => 100755 sd/source/ui/presenter/PresenterHelper.hxx mode change 100644 => 100755 sd/source/ui/presenter/PresenterPreviewCache.cxx mode change 100644 => 100755 sd/source/ui/presenter/PresenterPreviewCache.hxx mode change 100644 => 100755 sd/source/ui/presenter/PresenterTextView.cxx mode change 100644 => 100755 sd/source/ui/presenter/PresenterTextView.hxx mode change 100644 => 100755 sd/source/ui/presenter/SlideRenderer.cxx mode change 100644 => 100755 sd/source/ui/presenter/SlideRenderer.hxx mode change 100644 => 100755 sd/source/ui/presenter/makefile.mk mode change 100644 => 100755 sd/source/ui/slideshow/PaneHider.cxx mode change 100644 => 100755 sd/source/ui/slideshow/PaneHider.hxx mode change 100644 => 100755 sd/source/ui/slideshow/SlideShowRestarter.cxx mode change 100644 => 100755 sd/source/ui/slideshow/SlideShowRestarter.hxx mode change 100644 => 100755 sd/source/ui/slideshow/makefile.mk mode change 100644 => 100755 sd/source/ui/slideshow/showwin.cxx mode change 100644 => 100755 sd/source/ui/slideshow/showwindow.hxx mode change 100644 => 100755 sd/source/ui/slideshow/slideshow.cxx mode change 100644 => 100755 sd/source/ui/slideshow/slideshow.hrc mode change 100644 => 100755 sd/source/ui/slideshow/slideshow.src mode change 100644 => 100755 sd/source/ui/slideshow/slideshowimpl.cxx mode change 100644 => 100755 sd/source/ui/slideshow/slideshowimpl.hxx mode change 100644 => 100755 sd/source/ui/slideshow/slideshowviewimpl.cxx mode change 100644 => 100755 sd/source/ui/slideshow/slideshowviewimpl.hxx mode change 100644 => 100755 sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx mode change 100644 => 100755 sd/source/ui/slidesorter/cache/SlsBitmapCache.hxx mode change 100644 => 100755 sd/source/ui/slidesorter/cache/SlsBitmapCompressor.cxx mode change 100644 => 100755 sd/source/ui/slidesorter/cache/SlsBitmapCompressor.hxx mode change 100644 => 100755 sd/source/ui/slidesorter/cache/SlsBitmapFactory.cxx mode change 100644 => 100755 sd/source/ui/slidesorter/cache/SlsBitmapFactory.hxx mode change 100644 => 100755 sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx mode change 100644 => 100755 sd/source/ui/slidesorter/cache/SlsCacheCompactor.hxx mode change 100644 => 100755 sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx mode change 100644 => 100755 sd/source/ui/slidesorter/cache/SlsCacheConfiguration.hxx mode change 100644 => 100755 sd/source/ui/slidesorter/cache/SlsGenericPageCache.cxx mode change 100644 => 100755 sd/source/ui/slidesorter/cache/SlsGenericPageCache.hxx mode change 100644 => 100755 sd/source/ui/slidesorter/cache/SlsIdleDetector.cxx mode change 100644 => 100755 sd/source/ui/slidesorter/cache/SlsIdleDetector.hxx mode change 100644 => 100755 sd/source/ui/slidesorter/cache/SlsPageCache.cxx mode change 100644 => 100755 sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx mode change 100644 => 100755 sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx mode change 100644 => 100755 sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx mode change 100644 => 100755 sd/source/ui/slidesorter/cache/SlsQueueProcessorThread.hxx mode change 100644 => 100755 sd/source/ui/slidesorter/cache/SlsRequestFactory.cxx mode change 100644 => 100755 sd/source/ui/slidesorter/cache/SlsRequestFactory.hxx mode change 100644 => 100755 sd/source/ui/slidesorter/cache/SlsRequestPriorityClass.hxx mode change 100644 => 100755 sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx mode change 100644 => 100755 sd/source/ui/slidesorter/cache/SlsRequestQueue.hxx mode change 100644 => 100755 sd/source/ui/slidesorter/cache/makefile.mk mode change 100644 => 100755 sd/source/ui/slidesorter/controller/SlideSorterController.cxx mode change 100644 => 100755 sd/source/ui/slidesorter/controller/SlsAnimator.cxx mode change 100644 => 100755 sd/source/ui/slidesorter/controller/SlsClipboard.cxx mode change 100644 => 100755 sd/source/ui/slidesorter/controller/SlsCommand.hxx mode change 100644 => 100755 sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx mode change 100644 => 100755 sd/source/ui/slidesorter/controller/SlsFocusManager.cxx mode change 100644 => 100755 sd/source/ui/slidesorter/controller/SlsHideSlideFunction.cxx mode change 100644 => 100755 sd/source/ui/slidesorter/controller/SlsHideSlideFunction.hxx mode change 100644 => 100755 sd/source/ui/slidesorter/controller/SlsListener.cxx mode change 100644 => 100755 sd/source/ui/slidesorter/controller/SlsListener.hxx mode change 100644 => 100755 sd/source/ui/slidesorter/controller/SlsPageObjectFactory.cxx mode change 100644 => 100755 sd/source/ui/slidesorter/controller/SlsPageSelector.cxx mode change 100644 => 100755 sd/source/ui/slidesorter/controller/SlsProperties.cxx mode change 100644 => 100755 sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx mode change 100644 => 100755 sd/source/ui/slidesorter/controller/SlsSelectionCommand.cxx mode change 100644 => 100755 sd/source/ui/slidesorter/controller/SlsSelectionCommand.hxx mode change 100644 => 100755 sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx mode change 100644 => 100755 sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx mode change 100644 => 100755 sd/source/ui/slidesorter/controller/SlsSlideFunction.cxx mode change 100644 => 100755 sd/source/ui/slidesorter/controller/SlsSlotManager.cxx mode change 100644 => 100755 sd/source/ui/slidesorter/controller/SlsTransferable.cxx mode change 100644 => 100755 sd/source/ui/slidesorter/controller/SlsTransferable.hxx mode change 100644 => 100755 sd/source/ui/slidesorter/controller/makefile.mk mode change 100644 => 100755 sd/source/ui/slidesorter/inc/cache/SlsCacheContext.hxx mode change 100644 => 100755 sd/source/ui/slidesorter/inc/cache/SlsPageCache.hxx mode change 100644 => 100755 sd/source/ui/slidesorter/inc/cache/SlsPageCacheManager.hxx mode change 100644 => 100755 sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx mode change 100644 => 100755 sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx mode change 100644 => 100755 sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx mode change 100644 => 100755 sd/source/ui/slidesorter/inc/controller/SlsCurrentSlideManager.hxx mode change 100644 => 100755 sd/source/ui/slidesorter/inc/controller/SlsFocusManager.hxx mode change 100644 => 100755 sd/source/ui/slidesorter/inc/controller/SlsPageObjectFactory.hxx mode change 100644 => 100755 sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx mode change 100644 => 100755 sd/source/ui/slidesorter/inc/controller/SlsProperties.hxx mode change 100644 => 100755 sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx mode change 100644 => 100755 sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx mode change 100644 => 100755 sd/source/ui/slidesorter/inc/controller/SlsSelectionManager.hxx mode change 100644 => 100755 sd/source/ui/slidesorter/inc/controller/SlsSlideFunction.hxx mode change 100644 => 100755 sd/source/ui/slidesorter/inc/controller/SlsSlotManager.hxx mode change 100644 => 100755 sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx mode change 100644 => 100755 sd/source/ui/slidesorter/inc/model/SlsEnumeration.hxx mode change 100644 => 100755 sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx mode change 100644 => 100755 sd/source/ui/slidesorter/inc/model/SlsPageEnumeration.hxx mode change 100644 => 100755 sd/source/ui/slidesorter/inc/model/SlsPageEnumerationProvider.hxx mode change 100644 => 100755 sd/source/ui/slidesorter/inc/model/SlsSharedPageDescriptor.hxx mode change 100644 => 100755 sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx mode change 100644 => 100755 sd/source/ui/slidesorter/inc/view/SlsFontProvider.hxx mode change 100644 => 100755 sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx mode change 100644 => 100755 sd/source/ui/slidesorter/inc/view/SlsPageObject.hxx mode change 100644 => 100755 sd/source/ui/slidesorter/inc/view/SlsPageObjectViewContact.hxx mode change 100644 => 100755 sd/source/ui/slidesorter/inc/view/SlsPageObjectViewObjectContact.hxx mode change 100644 => 100755 sd/source/ui/slidesorter/inc/view/SlsViewOverlay.hxx mode change 100644 => 100755 sd/source/ui/slidesorter/makefile.mk mode change 100644 => 100755 sd/source/ui/slidesorter/model/SlideSorterModel.cxx mode change 100644 => 100755 sd/source/ui/slidesorter/model/SlsPageDescriptor.cxx mode change 100644 => 100755 sd/source/ui/slidesorter/model/SlsPageEnumeration.cxx mode change 100644 => 100755 sd/source/ui/slidesorter/model/SlsPageEnumerationProvider.cxx mode change 100644 => 100755 sd/source/ui/slidesorter/model/makefile.mk mode change 100644 => 100755 sd/source/ui/slidesorter/shell/SlideSorter.cxx mode change 100644 => 100755 sd/source/ui/slidesorter/shell/SlideSorterChildWindow.cxx mode change 100644 => 100755 sd/source/ui/slidesorter/shell/SlideSorterChildWindow.src mode change 100644 => 100755 sd/source/ui/slidesorter/shell/SlideSorterService.cxx mode change 100644 => 100755 sd/source/ui/slidesorter/shell/SlideSorterService.hxx mode change 100644 => 100755 sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx mode change 100644 => 100755 sd/source/ui/slidesorter/shell/makefile.mk mode change 100644 => 100755 sd/source/ui/slidesorter/view/SlideSorterView.cxx mode change 100644 => 100755 sd/source/ui/slidesorter/view/SlsFontProvider.cxx mode change 100644 => 100755 sd/source/ui/slidesorter/view/SlsLayouter.cxx mode change 100644 => 100755 sd/source/ui/slidesorter/view/SlsPageObject.cxx mode change 100644 => 100755 sd/source/ui/slidesorter/view/SlsPageObjectViewContact.cxx mode change 100644 => 100755 sd/source/ui/slidesorter/view/SlsPageObjectViewObjectContact.cxx mode change 100644 => 100755 sd/source/ui/slidesorter/view/SlsViewCacheContext.cxx mode change 100644 => 100755 sd/source/ui/slidesorter/view/SlsViewCacheContext.hxx mode change 100644 => 100755 sd/source/ui/slidesorter/view/SlsViewOverlay.cxx mode change 100644 => 100755 sd/source/ui/slidesorter/view/makefile.mk mode change 100644 => 100755 sd/source/ui/table/TableDesignPane.cxx mode change 100644 => 100755 sd/source/ui/table/TableDesignPane.hrc mode change 100644 => 100755 sd/source/ui/table/TableDesignPane.hxx mode change 100644 => 100755 sd/source/ui/table/TableDesignPane.src mode change 100644 => 100755 sd/source/ui/table/makefile.mk mode change 100644 => 100755 sd/source/ui/table/tablefunction.cxx mode change 100644 => 100755 sd/source/ui/table/tableobjectbar.cxx mode change 100644 => 100755 sd/source/ui/table/tableobjectbar.hxx mode change 100644 => 100755 sd/source/ui/toolpanel/ConstrainedIterator.cxx mode change 100644 => 100755 sd/source/ui/toolpanel/ConstrainedIterator.hxx mode change 100644 => 100755 sd/source/ui/toolpanel/ControlContainer.cxx mode change 100644 => 100755 sd/source/ui/toolpanel/ControlContainerDescriptor.hxx mode change 100644 => 100755 sd/source/ui/toolpanel/ControlDescriptorIterator.cxx mode change 100644 => 100755 sd/source/ui/toolpanel/ControlList.hxx mode change 100644 => 100755 sd/source/ui/toolpanel/EmptyWindow.cxx mode change 100644 => 100755 sd/source/ui/toolpanel/EmptyWindow.hxx mode change 100644 => 100755 sd/source/ui/toolpanel/LayoutMenu.cxx mode change 100644 => 100755 sd/source/ui/toolpanel/LayoutMenu.hxx mode change 100644 => 100755 sd/source/ui/toolpanel/LayoutableWindow.hxx mode change 100644 => 100755 sd/source/ui/toolpanel/ScrollPanel.cxx mode change 100644 => 100755 sd/source/ui/toolpanel/SimpleLayoutWrapper.cxx mode change 100644 => 100755 sd/source/ui/toolpanel/SimpleLayoutWrapper.hxx mode change 100644 => 100755 sd/source/ui/toolpanel/SlideSorterCacheDisplay.cxx mode change 100644 => 100755 sd/source/ui/toolpanel/SubToolPanel.cxx mode change 100644 => 100755 sd/source/ui/toolpanel/TaskPaneControlFactory.cxx mode change 100644 => 100755 sd/source/ui/toolpanel/TaskPaneFocusManager.cxx mode change 100644 => 100755 sd/source/ui/toolpanel/TaskPaneFocusManager.hxx mode change 100644 => 100755 sd/source/ui/toolpanel/TaskPaneShellManager.cxx mode change 100644 => 100755 sd/source/ui/toolpanel/TaskPaneShellManager.hxx mode change 100644 => 100755 sd/source/ui/toolpanel/TaskPaneTreeNode.cxx mode change 100644 => 100755 sd/source/ui/toolpanel/TaskPaneViewShell.cxx mode change 100644 => 100755 sd/source/ui/toolpanel/TestMenu.cxx mode change 100644 => 100755 sd/source/ui/toolpanel/TestMenu.hxx mode change 100644 => 100755 sd/source/ui/toolpanel/TestPanel.cxx mode change 100644 => 100755 sd/source/ui/toolpanel/TestPanel.hxx mode change 100644 => 100755 sd/source/ui/toolpanel/TitleBar.cxx mode change 100644 => 100755 sd/source/ui/toolpanel/TitleToolBox.cxx mode change 100644 => 100755 sd/source/ui/toolpanel/TitleToolBox.hxx mode change 100644 => 100755 sd/source/ui/toolpanel/TitledControl.cxx mode change 100644 => 100755 sd/source/ui/toolpanel/ToolPanel.cxx mode change 100644 => 100755 sd/source/ui/toolpanel/ToolPanelChildWindow.cxx mode change 100644 => 100755 sd/source/ui/toolpanel/ToolPanelChildWindow.src mode change 100644 => 100755 sd/source/ui/toolpanel/ToolPanelDescriptor.hxx mode change 100644 => 100755 sd/source/ui/toolpanel/controls/AllMasterPagesSelector.cxx mode change 100644 => 100755 sd/source/ui/toolpanel/controls/AllMasterPagesSelector.hxx mode change 100644 => 100755 sd/source/ui/toolpanel/controls/AnimationSchemesPanel.cxx mode change 100644 => 100755 sd/source/ui/toolpanel/controls/AnimationSchemesPanel.hxx mode change 100644 => 100755 sd/source/ui/toolpanel/controls/CurrentMasterPagesSelector.cxx mode change 100644 => 100755 sd/source/ui/toolpanel/controls/CurrentMasterPagesSelector.hxx mode change 100644 => 100755 sd/source/ui/toolpanel/controls/CustomAnimationPanel.cxx mode change 100644 => 100755 sd/source/ui/toolpanel/controls/CustomAnimationPanel.hxx mode change 100644 => 100755 sd/source/ui/toolpanel/controls/DocumentHelper.cxx mode change 100644 => 100755 sd/source/ui/toolpanel/controls/DocumentHelper.hxx mode change 100644 => 100755 sd/source/ui/toolpanel/controls/MasterPageContainer.cxx mode change 100644 => 100755 sd/source/ui/toolpanel/controls/MasterPageContainer.hxx mode change 100644 => 100755 sd/source/ui/toolpanel/controls/MasterPageContainerFiller.cxx mode change 100644 => 100755 sd/source/ui/toolpanel/controls/MasterPageContainerFiller.hxx mode change 100644 => 100755 sd/source/ui/toolpanel/controls/MasterPageContainerProviders.cxx mode change 100644 => 100755 sd/source/ui/toolpanel/controls/MasterPageContainerProviders.hxx mode change 100644 => 100755 sd/source/ui/toolpanel/controls/MasterPageContainerQueue.cxx mode change 100644 => 100755 sd/source/ui/toolpanel/controls/MasterPageContainerQueue.hxx mode change 100644 => 100755 sd/source/ui/toolpanel/controls/MasterPageDescriptor.cxx mode change 100644 => 100755 sd/source/ui/toolpanel/controls/MasterPageDescriptor.hxx mode change 100644 => 100755 sd/source/ui/toolpanel/controls/MasterPageObserver.cxx mode change 100644 => 100755 sd/source/ui/toolpanel/controls/MasterPagesPanel.cxx mode change 100644 => 100755 sd/source/ui/toolpanel/controls/MasterPagesPanel.hxx mode change 100644 => 100755 sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx mode change 100644 => 100755 sd/source/ui/toolpanel/controls/MasterPagesSelector.hxx mode change 100644 => 100755 sd/source/ui/toolpanel/controls/PreviewValueSet.cxx mode change 100644 => 100755 sd/source/ui/toolpanel/controls/PreviewValueSet.hxx mode change 100644 => 100755 sd/source/ui/toolpanel/controls/RecentMasterPagesSelector.cxx mode change 100644 => 100755 sd/source/ui/toolpanel/controls/RecentMasterPagesSelector.hxx mode change 100644 => 100755 sd/source/ui/toolpanel/controls/RecentlyUsedMasterPages.cxx mode change 100644 => 100755 sd/source/ui/toolpanel/controls/RecentlyUsedMasterPages.hxx mode change 100644 => 100755 sd/source/ui/toolpanel/controls/SlideTransitionPanel.cxx mode change 100644 => 100755 sd/source/ui/toolpanel/controls/SlideTransitionPanel.hxx mode change 100644 => 100755 sd/source/ui/toolpanel/controls/TableDesignPanel.cxx mode change 100644 => 100755 sd/source/ui/toolpanel/controls/TableDesignPanel.hxx mode change 100644 => 100755 sd/source/ui/toolpanel/controls/makefile.mk mode change 100644 => 100755 sd/source/ui/toolpanel/makefile.mk mode change 100644 => 100755 sd/source/ui/tools/AsynchronousCall.cxx mode change 100644 => 100755 sd/source/ui/tools/ConfigurationAccess.cxx mode change 100644 => 100755 sd/source/ui/tools/EventMultiplexer.cxx mode change 100644 => 100755 sd/source/ui/tools/IconCache.cxx mode change 100644 => 100755 sd/source/ui/tools/IdleDetection.cxx mode change 100644 => 100755 sd/source/ui/tools/PreviewRenderer.cxx mode change 100644 => 100755 sd/source/ui/tools/PropertySet.cxx mode change 100644 => 100755 sd/source/ui/tools/SdGlobalResourceContainer.cxx mode change 100644 => 100755 sd/source/ui/tools/SlotStateListener.cxx mode change 100644 => 100755 sd/source/ui/tools/TimerBasedTaskExecution.cxx mode change 100644 => 100755 sd/source/ui/tools/makefile.mk mode change 100644 => 100755 sd/source/ui/unoidl/DrawController.cxx mode change 100644 => 100755 sd/source/ui/unoidl/SdUnoDrawView.cxx mode change 100644 => 100755 sd/source/ui/unoidl/SdUnoOutlineView.cxx mode change 100644 => 100755 sd/source/ui/unoidl/SdUnoSlideView.cxx mode change 100644 => 100755 sd/source/ui/unoidl/UnoDocumentSettings.cxx mode change 100644 => 100755 sd/source/ui/unoidl/UnoDocumentSettings.hxx mode change 100644 => 100755 sd/source/ui/unoidl/detreg.cxx mode change 100644 => 100755 sd/source/ui/unoidl/facreg.cxx mode change 100644 => 100755 sd/source/ui/unoidl/makefile.mk mode change 100644 => 100755 sd/source/ui/unoidl/randomnode.cxx mode change 100644 => 100755 sd/source/ui/unoidl/sddetect.cxx mode change 100644 => 100755 sd/source/ui/unoidl/sddetect.hxx mode change 100644 => 100755 sd/source/ui/unoidl/unocpres.cxx mode change 100644 => 100755 sd/source/ui/unoidl/unocpres.hxx mode change 100644 => 100755 sd/source/ui/unoidl/unodoc.cxx mode change 100644 => 100755 sd/source/ui/unoidl/unohelp.hxx mode change 100644 => 100755 sd/source/ui/unoidl/unokywds.cxx mode change 100644 => 100755 sd/source/ui/unoidl/unolayer.cxx mode change 100644 => 100755 sd/source/ui/unoidl/unolayer.hxx mode change 100644 => 100755 sd/source/ui/unoidl/unomodel.cxx mode change 100644 => 100755 sd/source/ui/unoidl/unomodule.cxx mode change 100644 => 100755 sd/source/ui/unoidl/unomodule.hxx mode change 100644 => 100755 sd/source/ui/unoidl/unoobj.cxx mode change 100644 => 100755 sd/source/ui/unoidl/unoobj.hxx mode change 100644 => 100755 sd/source/ui/unoidl/unopage.cxx mode change 100644 => 100755 sd/source/ui/unoidl/unopage.hxx mode change 100644 => 100755 sd/source/ui/unoidl/unopback.cxx mode change 100644 => 100755 sd/source/ui/unoidl/unopback.hxx mode change 100644 => 100755 sd/source/ui/unoidl/unopool.cxx mode change 100644 => 100755 sd/source/ui/unoidl/unosrch.cxx mode change 100644 => 100755 sd/source/ui/unoidl/unovwcrs.cxx mode change 100644 => 100755 sd/source/ui/unoidl/unowcntr.cxx mode change 100644 => 100755 sd/source/ui/unoidl/unowcntr.hxx mode change 100644 => 100755 sd/source/ui/view/DocumentRenderer.cxx mode change 100644 => 100755 sd/source/ui/view/DocumentRenderer.hrc mode change 100644 => 100755 sd/source/ui/view/DocumentRenderer.src mode change 100644 => 100755 sd/source/ui/view/FormShellManager.cxx mode change 100644 => 100755 sd/source/ui/view/GraphicObjectBar.cxx mode change 100644 => 100755 sd/source/ui/view/GraphicViewShellBase.cxx mode change 100644 => 100755 sd/source/ui/view/ImpressViewShellBase.cxx mode change 100644 => 100755 sd/source/ui/view/MediaObjectBar.cxx mode change 100644 => 100755 sd/source/ui/view/OutlineViewShellBase.cxx mode change 100644 => 100755 sd/source/ui/view/Outliner.cxx mode change 100644 => 100755 sd/source/ui/view/OutlinerIterator.cxx mode change 100644 => 100755 sd/source/ui/view/PresentationViewShellBase.cxx mode change 100644 => 100755 sd/source/ui/view/SlideSorterViewShellBase.cxx mode change 100644 => 100755 sd/source/ui/view/ToolBarManager.cxx mode change 100644 => 100755 sd/source/ui/view/UpdateLockManager.cxx mode change 100644 => 100755 sd/source/ui/view/ViewShellHint.cxx mode change 100644 => 100755 sd/source/ui/view/ViewShellImplementation.cxx mode change 100644 => 100755 sd/source/ui/view/ViewTabBar.cxx mode change 100644 => 100755 sd/source/ui/view/WindowUpdater.cxx mode change 100644 => 100755 sd/source/ui/view/bmcache.cxx mode change 100644 => 100755 sd/source/ui/view/clview.cxx mode change 100644 => 100755 sd/source/ui/view/drawview.cxx mode change 100644 => 100755 sd/source/ui/view/drbezob.cxx mode change 100644 => 100755 sd/source/ui/view/drtxtob.cxx mode change 100644 => 100755 sd/source/ui/view/drtxtob1.cxx mode change 100644 => 100755 sd/source/ui/view/drviews1.cxx mode change 100644 => 100755 sd/source/ui/view/drviews2.cxx mode change 100644 => 100755 sd/source/ui/view/drviews3.cxx mode change 100644 => 100755 sd/source/ui/view/drviews4.cxx mode change 100644 => 100755 sd/source/ui/view/drviews5.cxx mode change 100644 => 100755 sd/source/ui/view/drviews6.cxx mode change 100644 => 100755 sd/source/ui/view/drviews7.cxx mode change 100644 => 100755 sd/source/ui/view/drviews8.cxx mode change 100644 => 100755 sd/source/ui/view/drviews9.cxx mode change 100644 => 100755 sd/source/ui/view/drviewsa.cxx mode change 100644 => 100755 sd/source/ui/view/drviewsb.cxx mode change 100644 => 100755 sd/source/ui/view/drviewsc.cxx mode change 100644 => 100755 sd/source/ui/view/drviewsd.cxx mode change 100644 => 100755 sd/source/ui/view/drviewse.cxx mode change 100644 => 100755 sd/source/ui/view/drviewsf.cxx mode change 100644 => 100755 sd/source/ui/view/drviewsg.cxx mode change 100644 => 100755 sd/source/ui/view/drviewsh.cxx mode change 100644 => 100755 sd/source/ui/view/drviewsi.cxx mode change 100644 => 100755 sd/source/ui/view/drviewsj.cxx mode change 100644 => 100755 sd/source/ui/view/drvwshrg.cxx mode change 100644 => 100755 sd/source/ui/view/frmview.cxx mode change 100644 => 100755 sd/source/ui/view/grviewsh.cxx mode change 100644 => 100755 sd/source/ui/view/makefile.mk mode change 100644 => 100755 sd/source/ui/view/outlnvs2.cxx mode change 100644 => 100755 sd/source/ui/view/outlnvsh.cxx mode change 100644 => 100755 sd/source/ui/view/outlview.cxx mode change 100644 => 100755 sd/source/ui/view/presvish.cxx mode change 100644 => 100755 sd/source/ui/view/sdruler.cxx mode change 100644 => 100755 sd/source/ui/view/sdview.cxx mode change 100644 => 100755 sd/source/ui/view/sdview2.cxx mode change 100644 => 100755 sd/source/ui/view/sdview3.cxx mode change 100644 => 100755 sd/source/ui/view/sdview4.cxx mode change 100644 => 100755 sd/source/ui/view/sdview5.cxx mode change 100644 => 100755 sd/source/ui/view/sdwindow.cxx mode change 100644 => 100755 sd/source/ui/view/showview.cxx mode change 100644 => 100755 sd/source/ui/view/tabcontr.cxx mode change 100644 => 100755 sd/source/ui/view/unmodpg.cxx mode change 100644 => 100755 sd/source/ui/view/viewoverlaymanager.cxx mode change 100644 => 100755 sd/source/ui/view/viewshe2.cxx mode change 100644 => 100755 sd/source/ui/view/viewshe3.cxx mode change 100644 => 100755 sd/source/ui/view/viewshel.cxx mode change 100644 => 100755 sd/source/ui/view/zoomlist.cxx mode change 100644 => 100755 sd/source/unotypes/makefile.mk mode change 100644 => 100755 sd/uiconfig/sdraw/menubar/menubar.xml mode change 100644 => 100755 sd/uiconfig/sdraw/statusbar/statusbar.xml mode change 100644 => 100755 sd/uiconfig/sdraw/toolbar/3dobjectsbar.xml mode change 100644 => 100755 sd/uiconfig/sdraw/toolbar/alignmentbar.xml mode change 100644 => 100755 sd/uiconfig/sdraw/toolbar/arrowsbar.xml mode change 100644 => 100755 sd/uiconfig/sdraw/toolbar/arrowshapes.xml mode change 100644 => 100755 sd/uiconfig/sdraw/toolbar/basicshapes.xml mode change 100644 => 100755 sd/uiconfig/sdraw/toolbar/bezierobjectbar.xml mode change 100644 => 100755 sd/uiconfig/sdraw/toolbar/calloutshapes.xml mode change 100644 => 100755 sd/uiconfig/sdraw/toolbar/choosemodebar.xml mode change 100644 => 100755 sd/uiconfig/sdraw/toolbar/colorbar.xml mode change 100644 => 100755 sd/uiconfig/sdraw/toolbar/commentsbar.xml mode change 100644 => 100755 sd/uiconfig/sdraw/toolbar/connectorsbar.xml mode change 100644 => 100755 sd/uiconfig/sdraw/toolbar/drawingobjectbar.xml mode change 100644 => 100755 sd/uiconfig/sdraw/toolbar/ellipsesbar.xml mode change 100644 => 100755 sd/uiconfig/sdraw/toolbar/extrusionobjectbar.xml mode change 100644 => 100755 sd/uiconfig/sdraw/toolbar/flowchartshapes.xml mode change 100644 => 100755 sd/uiconfig/sdraw/toolbar/fontworkobjectbar.xml mode change 100644 => 100755 sd/uiconfig/sdraw/toolbar/fontworkshapetype.xml mode change 100644 => 100755 sd/uiconfig/sdraw/toolbar/formcontrols.xml mode change 100644 => 100755 sd/uiconfig/sdraw/toolbar/formdesign.xml mode change 100644 => 100755 sd/uiconfig/sdraw/toolbar/formsfilterbar.xml mode change 100644 => 100755 sd/uiconfig/sdraw/toolbar/formsnavigationbar.xml mode change 100644 => 100755 sd/uiconfig/sdraw/toolbar/formtextobjectbar.xml mode change 100644 => 100755 sd/uiconfig/sdraw/toolbar/fullscreenbar.xml mode change 100644 => 100755 sd/uiconfig/sdraw/toolbar/gluepointsobjectbar.xml mode change 100644 => 100755 sd/uiconfig/sdraw/toolbar/graffilterbar.xml mode change 100644 => 100755 sd/uiconfig/sdraw/toolbar/graphicobjectbar.xml mode change 100644 => 100755 sd/uiconfig/sdraw/toolbar/insertbar.xml mode change 100644 => 100755 sd/uiconfig/sdraw/toolbar/linesbar.xml mode change 100644 => 100755 sd/uiconfig/sdraw/toolbar/masterviewtoolbar.xml mode change 100644 => 100755 sd/uiconfig/sdraw/toolbar/mediaobjectbar.xml mode change 100644 => 100755 sd/uiconfig/sdraw/toolbar/moreformcontrols.xml mode change 100644 => 100755 sd/uiconfig/sdraw/toolbar/optimizetablebar.xml mode change 100644 => 100755 sd/uiconfig/sdraw/toolbar/optionsbar.xml mode change 100644 => 100755 sd/uiconfig/sdraw/toolbar/positionbar.xml mode change 100644 => 100755 sd/uiconfig/sdraw/toolbar/rectanglesbar.xml mode change 100644 => 100755 sd/uiconfig/sdraw/toolbar/standardbar.xml mode change 100644 => 100755 sd/uiconfig/sdraw/toolbar/starshapes.xml mode change 100644 => 100755 sd/uiconfig/sdraw/toolbar/symbolshapes.xml mode change 100644 => 100755 sd/uiconfig/sdraw/toolbar/tableobjectbar.xml mode change 100644 => 100755 sd/uiconfig/sdraw/toolbar/textbar.xml mode change 100644 => 100755 sd/uiconfig/sdraw/toolbar/textobjectbar.xml mode change 100644 => 100755 sd/uiconfig/sdraw/toolbar/toolbar.xml mode change 100644 => 100755 sd/uiconfig/sdraw/toolbar/viewerbar.xml mode change 100644 => 100755 sd/uiconfig/sdraw/toolbar/zoombar.xml mode change 100644 => 100755 sd/uiconfig/simpress/menubar/menubar.xml mode change 100644 => 100755 sd/uiconfig/simpress/statusbar/statusbar.xml mode change 100644 => 100755 sd/uiconfig/simpress/toolbar/3dobjectsbar.xml mode change 100644 => 100755 sd/uiconfig/simpress/toolbar/alignmentbar.xml mode change 100644 => 100755 sd/uiconfig/simpress/toolbar/arrowsbar.xml mode change 100644 => 100755 sd/uiconfig/simpress/toolbar/arrowshapes.xml mode change 100644 => 100755 sd/uiconfig/simpress/toolbar/basicshapes.xml mode change 100644 => 100755 sd/uiconfig/simpress/toolbar/bezierobjectbar.xml mode change 100644 => 100755 sd/uiconfig/simpress/toolbar/calloutshapes.xml mode change 100644 => 100755 sd/uiconfig/simpress/toolbar/choosemodebar.xml mode change 100644 => 100755 sd/uiconfig/simpress/toolbar/colorbar.xml mode change 100644 => 100755 sd/uiconfig/simpress/toolbar/commentsbar.xml mode change 100644 => 100755 sd/uiconfig/simpress/toolbar/commontaskbar.xml mode change 100644 => 100755 sd/uiconfig/simpress/toolbar/connectorsbar.xml mode change 100644 => 100755 sd/uiconfig/simpress/toolbar/drawingobjectbar.xml mode change 100644 => 100755 sd/uiconfig/simpress/toolbar/ellipsesbar.xml mode change 100644 => 100755 sd/uiconfig/simpress/toolbar/extrusionobjectbar.xml mode change 100644 => 100755 sd/uiconfig/simpress/toolbar/flowchartshapes.xml mode change 100644 => 100755 sd/uiconfig/simpress/toolbar/fontworkobjectbar.xml mode change 100644 => 100755 sd/uiconfig/simpress/toolbar/fontworkshapetype.xml mode change 100644 => 100755 sd/uiconfig/simpress/toolbar/formcontrols.xml mode change 100644 => 100755 sd/uiconfig/simpress/toolbar/formdesign.xml mode change 100644 => 100755 sd/uiconfig/simpress/toolbar/formsfilterbar.xml mode change 100644 => 100755 sd/uiconfig/simpress/toolbar/formsnavigationbar.xml mode change 100644 => 100755 sd/uiconfig/simpress/toolbar/formtextobjectbar.xml mode change 100644 => 100755 sd/uiconfig/simpress/toolbar/fullscreenbar.xml mode change 100644 => 100755 sd/uiconfig/simpress/toolbar/gluepointsobjectbar.xml mode change 100644 => 100755 sd/uiconfig/simpress/toolbar/graffilterbar.xml mode change 100644 => 100755 sd/uiconfig/simpress/toolbar/graphicobjectbar.xml mode change 100644 => 100755 sd/uiconfig/simpress/toolbar/insertbar.xml mode change 100644 => 100755 sd/uiconfig/simpress/toolbar/linesbar.xml mode change 100644 => 100755 sd/uiconfig/simpress/toolbar/masterviewtoolbar.xml mode change 100644 => 100755 sd/uiconfig/simpress/toolbar/mediaobjectbar.xml mode change 100644 => 100755 sd/uiconfig/simpress/toolbar/moreformcontrols.xml mode change 100644 => 100755 sd/uiconfig/simpress/toolbar/optimizetablebar.xml mode change 100644 => 100755 sd/uiconfig/simpress/toolbar/optionsbar.xml mode change 100644 => 100755 sd/uiconfig/simpress/toolbar/outlinetoolbar.xml mode change 100644 => 100755 sd/uiconfig/simpress/toolbar/positionbar.xml mode change 100644 => 100755 sd/uiconfig/simpress/toolbar/rectanglesbar.xml mode change 100644 => 100755 sd/uiconfig/simpress/toolbar/slideviewobjectbar.xml mode change 100644 => 100755 sd/uiconfig/simpress/toolbar/slideviewtoolbar.xml mode change 100644 => 100755 sd/uiconfig/simpress/toolbar/standardbar.xml mode change 100644 => 100755 sd/uiconfig/simpress/toolbar/starshapes.xml mode change 100644 => 100755 sd/uiconfig/simpress/toolbar/symbolshapes.xml mode change 100644 => 100755 sd/uiconfig/simpress/toolbar/tableobjectbar.xml mode change 100644 => 100755 sd/uiconfig/simpress/toolbar/textbar.xml mode change 100644 => 100755 sd/uiconfig/simpress/toolbar/textobjectbar.xml mode change 100644 => 100755 sd/uiconfig/simpress/toolbar/toolbar.xml mode change 100644 => 100755 sd/uiconfig/simpress/toolbar/viewerbar.xml mode change 100644 => 100755 sd/uiconfig/simpress/toolbar/zoombar.xml mode change 100644 => 100755 sd/util/exports.dxp mode change 100644 => 100755 sd/util/hidother.hrc mode change 100644 => 100755 sd/util/hidother.src mode change 100644 => 100755 sd/util/makefile.mk mode change 100644 => 100755 sd/util/makefile.pmk mode change 100644 => 100755 sd/util/sd.flt mode change 100644 => 100755 sd/util/sd.map mode change 100644 => 100755 sd/util/sdd.map mode change 100644 => 100755 sd/util/sdfilt.map mode change 100644 => 100755 sd/util/sdui.map mode change 100644 => 100755 sd/workben/testdll/makefile mode change 100644 => 100755 sd/xml/AccessibleDrawDocumentView.xml mode change 100644 => 100755 sd/xml/AccessibleOutlineView.xml mode change 100644 => 100755 sd/xml/AccessiblePageShape.xml mode change 100644 => 100755 sd/xml/AccessiblePresentationGraphicShape.xml mode change 100644 => 100755 sd/xml/AccessiblePresentationOLEShape.xml mode change 100644 => 100755 sd/xml/AccessiblePresentationShape.xml mode change 100644 => 100755 sd/xml/AccessibleSlideView.xml mode change 100644 => 100755 sd/xml/AccessibleSlideViewObject.xml mode change 100644 => 100755 sd/xml/DrawingView.xml mode change 100644 => 100755 sd/xml/HandoutView.xml mode change 100644 => 100755 sd/xml/NotesView.xml mode change 100644 => 100755 sd/xml/OutlineView.xml mode change 100644 => 100755 sd/xml/PresentationView.xml mode change 100644 => 100755 sd/xml/SdDocLinkTargets.xml mode change 100644 => 100755 sd/xml/SdDrawPage.xml mode change 100644 => 100755 sd/xml/SdDrawPagesAccess.xml mode change 100644 => 100755 sd/xml/SdGenericDrawPage.xml mode change 100644 => 100755 sd/xml/SdLayer.xml mode change 100644 => 100755 sd/xml/SdLayerManager.xml mode change 100644 => 100755 sd/xml/SdMasterPage.xml mode change 100644 => 100755 sd/xml/SdMasterPagesAccess.xml mode change 100644 => 100755 sd/xml/SdPageLinkTargets.xml mode change 100644 => 100755 sd/xml/SdXCustomPresentation.xml mode change 100644 => 100755 sd/xml/SdXCustomPresentationAccess.xml mode change 100644 => 100755 sd/xml/SdXImpressDocument.xml mode change 100644 => 100755 sd/xml/SdXPresentation.xml mode change 100644 => 100755 sd/xml/SdXShape.xml mode change 100644 => 100755 sd/xml/SlidesView.xml mode change 100644 => 100755 sd/xml/effects.xml mode change 100644 => 100755 sd/xml/transitions-ogl.xml mode change 100644 => 100755 sd/xml/transitions.xml mode change 100644 => 100755 sd/xsl/effect.xsl (limited to 'sd') diff --git a/sd/inc/CustomAnimationCloner.hxx b/sd/inc/CustomAnimationCloner.hxx old mode 100644 new mode 100755 diff --git a/sd/inc/CustomAnimationEffect.hxx b/sd/inc/CustomAnimationEffect.hxx old mode 100644 new mode 100755 diff --git a/sd/inc/CustomAnimationPreset.hxx b/sd/inc/CustomAnimationPreset.hxx old mode 100644 new mode 100755 diff --git a/sd/inc/EffectMigration.hxx b/sd/inc/EffectMigration.hxx old mode 100644 new mode 100755 diff --git a/sd/inc/FactoryIds.hxx b/sd/inc/FactoryIds.hxx old mode 100644 new mode 100755 diff --git a/sd/inc/Outliner.hxx b/sd/inc/Outliner.hxx old mode 100644 new mode 100755 diff --git a/sd/inc/OutlinerIterator.hxx b/sd/inc/OutlinerIterator.hxx old mode 100644 new mode 100755 diff --git a/sd/inc/SdShapeTypes.hxx b/sd/inc/SdShapeTypes.hxx old mode 100644 new mode 100755 diff --git a/sd/inc/TransitionPreset.hxx b/sd/inc/TransitionPreset.hxx old mode 100644 new mode 100755 diff --git a/sd/inc/animations.hxx b/sd/inc/animations.hxx old mode 100644 new mode 100755 diff --git a/sd/inc/anmdef.hxx b/sd/inc/anmdef.hxx old mode 100644 new mode 100755 diff --git a/sd/inc/anminfo.hxx b/sd/inc/anminfo.hxx old mode 100644 new mode 100755 diff --git a/sd/inc/app.hrc b/sd/inc/app.hrc old mode 100644 new mode 100755 diff --git a/sd/inc/app.hxx b/sd/inc/app.hxx old mode 100644 new mode 100755 diff --git a/sd/inc/cusshow.hxx b/sd/inc/cusshow.hxx old mode 100644 new mode 100755 diff --git a/sd/inc/diadef.h b/sd/inc/diadef.h old mode 100644 new mode 100755 diff --git a/sd/inc/drawdoc.hxx b/sd/inc/drawdoc.hxx old mode 100644 new mode 100755 diff --git a/sd/inc/eetext.hxx b/sd/inc/eetext.hxx old mode 100644 new mode 100755 diff --git a/sd/inc/fadedef.h b/sd/inc/fadedef.h old mode 100644 new mode 100755 diff --git a/sd/inc/glob.hrc b/sd/inc/glob.hrc old mode 100644 new mode 100755 diff --git a/sd/inc/glob.hxx b/sd/inc/glob.hxx old mode 100644 new mode 100755 diff --git a/sd/inc/helper/simplereferencecomponent.hxx b/sd/inc/helper/simplereferencecomponent.hxx old mode 100644 new mode 100755 diff --git a/sd/inc/helpids.h b/sd/inc/helpids.h old mode 100644 new mode 100755 diff --git a/sd/inc/imapinfo.hxx b/sd/inc/imapinfo.hxx old mode 100644 new mode 100755 diff --git a/sd/inc/makefile.mk b/sd/inc/makefile.mk old mode 100644 new mode 100755 diff --git a/sd/inc/misc.hxx b/sd/inc/misc.hxx old mode 100644 new mode 100755 diff --git a/sd/inc/misc/scopelock.hxx b/sd/inc/misc/scopelock.hxx old mode 100644 new mode 100755 diff --git a/sd/inc/movedef.hxx b/sd/inc/movedef.hxx old mode 100644 new mode 100755 diff --git a/sd/inc/pch/precompiled_sd.cxx b/sd/inc/pch/precompiled_sd.cxx old mode 100644 new mode 100755 diff --git a/sd/inc/pch/precompiled_sd.hxx b/sd/inc/pch/precompiled_sd.hxx old mode 100644 new mode 100755 diff --git a/sd/inc/pglink.hxx b/sd/inc/pglink.hxx old mode 100644 new mode 100755 diff --git a/sd/inc/pres.hxx b/sd/inc/pres.hxx old mode 100644 new mode 100755 diff --git a/sd/inc/prlayout.hxx b/sd/inc/prlayout.hxx old mode 100644 new mode 100755 diff --git a/sd/inc/resltn.hxx b/sd/inc/resltn.hxx old mode 100644 new mode 100755 diff --git a/sd/inc/sd_primitivetypes2d.hxx b/sd/inc/sd_primitivetypes2d.hxx old mode 100644 new mode 100755 diff --git a/sd/inc/sdabstdlg.hxx b/sd/inc/sdabstdlg.hxx old mode 100644 new mode 100755 diff --git a/sd/inc/sdattr.hrc b/sd/inc/sdattr.hrc old mode 100644 new mode 100755 diff --git a/sd/inc/sdattr.hxx b/sd/inc/sdattr.hxx old mode 100644 new mode 100755 diff --git a/sd/inc/sdcgmfilter.hxx b/sd/inc/sdcgmfilter.hxx old mode 100644 new mode 100755 diff --git a/sd/inc/sddll.hxx b/sd/inc/sddll.hxx old mode 100644 new mode 100755 diff --git a/sd/inc/sddllapi.h b/sd/inc/sddllapi.h old mode 100644 new mode 100755 diff --git a/sd/inc/sdenumdef.hxx b/sd/inc/sdenumdef.hxx old mode 100644 new mode 100755 diff --git a/sd/inc/sderror.hxx b/sd/inc/sderror.hxx old mode 100644 new mode 100755 diff --git a/sd/inc/sdfilter.hxx b/sd/inc/sdfilter.hxx old mode 100644 new mode 100755 diff --git a/sd/inc/sdgrffilter.hxx b/sd/inc/sdgrffilter.hxx old mode 100644 new mode 100755 diff --git a/sd/inc/sdhtmlfilter.hxx b/sd/inc/sdhtmlfilter.hxx old mode 100644 new mode 100755 diff --git a/sd/inc/sdiocmpt.hxx b/sd/inc/sdiocmpt.hxx old mode 100644 new mode 100755 diff --git a/sd/inc/sdmod.hxx b/sd/inc/sdmod.hxx old mode 100644 new mode 100755 diff --git a/sd/inc/sdobjfac.hxx b/sd/inc/sdobjfac.hxx old mode 100644 new mode 100755 diff --git a/sd/inc/sdpage.hxx b/sd/inc/sdpage.hxx old mode 100644 new mode 100755 diff --git a/sd/inc/sdpptwrp.hxx b/sd/inc/sdpptwrp.hxx old mode 100644 new mode 100755 diff --git a/sd/inc/sdresid.hxx b/sd/inc/sdresid.hxx old mode 100644 new mode 100755 diff --git a/sd/inc/sduiks.hrc b/sd/inc/sduiks.hrc old mode 100644 new mode 100755 diff --git a/sd/inc/sdundo.hxx b/sd/inc/sdundo.hxx old mode 100644 new mode 100755 diff --git a/sd/inc/sdxmlwrp.hxx b/sd/inc/sdxmlwrp.hxx old mode 100644 new mode 100755 diff --git a/sd/inc/segdefs.hxx b/sd/inc/segdefs.hxx old mode 100644 new mode 100755 diff --git a/sd/inc/segdefs_.hxx b/sd/inc/segdefs_.hxx old mode 100644 new mode 100755 diff --git a/sd/inc/shapelist.hxx b/sd/inc/shapelist.hxx old mode 100644 new mode 100755 diff --git a/sd/inc/stlfamily.hxx b/sd/inc/stlfamily.hxx old mode 100644 new mode 100755 diff --git a/sd/inc/stlpool.hxx b/sd/inc/stlpool.hxx old mode 100644 new mode 100755 diff --git a/sd/inc/stlsheet.hxx b/sd/inc/stlsheet.hxx old mode 100644 new mode 100755 diff --git a/sd/inc/strmname.h b/sd/inc/strmname.h old mode 100644 new mode 100755 diff --git a/sd/inc/textapi.hxx b/sd/inc/textapi.hxx old mode 100644 new mode 100755 diff --git a/sd/inc/undo/undofactory.hxx b/sd/inc/undo/undofactory.hxx old mode 100644 new mode 100755 diff --git a/sd/inc/undo/undomanager.hxx b/sd/inc/undo/undomanager.hxx old mode 100644 new mode 100755 diff --git a/sd/inc/undo/undoobjects.hxx b/sd/inc/undo/undoobjects.hxx old mode 100644 new mode 100755 diff --git a/sd/inc/undoanim.hxx b/sd/inc/undoanim.hxx old mode 100644 new mode 100755 diff --git a/sd/prj/d.lst b/sd/prj/d.lst old mode 100644 new mode 100755 diff --git a/sd/prj/make.bat b/sd/prj/make.bat old mode 100644 new mode 100755 diff --git a/sd/prj/postdlv.btm b/sd/prj/postdlv.btm old mode 100644 new mode 100755 diff --git a/sd/prj/stree.bat b/sd/prj/stree.bat old mode 100644 new mode 100755 diff --git a/sd/prj/struct.txt b/sd/prj/struct.txt old mode 100644 new mode 100755 diff --git a/sd/qa/unoapi/knownissues.xcl b/sd/qa/unoapi/knownissues.xcl old mode 100644 new mode 100755 diff --git a/sd/qa/unoapi/makefile.mk b/sd/qa/unoapi/makefile.mk old mode 100644 new mode 100755 diff --git a/sd/qa/unoapi/sd.sce b/sd/qa/unoapi/sd.sce old mode 100644 new mode 100755 diff --git a/sd/res/buttons/glas-blue.zip b/sd/res/buttons/glas-blue.zip old mode 100644 new mode 100755 diff --git a/sd/res/buttons/glas-green.zip b/sd/res/buttons/glas-green.zip old mode 100644 new mode 100755 diff --git a/sd/res/buttons/glas-red.zip b/sd/res/buttons/glas-red.zip old mode 100644 new mode 100755 diff --git a/sd/res/buttons/round-gorilla.zip b/sd/res/buttons/round-gorilla.zip old mode 100644 new mode 100755 diff --git a/sd/res/buttons/round-white.zip b/sd/res/buttons/round-white.zip old mode 100644 new mode 100755 diff --git a/sd/res/buttons/simple.zip b/sd/res/buttons/simple.zip old mode 100644 new mode 100755 diff --git a/sd/res/buttons/square-blue.zip b/sd/res/buttons/square-blue.zip old mode 100644 new mode 100755 diff --git a/sd/res/buttons/square-gray.zip b/sd/res/buttons/square-gray.zip old mode 100644 new mode 100755 diff --git a/sd/res/buttons/square-green.zip b/sd/res/buttons/square-green.zip old mode 100644 new mode 100755 diff --git a/sd/res/buttons/square-red.zip b/sd/res/buttons/square-red.zip old mode 100644 new mode 100755 diff --git a/sd/res/buttons/square-yellow.zip b/sd/res/buttons/square-yellow.zip old mode 100644 new mode 100755 diff --git a/sd/res/webview/common.inc b/sd/res/webview/common.inc old mode 100644 new mode 100755 diff --git a/sd/res/webview/common.pl b/sd/res/webview/common.pl old mode 100644 new mode 100755 diff --git a/sd/res/webview/edit.asp b/sd/res/webview/edit.asp old mode 100644 new mode 100755 diff --git a/sd/res/webview/edit.pl b/sd/res/webview/edit.pl old mode 100644 new mode 100755 diff --git a/sd/res/webview/editpic.asp b/sd/res/webview/editpic.asp old mode 100644 new mode 100755 diff --git a/sd/res/webview/editpic.pl b/sd/res/webview/editpic.pl old mode 100644 new mode 100755 diff --git a/sd/res/webview/index.pl b/sd/res/webview/index.pl old mode 100644 new mode 100755 diff --git a/sd/res/webview/poll.asp b/sd/res/webview/poll.asp old mode 100644 new mode 100755 diff --git a/sd/res/webview/poll.pl b/sd/res/webview/poll.pl old mode 100644 new mode 100755 diff --git a/sd/res/webview/savepic.asp b/sd/res/webview/savepic.asp old mode 100644 new mode 100755 diff --git a/sd/res/webview/savepic.pl b/sd/res/webview/savepic.pl old mode 100644 new mode 100755 diff --git a/sd/res/webview/show.asp b/sd/res/webview/show.asp old mode 100644 new mode 100755 diff --git a/sd/res/webview/show.pl b/sd/res/webview/show.pl old mode 100644 new mode 100755 diff --git a/sd/res/webview/webview.asp b/sd/res/webview/webview.asp old mode 100644 new mode 100755 diff --git a/sd/res/webview/webview.pl b/sd/res/webview/webview.pl old mode 100644 new mode 100755 diff --git a/sd/sdi/SlideSorterController.sdi b/sd/sdi/SlideSorterController.sdi old mode 100644 new mode 100755 diff --git a/sd/sdi/TaskPaneViewShell.sdi b/sd/sdi/TaskPaneViewShell.sdi old mode 100644 new mode 100755 diff --git a/sd/sdi/ViewShellBase.sdi b/sd/sdi/ViewShellBase.sdi old mode 100644 new mode 100755 diff --git a/sd/sdi/_docsh.sdi b/sd/sdi/_docsh.sdi old mode 100644 new mode 100755 diff --git a/sd/sdi/_drvwsh.sdi b/sd/sdi/_drvwsh.sdi old mode 100644 new mode 100755 diff --git a/sd/sdi/app.sdi b/sd/sdi/app.sdi old mode 100644 new mode 100755 diff --git a/sd/sdi/docshell.sdi b/sd/sdi/docshell.sdi old mode 100644 new mode 100755 diff --git a/sd/sdi/drbezob.sdi b/sd/sdi/drbezob.sdi old mode 100644 new mode 100755 diff --git a/sd/sdi/drgrfob.sdi b/sd/sdi/drgrfob.sdi old mode 100644 new mode 100755 diff --git a/sd/sdi/drtxtob.sdi b/sd/sdi/drtxtob.sdi old mode 100644 new mode 100755 diff --git a/sd/sdi/drviewsh.sdi b/sd/sdi/drviewsh.sdi old mode 100644 new mode 100755 diff --git a/sd/sdi/grdocsh.sdi b/sd/sdi/grdocsh.sdi old mode 100644 new mode 100755 diff --git a/sd/sdi/grviewsh.sdi b/sd/sdi/grviewsh.sdi old mode 100644 new mode 100755 diff --git a/sd/sdi/makefile.mk b/sd/sdi/makefile.mk old mode 100644 new mode 100755 diff --git a/sd/sdi/mediaob.sdi b/sd/sdi/mediaob.sdi old mode 100644 new mode 100755 diff --git a/sd/sdi/outlnvsh.sdi b/sd/sdi/outlnvsh.sdi old mode 100644 new mode 100755 diff --git a/sd/sdi/sdgslots.sdi b/sd/sdi/sdgslots.sdi old mode 100644 new mode 100755 diff --git a/sd/sdi/sdnew.sdi b/sd/sdi/sdnew.sdi old mode 100644 new mode 100755 diff --git a/sd/sdi/sdraw.sdi b/sd/sdi/sdraw.sdi old mode 100644 new mode 100755 diff --git a/sd/sdi/sdslots.hrc b/sd/sdi/sdslots.hrc old mode 100644 new mode 100755 diff --git a/sd/sdi/sdslots.sdi b/sd/sdi/sdslots.sdi old mode 100644 new mode 100755 diff --git a/sd/sdi/tables.sdi b/sd/sdi/tables.sdi old mode 100644 new mode 100755 diff --git a/sd/source/core/CustomAnimationCloner.cxx b/sd/source/core/CustomAnimationCloner.cxx old mode 100644 new mode 100755 diff --git a/sd/source/core/CustomAnimationEffect.cxx b/sd/source/core/CustomAnimationEffect.cxx old mode 100644 new mode 100755 diff --git a/sd/source/core/CustomAnimationPreset.cxx b/sd/source/core/CustomAnimationPreset.cxx old mode 100644 new mode 100755 diff --git a/sd/source/core/EffectMigration.cxx b/sd/source/core/EffectMigration.cxx old mode 100644 new mode 100755 diff --git a/sd/source/core/PageListWatcher.cxx b/sd/source/core/PageListWatcher.cxx old mode 100644 new mode 100755 diff --git a/sd/source/core/PageListWatcher.hxx b/sd/source/core/PageListWatcher.hxx old mode 100644 new mode 100755 diff --git a/sd/source/core/TransitionPreset.cxx b/sd/source/core/TransitionPreset.cxx old mode 100644 new mode 100755 diff --git a/sd/source/core/anminfo.cxx b/sd/source/core/anminfo.cxx old mode 100644 new mode 100755 diff --git a/sd/source/core/annotations/Annotation.cxx b/sd/source/core/annotations/Annotation.cxx old mode 100644 new mode 100755 diff --git a/sd/source/core/annotations/AnnotationAccess.cxx b/sd/source/core/annotations/AnnotationAccess.cxx old mode 100644 new mode 100755 diff --git a/sd/source/core/annotations/AnnotationEnumeration.cxx b/sd/source/core/annotations/AnnotationEnumeration.cxx old mode 100644 new mode 100755 diff --git a/sd/source/core/annotations/makefile.mk b/sd/source/core/annotations/makefile.mk old mode 100644 new mode 100755 diff --git a/sd/source/core/cusshow.cxx b/sd/source/core/cusshow.cxx old mode 100644 new mode 100755 diff --git a/sd/source/core/drawdoc.cxx b/sd/source/core/drawdoc.cxx old mode 100644 new mode 100755 diff --git a/sd/source/core/drawdoc2.cxx b/sd/source/core/drawdoc2.cxx old mode 100644 new mode 100755 diff --git a/sd/source/core/drawdoc3.cxx b/sd/source/core/drawdoc3.cxx old mode 100644 new mode 100755 diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx old mode 100644 new mode 100755 diff --git a/sd/source/core/drawdoc_animations.cxx b/sd/source/core/drawdoc_animations.cxx old mode 100644 new mode 100755 diff --git a/sd/source/core/glob.src b/sd/source/core/glob.src old mode 100644 new mode 100755 diff --git a/sd/source/core/makefile.mk b/sd/source/core/makefile.mk old mode 100644 new mode 100755 diff --git a/sd/source/core/pglink.cxx b/sd/source/core/pglink.cxx old mode 100644 new mode 100755 diff --git a/sd/source/core/sdattr.cxx b/sd/source/core/sdattr.cxx old mode 100644 new mode 100755 diff --git a/sd/source/core/sdiocmpt.cxx b/sd/source/core/sdiocmpt.cxx old mode 100644 new mode 100755 diff --git a/sd/source/core/sdobjfac.cxx b/sd/source/core/sdobjfac.cxx old mode 100644 new mode 100755 diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx old mode 100644 new mode 100755 diff --git a/sd/source/core/sdpage2.cxx b/sd/source/core/sdpage2.cxx old mode 100644 new mode 100755 diff --git a/sd/source/core/sdpage_animations.cxx b/sd/source/core/sdpage_animations.cxx old mode 100644 new mode 100755 diff --git a/sd/source/core/shapelist.cxx b/sd/source/core/shapelist.cxx old mode 100644 new mode 100755 diff --git a/sd/source/core/stlfamily.cxx b/sd/source/core/stlfamily.cxx old mode 100644 new mode 100755 diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx old mode 100644 new mode 100755 diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx old mode 100644 new mode 100755 diff --git a/sd/source/core/text/makefile.mk b/sd/source/core/text/makefile.mk old mode 100644 new mode 100755 diff --git a/sd/source/core/text/textapi.cxx b/sd/source/core/text/textapi.cxx old mode 100644 new mode 100755 diff --git a/sd/source/core/typemap.cxx b/sd/source/core/typemap.cxx old mode 100644 new mode 100755 diff --git a/sd/source/core/undo/makefile.mk b/sd/source/core/undo/makefile.mk old mode 100644 new mode 100755 diff --git a/sd/source/core/undo/undofactory.cxx b/sd/source/core/undo/undofactory.cxx old mode 100644 new mode 100755 diff --git a/sd/source/core/undo/undomanager.cxx b/sd/source/core/undo/undomanager.cxx old mode 100644 new mode 100755 diff --git a/sd/source/core/undo/undoobjects.cxx b/sd/source/core/undo/undoobjects.cxx old mode 100644 new mode 100755 diff --git a/sd/source/core/undoanim.cxx b/sd/source/core/undoanim.cxx old mode 100644 new mode 100755 diff --git a/sd/source/filter/cgm/makefile.mk b/sd/source/filter/cgm/makefile.mk old mode 100644 new mode 100755 diff --git a/sd/source/filter/cgm/sdcgmfilter.cxx b/sd/source/filter/cgm/sdcgmfilter.cxx old mode 100644 new mode 100755 diff --git a/sd/source/filter/eppt/eppt.cxx b/sd/source/filter/eppt/eppt.cxx old mode 100644 new mode 100755 diff --git a/sd/source/filter/eppt/eppt.hxx b/sd/source/filter/eppt/eppt.hxx old mode 100644 new mode 100755 diff --git a/sd/source/filter/eppt/epptdef.hxx b/sd/source/filter/eppt/epptdef.hxx old mode 100644 new mode 100755 diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx old mode 100644 new mode 100755 diff --git a/sd/source/filter/eppt/escherex.cxx b/sd/source/filter/eppt/escherex.cxx old mode 100644 new mode 100755 diff --git a/sd/source/filter/eppt/escherex.hxx b/sd/source/filter/eppt/escherex.hxx old mode 100644 new mode 100755 diff --git a/sd/source/filter/eppt/makefile.mk b/sd/source/filter/eppt/makefile.mk old mode 100644 new mode 100755 diff --git a/sd/source/filter/eppt/pptexanimations.cxx b/sd/source/filter/eppt/pptexanimations.cxx old mode 100644 new mode 100755 diff --git a/sd/source/filter/eppt/pptexanimations.hxx b/sd/source/filter/eppt/pptexanimations.hxx old mode 100644 new mode 100755 diff --git a/sd/source/filter/eppt/pptexsoundcollection.cxx b/sd/source/filter/eppt/pptexsoundcollection.cxx old mode 100644 new mode 100755 diff --git a/sd/source/filter/eppt/pptexsoundcollection.hxx b/sd/source/filter/eppt/pptexsoundcollection.hxx old mode 100644 new mode 100755 diff --git a/sd/source/filter/grf/makefile.mk b/sd/source/filter/grf/makefile.mk old mode 100644 new mode 100755 diff --git a/sd/source/filter/grf/sdgrffilter.cxx b/sd/source/filter/grf/sdgrffilter.cxx old mode 100644 new mode 100755 diff --git a/sd/source/filter/html/HtmlOptionsDialog.cxx b/sd/source/filter/html/HtmlOptionsDialog.cxx old mode 100644 new mode 100755 diff --git a/sd/source/filter/html/buttonset.cxx b/sd/source/filter/html/buttonset.cxx old mode 100644 new mode 100755 diff --git a/sd/source/filter/html/buttonset.hxx b/sd/source/filter/html/buttonset.hxx old mode 100644 new mode 100755 diff --git a/sd/source/filter/html/htmlattr.cxx b/sd/source/filter/html/htmlattr.cxx old mode 100644 new mode 100755 diff --git a/sd/source/filter/html/htmlattr.hxx b/sd/source/filter/html/htmlattr.hxx old mode 100644 new mode 100755 diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx old mode 100644 new mode 100755 diff --git a/sd/source/filter/html/htmlex.hxx b/sd/source/filter/html/htmlex.hxx old mode 100644 new mode 100755 diff --git a/sd/source/filter/html/makefile.mk b/sd/source/filter/html/makefile.mk old mode 100644 new mode 100755 diff --git a/sd/source/filter/html/pubdlg.cxx b/sd/source/filter/html/pubdlg.cxx old mode 100644 new mode 100755 diff --git a/sd/source/filter/html/pubdlg.src b/sd/source/filter/html/pubdlg.src old mode 100644 new mode 100755 diff --git a/sd/source/filter/html/sdhtmlfilter.cxx b/sd/source/filter/html/sdhtmlfilter.cxx old mode 100644 new mode 100755 diff --git a/sd/source/filter/makefile.mk b/sd/source/filter/makefile.mk old mode 100644 new mode 100755 diff --git a/sd/source/filter/ppt/makefile.mk b/sd/source/filter/ppt/makefile.mk old mode 100644 new mode 100755 diff --git a/sd/source/filter/ppt/ppt97animations.cxx b/sd/source/filter/ppt/ppt97animations.cxx old mode 100644 new mode 100755 diff --git a/sd/source/filter/ppt/ppt97animations.hxx b/sd/source/filter/ppt/ppt97animations.hxx old mode 100644 new mode 100755 diff --git a/sd/source/filter/ppt/pptanimations.hxx b/sd/source/filter/ppt/pptanimations.hxx old mode 100644 new mode 100755 diff --git a/sd/source/filter/ppt/pptatom.cpp b/sd/source/filter/ppt/pptatom.cpp old mode 100644 new mode 100755 diff --git a/sd/source/filter/ppt/pptatom.hxx b/sd/source/filter/ppt/pptatom.hxx old mode 100644 new mode 100755 diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx old mode 100644 new mode 100755 diff --git a/sd/source/filter/ppt/pptin.hxx b/sd/source/filter/ppt/pptin.hxx old mode 100644 new mode 100755 diff --git a/sd/source/filter/ppt/pptinanimations.cxx b/sd/source/filter/ppt/pptinanimations.cxx old mode 100644 new mode 100755 diff --git a/sd/source/filter/ppt/pptinanimations.hxx b/sd/source/filter/ppt/pptinanimations.hxx old mode 100644 new mode 100755 diff --git a/sd/source/filter/ppt/propread.cxx b/sd/source/filter/ppt/propread.cxx old mode 100644 new mode 100755 diff --git a/sd/source/filter/ppt/propread.hxx b/sd/source/filter/ppt/propread.hxx old mode 100644 new mode 100755 diff --git a/sd/source/filter/sdfilter.cxx b/sd/source/filter/sdfilter.cxx old mode 100644 new mode 100755 diff --git a/sd/source/filter/sdpptwrp.cxx b/sd/source/filter/sdpptwrp.cxx old mode 100644 new mode 100755 diff --git a/sd/source/filter/xml/makefile.mk b/sd/source/filter/xml/makefile.mk old mode 100644 new mode 100755 diff --git a/sd/source/filter/xml/sdtransform.cxx b/sd/source/filter/xml/sdtransform.cxx old mode 100644 new mode 100755 diff --git a/sd/source/filter/xml/sdxmlwrp.cxx b/sd/source/filter/xml/sdxmlwrp.cxx old mode 100644 new mode 100755 diff --git a/sd/source/helper/makefile.mk b/sd/source/helper/makefile.mk old mode 100644 new mode 100755 diff --git a/sd/source/helper/simplereferencecomponent.cxx b/sd/source/helper/simplereferencecomponent.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/accessibility/AccessibleOutlineEditSource.cxx b/sd/source/ui/accessibility/AccessibleOutlineEditSource.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/accessibility/AccessibleOutlineView.cxx b/sd/source/ui/accessibility/AccessibleOutlineView.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/accessibility/AccessiblePageShape.cxx b/sd/source/ui/accessibility/AccessiblePageShape.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/accessibility/AccessiblePresentationGraphicShape.cxx b/sd/source/ui/accessibility/AccessiblePresentationGraphicShape.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx b/sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/accessibility/AccessiblePresentationShape.cxx b/sd/source/ui/accessibility/AccessiblePresentationShape.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/accessibility/AccessibleScrollPanel.cxx b/sd/source/ui/accessibility/AccessibleScrollPanel.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx b/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/accessibility/AccessibleTaskPane.cxx b/sd/source/ui/accessibility/AccessibleTaskPane.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/accessibility/AccessibleTreeNode.cxx b/sd/source/ui/accessibility/AccessibleTreeNode.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/accessibility/AccessibleViewForwarder.cxx b/sd/source/ui/accessibility/AccessibleViewForwarder.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/accessibility/SdShapeTypes.cxx b/sd/source/ui/accessibility/SdShapeTypes.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/accessibility/accessibility.hrc b/sd/source/ui/accessibility/accessibility.hrc old mode 100644 new mode 100755 diff --git a/sd/source/ui/accessibility/accessibility.src b/sd/source/ui/accessibility/accessibility.src old mode 100644 new mode 100755 diff --git a/sd/source/ui/animations/AnimationSchemesPane.cxx b/sd/source/ui/animations/AnimationSchemesPane.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/animations/AnimationSchemesPane.hrc b/sd/source/ui/animations/AnimationSchemesPane.hrc old mode 100644 new mode 100755 diff --git a/sd/source/ui/animations/AnimationSchemesPane.hxx b/sd/source/ui/animations/AnimationSchemesPane.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/animations/AnimationSchemesPane.src b/sd/source/ui/animations/AnimationSchemesPane.src old mode 100644 new mode 100755 diff --git a/sd/source/ui/animations/CustomAnimation.hrc b/sd/source/ui/animations/CustomAnimation.hrc old mode 100644 new mode 100755 diff --git a/sd/source/ui/animations/CustomAnimation.src b/sd/source/ui/animations/CustomAnimation.src old mode 100644 new mode 100755 diff --git a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/animations/CustomAnimationCreateDialog.hrc b/sd/source/ui/animations/CustomAnimationCreateDialog.hrc old mode 100644 new mode 100755 diff --git a/sd/source/ui/animations/CustomAnimationCreateDialog.hxx b/sd/source/ui/animations/CustomAnimationCreateDialog.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/animations/CustomAnimationCreateDialog.src b/sd/source/ui/animations/CustomAnimationCreateDialog.src old mode 100644 new mode 100755 diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/animations/CustomAnimationDialog.hrc b/sd/source/ui/animations/CustomAnimationDialog.hrc old mode 100644 new mode 100755 diff --git a/sd/source/ui/animations/CustomAnimationDialog.hxx b/sd/source/ui/animations/CustomAnimationDialog.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/animations/CustomAnimationDialog.src b/sd/source/ui/animations/CustomAnimationDialog.src old mode 100644 new mode 100755 diff --git a/sd/source/ui/animations/CustomAnimationList.cxx b/sd/source/ui/animations/CustomAnimationList.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/animations/CustomAnimationList.hxx b/sd/source/ui/animations/CustomAnimationList.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/animations/CustomAnimationPane.hrc b/sd/source/ui/animations/CustomAnimationPane.hrc old mode 100644 new mode 100755 diff --git a/sd/source/ui/animations/CustomAnimationPane.hxx b/sd/source/ui/animations/CustomAnimationPane.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/animations/CustomAnimationPane.src b/sd/source/ui/animations/CustomAnimationPane.src old mode 100644 new mode 100755 diff --git a/sd/source/ui/animations/CustomAnimationSchemesPane.hrc b/sd/source/ui/animations/CustomAnimationSchemesPane.hrc old mode 100644 new mode 100755 diff --git a/sd/source/ui/animations/CustomAnimationSchemesPane.src b/sd/source/ui/animations/CustomAnimationSchemesPane.src old mode 100644 new mode 100755 diff --git a/sd/source/ui/animations/DialogListBox.cxx b/sd/source/ui/animations/DialogListBox.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/animations/STLPropertySet.cxx b/sd/source/ui/animations/STLPropertySet.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/animations/STLPropertySet.hxx b/sd/source/ui/animations/STLPropertySet.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx b/sd/source/ui/animations/SlideTransitionPane.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/animations/SlideTransitionPane.hrc b/sd/source/ui/animations/SlideTransitionPane.hrc old mode 100644 new mode 100755 diff --git a/sd/source/ui/animations/SlideTransitionPane.hxx b/sd/source/ui/animations/SlideTransitionPane.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/animations/SlideTransitionPane.src b/sd/source/ui/animations/SlideTransitionPane.src old mode 100644 new mode 100755 diff --git a/sd/source/ui/animations/makefile.mk b/sd/source/ui/animations/makefile.mk old mode 100644 new mode 100755 diff --git a/sd/source/ui/animations/motionpathtag.cxx b/sd/source/ui/animations/motionpathtag.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/animations/motionpathtag.hxx b/sd/source/ui/animations/motionpathtag.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/annotations/annotationmanager.cxx b/sd/source/ui/annotations/annotationmanager.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/annotations/annotations.hrc b/sd/source/ui/annotations/annotations.hrc old mode 100644 new mode 100755 diff --git a/sd/source/ui/annotations/annotations.src b/sd/source/ui/annotations/annotations.src old mode 100644 new mode 100755 diff --git a/sd/source/ui/annotations/annotationtag.cxx b/sd/source/ui/annotations/annotationtag.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/annotations/annotationtag.hxx b/sd/source/ui/annotations/annotationtag.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/annotations/annotationwindow.cxx b/sd/source/ui/annotations/annotationwindow.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/annotations/annotationwindow.hxx b/sd/source/ui/annotations/annotationwindow.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/annotations/makefile.mk b/sd/source/ui/annotations/makefile.mk old mode 100644 new mode 100755 diff --git a/sd/source/ui/app/_app.hrc b/sd/source/ui/app/_app.hrc old mode 100644 new mode 100755 diff --git a/sd/source/ui/app/accel_tmpl.src b/sd/source/ui/app/accel_tmpl.src old mode 100644 new mode 100755 diff --git a/sd/source/ui/app/accelids_tmpl.src b/sd/source/ui/app/accelids_tmpl.src old mode 100644 new mode 100755 diff --git a/sd/source/ui/app/app.img b/sd/source/ui/app/app.img old mode 100644 new mode 100755 diff --git a/sd/source/ui/app/app.src b/sd/source/ui/app/app.src old mode 100644 new mode 100755 diff --git a/sd/source/ui/app/makefile.mk b/sd/source/ui/app/makefile.mk old mode 100644 new mode 100755 diff --git a/sd/source/ui/app/menu_tmpl.src b/sd/source/ui/app/menu_tmpl.src old mode 100644 new mode 100755 diff --git a/sd/source/ui/app/menuids2_tmpl.src b/sd/source/ui/app/menuids2_tmpl.src old mode 100644 new mode 100755 diff --git a/sd/source/ui/app/menuids3_tmpl.src b/sd/source/ui/app/menuids3_tmpl.src old mode 100644 new mode 100755 diff --git a/sd/source/ui/app/menuids4_tmpl.src b/sd/source/ui/app/menuids4_tmpl.src old mode 100644 new mode 100755 diff --git a/sd/source/ui/app/menuids_tmpl.src b/sd/source/ui/app/menuids_tmpl.src old mode 100644 new mode 100755 diff --git a/sd/source/ui/app/menuportal_tmpl.src b/sd/source/ui/app/menuportal_tmpl.src old mode 100644 new mode 100755 diff --git a/sd/source/ui/app/popup.src b/sd/source/ui/app/popup.src old mode 100644 new mode 100755 diff --git a/sd/source/ui/app/popup2_tmpl.src b/sd/source/ui/app/popup2_tmpl.src old mode 100644 new mode 100755 diff --git a/sd/source/ui/app/res_bmp.src b/sd/source/ui/app/res_bmp.src old mode 100644 new mode 100755 diff --git a/sd/source/ui/app/sddll.cxx b/sd/source/ui/app/sddll.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/app/sddll1.cxx b/sd/source/ui/app/sddll1.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/app/sddll2.cxx b/sd/source/ui/app/sddll2.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/app/sdmod.cxx b/sd/source/ui/app/sdmod.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/app/sdmod1.cxx b/sd/source/ui/app/sdmod1.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/app/sdmod2.cxx b/sd/source/ui/app/sdmod2.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/app/sdpopup.cxx b/sd/source/ui/app/sdpopup.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/app/sdresid.cxx b/sd/source/ui/app/sdresid.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/app/sdstring.src b/sd/source/ui/app/sdstring.src old mode 100644 new mode 100755 diff --git a/sd/source/ui/app/sdxfer.cxx b/sd/source/ui/app/sdxfer.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/app/strings.src b/sd/source/ui/app/strings.src old mode 100644 new mode 100755 diff --git a/sd/source/ui/app/tbx_ww.src b/sd/source/ui/app/tbx_ww.src old mode 100644 new mode 100755 diff --git a/sd/source/ui/app/tbxids_tmpl.src b/sd/source/ui/app/tbxids_tmpl.src old mode 100644 new mode 100755 diff --git a/sd/source/ui/app/tbxww.cxx b/sd/source/ui/app/tbxww.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/app/tmplctrl.cxx b/sd/source/ui/app/tmplctrl.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/app/toolbox.src b/sd/source/ui/app/toolbox.src old mode 100644 new mode 100755 diff --git a/sd/source/ui/app/toolbox2_tmpl.src b/sd/source/ui/app/toolbox2_tmpl.src old mode 100644 new mode 100755 diff --git a/sd/source/ui/controller/makefile.mk b/sd/source/ui/controller/makefile.mk old mode 100644 new mode 100755 diff --git a/sd/source/ui/controller/slidelayoutcontroller.cxx b/sd/source/ui/controller/slidelayoutcontroller.cxx index 1c2815087c98..489f6e489386 100644 --- a/sd/source/ui/controller/slidelayoutcontroller.cxx +++ b/sd/source/ui/controller/slidelayoutcontroller.cxx @@ -224,6 +224,7 @@ LayoutToolbarMenu::LayoutToolbarMenu( SlideLayoutController& rController, const case DrawViewMode_DRAW: pInfo = &standard[0]; break; case DrawViewMode_HANDOUT: pInfo = &handout[0]; nColCount = 2; break; case DrawViewMode_NOTES: pInfo = ¬es[0]; nColCount = 1; break; + default: break; } mpLayoutSet1->SetColCount( nColCount ); diff --git a/sd/source/ui/controller/slidelayoutcontroller.hxx b/sd/source/ui/controller/slidelayoutcontroller.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/dlg/AnimationChildWindow.cxx b/sd/source/ui/dlg/AnimationChildWindow.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/dlg/LayerDialog.src b/sd/source/ui/dlg/LayerDialog.src old mode 100644 new mode 100755 diff --git a/sd/source/ui/dlg/LayerDialogChildWindow.cxx b/sd/source/ui/dlg/LayerDialogChildWindow.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/dlg/LayerDialogContent.cxx b/sd/source/ui/dlg/LayerDialogContent.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/dlg/LayerTabBar.cxx b/sd/source/ui/dlg/LayerTabBar.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/dlg/NavigatorChildWindow.cxx b/sd/source/ui/dlg/NavigatorChildWindow.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/dlg/PaneChildWindows.cxx b/sd/source/ui/dlg/PaneChildWindows.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/dlg/PaneDockingWindow.cxx b/sd/source/ui/dlg/PaneDockingWindow.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/dlg/PaneDockingWindow.src b/sd/source/ui/dlg/PaneDockingWindow.src old mode 100644 new mode 100755 diff --git a/sd/source/ui/dlg/PaneShells.cxx b/sd/source/ui/dlg/PaneShells.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/dlg/SpellDialogChildWindow.cxx b/sd/source/ui/dlg/SpellDialogChildWindow.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/dlg/TemplateScanner.cxx b/sd/source/ui/dlg/TemplateScanner.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/dlg/animobjs.cxx b/sd/source/ui/dlg/animobjs.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/dlg/animobjs.src b/sd/source/ui/dlg/animobjs.src old mode 100644 new mode 100755 diff --git a/sd/source/ui/dlg/assclass.cxx b/sd/source/ui/dlg/assclass.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/dlg/brkdlg.cxx b/sd/source/ui/dlg/brkdlg.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/dlg/brkdlg.src b/sd/source/ui/dlg/brkdlg.src old mode 100644 new mode 100755 diff --git a/sd/source/ui/dlg/celltempl.cxx b/sd/source/ui/dlg/celltempl.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/dlg/celltempl.src b/sd/source/ui/dlg/celltempl.src old mode 100644 new mode 100755 diff --git a/sd/source/ui/dlg/copydlg.cxx b/sd/source/ui/dlg/copydlg.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/dlg/copydlg.src b/sd/source/ui/dlg/copydlg.src old mode 100644 new mode 100755 diff --git a/sd/source/ui/dlg/custsdlg.cxx b/sd/source/ui/dlg/custsdlg.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/dlg/custsdlg.src b/sd/source/ui/dlg/custsdlg.src old mode 100644 new mode 100755 diff --git a/sd/source/ui/dlg/diactrl.cxx b/sd/source/ui/dlg/diactrl.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/dlg/dlg_char.src b/sd/source/ui/dlg/dlg_char.src old mode 100644 new mode 100755 diff --git a/sd/source/ui/dlg/dlgass.cxx b/sd/source/ui/dlg/dlgass.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/dlg/dlgass.src b/sd/source/ui/dlg/dlgass.src old mode 100644 new mode 100755 diff --git a/sd/source/ui/dlg/dlgassim.cxx b/sd/source/ui/dlg/dlgassim.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/dlg/dlgassim.hxx b/sd/source/ui/dlg/dlgassim.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/dlg/dlgchar.cxx b/sd/source/ui/dlg/dlgchar.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/dlg/dlgctrls.cxx b/sd/source/ui/dlg/dlgctrls.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/dlg/dlgfield.cxx b/sd/source/ui/dlg/dlgfield.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/dlg/dlgfield.src b/sd/source/ui/dlg/dlgfield.src old mode 100644 new mode 100755 diff --git a/sd/source/ui/dlg/dlgolbul.cxx b/sd/source/ui/dlg/dlgolbul.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/dlg/dlgolbul.src b/sd/source/ui/dlg/dlgolbul.src old mode 100644 new mode 100755 diff --git a/sd/source/ui/dlg/dlgpage.cxx b/sd/source/ui/dlg/dlgpage.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/dlg/dlgpage.src b/sd/source/ui/dlg/dlgpage.src old mode 100644 new mode 100755 diff --git a/sd/source/ui/dlg/dlgsnap.cxx b/sd/source/ui/dlg/dlgsnap.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/dlg/dlgsnap.src b/sd/source/ui/dlg/dlgsnap.src old mode 100644 new mode 100755 diff --git a/sd/source/ui/dlg/docprev.cxx b/sd/source/ui/dlg/docprev.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/dlg/filedlg.cxx b/sd/source/ui/dlg/filedlg.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/dlg/gluectrl.cxx b/sd/source/ui/dlg/gluectrl.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/dlg/headerfooterdlg.cxx b/sd/source/ui/dlg/headerfooterdlg.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/dlg/headerfooterdlg.src b/sd/source/ui/dlg/headerfooterdlg.src old mode 100644 new mode 100755 diff --git a/sd/source/ui/dlg/ins_paste.cxx b/sd/source/ui/dlg/ins_paste.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/dlg/ins_paste.src b/sd/source/ui/dlg/ins_paste.src old mode 100644 new mode 100755 diff --git a/sd/source/ui/dlg/inspagob.cxx b/sd/source/ui/dlg/inspagob.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/dlg/inspagob.src b/sd/source/ui/dlg/inspagob.src old mode 100644 new mode 100755 diff --git a/sd/source/ui/dlg/layeroptionsdlg.cxx b/sd/source/ui/dlg/layeroptionsdlg.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/dlg/layeroptionsdlg.src b/sd/source/ui/dlg/layeroptionsdlg.src old mode 100644 new mode 100755 diff --git a/sd/source/ui/dlg/makefile.mk b/sd/source/ui/dlg/makefile.mk old mode 100644 new mode 100755 diff --git a/sd/source/ui/dlg/masterlayoutdlg.cxx b/sd/source/ui/dlg/masterlayoutdlg.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/dlg/masterlayoutdlg.src b/sd/source/ui/dlg/masterlayoutdlg.src old mode 100644 new mode 100755 diff --git a/sd/source/ui/dlg/morphdlg.cxx b/sd/source/ui/dlg/morphdlg.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/dlg/morphdlg.src b/sd/source/ui/dlg/morphdlg.src old mode 100644 new mode 100755 diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/dlg/navigatr.src b/sd/source/ui/dlg/navigatr.src old mode 100644 new mode 100755 diff --git a/sd/source/ui/dlg/paragr.cxx b/sd/source/ui/dlg/paragr.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/dlg/paragr.src b/sd/source/ui/dlg/paragr.src old mode 100644 new mode 100755 diff --git a/sd/source/ui/dlg/present.cxx b/sd/source/ui/dlg/present.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/dlg/present.src b/sd/source/ui/dlg/present.src old mode 100644 new mode 100755 diff --git a/sd/source/ui/dlg/printdialog.cxx b/sd/source/ui/dlg/printdialog.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/dlg/printdialog.hrc b/sd/source/ui/dlg/printdialog.hrc old mode 100644 new mode 100755 diff --git a/sd/source/ui/dlg/printdialog.src b/sd/source/ui/dlg/printdialog.src old mode 100644 new mode 100755 diff --git a/sd/source/ui/dlg/printdlg.cxx b/sd/source/ui/dlg/printdlg.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/dlg/printdlg.src b/sd/source/ui/dlg/printdlg.src old mode 100644 new mode 100755 diff --git a/sd/source/ui/dlg/prltempl.cxx b/sd/source/ui/dlg/prltempl.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/dlg/prltempl.src b/sd/source/ui/dlg/prltempl.src old mode 100644 new mode 100755 diff --git a/sd/source/ui/dlg/prntopts.cxx b/sd/source/ui/dlg/prntopts.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/dlg/prntopts.src b/sd/source/ui/dlg/prntopts.src old mode 100644 new mode 100755 diff --git a/sd/source/ui/dlg/sdabstdlg.cxx b/sd/source/ui/dlg/sdabstdlg.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/dlg/sddlgfact.cxx b/sd/source/ui/dlg/sddlgfact.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/dlg/sddlgfact.hxx b/sd/source/ui/dlg/sddlgfact.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/dlg/sdpreslt.cxx b/sd/source/ui/dlg/sdpreslt.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/dlg/sdpreslt.src b/sd/source/ui/dlg/sdpreslt.src old mode 100644 new mode 100755 diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/dlg/sduiexp.cxx b/sd/source/ui/dlg/sduiexp.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/dlg/tabtempl.cxx b/sd/source/ui/dlg/tabtempl.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/dlg/tabtempl.src b/sd/source/ui/dlg/tabtempl.src old mode 100644 new mode 100755 diff --git a/sd/source/ui/dlg/tpaction.cxx b/sd/source/ui/dlg/tpaction.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/dlg/tpaction.src b/sd/source/ui/dlg/tpaction.src old mode 100644 new mode 100755 diff --git a/sd/source/ui/dlg/tpoption.cxx b/sd/source/ui/dlg/tpoption.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/dlg/tpoption.src b/sd/source/ui/dlg/tpoption.src old mode 100644 new mode 100755 diff --git a/sd/source/ui/dlg/unchss.cxx b/sd/source/ui/dlg/unchss.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/dlg/vectdlg.cxx b/sd/source/ui/dlg/vectdlg.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/dlg/vectdlg.src b/sd/source/ui/dlg/vectdlg.src old mode 100644 new mode 100755 diff --git a/sd/source/ui/docshell/docshel2.cxx b/sd/source/ui/docshell/docshel2.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/docshell/docshel3.cxx b/sd/source/ui/docshell/docshel3.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/docshell/docshel4.cxx b/sd/source/ui/docshell/docshel4.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/docshell/docshell.cxx b/sd/source/ui/docshell/docshell.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/docshell/grdocsh.cxx b/sd/source/ui/docshell/grdocsh.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/docshell/makefile.mk b/sd/source/ui/docshell/makefile.mk old mode 100644 new mode 100755 diff --git a/sd/source/ui/docshell/sdclient.cxx b/sd/source/ui/docshell/sdclient.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/framework/configuration/ChangeRequestQueue.cxx b/sd/source/ui/framework/configuration/ChangeRequestQueue.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/framework/configuration/ChangeRequestQueue.hxx b/sd/source/ui/framework/configuration/ChangeRequestQueue.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx b/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.hxx b/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/framework/configuration/Configuration.cxx b/sd/source/ui/framework/configuration/Configuration.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/framework/configuration/ConfigurationClassifier.cxx b/sd/source/ui/framework/configuration/ConfigurationClassifier.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/framework/configuration/ConfigurationClassifier.hxx b/sd/source/ui/framework/configuration/ConfigurationClassifier.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/framework/configuration/ConfigurationController.cxx b/sd/source/ui/framework/configuration/ConfigurationController.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.cxx b/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.hxx b/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx b/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.hxx b/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/framework/configuration/ConfigurationTracer.cxx b/sd/source/ui/framework/configuration/ConfigurationTracer.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/framework/configuration/ConfigurationTracer.hxx b/sd/source/ui/framework/configuration/ConfigurationTracer.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx b/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/framework/configuration/ConfigurationUpdater.hxx b/sd/source/ui/framework/configuration/ConfigurationUpdater.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.cxx b/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.hxx b/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/framework/configuration/ResourceFactoryManager.cxx b/sd/source/ui/framework/configuration/ResourceFactoryManager.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/framework/configuration/ResourceFactoryManager.hxx b/sd/source/ui/framework/configuration/ResourceFactoryManager.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/framework/configuration/ResourceId.cxx b/sd/source/ui/framework/configuration/ResourceId.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/framework/configuration/UpdateRequest.cxx b/sd/source/ui/framework/configuration/UpdateRequest.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/framework/configuration/UpdateRequest.hxx b/sd/source/ui/framework/configuration/UpdateRequest.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/framework/configuration/makefile.mk b/sd/source/ui/framework/configuration/makefile.mk old mode 100644 new mode 100755 diff --git a/sd/source/ui/framework/factories/BasicPaneFactory.cxx b/sd/source/ui/framework/factories/BasicPaneFactory.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/framework/factories/BasicPaneFactory.hxx b/sd/source/ui/framework/factories/BasicPaneFactory.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/framework/factories/BasicToolBarFactory.cxx b/sd/source/ui/framework/factories/BasicToolBarFactory.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/framework/factories/BasicToolBarFactory.hxx b/sd/source/ui/framework/factories/BasicToolBarFactory.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/framework/factories/BasicViewFactory.cxx b/sd/source/ui/framework/factories/BasicViewFactory.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/framework/factories/BasicViewFactory.hxx b/sd/source/ui/framework/factories/BasicViewFactory.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/framework/factories/ChildWindowPane.cxx b/sd/source/ui/framework/factories/ChildWindowPane.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/framework/factories/ChildWindowPane.hxx b/sd/source/ui/framework/factories/ChildWindowPane.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/framework/factories/FrameWindowPane.cxx b/sd/source/ui/framework/factories/FrameWindowPane.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/framework/factories/FrameWindowPane.hxx b/sd/source/ui/framework/factories/FrameWindowPane.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/framework/factories/FullScreenPane.cxx b/sd/source/ui/framework/factories/FullScreenPane.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/framework/factories/FullScreenPane.hxx b/sd/source/ui/framework/factories/FullScreenPane.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/framework/factories/Pane.cxx b/sd/source/ui/framework/factories/Pane.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/framework/factories/PresentationFactory.cxx b/sd/source/ui/framework/factories/PresentationFactory.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/framework/factories/TaskPanelFactory.cxx b/sd/source/ui/framework/factories/TaskPanelFactory.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/framework/factories/TaskPanelFactory.hxx b/sd/source/ui/framework/factories/TaskPanelFactory.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/framework/factories/ViewShellWrapper.cxx b/sd/source/ui/framework/factories/ViewShellWrapper.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/framework/factories/makefile.mk b/sd/source/ui/framework/factories/makefile.mk old mode 100644 new mode 100755 diff --git a/sd/source/ui/framework/module/CenterViewFocusModule.cxx b/sd/source/ui/framework/module/CenterViewFocusModule.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/framework/module/CenterViewFocusModule.hxx b/sd/source/ui/framework/module/CenterViewFocusModule.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/framework/module/DrawModule.cxx b/sd/source/ui/framework/module/DrawModule.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/framework/module/ImpressModule.cxx b/sd/source/ui/framework/module/ImpressModule.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/framework/module/ModuleController.cxx b/sd/source/ui/framework/module/ModuleController.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/framework/module/PresentationModule.cxx b/sd/source/ui/framework/module/PresentationModule.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/framework/module/ReadOnlyModeObserver.cxx b/sd/source/ui/framework/module/ReadOnlyModeObserver.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/framework/module/ReadOnlyModeObserver.hxx b/sd/source/ui/framework/module/ReadOnlyModeObserver.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/framework/module/ResourceManager.cxx b/sd/source/ui/framework/module/ResourceManager.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/framework/module/ResourceManager.hxx b/sd/source/ui/framework/module/ResourceManager.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/framework/module/ShellStackGuard.cxx b/sd/source/ui/framework/module/ShellStackGuard.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/framework/module/ShellStackGuard.hxx b/sd/source/ui/framework/module/ShellStackGuard.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/framework/module/SlideSorterModule.cxx b/sd/source/ui/framework/module/SlideSorterModule.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/framework/module/SlideSorterModule.hxx b/sd/source/ui/framework/module/SlideSorterModule.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/framework/module/TaskPaneModule.cxx b/sd/source/ui/framework/module/TaskPaneModule.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/framework/module/TaskPaneModule.hxx b/sd/source/ui/framework/module/TaskPaneModule.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/framework/module/ToolBarModule.cxx b/sd/source/ui/framework/module/ToolBarModule.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/framework/module/ToolBarModule.hxx b/sd/source/ui/framework/module/ToolBarModule.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/framework/module/ViewTabBarModule.cxx b/sd/source/ui/framework/module/ViewTabBarModule.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/framework/module/ViewTabBarModule.hxx b/sd/source/ui/framework/module/ViewTabBarModule.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/framework/module/makefile.mk b/sd/source/ui/framework/module/makefile.mk old mode 100644 new mode 100755 diff --git a/sd/source/ui/framework/tools/FrameworkHelper.cxx b/sd/source/ui/framework/tools/FrameworkHelper.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/framework/tools/makefile.mk b/sd/source/ui/framework/tools/makefile.mk old mode 100644 new mode 100755 diff --git a/sd/source/ui/func/bulmaper.cxx b/sd/source/ui/func/bulmaper.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/func/fuarea.cxx b/sd/source/ui/func/fuarea.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/func/fubullet.cxx b/sd/source/ui/func/fubullet.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/func/fuchar.cxx b/sd/source/ui/func/fuchar.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/func/fucon3d.cxx b/sd/source/ui/func/fucon3d.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/func/fuconarc.cxx b/sd/source/ui/func/fuconarc.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/func/fuconbez.cxx b/sd/source/ui/func/fuconbez.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/func/fuconcs.cxx b/sd/source/ui/func/fuconcs.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/func/fuconnct.cxx b/sd/source/ui/func/fuconnct.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/func/fuconrec.cxx b/sd/source/ui/func/fuconrec.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/func/fuconstr.cxx b/sd/source/ui/func/fuconstr.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/func/fuconuno.cxx b/sd/source/ui/func/fuconuno.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/func/fucopy.cxx b/sd/source/ui/func/fucopy.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/func/fucushow.cxx b/sd/source/ui/func/fucushow.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/func/fudraw.cxx b/sd/source/ui/func/fudraw.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/func/fudspord.cxx b/sd/source/ui/func/fudspord.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/func/fuediglu.cxx b/sd/source/ui/func/fuediglu.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/func/fuexpand.cxx b/sd/source/ui/func/fuexpand.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/func/fuformatpaintbrush.cxx b/sd/source/ui/func/fuformatpaintbrush.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/func/fuhhconv.cxx b/sd/source/ui/func/fuhhconv.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/func/fuinsert.cxx b/sd/source/ui/func/fuinsert.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/func/fuinsfil.cxx b/sd/source/ui/func/fuinsfil.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/func/fuline.cxx b/sd/source/ui/func/fuline.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/func/fulinend.cxx b/sd/source/ui/func/fulinend.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/func/fulink.cxx b/sd/source/ui/func/fulink.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/func/fumeasur.cxx b/sd/source/ui/func/fumeasur.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/func/fumorph.cxx b/sd/source/ui/func/fumorph.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/func/fuoaprms.cxx b/sd/source/ui/func/fuoaprms.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/func/fuolbull.cxx b/sd/source/ui/func/fuolbull.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/func/fuoltext.cxx b/sd/source/ui/func/fuoltext.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/func/fuoutl.cxx b/sd/source/ui/func/fuoutl.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/func/fupage.cxx b/sd/source/ui/func/fupage.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/func/fuparagr.cxx b/sd/source/ui/func/fuparagr.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/func/fupoor.cxx b/sd/source/ui/func/fupoor.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/func/fuprlout.cxx b/sd/source/ui/func/fuprlout.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/func/fuprobjs.cxx b/sd/source/ui/func/fuprobjs.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/func/fuscale.cxx b/sd/source/ui/func/fuscale.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/func/fusearch.cxx b/sd/source/ui/func/fusearch.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/func/fusel.cxx b/sd/source/ui/func/fusel.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/func/fusldlg.cxx b/sd/source/ui/func/fusldlg.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/func/fusnapln.cxx b/sd/source/ui/func/fusnapln.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/func/fuspell.cxx b/sd/source/ui/func/fuspell.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/func/fusumry.cxx b/sd/source/ui/func/fusumry.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/func/futempl.cxx b/sd/source/ui/func/futempl.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/func/futext.cxx b/sd/source/ui/func/futext.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/func/futext2.cxx b/sd/source/ui/func/futext2.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/func/futhes.cxx b/sd/source/ui/func/futhes.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/func/futransf.cxx b/sd/source/ui/func/futransf.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/func/futxtatt.cxx b/sd/source/ui/func/futxtatt.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/func/fuvect.cxx b/sd/source/ui/func/fuvect.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/func/fuzoom.cxx b/sd/source/ui/func/fuzoom.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/func/makefile.mk b/sd/source/ui/func/makefile.mk old mode 100644 new mode 100755 diff --git a/sd/source/ui/func/outlinfo.cxx b/sd/source/ui/func/outlinfo.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/func/sdundo.cxx b/sd/source/ui/func/sdundo.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/func/sdundogr.cxx b/sd/source/ui/func/sdundogr.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/func/smarttag.cxx b/sd/source/ui/func/smarttag.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/func/undoback.cxx b/sd/source/ui/func/undoback.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/func/undoheaderfooter.cxx b/sd/source/ui/func/undoheaderfooter.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/func/undolayer.cxx b/sd/source/ui/func/undolayer.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/func/undopage.cxx b/sd/source/ui/func/undopage.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/func/unmovss.cxx b/sd/source/ui/func/unmovss.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/func/unoaprms.cxx b/sd/source/ui/func/unoaprms.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/func/unprlout.cxx b/sd/source/ui/func/unprlout.cxx old mode 100644 new mode 100755 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 diff --git a/sd/source/ui/presenter/CanvasUpdateRequester.cxx b/sd/source/ui/presenter/CanvasUpdateRequester.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/presenter/CanvasUpdateRequester.hxx b/sd/source/ui/presenter/CanvasUpdateRequester.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/presenter/PresenterCanvas.cxx b/sd/source/ui/presenter/PresenterCanvas.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/presenter/PresenterCanvas.hxx b/sd/source/ui/presenter/PresenterCanvas.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/presenter/PresenterCanvasFactory.cxx b/sd/source/ui/presenter/PresenterCanvasFactory.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/presenter/PresenterHelper.cxx b/sd/source/ui/presenter/PresenterHelper.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/presenter/PresenterHelper.hxx b/sd/source/ui/presenter/PresenterHelper.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/presenter/PresenterPreviewCache.cxx b/sd/source/ui/presenter/PresenterPreviewCache.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/presenter/PresenterPreviewCache.hxx b/sd/source/ui/presenter/PresenterPreviewCache.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/presenter/PresenterTextView.cxx b/sd/source/ui/presenter/PresenterTextView.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/presenter/PresenterTextView.hxx b/sd/source/ui/presenter/PresenterTextView.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/presenter/SlideRenderer.cxx b/sd/source/ui/presenter/SlideRenderer.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/presenter/SlideRenderer.hxx b/sd/source/ui/presenter/SlideRenderer.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/presenter/makefile.mk b/sd/source/ui/presenter/makefile.mk old mode 100644 new mode 100755 diff --git a/sd/source/ui/slideshow/PaneHider.cxx b/sd/source/ui/slideshow/PaneHider.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/slideshow/PaneHider.hxx b/sd/source/ui/slideshow/PaneHider.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/slideshow/SlideShowRestarter.cxx b/sd/source/ui/slideshow/SlideShowRestarter.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/slideshow/SlideShowRestarter.hxx b/sd/source/ui/slideshow/SlideShowRestarter.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/slideshow/makefile.mk b/sd/source/ui/slideshow/makefile.mk old mode 100644 new mode 100755 diff --git a/sd/source/ui/slideshow/showwin.cxx b/sd/source/ui/slideshow/showwin.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/slideshow/showwindow.hxx b/sd/source/ui/slideshow/showwindow.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/slideshow/slideshow.cxx b/sd/source/ui/slideshow/slideshow.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/slideshow/slideshow.hrc b/sd/source/ui/slideshow/slideshow.hrc old mode 100644 new mode 100755 diff --git a/sd/source/ui/slideshow/slideshow.src b/sd/source/ui/slideshow/slideshow.src old mode 100644 new mode 100755 diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/slideshow/slideshowimpl.hxx b/sd/source/ui/slideshow/slideshowimpl.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/slideshow/slideshowviewimpl.cxx b/sd/source/ui/slideshow/slideshowviewimpl.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/slideshow/slideshowviewimpl.hxx b/sd/source/ui/slideshow/slideshowviewimpl.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx b/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/slidesorter/cache/SlsBitmapCache.hxx b/sd/source/ui/slidesorter/cache/SlsBitmapCache.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/slidesorter/cache/SlsBitmapCompressor.cxx b/sd/source/ui/slidesorter/cache/SlsBitmapCompressor.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/slidesorter/cache/SlsBitmapCompressor.hxx b/sd/source/ui/slidesorter/cache/SlsBitmapCompressor.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/slidesorter/cache/SlsBitmapFactory.cxx b/sd/source/ui/slidesorter/cache/SlsBitmapFactory.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/slidesorter/cache/SlsBitmapFactory.hxx b/sd/source/ui/slidesorter/cache/SlsBitmapFactory.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx b/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/slidesorter/cache/SlsCacheCompactor.hxx b/sd/source/ui/slidesorter/cache/SlsCacheCompactor.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx b/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.hxx b/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/slidesorter/cache/SlsGenericPageCache.cxx b/sd/source/ui/slidesorter/cache/SlsGenericPageCache.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/slidesorter/cache/SlsGenericPageCache.hxx b/sd/source/ui/slidesorter/cache/SlsGenericPageCache.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/slidesorter/cache/SlsIdleDetector.cxx b/sd/source/ui/slidesorter/cache/SlsIdleDetector.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/slidesorter/cache/SlsIdleDetector.hxx b/sd/source/ui/slidesorter/cache/SlsIdleDetector.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/slidesorter/cache/SlsPageCache.cxx b/sd/source/ui/slidesorter/cache/SlsPageCache.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx b/sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/slidesorter/cache/SlsQueueProcessorThread.hxx b/sd/source/ui/slidesorter/cache/SlsQueueProcessorThread.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/slidesorter/cache/SlsRequestFactory.cxx b/sd/source/ui/slidesorter/cache/SlsRequestFactory.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/slidesorter/cache/SlsRequestFactory.hxx b/sd/source/ui/slidesorter/cache/SlsRequestFactory.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/slidesorter/cache/SlsRequestPriorityClass.hxx b/sd/source/ui/slidesorter/cache/SlsRequestPriorityClass.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx b/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/slidesorter/cache/SlsRequestQueue.hxx b/sd/source/ui/slidesorter/cache/SlsRequestQueue.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/slidesorter/cache/makefile.mk b/sd/source/ui/slidesorter/cache/makefile.mk old mode 100644 new mode 100755 diff --git a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/slidesorter/controller/SlsAnimator.cxx b/sd/source/ui/slidesorter/controller/SlsAnimator.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/slidesorter/controller/SlsCommand.hxx b/sd/source/ui/slidesorter/controller/SlsCommand.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx b/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/slidesorter/controller/SlsFocusManager.cxx b/sd/source/ui/slidesorter/controller/SlsFocusManager.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/slidesorter/controller/SlsHideSlideFunction.cxx b/sd/source/ui/slidesorter/controller/SlsHideSlideFunction.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/slidesorter/controller/SlsHideSlideFunction.hxx b/sd/source/ui/slidesorter/controller/SlsHideSlideFunction.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/slidesorter/controller/SlsListener.cxx b/sd/source/ui/slidesorter/controller/SlsListener.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/slidesorter/controller/SlsListener.hxx b/sd/source/ui/slidesorter/controller/SlsListener.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/slidesorter/controller/SlsPageObjectFactory.cxx b/sd/source/ui/slidesorter/controller/SlsPageObjectFactory.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx b/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/slidesorter/controller/SlsProperties.cxx b/sd/source/ui/slidesorter/controller/SlsProperties.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx b/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionCommand.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionCommand.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionCommand.hxx b/sd/source/ui/slidesorter/controller/SlsSelectionCommand.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/slidesorter/controller/SlsSlideFunction.cxx b/sd/source/ui/slidesorter/controller/SlsSlideFunction.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/slidesorter/controller/SlsTransferable.cxx b/sd/source/ui/slidesorter/controller/SlsTransferable.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/slidesorter/controller/SlsTransferable.hxx b/sd/source/ui/slidesorter/controller/SlsTransferable.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/slidesorter/controller/makefile.mk b/sd/source/ui/slidesorter/controller/makefile.mk old mode 100644 new mode 100755 diff --git a/sd/source/ui/slidesorter/inc/cache/SlsCacheContext.hxx b/sd/source/ui/slidesorter/inc/cache/SlsCacheContext.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/slidesorter/inc/cache/SlsPageCache.hxx b/sd/source/ui/slidesorter/inc/cache/SlsPageCache.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/slidesorter/inc/cache/SlsPageCacheManager.hxx b/sd/source/ui/slidesorter/inc/cache/SlsPageCacheManager.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx b/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx b/sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx b/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/slidesorter/inc/controller/SlsCurrentSlideManager.hxx b/sd/source/ui/slidesorter/inc/controller/SlsCurrentSlideManager.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/slidesorter/inc/controller/SlsFocusManager.hxx b/sd/source/ui/slidesorter/inc/controller/SlsFocusManager.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/slidesorter/inc/controller/SlsPageObjectFactory.hxx b/sd/source/ui/slidesorter/inc/controller/SlsPageObjectFactory.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx b/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/slidesorter/inc/controller/SlsProperties.hxx b/sd/source/ui/slidesorter/inc/controller/SlsProperties.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx b/sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx b/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/slidesorter/inc/controller/SlsSelectionManager.hxx b/sd/source/ui/slidesorter/inc/controller/SlsSelectionManager.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/slidesorter/inc/controller/SlsSlideFunction.hxx b/sd/source/ui/slidesorter/inc/controller/SlsSlideFunction.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/slidesorter/inc/controller/SlsSlotManager.hxx b/sd/source/ui/slidesorter/inc/controller/SlsSlotManager.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx b/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/slidesorter/inc/model/SlsEnumeration.hxx b/sd/source/ui/slidesorter/inc/model/SlsEnumeration.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx b/sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/slidesorter/inc/model/SlsPageEnumeration.hxx b/sd/source/ui/slidesorter/inc/model/SlsPageEnumeration.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/slidesorter/inc/model/SlsPageEnumerationProvider.hxx b/sd/source/ui/slidesorter/inc/model/SlsPageEnumerationProvider.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/slidesorter/inc/model/SlsSharedPageDescriptor.hxx b/sd/source/ui/slidesorter/inc/model/SlsSharedPageDescriptor.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx b/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/slidesorter/inc/view/SlsFontProvider.hxx b/sd/source/ui/slidesorter/inc/view/SlsFontProvider.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx b/sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/slidesorter/inc/view/SlsPageObject.hxx b/sd/source/ui/slidesorter/inc/view/SlsPageObject.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/slidesorter/inc/view/SlsPageObjectViewContact.hxx b/sd/source/ui/slidesorter/inc/view/SlsPageObjectViewContact.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/slidesorter/inc/view/SlsPageObjectViewObjectContact.hxx b/sd/source/ui/slidesorter/inc/view/SlsPageObjectViewObjectContact.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/slidesorter/inc/view/SlsViewOverlay.hxx b/sd/source/ui/slidesorter/inc/view/SlsViewOverlay.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/slidesorter/makefile.mk b/sd/source/ui/slidesorter/makefile.mk old mode 100644 new mode 100755 diff --git a/sd/source/ui/slidesorter/model/SlideSorterModel.cxx b/sd/source/ui/slidesorter/model/SlideSorterModel.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/slidesorter/model/SlsPageDescriptor.cxx b/sd/source/ui/slidesorter/model/SlsPageDescriptor.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/slidesorter/model/SlsPageEnumeration.cxx b/sd/source/ui/slidesorter/model/SlsPageEnumeration.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/slidesorter/model/SlsPageEnumerationProvider.cxx b/sd/source/ui/slidesorter/model/SlsPageEnumerationProvider.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/slidesorter/model/makefile.mk b/sd/source/ui/slidesorter/model/makefile.mk old mode 100644 new mode 100755 diff --git a/sd/source/ui/slidesorter/shell/SlideSorter.cxx b/sd/source/ui/slidesorter/shell/SlideSorter.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/slidesorter/shell/SlideSorterChildWindow.cxx b/sd/source/ui/slidesorter/shell/SlideSorterChildWindow.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/slidesorter/shell/SlideSorterChildWindow.src b/sd/source/ui/slidesorter/shell/SlideSorterChildWindow.src old mode 100644 new mode 100755 diff --git a/sd/source/ui/slidesorter/shell/SlideSorterService.cxx b/sd/source/ui/slidesorter/shell/SlideSorterService.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/slidesorter/shell/SlideSorterService.hxx b/sd/source/ui/slidesorter/shell/SlideSorterService.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/slidesorter/shell/makefile.mk b/sd/source/ui/slidesorter/shell/makefile.mk old mode 100644 new mode 100755 diff --git a/sd/source/ui/slidesorter/view/SlideSorterView.cxx b/sd/source/ui/slidesorter/view/SlideSorterView.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/slidesorter/view/SlsFontProvider.cxx b/sd/source/ui/slidesorter/view/SlsFontProvider.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/slidesorter/view/SlsLayouter.cxx b/sd/source/ui/slidesorter/view/SlsLayouter.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/slidesorter/view/SlsPageObject.cxx b/sd/source/ui/slidesorter/view/SlsPageObject.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/slidesorter/view/SlsPageObjectViewContact.cxx b/sd/source/ui/slidesorter/view/SlsPageObjectViewContact.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/slidesorter/view/SlsPageObjectViewObjectContact.cxx b/sd/source/ui/slidesorter/view/SlsPageObjectViewObjectContact.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/slidesorter/view/SlsViewCacheContext.cxx b/sd/source/ui/slidesorter/view/SlsViewCacheContext.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/slidesorter/view/SlsViewCacheContext.hxx b/sd/source/ui/slidesorter/view/SlsViewCacheContext.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/slidesorter/view/SlsViewOverlay.cxx b/sd/source/ui/slidesorter/view/SlsViewOverlay.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/slidesorter/view/makefile.mk b/sd/source/ui/slidesorter/view/makefile.mk old mode 100644 new mode 100755 diff --git a/sd/source/ui/table/TableDesignPane.cxx b/sd/source/ui/table/TableDesignPane.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/table/TableDesignPane.hrc b/sd/source/ui/table/TableDesignPane.hrc old mode 100644 new mode 100755 diff --git a/sd/source/ui/table/TableDesignPane.hxx b/sd/source/ui/table/TableDesignPane.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/table/TableDesignPane.src b/sd/source/ui/table/TableDesignPane.src old mode 100644 new mode 100755 diff --git a/sd/source/ui/table/makefile.mk b/sd/source/ui/table/makefile.mk old mode 100644 new mode 100755 diff --git a/sd/source/ui/table/tablefunction.cxx b/sd/source/ui/table/tablefunction.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/table/tableobjectbar.cxx b/sd/source/ui/table/tableobjectbar.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/table/tableobjectbar.hxx b/sd/source/ui/table/tableobjectbar.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/toolpanel/ConstrainedIterator.cxx b/sd/source/ui/toolpanel/ConstrainedIterator.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/toolpanel/ConstrainedIterator.hxx b/sd/source/ui/toolpanel/ConstrainedIterator.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/toolpanel/ControlContainer.cxx b/sd/source/ui/toolpanel/ControlContainer.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/toolpanel/ControlContainerDescriptor.hxx b/sd/source/ui/toolpanel/ControlContainerDescriptor.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/toolpanel/ControlDescriptorIterator.cxx b/sd/source/ui/toolpanel/ControlDescriptorIterator.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/toolpanel/ControlList.hxx b/sd/source/ui/toolpanel/ControlList.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/toolpanel/EmptyWindow.cxx b/sd/source/ui/toolpanel/EmptyWindow.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/toolpanel/EmptyWindow.hxx b/sd/source/ui/toolpanel/EmptyWindow.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/toolpanel/LayoutMenu.cxx b/sd/source/ui/toolpanel/LayoutMenu.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/toolpanel/LayoutMenu.hxx b/sd/source/ui/toolpanel/LayoutMenu.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/toolpanel/LayoutableWindow.hxx b/sd/source/ui/toolpanel/LayoutableWindow.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/toolpanel/ScrollPanel.cxx b/sd/source/ui/toolpanel/ScrollPanel.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/toolpanel/SimpleLayoutWrapper.cxx b/sd/source/ui/toolpanel/SimpleLayoutWrapper.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/toolpanel/SimpleLayoutWrapper.hxx b/sd/source/ui/toolpanel/SimpleLayoutWrapper.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/toolpanel/SlideSorterCacheDisplay.cxx b/sd/source/ui/toolpanel/SlideSorterCacheDisplay.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/toolpanel/SubToolPanel.cxx b/sd/source/ui/toolpanel/SubToolPanel.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/toolpanel/TaskPaneControlFactory.cxx b/sd/source/ui/toolpanel/TaskPaneControlFactory.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/toolpanel/TaskPaneFocusManager.cxx b/sd/source/ui/toolpanel/TaskPaneFocusManager.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/toolpanel/TaskPaneFocusManager.hxx b/sd/source/ui/toolpanel/TaskPaneFocusManager.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/toolpanel/TaskPaneShellManager.cxx b/sd/source/ui/toolpanel/TaskPaneShellManager.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/toolpanel/TaskPaneShellManager.hxx b/sd/source/ui/toolpanel/TaskPaneShellManager.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/toolpanel/TaskPaneTreeNode.cxx b/sd/source/ui/toolpanel/TaskPaneTreeNode.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/toolpanel/TaskPaneViewShell.cxx b/sd/source/ui/toolpanel/TaskPaneViewShell.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/toolpanel/TestMenu.cxx b/sd/source/ui/toolpanel/TestMenu.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/toolpanel/TestMenu.hxx b/sd/source/ui/toolpanel/TestMenu.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/toolpanel/TestPanel.cxx b/sd/source/ui/toolpanel/TestPanel.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/toolpanel/TestPanel.hxx b/sd/source/ui/toolpanel/TestPanel.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/toolpanel/TitleBar.cxx b/sd/source/ui/toolpanel/TitleBar.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/toolpanel/TitleToolBox.cxx b/sd/source/ui/toolpanel/TitleToolBox.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/toolpanel/TitleToolBox.hxx b/sd/source/ui/toolpanel/TitleToolBox.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/toolpanel/TitledControl.cxx b/sd/source/ui/toolpanel/TitledControl.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/toolpanel/ToolPanel.cxx b/sd/source/ui/toolpanel/ToolPanel.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/toolpanel/ToolPanelChildWindow.cxx b/sd/source/ui/toolpanel/ToolPanelChildWindow.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/toolpanel/ToolPanelChildWindow.src b/sd/source/ui/toolpanel/ToolPanelChildWindow.src old mode 100644 new mode 100755 diff --git a/sd/source/ui/toolpanel/ToolPanelDescriptor.hxx b/sd/source/ui/toolpanel/ToolPanelDescriptor.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/toolpanel/controls/AllMasterPagesSelector.cxx b/sd/source/ui/toolpanel/controls/AllMasterPagesSelector.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/toolpanel/controls/AllMasterPagesSelector.hxx b/sd/source/ui/toolpanel/controls/AllMasterPagesSelector.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/toolpanel/controls/AnimationSchemesPanel.cxx b/sd/source/ui/toolpanel/controls/AnimationSchemesPanel.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/toolpanel/controls/AnimationSchemesPanel.hxx b/sd/source/ui/toolpanel/controls/AnimationSchemesPanel.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/toolpanel/controls/CurrentMasterPagesSelector.cxx b/sd/source/ui/toolpanel/controls/CurrentMasterPagesSelector.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/toolpanel/controls/CurrentMasterPagesSelector.hxx b/sd/source/ui/toolpanel/controls/CurrentMasterPagesSelector.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/toolpanel/controls/CustomAnimationPanel.cxx b/sd/source/ui/toolpanel/controls/CustomAnimationPanel.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/toolpanel/controls/CustomAnimationPanel.hxx b/sd/source/ui/toolpanel/controls/CustomAnimationPanel.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/toolpanel/controls/DocumentHelper.cxx b/sd/source/ui/toolpanel/controls/DocumentHelper.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/toolpanel/controls/DocumentHelper.hxx b/sd/source/ui/toolpanel/controls/DocumentHelper.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/toolpanel/controls/MasterPageContainer.cxx b/sd/source/ui/toolpanel/controls/MasterPageContainer.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/toolpanel/controls/MasterPageContainer.hxx b/sd/source/ui/toolpanel/controls/MasterPageContainer.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/toolpanel/controls/MasterPageContainerFiller.cxx b/sd/source/ui/toolpanel/controls/MasterPageContainerFiller.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/toolpanel/controls/MasterPageContainerFiller.hxx b/sd/source/ui/toolpanel/controls/MasterPageContainerFiller.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/toolpanel/controls/MasterPageContainerProviders.cxx b/sd/source/ui/toolpanel/controls/MasterPageContainerProviders.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/toolpanel/controls/MasterPageContainerProviders.hxx b/sd/source/ui/toolpanel/controls/MasterPageContainerProviders.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/toolpanel/controls/MasterPageContainerQueue.cxx b/sd/source/ui/toolpanel/controls/MasterPageContainerQueue.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/toolpanel/controls/MasterPageContainerQueue.hxx b/sd/source/ui/toolpanel/controls/MasterPageContainerQueue.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/toolpanel/controls/MasterPageDescriptor.cxx b/sd/source/ui/toolpanel/controls/MasterPageDescriptor.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/toolpanel/controls/MasterPageDescriptor.hxx b/sd/source/ui/toolpanel/controls/MasterPageDescriptor.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/toolpanel/controls/MasterPageObserver.cxx b/sd/source/ui/toolpanel/controls/MasterPageObserver.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/toolpanel/controls/MasterPagesPanel.cxx b/sd/source/ui/toolpanel/controls/MasterPagesPanel.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/toolpanel/controls/MasterPagesPanel.hxx b/sd/source/ui/toolpanel/controls/MasterPagesPanel.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx b/sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/toolpanel/controls/MasterPagesSelector.hxx b/sd/source/ui/toolpanel/controls/MasterPagesSelector.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/toolpanel/controls/PreviewValueSet.cxx b/sd/source/ui/toolpanel/controls/PreviewValueSet.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/toolpanel/controls/PreviewValueSet.hxx b/sd/source/ui/toolpanel/controls/PreviewValueSet.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/toolpanel/controls/RecentMasterPagesSelector.cxx b/sd/source/ui/toolpanel/controls/RecentMasterPagesSelector.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/toolpanel/controls/RecentMasterPagesSelector.hxx b/sd/source/ui/toolpanel/controls/RecentMasterPagesSelector.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/toolpanel/controls/RecentlyUsedMasterPages.cxx b/sd/source/ui/toolpanel/controls/RecentlyUsedMasterPages.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/toolpanel/controls/RecentlyUsedMasterPages.hxx b/sd/source/ui/toolpanel/controls/RecentlyUsedMasterPages.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/toolpanel/controls/SlideTransitionPanel.cxx b/sd/source/ui/toolpanel/controls/SlideTransitionPanel.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/toolpanel/controls/SlideTransitionPanel.hxx b/sd/source/ui/toolpanel/controls/SlideTransitionPanel.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/toolpanel/controls/TableDesignPanel.cxx b/sd/source/ui/toolpanel/controls/TableDesignPanel.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/toolpanel/controls/TableDesignPanel.hxx b/sd/source/ui/toolpanel/controls/TableDesignPanel.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/toolpanel/controls/makefile.mk b/sd/source/ui/toolpanel/controls/makefile.mk old mode 100644 new mode 100755 diff --git a/sd/source/ui/toolpanel/makefile.mk b/sd/source/ui/toolpanel/makefile.mk old mode 100644 new mode 100755 diff --git a/sd/source/ui/tools/AsynchronousCall.cxx b/sd/source/ui/tools/AsynchronousCall.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/tools/ConfigurationAccess.cxx b/sd/source/ui/tools/ConfigurationAccess.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/tools/EventMultiplexer.cxx b/sd/source/ui/tools/EventMultiplexer.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/tools/IconCache.cxx b/sd/source/ui/tools/IconCache.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/tools/IdleDetection.cxx b/sd/source/ui/tools/IdleDetection.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/tools/PreviewRenderer.cxx b/sd/source/ui/tools/PreviewRenderer.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/tools/PropertySet.cxx b/sd/source/ui/tools/PropertySet.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/tools/SdGlobalResourceContainer.cxx b/sd/source/ui/tools/SdGlobalResourceContainer.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/tools/SlotStateListener.cxx b/sd/source/ui/tools/SlotStateListener.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/tools/TimerBasedTaskExecution.cxx b/sd/source/ui/tools/TimerBasedTaskExecution.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/tools/makefile.mk b/sd/source/ui/tools/makefile.mk old mode 100644 new mode 100755 diff --git a/sd/source/ui/unoidl/DrawController.cxx b/sd/source/ui/unoidl/DrawController.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/unoidl/SdUnoDrawView.cxx b/sd/source/ui/unoidl/SdUnoDrawView.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/unoidl/SdUnoOutlineView.cxx b/sd/source/ui/unoidl/SdUnoOutlineView.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/unoidl/SdUnoSlideView.cxx b/sd/source/ui/unoidl/SdUnoSlideView.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/unoidl/UnoDocumentSettings.cxx b/sd/source/ui/unoidl/UnoDocumentSettings.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/unoidl/UnoDocumentSettings.hxx b/sd/source/ui/unoidl/UnoDocumentSettings.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/unoidl/detreg.cxx b/sd/source/ui/unoidl/detreg.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/unoidl/facreg.cxx b/sd/source/ui/unoidl/facreg.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/unoidl/makefile.mk b/sd/source/ui/unoidl/makefile.mk old mode 100644 new mode 100755 diff --git a/sd/source/ui/unoidl/randomnode.cxx b/sd/source/ui/unoidl/randomnode.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/unoidl/sddetect.cxx b/sd/source/ui/unoidl/sddetect.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/unoidl/sddetect.hxx b/sd/source/ui/unoidl/sddetect.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/unoidl/unocpres.cxx b/sd/source/ui/unoidl/unocpres.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/unoidl/unocpres.hxx b/sd/source/ui/unoidl/unocpres.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/unoidl/unodoc.cxx b/sd/source/ui/unoidl/unodoc.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/unoidl/unohelp.hxx b/sd/source/ui/unoidl/unohelp.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/unoidl/unokywds.cxx b/sd/source/ui/unoidl/unokywds.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/unoidl/unolayer.cxx b/sd/source/ui/unoidl/unolayer.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/unoidl/unolayer.hxx b/sd/source/ui/unoidl/unolayer.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/unoidl/unomodule.cxx b/sd/source/ui/unoidl/unomodule.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/unoidl/unomodule.hxx b/sd/source/ui/unoidl/unomodule.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/unoidl/unoobj.cxx b/sd/source/ui/unoidl/unoobj.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/unoidl/unoobj.hxx b/sd/source/ui/unoidl/unoobj.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/unoidl/unopage.hxx b/sd/source/ui/unoidl/unopage.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/unoidl/unopback.cxx b/sd/source/ui/unoidl/unopback.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/unoidl/unopback.hxx b/sd/source/ui/unoidl/unopback.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/unoidl/unopool.cxx b/sd/source/ui/unoidl/unopool.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/unoidl/unosrch.cxx b/sd/source/ui/unoidl/unosrch.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/unoidl/unovwcrs.cxx b/sd/source/ui/unoidl/unovwcrs.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/unoidl/unowcntr.cxx b/sd/source/ui/unoidl/unowcntr.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/unoidl/unowcntr.hxx b/sd/source/ui/unoidl/unowcntr.hxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/view/DocumentRenderer.cxx b/sd/source/ui/view/DocumentRenderer.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/view/DocumentRenderer.hrc b/sd/source/ui/view/DocumentRenderer.hrc old mode 100644 new mode 100755 diff --git a/sd/source/ui/view/DocumentRenderer.src b/sd/source/ui/view/DocumentRenderer.src old mode 100644 new mode 100755 diff --git a/sd/source/ui/view/FormShellManager.cxx b/sd/source/ui/view/FormShellManager.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/view/GraphicObjectBar.cxx b/sd/source/ui/view/GraphicObjectBar.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/view/GraphicViewShellBase.cxx b/sd/source/ui/view/GraphicViewShellBase.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/view/ImpressViewShellBase.cxx b/sd/source/ui/view/ImpressViewShellBase.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/view/MediaObjectBar.cxx b/sd/source/ui/view/MediaObjectBar.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/view/OutlineViewShellBase.cxx b/sd/source/ui/view/OutlineViewShellBase.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/view/OutlinerIterator.cxx b/sd/source/ui/view/OutlinerIterator.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/view/PresentationViewShellBase.cxx b/sd/source/ui/view/PresentationViewShellBase.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/view/SlideSorterViewShellBase.cxx b/sd/source/ui/view/SlideSorterViewShellBase.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/view/ToolBarManager.cxx b/sd/source/ui/view/ToolBarManager.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/view/UpdateLockManager.cxx b/sd/source/ui/view/UpdateLockManager.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx index fb8c31335668..f609f669da03 100644 --- a/sd/source/ui/view/ViewShellBase.cxx +++ b/sd/source/ui/view/ViewShellBase.cxx @@ -1300,7 +1300,7 @@ CustomHandleManager& ViewShellBase::getCustomHandleManager() const ::rtl::OUString ViewShellBase::RetrieveLabelFromCommand( const ::rtl::OUString& aCmdURL ) const { - Reference< XFrame > xFrame( GetMainViewShell()->GetViewFrame()->GetFrame()->GetFrameInterface(), UNO_QUERY ); + Reference< XFrame > xFrame( GetMainViewShell()->GetViewFrame()->GetFrame().GetFrameInterface(), UNO_QUERY ); return ImplRetrieveLabelFromCommand( xFrame, aCmdURL ); } diff --git a/sd/source/ui/view/ViewShellHint.cxx b/sd/source/ui/view/ViewShellHint.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/view/ViewShellImplementation.cxx b/sd/source/ui/view/ViewShellImplementation.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/view/ViewTabBar.cxx b/sd/source/ui/view/ViewTabBar.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/view/WindowUpdater.cxx b/sd/source/ui/view/WindowUpdater.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/view/bmcache.cxx b/sd/source/ui/view/bmcache.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/view/clview.cxx b/sd/source/ui/view/clview.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/view/drawview.cxx b/sd/source/ui/view/drawview.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/view/drbezob.cxx b/sd/source/ui/view/drbezob.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/view/drtxtob.cxx b/sd/source/ui/view/drtxtob.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/view/drtxtob1.cxx b/sd/source/ui/view/drtxtob1.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/view/drviews3.cxx b/sd/source/ui/view/drviews3.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/view/drviews4.cxx b/sd/source/ui/view/drviews4.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/view/drviews5.cxx b/sd/source/ui/view/drviews5.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/view/drviews6.cxx b/sd/source/ui/view/drviews6.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/view/drviews7.cxx b/sd/source/ui/view/drviews7.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/view/drviews8.cxx b/sd/source/ui/view/drviews8.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/view/drviews9.cxx b/sd/source/ui/view/drviews9.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/view/drviewsa.cxx b/sd/source/ui/view/drviewsa.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/view/drviewsb.cxx b/sd/source/ui/view/drviewsb.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/view/drviewsc.cxx b/sd/source/ui/view/drviewsc.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/view/drviewsd.cxx b/sd/source/ui/view/drviewsd.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/view/drviewse.cxx b/sd/source/ui/view/drviewse.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/view/drviewsf.cxx b/sd/source/ui/view/drviewsf.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/view/drviewsg.cxx b/sd/source/ui/view/drviewsg.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/view/drviewsh.cxx b/sd/source/ui/view/drviewsh.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/view/drviewsi.cxx b/sd/source/ui/view/drviewsi.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/view/drviewsj.cxx b/sd/source/ui/view/drviewsj.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/view/drvwshrg.cxx b/sd/source/ui/view/drvwshrg.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/view/frmview.cxx b/sd/source/ui/view/frmview.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/view/grviewsh.cxx b/sd/source/ui/view/grviewsh.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/view/makefile.mk b/sd/source/ui/view/makefile.mk old mode 100644 new mode 100755 diff --git a/sd/source/ui/view/outlnvs2.cxx b/sd/source/ui/view/outlnvs2.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/view/presvish.cxx b/sd/source/ui/view/presvish.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/view/sdruler.cxx b/sd/source/ui/view/sdruler.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/view/sdview.cxx b/sd/source/ui/view/sdview.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/view/sdview2.cxx b/sd/source/ui/view/sdview2.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/view/sdview3.cxx b/sd/source/ui/view/sdview3.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/view/sdview4.cxx b/sd/source/ui/view/sdview4.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/view/sdview5.cxx b/sd/source/ui/view/sdview5.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/view/sdwindow.cxx b/sd/source/ui/view/sdwindow.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/view/showview.cxx b/sd/source/ui/view/showview.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/view/tabcontr.cxx b/sd/source/ui/view/tabcontr.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/view/unmodpg.cxx b/sd/source/ui/view/unmodpg.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/view/viewoverlaymanager.cxx b/sd/source/ui/view/viewoverlaymanager.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/view/viewshe2.cxx b/sd/source/ui/view/viewshe2.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/view/viewshe3.cxx b/sd/source/ui/view/viewshe3.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/view/zoomlist.cxx b/sd/source/ui/view/zoomlist.cxx old mode 100644 new mode 100755 diff --git a/sd/source/unotypes/makefile.mk b/sd/source/unotypes/makefile.mk old mode 100644 new mode 100755 diff --git a/sd/uiconfig/sdraw/menubar/menubar.xml b/sd/uiconfig/sdraw/menubar/menubar.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/sdraw/statusbar/statusbar.xml b/sd/uiconfig/sdraw/statusbar/statusbar.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/sdraw/toolbar/3dobjectsbar.xml b/sd/uiconfig/sdraw/toolbar/3dobjectsbar.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/sdraw/toolbar/alignmentbar.xml b/sd/uiconfig/sdraw/toolbar/alignmentbar.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/sdraw/toolbar/arrowsbar.xml b/sd/uiconfig/sdraw/toolbar/arrowsbar.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/sdraw/toolbar/arrowshapes.xml b/sd/uiconfig/sdraw/toolbar/arrowshapes.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/sdraw/toolbar/basicshapes.xml b/sd/uiconfig/sdraw/toolbar/basicshapes.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/sdraw/toolbar/bezierobjectbar.xml b/sd/uiconfig/sdraw/toolbar/bezierobjectbar.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/sdraw/toolbar/calloutshapes.xml b/sd/uiconfig/sdraw/toolbar/calloutshapes.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/sdraw/toolbar/choosemodebar.xml b/sd/uiconfig/sdraw/toolbar/choosemodebar.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/sdraw/toolbar/colorbar.xml b/sd/uiconfig/sdraw/toolbar/colorbar.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/sdraw/toolbar/commentsbar.xml b/sd/uiconfig/sdraw/toolbar/commentsbar.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/sdraw/toolbar/connectorsbar.xml b/sd/uiconfig/sdraw/toolbar/connectorsbar.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/sdraw/toolbar/drawingobjectbar.xml b/sd/uiconfig/sdraw/toolbar/drawingobjectbar.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/sdraw/toolbar/ellipsesbar.xml b/sd/uiconfig/sdraw/toolbar/ellipsesbar.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/sdraw/toolbar/extrusionobjectbar.xml b/sd/uiconfig/sdraw/toolbar/extrusionobjectbar.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/sdraw/toolbar/flowchartshapes.xml b/sd/uiconfig/sdraw/toolbar/flowchartshapes.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/sdraw/toolbar/fontworkobjectbar.xml b/sd/uiconfig/sdraw/toolbar/fontworkobjectbar.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/sdraw/toolbar/fontworkshapetype.xml b/sd/uiconfig/sdraw/toolbar/fontworkshapetype.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/sdraw/toolbar/formcontrols.xml b/sd/uiconfig/sdraw/toolbar/formcontrols.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/sdraw/toolbar/formdesign.xml b/sd/uiconfig/sdraw/toolbar/formdesign.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/sdraw/toolbar/formsfilterbar.xml b/sd/uiconfig/sdraw/toolbar/formsfilterbar.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/sdraw/toolbar/formsnavigationbar.xml b/sd/uiconfig/sdraw/toolbar/formsnavigationbar.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/sdraw/toolbar/formtextobjectbar.xml b/sd/uiconfig/sdraw/toolbar/formtextobjectbar.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/sdraw/toolbar/fullscreenbar.xml b/sd/uiconfig/sdraw/toolbar/fullscreenbar.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/sdraw/toolbar/gluepointsobjectbar.xml b/sd/uiconfig/sdraw/toolbar/gluepointsobjectbar.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/sdraw/toolbar/graffilterbar.xml b/sd/uiconfig/sdraw/toolbar/graffilterbar.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/sdraw/toolbar/graphicobjectbar.xml b/sd/uiconfig/sdraw/toolbar/graphicobjectbar.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/sdraw/toolbar/insertbar.xml b/sd/uiconfig/sdraw/toolbar/insertbar.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/sdraw/toolbar/linesbar.xml b/sd/uiconfig/sdraw/toolbar/linesbar.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/sdraw/toolbar/masterviewtoolbar.xml b/sd/uiconfig/sdraw/toolbar/masterviewtoolbar.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/sdraw/toolbar/mediaobjectbar.xml b/sd/uiconfig/sdraw/toolbar/mediaobjectbar.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/sdraw/toolbar/moreformcontrols.xml b/sd/uiconfig/sdraw/toolbar/moreformcontrols.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/sdraw/toolbar/optimizetablebar.xml b/sd/uiconfig/sdraw/toolbar/optimizetablebar.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/sdraw/toolbar/optionsbar.xml b/sd/uiconfig/sdraw/toolbar/optionsbar.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/sdraw/toolbar/positionbar.xml b/sd/uiconfig/sdraw/toolbar/positionbar.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/sdraw/toolbar/rectanglesbar.xml b/sd/uiconfig/sdraw/toolbar/rectanglesbar.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/sdraw/toolbar/standardbar.xml b/sd/uiconfig/sdraw/toolbar/standardbar.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/sdraw/toolbar/starshapes.xml b/sd/uiconfig/sdraw/toolbar/starshapes.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/sdraw/toolbar/symbolshapes.xml b/sd/uiconfig/sdraw/toolbar/symbolshapes.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/sdraw/toolbar/tableobjectbar.xml b/sd/uiconfig/sdraw/toolbar/tableobjectbar.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/sdraw/toolbar/textbar.xml b/sd/uiconfig/sdraw/toolbar/textbar.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/sdraw/toolbar/textobjectbar.xml b/sd/uiconfig/sdraw/toolbar/textobjectbar.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/sdraw/toolbar/toolbar.xml b/sd/uiconfig/sdraw/toolbar/toolbar.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/sdraw/toolbar/viewerbar.xml b/sd/uiconfig/sdraw/toolbar/viewerbar.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/sdraw/toolbar/zoombar.xml b/sd/uiconfig/sdraw/toolbar/zoombar.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/simpress/menubar/menubar.xml b/sd/uiconfig/simpress/menubar/menubar.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/simpress/statusbar/statusbar.xml b/sd/uiconfig/simpress/statusbar/statusbar.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/simpress/toolbar/3dobjectsbar.xml b/sd/uiconfig/simpress/toolbar/3dobjectsbar.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/simpress/toolbar/alignmentbar.xml b/sd/uiconfig/simpress/toolbar/alignmentbar.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/simpress/toolbar/arrowsbar.xml b/sd/uiconfig/simpress/toolbar/arrowsbar.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/simpress/toolbar/arrowshapes.xml b/sd/uiconfig/simpress/toolbar/arrowshapes.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/simpress/toolbar/basicshapes.xml b/sd/uiconfig/simpress/toolbar/basicshapes.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/simpress/toolbar/bezierobjectbar.xml b/sd/uiconfig/simpress/toolbar/bezierobjectbar.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/simpress/toolbar/calloutshapes.xml b/sd/uiconfig/simpress/toolbar/calloutshapes.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/simpress/toolbar/choosemodebar.xml b/sd/uiconfig/simpress/toolbar/choosemodebar.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/simpress/toolbar/colorbar.xml b/sd/uiconfig/simpress/toolbar/colorbar.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/simpress/toolbar/commentsbar.xml b/sd/uiconfig/simpress/toolbar/commentsbar.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/simpress/toolbar/commontaskbar.xml b/sd/uiconfig/simpress/toolbar/commontaskbar.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/simpress/toolbar/connectorsbar.xml b/sd/uiconfig/simpress/toolbar/connectorsbar.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/simpress/toolbar/drawingobjectbar.xml b/sd/uiconfig/simpress/toolbar/drawingobjectbar.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/simpress/toolbar/ellipsesbar.xml b/sd/uiconfig/simpress/toolbar/ellipsesbar.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/simpress/toolbar/extrusionobjectbar.xml b/sd/uiconfig/simpress/toolbar/extrusionobjectbar.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/simpress/toolbar/flowchartshapes.xml b/sd/uiconfig/simpress/toolbar/flowchartshapes.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/simpress/toolbar/fontworkobjectbar.xml b/sd/uiconfig/simpress/toolbar/fontworkobjectbar.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/simpress/toolbar/fontworkshapetype.xml b/sd/uiconfig/simpress/toolbar/fontworkshapetype.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/simpress/toolbar/formcontrols.xml b/sd/uiconfig/simpress/toolbar/formcontrols.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/simpress/toolbar/formdesign.xml b/sd/uiconfig/simpress/toolbar/formdesign.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/simpress/toolbar/formsfilterbar.xml b/sd/uiconfig/simpress/toolbar/formsfilterbar.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/simpress/toolbar/formsnavigationbar.xml b/sd/uiconfig/simpress/toolbar/formsnavigationbar.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/simpress/toolbar/formtextobjectbar.xml b/sd/uiconfig/simpress/toolbar/formtextobjectbar.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/simpress/toolbar/fullscreenbar.xml b/sd/uiconfig/simpress/toolbar/fullscreenbar.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/simpress/toolbar/gluepointsobjectbar.xml b/sd/uiconfig/simpress/toolbar/gluepointsobjectbar.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/simpress/toolbar/graffilterbar.xml b/sd/uiconfig/simpress/toolbar/graffilterbar.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/simpress/toolbar/graphicobjectbar.xml b/sd/uiconfig/simpress/toolbar/graphicobjectbar.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/simpress/toolbar/insertbar.xml b/sd/uiconfig/simpress/toolbar/insertbar.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/simpress/toolbar/linesbar.xml b/sd/uiconfig/simpress/toolbar/linesbar.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/simpress/toolbar/masterviewtoolbar.xml b/sd/uiconfig/simpress/toolbar/masterviewtoolbar.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/simpress/toolbar/mediaobjectbar.xml b/sd/uiconfig/simpress/toolbar/mediaobjectbar.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/simpress/toolbar/moreformcontrols.xml b/sd/uiconfig/simpress/toolbar/moreformcontrols.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/simpress/toolbar/optimizetablebar.xml b/sd/uiconfig/simpress/toolbar/optimizetablebar.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/simpress/toolbar/optionsbar.xml b/sd/uiconfig/simpress/toolbar/optionsbar.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/simpress/toolbar/outlinetoolbar.xml b/sd/uiconfig/simpress/toolbar/outlinetoolbar.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/simpress/toolbar/positionbar.xml b/sd/uiconfig/simpress/toolbar/positionbar.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/simpress/toolbar/rectanglesbar.xml b/sd/uiconfig/simpress/toolbar/rectanglesbar.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/simpress/toolbar/slideviewobjectbar.xml b/sd/uiconfig/simpress/toolbar/slideviewobjectbar.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/simpress/toolbar/slideviewtoolbar.xml b/sd/uiconfig/simpress/toolbar/slideviewtoolbar.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/simpress/toolbar/standardbar.xml b/sd/uiconfig/simpress/toolbar/standardbar.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/simpress/toolbar/starshapes.xml b/sd/uiconfig/simpress/toolbar/starshapes.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/simpress/toolbar/symbolshapes.xml b/sd/uiconfig/simpress/toolbar/symbolshapes.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/simpress/toolbar/tableobjectbar.xml b/sd/uiconfig/simpress/toolbar/tableobjectbar.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/simpress/toolbar/textbar.xml b/sd/uiconfig/simpress/toolbar/textbar.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/simpress/toolbar/textobjectbar.xml b/sd/uiconfig/simpress/toolbar/textobjectbar.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/simpress/toolbar/toolbar.xml b/sd/uiconfig/simpress/toolbar/toolbar.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/simpress/toolbar/viewerbar.xml b/sd/uiconfig/simpress/toolbar/viewerbar.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/simpress/toolbar/zoombar.xml b/sd/uiconfig/simpress/toolbar/zoombar.xml old mode 100644 new mode 100755 diff --git a/sd/util/exports.dxp b/sd/util/exports.dxp old mode 100644 new mode 100755 diff --git a/sd/util/hidother.hrc b/sd/util/hidother.hrc old mode 100644 new mode 100755 diff --git a/sd/util/hidother.src b/sd/util/hidother.src old mode 100644 new mode 100755 diff --git a/sd/util/makefile.mk b/sd/util/makefile.mk old mode 100644 new mode 100755 diff --git a/sd/util/makefile.pmk b/sd/util/makefile.pmk old mode 100644 new mode 100755 diff --git a/sd/util/sd.flt b/sd/util/sd.flt old mode 100644 new mode 100755 diff --git a/sd/util/sd.map b/sd/util/sd.map old mode 100644 new mode 100755 diff --git a/sd/util/sdd.map b/sd/util/sdd.map old mode 100644 new mode 100755 diff --git a/sd/util/sdfilt.map b/sd/util/sdfilt.map old mode 100644 new mode 100755 diff --git a/sd/util/sdui.map b/sd/util/sdui.map old mode 100644 new mode 100755 diff --git a/sd/workben/testdll/makefile b/sd/workben/testdll/makefile old mode 100644 new mode 100755 diff --git a/sd/xml/AccessibleDrawDocumentView.xml b/sd/xml/AccessibleDrawDocumentView.xml old mode 100644 new mode 100755 diff --git a/sd/xml/AccessibleOutlineView.xml b/sd/xml/AccessibleOutlineView.xml old mode 100644 new mode 100755 diff --git a/sd/xml/AccessiblePageShape.xml b/sd/xml/AccessiblePageShape.xml old mode 100644 new mode 100755 diff --git a/sd/xml/AccessiblePresentationGraphicShape.xml b/sd/xml/AccessiblePresentationGraphicShape.xml old mode 100644 new mode 100755 diff --git a/sd/xml/AccessiblePresentationOLEShape.xml b/sd/xml/AccessiblePresentationOLEShape.xml old mode 100644 new mode 100755 diff --git a/sd/xml/AccessiblePresentationShape.xml b/sd/xml/AccessiblePresentationShape.xml old mode 100644 new mode 100755 diff --git a/sd/xml/AccessibleSlideView.xml b/sd/xml/AccessibleSlideView.xml old mode 100644 new mode 100755 diff --git a/sd/xml/AccessibleSlideViewObject.xml b/sd/xml/AccessibleSlideViewObject.xml old mode 100644 new mode 100755 diff --git a/sd/xml/DrawingView.xml b/sd/xml/DrawingView.xml old mode 100644 new mode 100755 diff --git a/sd/xml/HandoutView.xml b/sd/xml/HandoutView.xml old mode 100644 new mode 100755 diff --git a/sd/xml/NotesView.xml b/sd/xml/NotesView.xml old mode 100644 new mode 100755 diff --git a/sd/xml/OutlineView.xml b/sd/xml/OutlineView.xml old mode 100644 new mode 100755 diff --git a/sd/xml/PresentationView.xml b/sd/xml/PresentationView.xml old mode 100644 new mode 100755 diff --git a/sd/xml/SdDocLinkTargets.xml b/sd/xml/SdDocLinkTargets.xml old mode 100644 new mode 100755 diff --git a/sd/xml/SdDrawPage.xml b/sd/xml/SdDrawPage.xml old mode 100644 new mode 100755 diff --git a/sd/xml/SdDrawPagesAccess.xml b/sd/xml/SdDrawPagesAccess.xml old mode 100644 new mode 100755 diff --git a/sd/xml/SdGenericDrawPage.xml b/sd/xml/SdGenericDrawPage.xml old mode 100644 new mode 100755 diff --git a/sd/xml/SdLayer.xml b/sd/xml/SdLayer.xml old mode 100644 new mode 100755 diff --git a/sd/xml/SdLayerManager.xml b/sd/xml/SdLayerManager.xml old mode 100644 new mode 100755 diff --git a/sd/xml/SdMasterPage.xml b/sd/xml/SdMasterPage.xml old mode 100644 new mode 100755 diff --git a/sd/xml/SdMasterPagesAccess.xml b/sd/xml/SdMasterPagesAccess.xml old mode 100644 new mode 100755 diff --git a/sd/xml/SdPageLinkTargets.xml b/sd/xml/SdPageLinkTargets.xml old mode 100644 new mode 100755 diff --git a/sd/xml/SdXCustomPresentation.xml b/sd/xml/SdXCustomPresentation.xml old mode 100644 new mode 100755 diff --git a/sd/xml/SdXCustomPresentationAccess.xml b/sd/xml/SdXCustomPresentationAccess.xml old mode 100644 new mode 100755 diff --git a/sd/xml/SdXImpressDocument.xml b/sd/xml/SdXImpressDocument.xml old mode 100644 new mode 100755 diff --git a/sd/xml/SdXPresentation.xml b/sd/xml/SdXPresentation.xml old mode 100644 new mode 100755 diff --git a/sd/xml/SdXShape.xml b/sd/xml/SdXShape.xml old mode 100644 new mode 100755 diff --git a/sd/xml/SlidesView.xml b/sd/xml/SlidesView.xml old mode 100644 new mode 100755 diff --git a/sd/xml/effects.xml b/sd/xml/effects.xml old mode 100644 new mode 100755 diff --git a/sd/xml/transitions-ogl.xml b/sd/xml/transitions-ogl.xml old mode 100644 new mode 100755 diff --git a/sd/xml/transitions.xml b/sd/xml/transitions.xml old mode 100644 new mode 100755 diff --git a/sd/xsl/effect.xsl b/sd/xsl/effect.xsl 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. --- .../ui/framework/factories/TaskPanelFactory.cxx | 5 +- .../ui/framework/factories/ViewShellWrapper.cxx | 90 +-- sd/source/ui/framework/tools/FrameworkHelper.cxx | 2 +- sd/source/ui/inc/framework/ViewShellWrapper.hxx | 33 +- sd/source/ui/inc/taskpane/PanelId.hxx | 5 + sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx | 26 +- sd/source/ui/toolpanel/CustomToolPanel.cxx | 290 ---------- sd/source/ui/toolpanel/CustomToolPanel.hxx | 113 ---- sd/source/ui/toolpanel/MethodGuard.hxx | 67 +++ sd/source/ui/toolpanel/StandardToolPanel.cxx | 163 ------ sd/source/ui/toolpanel/StandardToolPanel.hxx | 84 --- sd/source/ui/toolpanel/TaskPaneToolPanel.cxx | 101 ---- sd/source/ui/toolpanel/TaskPaneToolPanel.hxx | 97 ---- sd/source/ui/toolpanel/ToolPanel.cxx | 113 ++++ sd/source/ui/toolpanel/ToolPanel.hxx | 80 +++ sd/source/ui/toolpanel/ToolPanelDeck.cxx | 160 ------ sd/source/ui/toolpanel/ToolPanelDeck.hxx | 97 ---- sd/source/ui/toolpanel/ToolPanelFactory.cxx | 255 +++++++++ sd/source/ui/toolpanel/ToolPanelUIElement.cxx | 134 +++++ sd/source/ui/toolpanel/ToolPanelUIElement.hxx | 87 +++ sd/source/ui/toolpanel/ToolPanelViewShell.cxx | 637 ++++++++------------- sd/source/ui/toolpanel/makefile.mk | 7 +- sd/source/ui/unoidl/facreg.cxx | 25 + sd/source/ui/view/drvwshrg.cxx | 1 + 24 files changed, 1042 insertions(+), 1630 deletions(-) delete mode 100644 sd/source/ui/toolpanel/CustomToolPanel.cxx delete mode 100644 sd/source/ui/toolpanel/CustomToolPanel.hxx create mode 100644 sd/source/ui/toolpanel/MethodGuard.hxx delete mode 100644 sd/source/ui/toolpanel/StandardToolPanel.cxx delete mode 100644 sd/source/ui/toolpanel/StandardToolPanel.hxx delete mode 100644 sd/source/ui/toolpanel/TaskPaneToolPanel.cxx delete mode 100644 sd/source/ui/toolpanel/TaskPaneToolPanel.hxx create mode 100644 sd/source/ui/toolpanel/ToolPanel.cxx create mode 100644 sd/source/ui/toolpanel/ToolPanel.hxx delete mode 100755 sd/source/ui/toolpanel/ToolPanelDeck.cxx delete mode 100644 sd/source/ui/toolpanel/ToolPanelDeck.hxx create mode 100644 sd/source/ui/toolpanel/ToolPanelFactory.cxx create mode 100644 sd/source/ui/toolpanel/ToolPanelUIElement.cxx create mode 100644 sd/source/ui/toolpanel/ToolPanelUIElement.hxx (limited to 'sd') diff --git a/sd/source/ui/framework/factories/TaskPanelFactory.cxx b/sd/source/ui/framework/factories/TaskPanelFactory.cxx index 89bb417fde25..9892fe4e61f5 100644 --- a/sd/source/ui/framework/factories/TaskPanelFactory.cxx +++ b/sd/source/ui/framework/factories/TaskPanelFactory.cxx @@ -263,14 +263,15 @@ void SAL_CALL TaskPanelFactory::releaseResource ( const ::boost::shared_ptr< ViewShell > pPaneViewShell( pFrameworkHelper->GetViewShell( sPaneURL ) ); if ( pPaneViewShell != NULL ) { - toolpanel::PanelId ePanelId( toolpanel::GetStandardPanelId( xResourceId->getResourceURL() ) ); + const ::rtl::OUString sPanelResourceURL( xResourceId->getResourceURL() ); + const toolpanel::PanelId ePanelId( toolpanel::GetStandardPanelId( sPanelResourceURL ) ); toolpanel::ToolPanelViewShell* pToolPanel = dynamic_cast< toolpanel::ToolPanelViewShell* >( pPaneViewShell.get() ); if ( ( ePanelId != toolpanel::PID_UNKNOWN ) && ( pToolPanel != NULL ) ) { - pToolPanel->DeactivatePanel( ePanelId ); + pToolPanel->DeactivatePanel( sPanelResourceURL ); } else { diff --git a/sd/source/ui/framework/factories/ViewShellWrapper.cxx b/sd/source/ui/framework/factories/ViewShellWrapper.cxx index e2fa7ff570e6..30136e590004 100644 --- a/sd/source/ui/framework/factories/ViewShellWrapper.cxx +++ b/sd/source/ui/framework/factories/ViewShellWrapper.cxx @@ -69,8 +69,7 @@ ViewShellWrapper::ViewShellWrapper ( : ViewShellWrapperInterfaceBase(MutexOwner::maMutex), mpViewShell(pViewShell), mxViewId(rxViewId), - mxWindow(rxWindow), - mbIsPane( pViewShell == NULL ? false : ( pViewShell->GetShellType() == ViewShell::ST_TASK_PANE ) ) + mxWindow(rxWindow) { if (rxWindow.is()) { @@ -118,93 +117,6 @@ void SAL_CALL ViewShellWrapper::disposing (void) -//----- XInterface ------------------------------------------------------------ - -Any SAL_CALL ViewShellWrapper::queryInterface( const Type& i_rType ) throw (RuntimeException) -{ - Any aInterface( ViewShellWrapperInterfaceBase::queryInterface( i_rType ) ); - if ( !aInterface.hasValue() ) - { - if ( mbIsPane ) - aInterface = ViewShellWrapper_PaneBase::queryInterface( i_rType ); - else - aInterface = ViewShellWrapper_ViewBase::queryInterface( i_rType ); - } - return aInterface; -} - -void SAL_CALL ViewShellWrapper::acquire() throw () -{ - ViewShellWrapperInterfaceBase::acquire(); -} - -void SAL_CALL ViewShellWrapper::release() throw () -{ - ViewShellWrapperInterfaceBase::release(); -} - -//----- XTypeProvider --------------------------------------------------------- - -Sequence< Type > SAL_CALL ViewShellWrapper::getTypes( ) throw (RuntimeException) -{ - const Sequence< Type > aCommonTypes( ViewShellWrapperInterfaceBase::getTypes() ); - const Sequence< Type > aSpecialTypes( - mbIsPane - ? ViewShellWrapper_PaneBase::getTypes() - : ViewShellWrapper_ViewBase::getTypes() - ); - return ::comphelper::concatSequences( aCommonTypes, aSpecialTypes ); -} - -Sequence< ::sal_Int8 > SAL_CALL ViewShellWrapper::getImplementationId( ) throw (RuntimeException) -{ - static ::cppu::OImplementationId* pViewId = NULL; - static ::cppu::OImplementationId* pPaneId = NULL; - if ( !pViewId ) - { - ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); - if ( !pViewId ) - { - static ::cppu::OImplementationId aViewId; - static ::cppu::OImplementationId aPaneId; - pViewId = &aViewId; - pPaneId = &aPaneId; - } - } - - return ( mbIsPane ? pPaneId : pViewId )->getImplementationId(); -} - -//----- XPane ----------------------------------------------------------------- - -Reference< XInterface > ViewShellWrapper::impl_getPaneWindowOrCanvas( const bool i_bWindow ) -{ - ::vos::OGuard aSolarGuard( Application::GetSolarMutex() ); - ::osl::MutexGuard aGuard( maMutex ); - if ( !mpViewShell.get() ) - throw DisposedException( ::rtl::OUString(), *this ); - - ToolPanelViewShell* pToolPanelShell = dynamic_cast< ToolPanelViewShell* >( mpViewShell.get() ); - ENSURE_OR_RETURN( pToolPanelShell != NULL, "XPane should be accessible for a ToolPanelViewShell only", NULL ); - - ::Window* pPaneWindow = pToolPanelShell->GetToolPanelParentWindow(); - ENSURE_OR_RETURN( pPaneWindow, "shell is not able to provide a panel parent", NULL ); - - if ( i_bWindow ) - return VCLUnoHelper::GetInterface( pPaneWindow ); - return pPaneWindow->GetCanvas(); -} - -Reference< XWindow > SAL_CALL ViewShellWrapper::getWindow() throw (RuntimeException) -{ - return Reference< XWindow >( impl_getPaneWindowOrCanvas( true ), UNO_QUERY ); -} - -Reference< XCanvas > SAL_CALL ViewShellWrapper::getCanvas() throw (RuntimeException) -{ - return Reference< XCanvas >( impl_getPaneWindowOrCanvas( false ), UNO_QUERY ); -} - //----- XResource ------------------------------------------------------------- Reference SAL_CALL ViewShellWrapper::getResourceId (void) diff --git a/sd/source/ui/framework/tools/FrameworkHelper.cxx b/sd/source/ui/framework/tools/FrameworkHelper.cxx index cc68f79535ba..1fed73205065 100644 --- a/sd/source/ui/framework/tools/FrameworkHelper.cxx +++ b/sd/source/ui/framework/tools/FrameworkHelper.cxx @@ -222,7 +222,7 @@ const OUString FrameworkHelper::msViewTabBarURL( // Task panel URLs. const ::rtl::OUString FrameworkHelper::msTaskPanelURLPrefix( - OUString::createFromAscii("private:resource/toolpanel/")); + OUString::createFromAscii("private:resource/toolpanel/DrawingFramework/")); const ::rtl::OUString FrameworkHelper::msMasterPagesTaskPanelURL( msTaskPanelURLPrefix + OUString::createFromAscii("MasterPages")); const ::rtl::OUString FrameworkHelper::msLayoutTaskPanelURL( 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; diff --git a/sd/source/ui/toolpanel/CustomToolPanel.cxx b/sd/source/ui/toolpanel/CustomToolPanel.cxx deleted file mode 100644 index 1515bf09104f..000000000000 --- a/sd/source/ui/toolpanel/CustomToolPanel.cxx +++ /dev/null @@ -1,290 +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. - * -************************************************************************/ - -#include "precompiled_sd.hxx" - -#include "CustomToolPanel.hxx" -#include "framework/FrameworkHelper.hxx" - -/** === begin UNO includes === **/ -#include -#include -#include -/** === end UNO includes === **/ - -#include -#include -#include - -#if OSL_DEBUG_LEVEL > 0 -#include -#endif - -//...................................................................................................................... -namespace sd { namespace toolpanel -{ -//...................................................................................................................... - - /** === begin UNO using === **/ - using ::com::sun::star::uno::Reference; - using ::com::sun::star::uno::XInterface; - using ::com::sun::star::uno::UNO_QUERY; - using ::com::sun::star::uno::UNO_QUERY_THROW; - using ::com::sun::star::uno::UNO_SET_THROW; - using ::com::sun::star::uno::Exception; - using ::com::sun::star::uno::RuntimeException; - using ::com::sun::star::uno::Any; - using ::com::sun::star::uno::makeAny; - using ::com::sun::star::uno::Sequence; - using ::com::sun::star::uno::Type; - using ::com::sun::star::drawing::framework::XConfigurationController; - using ::com::sun::star::drawing::framework::XResourceId; - using ::com::sun::star::drawing::framework::ResourceId; - using ::com::sun::star::drawing::framework::XResource; - using ::com::sun::star::awt::XWindow; - using ::com::sun::star::accessibility::XAccessible; - using ::com::sun::star::drawing::framework::XPane2; - /** === end UNO using === **/ - namespace PosSize = ::com::sun::star::awt::PosSize; - - //================================================================================================================== - //= helper - //================================================================================================================== - namespace - { - ::rtl::OUString lcl_getPanelConfig( const ::utl::OConfigurationNode& i_rPanelConfig, const sal_Char* i_pAsciiPropName ) - { - ::rtl::OUString sConfigValue; - OSL_VERIFY( i_rPanelConfig.getNodeValue( i_pAsciiPropName ) >>= sConfigValue ); - if ( sConfigValue.getLength() == 0 ) - { -#if OSL_DEBUG_LEVEL > 0 - ::rtl::OStringBuffer aMessage; - aMessage.append( "lcl_getPanelConfig: invalid config value (" ); - aMessage.append( i_pAsciiPropName ); - aMessage.append( ") for panel config '" ); - aMessage.append( ::rtl::OUStringToOString( i_rPanelConfig.getLocalName(), RTL_TEXTENCODING_UTF8 ) ); - aMessage.append( "'" ); - OSL_ENSURE( false, aMessage.makeStringAndClear().getStr() ); -#endif - } - return sConfigValue; - } - } - - //================================================================================================================== - //= CustomToolPanel - //================================================================================================================== - //------------------------------------------------------------------------------------------------------------------ - CustomToolPanel::CustomToolPanel( ToolPanelDeck& i_rPanelDeck, const ::utl::OConfigurationNode& i_rPanelConfig, - const Reference< XResourceId >& i_rPaneResourceId, const ::boost::shared_ptr< framework::FrameworkHelper >& i_pFrameworkHelper ) - :TaskPaneToolPanel( i_rPanelDeck, lcl_getPanelConfig( i_rPanelConfig, "DisplayTitle" ), Image() /* TODO */, SmartId() /* TODO */ ) - ,m_pFrameworkHelper( i_pFrameworkHelper ) - ,m_xPanelResourceId() - ,m_xResource() - ,m_xToolPanel() - ,m_bAttemptedPanelCreation( false ) - ,m_nResourceAccessLock( 0 ) - { - ENSURE_OR_THROW( m_pFrameworkHelper.get() != NULL, "invalid framework helper" ); - ENSURE_OR_THROW( i_rPaneResourceId.is(), "invalid pane resource id" ); - try - { - ::rtl::OUString sPanelResourceURL( lcl_getPanelConfig( i_rPanelConfig, "ResourceURL" ) ); - m_xPanelResourceId.set( - ResourceId::createWithAnchor( - ::comphelper::getProcessComponentContext(), - sPanelResourceURL, - i_rPaneResourceId ), - UNO_SET_THROW - ); - } - catch( const Exception& ) - { - DBG_UNHANDLED_EXCEPTION(); - } - } - - //------------------------------------------------------------------------------------------------------------------ - CustomToolPanel::~CustomToolPanel() - { - } - - //------------------------------------------------------------------------------------------------------------------ - void CustomToolPanel::Activate( ::Window& i_rParentWindow ) - { - OSL_ENSURE( &getPanelWindowAnchor() == &i_rParentWindow, - "CustomToolPanel::Activate: invalid new parent window" ); - // getPanelWindowAnchor() is what is returned in the TaskPane's XPane::getWindow method. So, - // any custom panel which is loaded into the TaskPane will use this window as parent window. - // Consequently, this is the window which shall be passed here, since this method is intended to - // re-create the panel with the given parent. - - // we do not need to do anything here. The XResourceFactory::createResource method of the custom - // tool panel already created and showed the window. - } - - //------------------------------------------------------------------------------------------------------------------ - void CustomToolPanel::Deactivate() - { - // When a certain tool panel is activated, this is routed through the drawing framework, which ensures - // that the resource associated with the previously active panel is deactivated, which calls the - // XResourceFactory::destroyResource at our custom panel's factory. - - // So, we do not have to do anything here - except forgetting the XResource, at it might (or might not, - // if cached by the factory) be re-created next time. - m_xResource.clear(); - m_xToolPanel.clear(); - m_bAttemptedPanelCreation = false; - } - - //------------------------------------------------------------------------------------------------------------------ - void CustomToolPanel::SetSizePixel( const Size& i_rPanelWindowSize ) - { - impl_ensurePanel(); - if ( !m_xToolPanel.is() ) - // if the custom panel does not support XPanel, this just means it is its own responsibility - // to resize/layout everything within the pane window. - return; - - try - { - Reference< XWindow > xPanelWindow( m_xToolPanel->getWindow(), UNO_SET_THROW ); - xPanelWindow->setPosSize( 0, 0, i_rPanelWindowSize.Width(), i_rPanelWindowSize.Height(), - PosSize::POSSIZE ); - } - catch( const Exception& ) - { - DBG_UNHANDLED_EXCEPTION(); - } - } - - //------------------------------------------------------------------------------------------------------------------ - void CustomToolPanel::GrabFocus() - { - impl_ensurePanel(); - if ( !m_xToolPanel.is() ) - // if the custom panel does not support XPanel, this just means it is its own responsibility - // to care for focus handling - return; - - try - { - Reference< XWindow > xPanelWindow( m_xToolPanel->getWindow(), UNO_SET_THROW ); - xPanelWindow->setFocus(); - } - catch( const Exception& ) - { - DBG_UNHANDLED_EXCEPTION(); - } - } - - //------------------------------------------------------------------------------------------------------------------ - void CustomToolPanel::Dispose() - { - // nothing to do here. Lifetime handling of the XResource which this panel represents is done by - // the drawing framework, we ourself do not have resources to release. - TaskPaneToolPanel::Dispose(); - } - - //------------------------------------------------------------------------------------------------------------------ - Reference< XAccessible > CustomToolPanel::CreatePanelAccessible( const Reference< XAccessible >& i_rParentAccessible ) - { - ENSURE_OR_RETURN( !isDisposed(), "CustomToolPanel::CreatePanelAccessible: already disposed!", NULL ); - (void)i_rParentAccessible; - - // an XResource might also be an XPane2, which can provide an XAccessible. Check this first. - const Reference< XPane2 > xPane( m_xResource, UNO_QUERY ); - if ( xPane.is() ) - { - const Reference< XAccessible > xPaneAccessible( xPane->getAccessible() ); - if ( xPaneAccessible.is() ) - return xPaneAccessible; - } - - // if we have an XToolPanel, ask it for its XWindow, and query it - impl_ensurePanel(); - if ( !m_xToolPanel.is() ) - return NULL; - - const Reference< XAccessible > xPanelWindowAccessible( m_xToolPanel->getWindow(), UNO_QUERY ); - if ( xPanelWindowAccessible.is() ) - return xPanelWindowAccessible; - - // maybe the XToolPanel itself can provide an XAccessible? - const Reference< XAccessible > xPanelAccessible( m_xToolPanel, UNO_QUERY ); - if ( xPanelAccessible.is() ) - return xPanelAccessible; - - OSL_ENSURE( false, "CustomToolPanel::CreatePanelAccessible: no XAccessible for the custom panel!" ); - return NULL; - } - - //------------------------------------------------------------------------------------------------------------------ - void CustomToolPanel::LockResourceAccess() - { - ++m_nResourceAccessLock; - } - - //------------------------------------------------------------------------------------------------------------------ - void CustomToolPanel::UnlockResourceAccess() - { - OSL_ENSURE( m_nResourceAccessLock > 0, "CustomToolPanel::UnlockResourceAccess: not locked!" ); - --m_nResourceAccessLock; - } - - //------------------------------------------------------------------------------------------------------------------ - const Reference< XResourceId >& CustomToolPanel::getResourceId() const - { - return m_xPanelResourceId; - } - - //------------------------------------------------------------------------------------------------------------------ - void CustomToolPanel::impl_ensurePanel() - { - ENSURE_OR_RETURN_VOID( !isDisposed(), "already disposed" ); - - if ( ( m_nResourceAccessLock == 0 ) && !m_bAttemptedPanelCreation ) - { - m_bAttemptedPanelCreation = true; - - try - { - Reference< XConfigurationController > xConfigController( m_pFrameworkHelper->GetConfigurationController(), UNO_QUERY_THROW ); - m_xResource.set( xConfigController->getResource( m_xPanelResourceId ), UNO_QUERY_THROW ); - m_xToolPanel.set( m_xResource, UNO_QUERY ); - } - catch( const Exception& ) - { - DBG_UNHANDLED_EXCEPTION(); - } - } - } - -//...................................................................................................................... -} } // namespace sd::toolpanel -//...................................................................................................................... - diff --git a/sd/source/ui/toolpanel/CustomToolPanel.hxx b/sd/source/ui/toolpanel/CustomToolPanel.hxx deleted file mode 100644 index 7f7f5ec3417d..000000000000 --- a/sd/source/ui/toolpanel/CustomToolPanel.hxx +++ /dev/null @@ -1,113 +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_TOOLPANEL_CUSTOMTOOLPANEL_HXX -#define SD_TOOLPANEL_CUSTOMTOOLPANEL_HXX - -#include "TaskPaneToolPanel.hxx" - -/** === begin UNO includes === **/ -#include -#include -#include -#include -/** === end UNO includes === **/ - -#include - -namespace utl -{ - class OConfigurationNode; -} - -namespace sd { namespace framework -{ - class FrameworkHelper; -} } - -//...................................................................................................................... -namespace sd { namespace toolpanel -{ -//...................................................................................................................... - - class ToolPanelDeck; - - //================================================================================================================== - //= CustomToolPanel - //================================================================================================================== - /** is a ::svt::IToolPanel implementation for custom tool panels, i.e. those defined in the configuration, and - implemented by external components. - */ - class CustomToolPanel : public TaskPaneToolPanel - { - public: - CustomToolPanel( - ToolPanelDeck& i_rPanelDeck, - const ::utl::OConfigurationNode& i_rPanelConfig, - const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::framework::XResourceId >& i_rPaneResourceId, - const ::boost::shared_ptr< framework::FrameworkHelper >& i_pFrameworkHelper - ); - ~CustomToolPanel(); - - // IToolPanel overridables - virtual void Activate( ::Window& i_rParentWindow ); - virtual void Deactivate(); - virtual void SetSizePixel( const Size& i_rPanelWindowSize ); - virtual void GrabFocus(); - virtual void Dispose(); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > - CreatePanelAccessible( - const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& i_rParentAccessible - ); - - /** locks (aka prevents) the access to the associated XResource object - */ - void LockResourceAccess(); - /** unlocks (aka allows) the access to the associated XResource object - */ - void UnlockResourceAccess(); - - protected: - // TaskPaneToolPanel overridables - virtual const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::framework::XResourceId >& getResourceId() const; - - private: - void impl_ensurePanel(); - - private: - ::boost::shared_ptr< framework::FrameworkHelper > m_pFrameworkHelper; - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::framework::XResourceId > m_xPanelResourceId; - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::framework::XResource > m_xResource; - ::com::sun::star::uno::Reference< ::com::sun::star::ui::XToolPanel > m_xToolPanel; - bool m_bAttemptedPanelCreation; - sal_uInt32 m_nResourceAccessLock; - }; - -//...................................................................................................................... -} } // namespace sd::toolpanel -//...................................................................................................................... - -#endif // SD_TOOLPANEL_CUSTOMTOOLPANEL_HXX diff --git a/sd/source/ui/toolpanel/MethodGuard.hxx b/sd/source/ui/toolpanel/MethodGuard.hxx new file mode 100644 index 000000000000..45b81367c8de --- /dev/null +++ b/sd/source/ui/toolpanel/MethodGuard.hxx @@ -0,0 +1,67 @@ +/************************************************************************* + * 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_METHODGUARD_HXX +#define SD_METHODGUARD_HXX + +#include + +//...................................................................................................................... +namespace sd { namespace toolpanel +{ +//...................................................................................................................... + + //================================================================================================================== + //= MethodGuard + //================================================================================================================== + template < class COMPONENT > + class MethodGuard + { + public: + MethodGuard( COMPONENT& i_rComponent ) + :m_aGuard( i_rComponent.getMutex() ) + { + i_rComponent.checkDisposed(); + } + + ~MethodGuard() + { + } + + inline void clear() + { + m_aGuard.clear(); + } + + private: + ::osl::ClearableMutexGuard m_aGuard; + }; + +//...................................................................................................................... +} } // namespace sd::toolpanel +//...................................................................................................................... + +#endif // SD_METHODGUARD_HXX diff --git a/sd/source/ui/toolpanel/StandardToolPanel.cxx b/sd/source/ui/toolpanel/StandardToolPanel.cxx deleted file mode 100644 index ede20ea3404c..000000000000 --- a/sd/source/ui/toolpanel/StandardToolPanel.cxx +++ /dev/null @@ -1,163 +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. - * -************************************************************************/ - -#include "precompiled_sd.hxx" - -#include "StandardToolPanel.hxx" -#include "ToolPanelDeck.hxx" -#include "sdresid.hxx" - -/** === begin UNO includes === **/ -/** === end UNO includes === **/ - -#include - -//...................................................................................................................... -namespace sd { namespace toolpanel -{ -//...................................................................................................................... - - /** === begin UNO using === **/ - using ::com::sun::star::uno::Reference; - using ::com::sun::star::uno::XInterface; - using ::com::sun::star::uno::UNO_QUERY; - using ::com::sun::star::uno::UNO_QUERY_THROW; - using ::com::sun::star::uno::UNO_SET_THROW; - using ::com::sun::star::uno::Exception; - using ::com::sun::star::uno::RuntimeException; - using ::com::sun::star::uno::Any; - using ::com::sun::star::uno::makeAny; - using ::com::sun::star::uno::Sequence; - using ::com::sun::star::uno::Type; - using ::com::sun::star::drawing::framework::XResourceId; - using ::com::sun::star::accessibility::XAccessible; - /** === end UNO using === **/ - - //================================================================================================================== - //= StandardToolPanel - //================================================================================================================== - //------------------------------------------------------------------------------------------------------------------ - StandardToolPanel::StandardToolPanel( ToolPanelDeck& i_rPanelDeck, ::std::auto_ptr< ControlFactory >& i_rControlFactory, - const USHORT i_nTitleResId, const Image& i_rImage, const ULONG i_nHelpId, - const Reference< XResourceId >& i_rPanelResourceId ) - :TaskPaneToolPanel( i_rPanelDeck, SdResId( i_nTitleResId ), i_rImage, SmartId( i_nHelpId ) ) - ,m_pControlFactory( i_rControlFactory ) - ,m_xPanelResourceId( i_rPanelResourceId ) - { - ENSURE_OR_THROW( m_pControlFactory.get(), "illegal control factory" ); - } - - //------------------------------------------------------------------------------------------------------------------ - StandardToolPanel::~StandardToolPanel() - { - m_pControl.reset(); - } - - //------------------------------------------------------------------------------------------------------------------ - void StandardToolPanel::Activate( ::Window& i_rParentWindow ) - { - Window* pPanelWindow( impl_getPanelWindow() ); - ENSURE_OR_RETURN_VOID( pPanelWindow, "no window to show" ); - pPanelWindow->SetPosSizePixel( Point(), i_rParentWindow.GetSizePixel() ); - pPanelWindow->Show(); - } - - //------------------------------------------------------------------------------------------------------------------ - void StandardToolPanel::Deactivate() - { - Window* pPanelWindow( impl_getPanelWindow() ); - ENSURE_OR_RETURN_VOID( pPanelWindow, "no window to hide" ); - pPanelWindow->Hide(); - } - - //------------------------------------------------------------------------------------------------------------------ - void StandardToolPanel::SetSizePixel( const Size& i_rPanelWindowSize ) - { - Window* pPanelWindow( impl_getPanelWindow() ); - ENSURE_OR_RETURN_VOID( pPanelWindow, "no window to resize" ); - pPanelWindow->SetSizePixel( i_rPanelWindowSize ); - } - - //------------------------------------------------------------------------------------------------------------------ - void StandardToolPanel::GrabFocus() - { - Window* pPanelWindow( impl_getPanelWindow() ); - ENSURE_OR_RETURN_VOID( pPanelWindow, "no window to focus" ); - pPanelWindow->GrabFocus(); - } - - //------------------------------------------------------------------------------------------------------------------ - void StandardToolPanel::Dispose() - { - m_pControl.reset(); - TaskPaneToolPanel::Dispose(); - } - - //------------------------------------------------------------------------------------------------------------------ - Reference< XAccessible > StandardToolPanel::CreatePanelAccessible( const Reference< XAccessible >& i_rParentAccessible ) - { - ENSURE_OR_RETURN( !isDisposed(), "already disposed!", NULL ); - - Window* pControlWindow( m_pControl->GetWindow() ); - - Reference< XAccessible > xControlAccessible( pControlWindow->GetAccessible( FALSE ) ); - if ( !xControlAccessible.is() ) - { - xControlAccessible = m_pControl->CreateAccessibleObject( i_rParentAccessible ); - OSL_ENSURE( xControlAccessible.is(), "StandardToolPanel::CreatePanelAccessible: invalid XAccessible returned by CreateAccessibleObject!" ); - pControlWindow->SetAccessible( xControlAccessible ); - } - return xControlAccessible; - } - - //------------------------------------------------------------------------------------------------------------------ - const Reference< XResourceId >& StandardToolPanel::getResourceId() const - { - return m_xPanelResourceId; - } - - //------------------------------------------------------------------------------------------------------------------ - ::Window* StandardToolPanel::impl_getPanelWindow() const - { - if ( const_cast< StandardToolPanel* >( this )->impl_ensureControl() ) - return m_pControl->GetWindow(); - return NULL; - } - - //------------------------------------------------------------------------------------------------------------------ - bool StandardToolPanel::impl_ensureControl() - { - if ( m_pControl.get() ) - return true; - if ( isDisposed() ) - return false; - m_pControl = m_pControlFactory->CreateControl( getPanelWindowAnchor() ); - return ( m_pControl.get() != NULL ); - } - -//...................................................................................................................... -} } // namespace sd::toolpanel -//...................................................................................................................... diff --git a/sd/source/ui/toolpanel/StandardToolPanel.hxx b/sd/source/ui/toolpanel/StandardToolPanel.hxx deleted file mode 100644 index a40c3d4af5f2..000000000000 --- a/sd/source/ui/toolpanel/StandardToolPanel.hxx +++ /dev/null @@ -1,84 +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_TOOLPANEL_STANDARDTOOLPANEL_HXX -#define SD_TOOLPANEL_STANDARDTOOLPANEL_HXX - -#include "TaskPaneToolPanel.hxx" - -//...................................................................................................................... -namespace sd { namespace toolpanel -{ -//...................................................................................................................... - - //================================================================================================================== - //= StandardToolPanel - //================================================================================================================== - /** an IToolPanel implementation for one of the standard (aka built-in) tool panels - */ - class StandardToolPanel : public TaskPaneToolPanel - { - public: - StandardToolPanel( - ToolPanelDeck& i_rPanelDeck, - ::std::auto_ptr< ControlFactory >& i_rControlFactory, - const USHORT i_nTitleResId, - const Image& i_rImage, - const ULONG i_nHelpId, - const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::framework::XResourceId >& i_rPanelResourceId - ); - ~StandardToolPanel(); - - // IToolPanel overridables - virtual void Activate( ::Window& i_rParentWindow ); - virtual void Deactivate(); - virtual void SetSizePixel( const Size& i_rPanelWindowSize ); - virtual void GrabFocus(); - virtual void Dispose(); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > - CreatePanelAccessible( - const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& i_rParentAccessible - ); - - // TaskPaneToolPanel overridables - virtual const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::framework::XResourceId >& getResourceId() const; - - private: - bool impl_ensureControl(); - ::Window* impl_getPanelWindow() const; - - private: - ::std::auto_ptr< ControlFactory > m_pControlFactory; - ::std::auto_ptr< TreeNode > m_pControl; - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::framework::XResourceId > - m_xPanelResourceId; - }; - -//...................................................................................................................... -} } // namespace sd::toolpanel -//...................................................................................................................... - -#endif // SD_TOOLPANEL_STANDARDTOOLPANEL_HXX diff --git a/sd/source/ui/toolpanel/TaskPaneToolPanel.cxx b/sd/source/ui/toolpanel/TaskPaneToolPanel.cxx deleted file mode 100644 index 4d0103086932..000000000000 --- a/sd/source/ui/toolpanel/TaskPaneToolPanel.cxx +++ /dev/null @@ -1,101 +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. - * -************************************************************************/ - -#include "precompiled_sd.hxx" - -#include "TaskPaneToolPanel.hxx" -#include "ToolPanelDeck.hxx" - -#include -#include - -//...................................................................................................................... -namespace sd { namespace toolpanel -{ -//...................................................................................................................... - - /** === begin UNO using === **/ - using ::com::sun::star::uno::Reference; - using ::com::sun::star::uno::XInterface; - using ::com::sun::star::uno::UNO_QUERY; - using ::com::sun::star::uno::UNO_QUERY_THROW; - using ::com::sun::star::uno::UNO_SET_THROW; - using ::com::sun::star::uno::Exception; - using ::com::sun::star::uno::RuntimeException; - using ::com::sun::star::uno::Any; - using ::com::sun::star::uno::makeAny; - using ::com::sun::star::uno::Sequence; - using ::com::sun::star::uno::Type; - using ::com::sun::star::drawing::framework::XResourceId; - /** === end UNO using === **/ - - //================================================================================================================== - //= TaskPaneToolPanel - //================================================================================================================== - //------------------------------------------------------------------------------------------------------------------ - TaskPaneToolPanel::TaskPaneToolPanel( ToolPanelDeck& i_rPanelDeck, const String& i_rPanelName, const Image& i_rImage, - const SmartId& i_rHelpId ) - :m_pPanelDeck( &i_rPanelDeck ) - ,m_aPanelImage( i_rImage ) - ,m_sPanelName( i_rPanelName ) - ,m_aHelpId( i_rHelpId ) - { - } - - //------------------------------------------------------------------------------------------------------------------ - TaskPaneToolPanel::~TaskPaneToolPanel() - { - } - - //------------------------------------------------------------------------------------------------------------------ - Window& TaskPaneToolPanel::getPanelWindowAnchor() - { - OSL_ENSURE( !isDisposed(), "already disposed!" ); - return m_pPanelDeck->GetPanelWindowAnchor(); - } - - //------------------------------------------------------------------------------------------------------------------ - ::rtl::OUString TaskPaneToolPanel::GetDisplayName() const - { - return m_sPanelName; - } - - //------------------------------------------------------------------------------------------------------------------ - Image TaskPaneToolPanel::GetImage() const - { - return m_aPanelImage; - } - - //------------------------------------------------------------------------------------------------------------------ - void TaskPaneToolPanel::Dispose() - { - ENSURE_OR_RETURN_VOID( m_pPanelDeck, "disposed twice" ); - m_pPanelDeck = NULL; - } - -//...................................................................................................................... -} } // namespace sd::toolpanel -//...................................................................................................................... diff --git a/sd/source/ui/toolpanel/TaskPaneToolPanel.hxx b/sd/source/ui/toolpanel/TaskPaneToolPanel.hxx deleted file mode 100644 index d92b1c14bf27..000000000000 --- a/sd/source/ui/toolpanel/TaskPaneToolPanel.hxx +++ /dev/null @@ -1,97 +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_TASKPANETOOLPANEL_HXX -#define SD_TASKPANETOOLPANEL_HXX - -#include "taskpane/TaskPaneControlFactory.hxx" - -/** === begin UNO includes === **/ -#include -/** === end UNO includes === **/ - -#include - -#include -#include - -#include - -//...................................................................................................................... -namespace sd { namespace toolpanel -{ -//...................................................................................................................... - - class ToolPanelDeck; - - //================================================================================================================== - //= TaskPaneToolPanel - //================================================================================================================== - class TaskPaneToolPanel : public ::svt::ToolPanelBase - { - protected: - TaskPaneToolPanel( - ToolPanelDeck& i_rPanelDeck, - const String& i_rPanelName, - const Image& i_rImage, - const SmartId& i_rHelpId - ); - ~TaskPaneToolPanel(); - - public: - // IToolPanel overridables - virtual ::rtl::OUString GetDisplayName() const; - virtual Image GetImage() const; - virtual void Dispose(); - // those are still abstract, and waiting to be overloaded - virtual void Activate( ::Window& i_rParentWindow ) = 0; - virtual void Deactivate() = 0; - virtual void SetSizePixel( const Size& i_rPanelWindowSize ) = 0; - virtual void GrabFocus() = 0; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > - CreatePanelAccessible( - const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& i_rParentAccessible - ) = 0; - - // own overridables - virtual const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::framework::XResourceId >& getResourceId() const = 0; - - protected: - bool isDisposed() const { return m_pPanelDeck == NULL; } - Window& getPanelWindowAnchor(); - - private: - ToolPanelDeck* m_pPanelDeck; - const Image m_aPanelImage; - const String m_sPanelName; - const SmartId m_aHelpId; - }; - -//...................................................................................................................... -} } // namespace sd::toolpanel -//...................................................................................................................... - -#endif // SD_TASKPANETOOLPANEL_HXX diff --git a/sd/source/ui/toolpanel/ToolPanel.cxx b/sd/source/ui/toolpanel/ToolPanel.cxx new file mode 100644 index 000000000000..6dbcae52547a --- /dev/null +++ b/sd/source/ui/toolpanel/ToolPanel.cxx @@ -0,0 +1,113 @@ +/************************************************************************* + * 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. + * + ************************************************************************/ + +#include "precompiled_sd.hxx" + +#include "ToolPanel.hxx" +#include "MethodGuard.hxx" +#include + +/** === begin UNO includes === **/ +#include +/** === end UNO includes === **/ + +#include + +//...................................................................................................................... +namespace sd { namespace toolpanel +{ +//...................................................................................................................... + + /** === begin UNO using === **/ + using ::com::sun::star::uno::Reference; + using ::com::sun::star::uno::XInterface; + using ::com::sun::star::uno::UNO_QUERY; + using ::com::sun::star::uno::UNO_QUERY_THROW; + using ::com::sun::star::uno::UNO_SET_THROW; + using ::com::sun::star::uno::Exception; + using ::com::sun::star::uno::RuntimeException; + using ::com::sun::star::uno::Any; + using ::com::sun::star::uno::makeAny; + using ::com::sun::star::uno::Sequence; + using ::com::sun::star::uno::Type; + using ::com::sun::star::lang::DisposedException; + using ::com::sun::star::awt::XWindow; + using ::com::sun::star::accessibility::XAccessible; + /** === end UNO using === **/ + + typedef MethodGuard< ToolPanel > ToolPanelGuard; + + //================================================================================================================== + //= ToolPanel + //================================================================================================================== + //------------------------------------------------------------------------------------------------------------------ + ToolPanel::ToolPanel( ::std::auto_ptr< TreeNode >& i_rControl ) + :ToolPanel_Base( m_aMutex ) + ,m_pControl( i_rControl ) + { + } + + //------------------------------------------------------------------------------------------------------------------ + ToolPanel::~ToolPanel() + { + } + + //------------------------------------------------------------------------------------------------------------------ + void ToolPanel::checkDisposed() + { + if ( m_pControl.get() == NULL ) + throw DisposedException( ::rtl::OUString(), *this ); + } + + //------------------------------------------------------------------------------------------------------------------ + Reference< XWindow > SAL_CALL ToolPanel::getWindow() throw (RuntimeException) + { + ToolPanelGuard aGuard( *this ); + return Reference< XWindow >( m_pControl->GetWindow()->GetComponentInterface(), UNO_QUERY_THROW ); + } + + //------------------------------------------------------------------------------------------------------------------ + Reference< XAccessible > SAL_CALL ToolPanel::createAccessible( const Reference< XAccessible >& i_rParentAccessible ) throw (RuntimeException) + { + ToolPanelGuard aGuard( *this ); + Reference< XAccessible > xAccessible( m_pControl->GetWindow()->GetAccessible( FALSE ) ); + if ( !xAccessible.is() ) + { + xAccessible.set( m_pControl->CreateAccessibleObject( i_rParentAccessible ) ); + m_pControl->GetWindow()->SetAccessible( xAccessible ); + } + return xAccessible; + } + + //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL ToolPanel::disposing() + { + m_pControl.reset(); + } + +//...................................................................................................................... +} } // namespace sd::toolpanel +//...................................................................................................................... diff --git a/sd/source/ui/toolpanel/ToolPanel.hxx b/sd/source/ui/toolpanel/ToolPanel.hxx new file mode 100644 index 000000000000..2fe4a64c71be --- /dev/null +++ b/sd/source/ui/toolpanel/ToolPanel.hxx @@ -0,0 +1,80 @@ +/************************************************************************* + * 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_TOOLPANEL_HXX +#define SD_TOOLPANEL_HXX + +/** === begin UNO includes === **/ +#include +/** === end UNO includes === **/ + +#include +#include + +#include + +//...................................................................................................................... +namespace sd { namespace toolpanel +{ +//...................................................................................................................... + + class TreeNode; + + //================================================================================================================== + //= ToolPanel + //================================================================================================================== + typedef ::cppu::WeakComponentImplHelper1 < ::com::sun::star::ui::XToolPanel + > ToolPanel_Base; + class ToolPanel :public ::cppu::BaseMutex + ,public ToolPanel_Base + { + public: + ToolPanel( + ::std::auto_ptr< TreeNode >& i_rControl + ); + + // XToolPanel + 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::accessibility::XAccessible > SAL_CALL createAccessible( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& ParentAccessible ) throw (::com::sun::star::uno::RuntimeException); + + // OComponentHelper + virtual void SAL_CALL disposing(); + + ::osl::Mutex& getMutex() { return m_aMutex; } + void checkDisposed(); + + protected: + ~ToolPanel(); + + private: + ::std::auto_ptr< TreeNode > m_pControl; + }; + +//...................................................................................................................... +} } // namespace sd::toolpanel +//...................................................................................................................... + +#endif // SD_TOOLPANEL_HXX diff --git a/sd/source/ui/toolpanel/ToolPanelDeck.cxx b/sd/source/ui/toolpanel/ToolPanelDeck.cxx deleted file mode 100755 index 53a1caff73d9..000000000000 --- a/sd/source/ui/toolpanel/ToolPanelDeck.cxx +++ /dev/null @@ -1,160 +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. - * -************************************************************************/ - -#include "precompiled_sd.hxx" - -#include "ToolPanelDeck.hxx" -#include "taskpane/ToolPanelViewShell.hxx" -#include "taskpane/ControlContainer.hxx" -#include "framework/FrameworkHelper.hxx" -#include "TaskPaneToolPanel.hxx" -#include "strings.hrc" -#include "sdresid.hxx" - -/** === begin UNO includes === **/ -#include -/** === end UNO includes === **/ - -#include -#include -#include - -//...................................................................................................................... -namespace sd { namespace toolpanel -{ -//...................................................................................................................... - - /** === begin UNO using === **/ - using ::com::sun::star::uno::Reference; - using ::com::sun::star::uno::XInterface; - using ::com::sun::star::uno::UNO_QUERY; - using ::com::sun::star::uno::UNO_QUERY_THROW; - using ::com::sun::star::uno::UNO_SET_THROW; - using ::com::sun::star::uno::Exception; - using ::com::sun::star::uno::RuntimeException; - using ::com::sun::star::uno::Any; - using ::com::sun::star::uno::makeAny; - using ::com::sun::star::uno::Sequence; - using ::com::sun::star::uno::Type; - using ::com::sun::star::drawing::framework::XResourceId; - using ::com::sun::star::drawing::framework::ResourceActivationMode_REPLACE; - /** === end UNO using === **/ - using ::sd::framework::FrameworkHelper; - - //================================================================================================================== - //= ToolPanelDeck - //================================================================================================================== - //------------------------------------------------------------------------------------------------------------------ - ToolPanelDeck::ToolPanelDeck( Window& i_rParent, ToolPanelViewShell& i_rViewShell ) - :ToolPanelDeck_Base( i_rParent, WB_DIALOGCONTROL ) - ,m_rViewShell( i_rViewShell ) - { - SetDrawersLayout(); - - const String sPaneTitle( SdResId( STR_RIGHT_PANE_TITLE ) ); - SetAccessibleName( sPaneTitle ); - SetAccessibleDescription( sPaneTitle ); - } - - //------------------------------------------------------------------------------------------------------------------ - ToolPanelDeck::~ToolPanelDeck() - { - } - - //------------------------------------------------------------------------------------------------------------------ - void ToolPanelDeck::SetDrawersLayout() - { - const ::svt::PDeckLayouter pLayouter( GetLayouter() ); - const ::svt::DrawerDeckLayouter* pDrawerLayouter = dynamic_cast< const ::svt::DrawerDeckLayouter* >( pLayouter.get() ); - if ( pDrawerLayouter != NULL ) - // already have the proper layout - return; - SetLayouter( new ::svt::DrawerDeckLayouter( *this, *this ) ); - } - - //------------------------------------------------------------------------------------------------------------------ - void ToolPanelDeck::SetTabsLayout( const ::svt::TabAlignment i_eTabAlignment, const ::svt::TabItemContent i_eTabContent ) - { - ::svt::PDeckLayouter pLayouter( GetLayouter() ); - ::svt::TabDeckLayouter* pTabLayouter = dynamic_cast< ::svt::TabDeckLayouter* >( pLayouter.get() ); - if ( ( pTabLayouter != NULL ) - && ( pTabLayouter->GetTabAlignment() == i_eTabAlignment ) - && ( pTabLayouter->GetTabItemContent() == i_eTabContent ) - ) - // already have the requested layout - return; - - if ( pTabLayouter && ( pTabLayouter->GetTabAlignment() == i_eTabAlignment ) ) - { - // changing only the item content does not require a new layouter instance - pTabLayouter->SetTabItemContent( i_eTabContent ); - return; - } - - SetLayouter( new ::svt::TabDeckLayouter( *this, *this, i_eTabAlignment, i_eTabContent ) ); - } - - //------------------------------------------------------------------------------------------------------------------ - void ToolPanelDeck::ActivatePanelDirectly( const ::boost::optional< size_t >& i_rPanel ) - { - ToolPanelDeck_Base::ActivatePanel( i_rPanel ); - } - - //------------------------------------------------------------------------------------------------------------------ - void ToolPanelDeck::ActivatePanelResource( const size_t i_nPanel ) - { - // determine resource ID for the given panel - ::svt::PToolPanel pPanel( GetPanel( i_nPanel ) ); - const TaskPaneToolPanel* pTaskPanePanel( dynamic_cast< const TaskPaneToolPanel* >( pPanel.get() ) ); - ENSURE_OR_RETURN_VOID( pTaskPanePanel, "did not find the right panel/type at the given position" ); - const Reference< XResourceId > xPanelId( pTaskPanePanel->getResourceId() ); - - // delegate the request to the configuration controller - ::boost::shared_ptr< FrameworkHelper > pFrameworkHelper( FrameworkHelper::Instance( m_rViewShell.GetViewShellBase() ) ); - pFrameworkHelper->GetConfigurationController()->requestResourceActivation( - xPanelId, ResourceActivationMode_REPLACE ); - } - - //------------------------------------------------------------------------------------------------------------------ - void ToolPanelDeck::ActivatePanel( const ::boost::optional< size_t >& i_rPanel ) - { - if ( !i_rPanel ) - { - // this is a de-activate request. Quite improbable that this really happens: We're within the overloaded - // version of IToolPanelDeck::ActivatePanel. The only instance which has access to this IToolPanel - // interface is the panel layouter, which is not expected to call us with a NULL panel position. - // All other instances should not have access to this method, as it is protected in this class here. - OSL_ENSURE( false, "ToolPanelDeck::ActivatePanel: is this legitimate?" ); - // well, handle it nonetheless. - ActivatePanelDirectly( i_rPanel ); - } - else - ActivatePanelResource( *i_rPanel ); - } - -//...................................................................................................................... -} } // namespace sd::toolpanel -//...................................................................................................................... diff --git a/sd/source/ui/toolpanel/ToolPanelDeck.hxx b/sd/source/ui/toolpanel/ToolPanelDeck.hxx deleted file mode 100644 index e140d9577220..000000000000 --- a/sd/source/ui/toolpanel/ToolPanelDeck.hxx +++ /dev/null @@ -1,97 +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_TOOLPANELDECK_HXX -#define SD_TOOLPANELDECK_HXX - -#include "taskpane/TaskPaneTreeNode.hxx" -#include "taskpane/TaskPaneControlFactory.hxx" - -/** === begin UNO includes === **/ -#include -/** === end UNO includes === **/ - -#include -#include -#include - -//...................................................................................................................... -namespace sd { namespace toolpanel -{ -//...................................................................................................................... - - class ToolPanelViewShell; - - //================================================================================================================== - //= ToolPanelDeck - //================================================================================================================== - typedef ::svt::ToolPanelDeck ToolPanelDeck_Base; - class ToolPanelDeck : public ToolPanelDeck_Base - { - public: - ToolPanelDeck( - ::Window& i_rParent, - ToolPanelViewShell& i_rViewShell - ); - ~ToolPanelDeck(); - - /** activates a layout where the active panel is selected via tabs at the right/left/top/bottom (depending on - the given TabAlignment value). - */ - void SetTabsLayout( const ::svt::TabAlignment i_eTabAlignment, const ::svt::TabItemContent i_eTabContent ); - - /** activates the "classical" layout with the panels being represneted by stacked drawers - */ - void SetDrawersLayout(); - - /** directly activates the given panel, without re-routing the activation request through the drawing - framework's configuration controller. - */ - void ActivatePanelDirectly( const ::boost::optional< size_t >& i_rPanel ); - - /** activates the given panel by delegating the acvtivation request to the drawing framework's configuration - controller. - */ - void ActivatePanelResource( const size_t i_nPanel ); - - protected: - // IToolPanelDeck - /** this method, which is part of the callback used by the PanelSelector, does not forward the request to - the base class. Instead, it forwards it to the ToolPanelViewShell, which transforms it into a request - to the drawing framework's configuration controller, which in turn will end up in our public - ActivatePanelDirectly method. - */ - virtual void ActivatePanel( const ::boost::optional< size_t >& i_rPanel ); - - private: - ToolPanelViewShell& m_rViewShell; - }; - -//...................................................................................................................... -} } // sd::toolpanel -//...................................................................................................................... - -#endif // SD_TOOLPANELDECK_HXX diff --git a/sd/source/ui/toolpanel/ToolPanelFactory.cxx b/sd/source/ui/toolpanel/ToolPanelFactory.cxx new file mode 100644 index 000000000000..a0315ed30fd0 --- /dev/null +++ b/sd/source/ui/toolpanel/ToolPanelFactory.cxx @@ -0,0 +1,255 @@ +/************************************************************************* + * 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. + * + ************************************************************************/ + +#include "precompiled_sd.hxx" + +#include "taskpane/ToolPanelViewShell.hxx" +#include "framework/FrameworkHelper.hxx" +#include "PaneChildWindows.hxx" +#include "ViewShellBase.hxx" +#include "app.hrc" + +/** === begin UNO includes === **/ +#include +#include +#include +#include +#include +#include +/** === end UNO includes === **/ + +#include +#include +#include +#include +#include +#include +#include + +//...................................................................................................................... +namespace sd { namespace toolpanel +{ +//...................................................................................................................... + + /** === begin UNO using === **/ + using ::com::sun::star::uno::Reference; + using ::com::sun::star::uno::XInterface; + using ::com::sun::star::uno::UNO_QUERY; + using ::com::sun::star::uno::UNO_QUERY_THROW; + using ::com::sun::star::uno::UNO_SET_THROW; + using ::com::sun::star::uno::Exception; + using ::com::sun::star::uno::RuntimeException; + using ::com::sun::star::uno::Any; + using ::com::sun::star::uno::makeAny; + using ::com::sun::star::uno::Sequence; + using ::com::sun::star::uno::Type; + using ::com::sun::star::uno::XComponentContext; + using ::com::sun::star::ui::XUIElementFactory; + using ::com::sun::star::ui::XUIElement; + using ::com::sun::star::beans::PropertyValue; + using ::com::sun::star::container::NoSuchElementException; + using ::com::sun::star::lang::IllegalArgumentException; + using ::com::sun::star::lang::XServiceInfo; + using ::com::sun::star::lang::XInitialization; + using ::com::sun::star::frame::XFrame; + using ::com::sun::star::awt::XWindow; + /** === end UNO using === **/ + + //================================================================================================================== + //= ToolPanelFactory + //================================================================================================================== + typedef ::cppu::WeakImplHelper3 < XUIElementFactory + , XServiceInfo + , XInitialization + > ToolPanelFactory_Base; + class ToolPanelFactory : public ToolPanelFactory_Base + { + public: + ToolPanelFactory( const Reference< XComponentContext >& i_rContext ); + + // XUIElementFactory + virtual Reference< XUIElement > SAL_CALL createUIElement( const ::rtl::OUString& ResourceURL, const Sequence< PropertyValue >& Args ) throw (NoSuchElementException, IllegalArgumentException, RuntimeException); + + // XServiceInfo + virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (RuntimeException); + virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (RuntimeException); + virtual Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (RuntimeException); + + // XInitialization + virtual void SAL_CALL initialize( const Sequence< Any >& aArguments ) throw (Exception, RuntimeException); + + protected: + virtual ~ToolPanelFactory(); + + private: + const Reference< XComponentContext > m_xContext; + }; + + //------------------------------------------------------------------------------------------------------------------ + Reference< XInterface > SAL_CALL ToolPanelFactory_createInstance( const Reference< XComponentContext >& i_rContext ) + { + return Reference< XInterface >( *new ToolPanelFactory( i_rContext ) ); + } + + //------------------------------------------------------------------------------------------------------------------ + ::rtl::OUString ToolPanelFactory_getImplementationName() throw(RuntimeException) + { + return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.drawing.ToolPanelFactory" ) ); + } + + //------------------------------------------------------------------------------------------------------------------ + Sequence< ::rtl::OUString > SAL_CALL ToolPanelFactory_getSupportedServiceNames (void) + throw (RuntimeException) + { + const ::rtl::OUString sServiceName( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.DefaultToolPanelFactory" ) ); + return Sequence< ::rtl::OUString >( &sServiceName, 1 ); + } + + //------------------------------------------------------------------------------------------------------------------ + ToolPanelFactory::ToolPanelFactory( const Reference< XComponentContext >& i_rContext ) + :m_xContext( i_rContext ) + { + } + + //------------------------------------------------------------------------------------------------------------------ + ToolPanelFactory::~ToolPanelFactory() + { + } + + //------------------------------------------------------------------------------------------------------------------ + Reference< XUIElement > SAL_CALL ToolPanelFactory::createUIElement( const ::rtl::OUString& i_rResourceURL, const Sequence< PropertyValue >& i_rArgs ) throw (NoSuchElementException, IllegalArgumentException, RuntimeException) + { + ::vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + + const PanelId ePanelId( toolpanel::GetStandardPanelId( i_rResourceURL ) ); + if ( ePanelId == PID_UNKNOWN ) + throw NoSuchElementException( i_rResourceURL, *this ); + + const ::comphelper::NamedValueCollection aArgs( i_rArgs ); + const Reference< XFrame > xDocFrame( aArgs.getOrDefault( "Frame", Reference< XFrame >() ) ); + const Reference< XWindow > xParentWindow( aArgs.getOrDefault( "ParentWindow", Reference< XWindow >() ) ); + if ( !xDocFrame.is() || !xParentWindow.is() ) + throw IllegalArgumentException( + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "For creating a standard tool panel, a Frame and a Parent window are needed." ) ), + *this, + 2 + ); + + // look up the Sfx(View)Frame for the given XFrame + SfxViewFrame* pViewFrame = NULL; + for ( SfxFrame* pFrame = SfxFrame::GetFirst(); + pFrame != NULL; + pFrame = SfxFrame::GetNext( *pFrame ) + ) + { + if ( pFrame->GetFrameInterface() == xDocFrame ) + { + pViewFrame = pFrame->GetCurrentViewFrame(); + break; + } + } + + if ( !pViewFrame || !pViewFrame->HasChildWindow( SID_RIGHT_PANE ) ) + throw IllegalArgumentException( + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Illegal frame." ) ), + *this, + 2 + ); + + // retrieve the task pane + ToolPanelChildWindow* pToolPanelWindow( dynamic_cast< ToolPanelChildWindow* >( pViewFrame->GetChildWindow( SID_RIGHT_PANE ) ) ); + if ( !pToolPanelWindow ) + throw IllegalArgumentException( + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "No Impress document, or no Impress Task Pane." ) ), + *this, + 2 + ); + + // retrieve the ViewShellBase, and the view shell of the task pane + ViewShellBase* pViewShellBase = dynamic_cast< ViewShellBase* >( pViewFrame->GetViewShell() ); + ::boost::shared_ptr< framework::FrameworkHelper > pFrameworkHelper; + if ( pViewShellBase ) + pFrameworkHelper = framework::FrameworkHelper::Instance( *pViewShellBase ); + ::boost::shared_ptr< ViewShell > pViewShell; + if ( pFrameworkHelper.get() ) + pViewShell = pFrameworkHelper->GetViewShell( framework::FrameworkHelper::msRightPaneURL ); + ToolPanelViewShell* pToolPanelShell = dynamic_cast< ToolPanelViewShell* >( pViewShell.get() ); + + if ( !pToolPanelShell ) + throw IllegalArgumentException( + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Wrong document type." ) ), + *this, + 2 + ); + + ::Window* pParentWindow = VCLUnoHelper::GetWindow( xParentWindow ); + if ( !pParentWindow || !pToolPanelShell->IsPanelAnchorWindow( *pParentWindow ) ) + throw IllegalArgumentException( + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Unsupported parent window." ) ), + *this, + 2 + ); + + return pToolPanelShell->CreatePanelUIElement( xDocFrame, i_rResourceURL ); + } + + //------------------------------------------------------------------------------------------------------------------ + ::rtl::OUString SAL_CALL ToolPanelFactory::getImplementationName( ) throw (RuntimeException) + { + return ToolPanelFactory_getImplementationName(); + } + + //------------------------------------------------------------------------------------------------------------------ + ::sal_Bool SAL_CALL ToolPanelFactory::supportsService( const ::rtl::OUString& i_rServiceName ) throw (RuntimeException) + { + const Sequence< ::rtl::OUString > aSupported( getSupportedServiceNames() ); + for ( const ::rtl::OUString* pSupported = aSupported.getConstArray(); + pSupported != aSupported.getConstArray() + aSupported.getLength(); + ++pSupported + ) + if ( *pSupported == i_rServiceName ) + return sal_True; + + return sal_False; + } + + //------------------------------------------------------------------------------------------------------------------ + Sequence< ::rtl::OUString > SAL_CALL ToolPanelFactory::getSupportedServiceNames( ) throw (RuntimeException) + { + return ToolPanelFactory_getSupportedServiceNames(); + } + + //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL ToolPanelFactory::initialize( const Sequence< Any >& i_rArguments ) throw (Exception, RuntimeException) + { + ::comphelper::NamedValueCollection aArgs( i_rArguments ); + (void)aArgs; + // TODO + } + +//...................................................................................................................... +} } // namespace sd::toolpanel +//...................................................................................................................... diff --git a/sd/source/ui/toolpanel/ToolPanelUIElement.cxx b/sd/source/ui/toolpanel/ToolPanelUIElement.cxx new file mode 100644 index 000000000000..e81f683bcfa7 --- /dev/null +++ b/sd/source/ui/toolpanel/ToolPanelUIElement.cxx @@ -0,0 +1,134 @@ +/************************************************************************* + * 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. + * + ************************************************************************/ + +#include "precompiled_sd.hxx" + +#include "ToolPanelUIElement.hxx" +#include "MethodGuard.hxx" + +/** === begin UNO includes === **/ +#include +#include +/** === end UNO includes === **/ + +#include + +//...................................................................................................................... +namespace sd { namespace toolpanel +{ +//...................................................................................................................... + + /** === begin UNO using === **/ + using ::com::sun::star::uno::Reference; + using ::com::sun::star::uno::XInterface; + using ::com::sun::star::uno::UNO_QUERY; + using ::com::sun::star::uno::UNO_QUERY_THROW; + using ::com::sun::star::uno::UNO_SET_THROW; + using ::com::sun::star::uno::Exception; + using ::com::sun::star::uno::RuntimeException; + using ::com::sun::star::uno::Any; + using ::com::sun::star::uno::makeAny; + using ::com::sun::star::uno::Sequence; + using ::com::sun::star::uno::Type; + using ::com::sun::star::frame::XFrame; + using ::com::sun::star::lang::XComponent; + using ::com::sun::star::ui::XToolPanel; + using ::com::sun::star::lang::DisposedException; + /** === end UNO using === **/ + namespace UIElementType = ::com::sun::star::ui::UIElementType; + + typedef MethodGuard< ToolPanelUIElement > UIElementMethodGuard; + + //================================================================================================================== + //= ToolPanelUIElement + //================================================================================================================== + //------------------------------------------------------------------------------------------------------------------ + ToolPanelUIElement::ToolPanelUIElement( const Reference< XFrame >& i_rFrame, const ::rtl::OUString& i_rResourceURL, + const Reference< XToolPanel >& i_rToolPanel ) + :ToolPanelUIElement_Base( m_aMutex ) + ,m_xFrame( i_rFrame ) + ,m_sResourceURL( i_rResourceURL ) + ,m_xToolPanel( i_rToolPanel ) + { + } + + //------------------------------------------------------------------------------------------------------------------ + ToolPanelUIElement::~ToolPanelUIElement() + { + } + + //------------------------------------------------------------------------------------------------------------------ + void ToolPanelUIElement::checkDisposed() + { + if ( !m_xToolPanel.is() ) + throw DisposedException( ::rtl::OUString(), *this ); + } + + //------------------------------------------------------------------------------------------------------------------ + Reference< XFrame > SAL_CALL ToolPanelUIElement::getFrame() throw (RuntimeException) + { + UIElementMethodGuard aGuard( *this ); + return m_xFrame; + } + + //------------------------------------------------------------------------------------------------------------------ + ::rtl::OUString SAL_CALL ToolPanelUIElement::getResourceURL() throw (RuntimeException) + { + UIElementMethodGuard aGuard( *this ); + return m_sResourceURL; + } + + //------------------------------------------------------------------------------------------------------------------ + ::sal_Int16 SAL_CALL ToolPanelUIElement::getType() throw (RuntimeException) + { + UIElementMethodGuard aGuard( *this ); + return UIElementType::TOOLPANEL; + } + + //------------------------------------------------------------------------------------------------------------------ + Reference< XInterface > SAL_CALL ToolPanelUIElement::getRealInterface( ) throw (RuntimeException) + { + UIElementMethodGuard aGuard( *this ); + return m_xToolPanel.get(); + } + + //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL ToolPanelUIElement::disposing() + { + try + { + Reference< XComponent > xPanelComponent( m_xToolPanel, UNO_QUERY_THROW ); + xPanelComponent->dispose(); + } + catch( const Exception& ) + { + DBG_UNHANDLED_EXCEPTION(); + } + } + +//...................................................................................................................... +} } // namespace sd::toolpanel +//...................................................................................................................... diff --git a/sd/source/ui/toolpanel/ToolPanelUIElement.hxx b/sd/source/ui/toolpanel/ToolPanelUIElement.hxx new file mode 100644 index 000000000000..0a74b7bd449e --- /dev/null +++ b/sd/source/ui/toolpanel/ToolPanelUIElement.hxx @@ -0,0 +1,87 @@ +/************************************************************************* + * 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_TOOLPANELUIELEMENT_HXX +#define SD_TOOLPANELUIELEMENT_HXX + +/** === begin UNO includes === **/ +#include +#include +/** === end UNO includes === **/ + +#include +#include + +#include + +//...................................................................................................................... +namespace sd { namespace toolpanel +{ +//...................................................................................................................... + + class TreeNode; + + //================================================================================================================== + //= ToolPanelUIElement + //================================================================================================================== + typedef ::cppu::WeakComponentImplHelper1 < ::com::sun::star::ui::XUIElement + > ToolPanelUIElement_Base; + class ToolPanelUIElement :public ::cppu::BaseMutex + ,public ToolPanelUIElement_Base + { + public: + ToolPanelUIElement( + const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& i_rFrame, + const ::rtl::OUString& i_rResourceURL, + const ::com::sun::star::uno::Reference< ::com::sun::star::ui::XToolPanel >& i_rToolPanel + ); + + // XUIElement + virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > SAL_CALL getFrame() throw (::com::sun::star::uno::RuntimeException); + virtual ::rtl::OUString SAL_CALL getResourceURL() throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Int16 SAL_CALL getType() throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getRealInterface( ) throw (::com::sun::star::uno::RuntimeException); + + void checkDisposed(); + ::osl::Mutex& getMutex() { return m_aMutex; } + + protected: + virtual ~ToolPanelUIElement(); + + // OComponentHelper + virtual void SAL_CALL disposing(); + + private: + const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > m_xFrame; + const ::rtl::OUString m_sResourceURL; + const ::com::sun::star::uno::Reference< ::com::sun::star::ui::XToolPanel > m_xToolPanel; + }; + +//...................................................................................................................... +} } // namespace sd::toolpanel +//...................................................................................................................... + +#endif // SD_TOOLPANELUIELEMENT_HXX diff --git a/sd/source/ui/toolpanel/ToolPanelViewShell.cxx b/sd/source/ui/toolpanel/ToolPanelViewShell.cxx index 429d1564ad1f..99d130096e27 100755 --- a/sd/source/ui/toolpanel/ToolPanelViewShell.cxx +++ b/sd/source/ui/toolpanel/ToolPanelViewShell.cxx @@ -31,18 +31,18 @@ #include "TaskPaneShellManager.hxx" #include "TaskPaneFocusManager.hxx" -#include "StandardToolPanel.hxx" -#include "CustomToolPanel.hxx" +#include "taskpane/TaskPaneControlFactory.hxx" #include "controls/MasterPagesPanel.hxx" #include "LayoutMenu.hxx" #include "controls/TableDesignPanel.hxx" #include "controls/CustomAnimationPanel.hxx" #include "controls/SlideTransitionPanel.hxx" #include "controls/MasterPagesSelector.hxx" +#include "ToolPanel.hxx" +#include "ToolPanelUIElement.hxx" #include "PaneDockingWindow.hxx" #include "FrameView.hxx" #include "Window.hxx" -#include "ToolPanelDeck.hxx" #include "sdmod.hxx" #include "app.hrc" #include "glob.hrc" @@ -56,10 +56,14 @@ #include #include #include +#include #include /** === end UNO includes === **/ +#include +#include #include +#include #include #include #include @@ -114,6 +118,9 @@ using ::com::sun::star::drawing::framework::XConfigurationControllerBroadcaster; using ::com::sun::star::drawing::framework::XConfigurationController; using ::com::sun::star::drawing::framework::XConfiguration; using ::com::sun::star::drawing::framework::AnchorBindingMode_DIRECT; +using ::com::sun::star::ui::XUIElement; +using ::com::sun::star::ui::XToolPanel; +using ::com::sun::star::drawing::framework::ResourceActivationMode_REPLACE; /** === end UNO using === **/ using ::sd::framework::FrameworkHelper; @@ -225,41 +232,25 @@ public: PanelSelectorLayout GetLayout() const { return m_eCurrentLayout; } - /** called by our configuration controller listener when the request to activate a tool panel has been observed. + /** activates the panel which has the given resource URL */ - void OnToolPanelActivationRequest( const ::rtl::OUString& i_rResourceURL ); + void ActivatePanelByResource( const ::rtl::OUString& i_rPanelResourceURL ); - /** provides access to the the VCL window of the panel deck - */ - ::Window& GetPanelDeck() { return *m_pPanelDeck.get(); } - const ::Window& GetPanelDeck() const { return *m_pPanelDeck.get(); } + /** de-activates the panel given by its resource URL, bypassing the configuration controller - ::Window* GetToolPanelParentWindow() { return m_pPanelDeck.get() ? &m_pPanelDeck->GetPanelWindowAnchor() : NULL; } - - /** returns the logical number of panels. This is greater than or equal to the number of panels displayed in the - panel deck + If the panel is not active currently, nothing happens. */ - size_t GetPanelCount() const - { - return m_aPanels.size(); - } - - const PanelDescriptor& GetPanel( const size_t i_nLogicalPanelIndex ) const - { - return m_aPanels[ i_nLogicalPanelIndex ]; - } + void DeactivatePanelByResource( const ::rtl::OUString& i_rPanelResourceURL ); - void TogglePanelVisibility( const size_t i_nLogicalPanelIndex ); - - /** ensures the panel with the given ID is visible, and directly activates it, bypassing the configuration controller + /** provides access to the the VCL window of the panel deck */ - void ActivatePanelDirectly( const PanelId i_nPanelId ); + ::sfx2::ModuleTaskPane& GetTaskPane() { return *m_pTaskPane; } + const ::sfx2::ModuleTaskPane& GetTaskPane() const { return *m_pTaskPane; } - /** de-activates the panel given by ID, bypassing the configuration controller + ::svt::ToolPanelDeck& GetToolPanelDeck() { return GetTaskPane().GetPanelDeck(); } + const ::svt::ToolPanelDeck& GetToolPanelDeck() const { return GetTaskPane().GetPanelDeck(); } - If the panel is not active currently, nothing happens. - */ - void DeactivatePanelDirectly( const PanelId i_nPanelId ); + void TogglePanelVisibility( const size_t i_nLogicalPanelIndex ); Reference< XAccessible > CreateAccessible( ::sd::Window& i_rWindow ); @@ -273,35 +264,27 @@ protected: virtual void Dying(); private: - void RegisterPanel( size_t i_nPosition, PanelId i_nPanelId, const ::svt::PToolPanel& i_rPanel ); void UpdateDockingWindowTitle(); - /** creates the built-in panels, returns the position of the panel to initially activate - */ - struct PanelActivation + struct InitialPanel { - size_t nPanelPos; - bool bActivateAsResource; - - PanelActivation() - :nPanelPos( size_t( -1 ) ) - ,bActivateAsResource( true ) + ::rtl::OUString sPanelResourceURL; + bool bActivateDirectly; + InitialPanel() + :sPanelResourceURL() + ,bActivateDirectly( true ) { } }; - PanelActivation SetupDefaultPanels(); - - /** creates the custom panels - */ - void SetupCustomPanels(); - - typedef ::std::vector< PanelDescriptor > PanelDescriptors; - PanelDescriptors m_aPanels; - ToolPanelViewShell& m_rPanelViewShell; - ::boost::scoped_ptr< ToolPanelDeck > m_pPanelDeck; - ::rtl::Reference< ConfigurationListener > m_pConfigListener; - PanelSelectorLayout m_eCurrentLayout; - bool m_bInitialized; + InitialPanel DetermineInitialPanel(); + + typedef ::std::vector< PanelDescriptor > PanelDescriptors; + ToolPanelViewShell& m_rPanelViewShell; + ::boost::scoped_ptr< ::sfx2::ModuleTaskPane > m_pTaskPane; + //::boost::scoped_ptr< ToolPanelDeck > m_pPanelDeck; + ::rtl::Reference< ConfigurationListener > m_pConfigListener; + PanelSelectorLayout m_eCurrentLayout; + bool m_bInitialized; }; // ===================================================================================================================== @@ -335,17 +318,6 @@ void SAL_CALL ConfigurationListener::notifyConfigurationChange( const Configurat ::osl::MutexGuard aGuard( m_aMutex ); impl_checkDisposed_throw(); -// if ( i_rEvent.Type == FrameworkHelper::msConfigurationUpdateStartEvent ) -// { -// m_pShellImpl->GetPanelDeck().SetUpdateMode( FALSE ); -// return; -// } -// if ( i_rEvent.Type == FrameworkHelper::msConfigurationUpdateEndEvent ) -// { -// m_pShellImpl->GetPanelDeck().SetUpdateMode( TRUE ); -// return; -// } -// // is this an event we're interested in? if ( i_rEvent.Type != FrameworkHelper::msResourceActivationEvent ) return; @@ -360,7 +332,7 @@ void SAL_CALL ConfigurationListener::notifyConfigurationChange( const Configurat if ( sAnchorURL != FrameworkHelper::msTaskPaneURL ) return; - m_pShellImpl->OnToolPanelActivationRequest( i_rEvent.ResourceId->getResourceURL() ); + m_pShellImpl->ActivatePanelByResource( i_rEvent.ResourceId->getResourceURL() ); } // --------------------------------------------------------------------------------------------------------------------- @@ -410,75 +382,17 @@ SFX_IMPL_INTERFACE(ToolPanelViewShell, SfxShell, SdResId(STR_TASKPANEVIEWSHELL)) TYPEINIT1(ToolPanelViewShell, ViewShell); // --------------------------------------------------------------------------------------------------------------------- -ToolPanelViewShell_Impl::PanelActivation ToolPanelViewShell_Impl::SetupDefaultPanels() +ToolPanelViewShell_Impl::InitialPanel ToolPanelViewShell_Impl::DetermineInitialPanel() { - typedef std::auto_ptr (*ControlFactoryFactory)( ToolPanelViewShell& i_rToolPanelShell ); - - struct PanelDescriptor - { - ControlFactoryFactory pFactory; - const sal_Char* pImageCommandName; - USHORT nTitleResourceID; - ULONG nHelpID; - PanelId nPanelID; - ::rtl::OUString sResourceURL; - }; - - PanelDescriptor aPanels[] = - { - // "Master Pages" - { &controls::MasterPagesPanel::CreateControlFactory, - "PresentationLayout", - STR_TASKPANEL_MASTER_PAGE_TITLE, - HID_SD_SLIDE_DESIGNS, - PID_MASTER_PAGES, - FrameworkHelper::msMasterPagesTaskPanelURL - }, - // "Layout" - { &LayoutMenu::CreateControlFactory, - "ModifyPage", - STR_TASKPANEL_LAYOUT_MENU_TITLE, - HID_SD_SLIDE_LAYOUTS, - PID_LAYOUT, - FrameworkHelper::msLayoutTaskPanelURL - }, - // "Tables Design" - { &controls::TableDesignPanel::CreateControlFactory, - "InsertTable", - DLG_TABLEDESIGNPANE, - HID_SD_TABLE_DESIGN, - PID_TABLE_DESIGN, - FrameworkHelper::msTableDesignPanelURL - }, - // "Custom Animation" - { &controls::CustomAnimationPanel::CreateControlFactory, - "CustomAnimation", - STR_CUSTOMANIMATIONPANE, - HID_SD_CUSTOM_ANIMATIONS, - PID_CUSTOM_ANIMATION, - FrameworkHelper::msCustomAnimationTaskPanelURL - }, - // "Slide Transition" - { &controls::SlideTransitionPanel::CreateControlFactory, - "RehearseTimings", - STR_SLIDE_TRANSITION_PANE, - HID_SD_SLIDE_TRANSITIONS, - PID_SLIDE_TRANSITION, - FrameworkHelper::msSlideTransitionTaskPanelURL - } - }; - - // compose the resource ID for the ToolPanel view - ::boost::shared_ptr< FrameworkHelper > pFrameworkHelper( FrameworkHelper::Instance( m_rPanelViewShell.GetViewShellBase() ) ); - const Reference< XResourceId > xToolPanelId( pFrameworkHelper->CreateResourceId( FrameworkHelper::msTaskPaneURL, FrameworkHelper::msRightPaneURL ) ); - - // determine which panel should be activated initially. - // Default to PID_LAYOUT, but check whether the requested configuration already contains a tool panel, in this case, + // Default to Layout panel, but check whether the requested configuration already contains a tool panel, in this case, // use that one. - PanelId nPanelToActivate = PID_LAYOUT; - PanelActivation aPanelToActivate; + InitialPanel aPanelToActivate; + aPanelToActivate.sPanelResourceURL = FrameworkHelper::msLayoutTaskPanelURL; + aPanelToActivate.bActivateDirectly = false; try { + ::boost::shared_ptr< FrameworkHelper > pFrameworkHelper( FrameworkHelper::Instance( m_rPanelViewShell.GetViewShellBase() ) ); + const Reference< XResourceId > xToolPanelId( pFrameworkHelper->CreateResourceId( FrameworkHelper::msTaskPaneURL, FrameworkHelper::msRightPaneURL ) ); Reference< XConfigurationController > xCC( pFrameworkHelper->GetConfigurationController(), UNO_QUERY_THROW ); Reference< XConfiguration > xConfiguration( xCC->getRequestedConfiguration(), UNO_QUERY_THROW ); Sequence< Reference< XResourceId > > aViewIds( xConfiguration->getResources( @@ -491,8 +405,8 @@ ToolPanelViewShell_Impl::PanelActivation ToolPanelViewShell_Impl::SetupDefaultPa PanelId nRequestedPanel = GetStandardPanelId( sResourceURL ); if ( nRequestedPanel != PID_UNKNOWN ) { - nPanelToActivate = nRequestedPanel; - aPanelToActivate.bActivateAsResource = false; + aPanelToActivate.sPanelResourceURL = sResourceURL; + aPanelToActivate.bActivateDirectly = true; } } } @@ -500,74 +414,9 @@ ToolPanelViewShell_Impl::PanelActivation ToolPanelViewShell_Impl::SetupDefaultPa { DBG_UNHANDLED_EXCEPTION(); } - - // create the panels - Reference< XFrame > xFrame( m_rPanelViewShell.GetViewShellBase().GetViewFrame()->GetFrame()->GetFrameInterface() ); - const BOOL bHiContrast( m_pPanelDeck->GetSettings().GetStyleSettings().GetHighContrastMode() ); - for ( size_t i=0; i < sizeof( aPanels ) / sizeof( aPanels[0] ); ++i ) - { - // compose the command name, and obtain the image for it - ::rtl::OUStringBuffer aCommandName; - aCommandName.appendAscii( ".uno:" ); - aCommandName.appendAscii( aPanels[i].pImageCommandName ); - const Image aPanelImage( GetImage( xFrame, aCommandName.makeStringAndClear(), FALSE, bHiContrast ) ); - - // compose the resource ID of the panel - const Reference< XResourceId > xPanelId( pFrameworkHelper->CreateResourceId( aPanels[i].sResourceURL, xToolPanelId ) ); - - // create and insert the panel - ::std::auto_ptr< ControlFactory > pControlFactory( (*aPanels[i].pFactory)( m_rPanelViewShell ) ); - ::svt::PToolPanel pNewPanel( new StandardToolPanel( - *m_pPanelDeck, - pControlFactory, - aPanels[i].nTitleResourceID, - aPanelImage, - aPanels[i].nHelpID, - xPanelId - ) ); - const size_t nPanelPos = m_pPanelDeck->InsertPanel( pNewPanel, m_pPanelDeck->GetPanelCount() ); - - // remember it - RegisterPanel( nPanelPos, aPanels[i].nPanelID, pNewPanel ); - - if ( nPanelToActivate == aPanels[i].nPanelID ) - aPanelToActivate.nPanelPos = nPanelPos; - } - return aPanelToActivate; } -// --------------------------------------------------------------------------------------------------------------------- -void ToolPanelViewShell_Impl::SetupCustomPanels() -{ - // compose the resource ID for the ToolPanel view - ::boost::shared_ptr< FrameworkHelper > pFrameworkHelper( FrameworkHelper::Instance( m_rPanelViewShell.GetViewShellBase() ) ); - const Reference< XResourceId > xToolPanelId( pFrameworkHelper->CreateResourceId( FrameworkHelper::msTaskPaneURL, FrameworkHelper::msRightPaneURL ) ); - - // get the config node holding the custom tool panel descriptions - ::utl::OConfigurationTreeRoot aConfig( ::comphelper::ComponentContext( ::comphelper::getProcessServiceFactory() ), - "/org.openoffice.Office.Impress/MultiPaneGUI/ToolPanel/CustomPanels", false ); - const Sequence< ::rtl::OUString > aCustomPanelDescs( aConfig.getNodeNames() ); - - // create panels - size_t nCustomPanelNo = 0; - for ( const ::rtl::OUString* panelNodeName = aCustomPanelDescs.getConstArray(); - panelNodeName != aCustomPanelDescs.getConstArray() + aCustomPanelDescs.getLength(); - ++panelNodeName - ) - { - ::utl::OConfigurationNode aPanelDesc( aConfig.openNode( *panelNodeName ) ); - - // create and insert the panel - ::svt::PToolPanel pNewPanel( new CustomToolPanel( *m_pPanelDeck, aPanelDesc, xToolPanelId, pFrameworkHelper ) ); - const size_t nPanelPos = m_pPanelDeck->InsertPanel( pNewPanel, m_pPanelDeck->GetPanelCount() ); - - // remember it - RegisterPanel( nPanelPos, PanelId( PID_FIRST_CUSTOM_PANEL + nCustomPanelNo ), pNewPanel ); - ++nCustomPanelNo; - } -} - // --------------------------------------------------------------------------------------------------------------------- void ToolPanelViewShell_Impl::Setup() { @@ -575,20 +424,26 @@ void ToolPanelViewShell_Impl::Setup() return; m_bInitialized = true; - // standard (built-in) panels - const PanelActivation aPanelToActivate = SetupDefaultPanels(); - - // custom panels - SetupCustomPanels(); - - // activate default panel - if ( aPanelToActivate.bActivateAsResource ) - m_pPanelDeck->ActivatePanelResource( aPanelToActivate.nPanelPos ); - else - m_pPanelDeck->ActivatePanelDirectly( aPanelToActivate.nPanelPos ); + // initially activate a panel + const InitialPanel aInitialPanel = DetermineInitialPanel(); + if ( aInitialPanel.sPanelResourceURL.getLength() ) + { + if ( aInitialPanel.bActivateDirectly ) + { + ActivatePanelByResource( aInitialPanel.sPanelResourceURL ); + } + else + { + ::boost::shared_ptr< FrameworkHelper > pFrameworkHelper( FrameworkHelper::Instance( GetAntiImpl().GetViewShellBase() ) ); + const Reference< XResourceId > xToolPanelId( pFrameworkHelper->CreateResourceId( + FrameworkHelper::msTaskPaneURL, FrameworkHelper::msRightPaneURL, aInitialPanel.sPanelResourceURL ) ); + pFrameworkHelper->GetConfigurationController()->requestResourceActivation( + xToolPanelId, ResourceActivationMode_REPLACE ); + } + } - // add as listener to the panel deck - m_pPanelDeck->AddListener( *this ); +// // add as listener to the panel deck +// m_pPanelDeck->AddListener( *this ); // initialize panel selector SetLayout( LAYOUT_DRAWERS, true ); @@ -596,7 +451,7 @@ void ToolPanelViewShell_Impl::Setup() // listen at the configuration m_pConfigListener.set( new ConfigurationListener( *this ) ); - m_pPanelDeck->Show(); + m_pTaskPane->Show(); } // --------------------------------------------------------------------------------------------------------------------- @@ -605,24 +460,24 @@ void ToolPanelViewShell_Impl::SetLayout( const PanelSelectorLayout i_eLayout, co if ( !i_bForce && ( m_eCurrentLayout == i_eLayout ) ) return; - switch ( i_eLayout ) - { - case LAYOUT_DRAWERS: - m_pPanelDeck->SetDrawersLayout(); - break; - case LAYOUT_TABS_TOP: - m_pPanelDeck->SetTabsLayout( ::svt::TABS_TOP, ::svt::TABITEM_IMAGE_ONLY ); - break; - case LAYOUT_TABS_BOTTOM: - m_pPanelDeck->SetTabsLayout( ::svt::TABS_BOTTOM, ::svt::TABITEM_IMAGE_ONLY ); - break; - case LAYOUT_TABS_LEFT: - m_pPanelDeck->SetTabsLayout( ::svt::TABS_LEFT, ::svt::TABITEM_IMAGE_ONLY ); - break; - case LAYOUT_TABS_RIGHT: - m_pPanelDeck->SetTabsLayout( ::svt::TABS_RIGHT, ::svt::TABITEM_IMAGE_ONLY ); - break; - } +// switch ( i_eLayout ) +// { +// case LAYOUT_DRAWERS: +// m_pPanelDeck->SetDrawersLayout(); +// break; +// case LAYOUT_TABS_TOP: +// m_pPanelDeck->SetTabsLayout( ::svt::TABS_TOP, ::svt::TABITEM_IMAGE_ONLY ); +// break; +// case LAYOUT_TABS_BOTTOM: +// m_pPanelDeck->SetTabsLayout( ::svt::TABS_BOTTOM, ::svt::TABITEM_IMAGE_ONLY ); +// break; +// case LAYOUT_TABS_LEFT: +// m_pPanelDeck->SetTabsLayout( ::svt::TABS_LEFT, ::svt::TABITEM_IMAGE_ONLY ); +// break; +// case LAYOUT_TABS_RIGHT: +// m_pPanelDeck->SetTabsLayout( ::svt::TABS_RIGHT, ::svt::TABITEM_IMAGE_ONLY ); +// break; +// } m_eCurrentLayout = i_eLayout; UpdateDockingWindowTitle(); } @@ -632,56 +487,45 @@ void ToolPanelViewShell_Impl::Cleanup() { if ( m_bInitialized ) { - m_pPanelDeck->RemoveListener( *this ); - // remove the panels which are not under the control of the panel deck currently - for ( PanelDescriptors::iterator panelPos = m_aPanels.begin(); - panelPos != m_aPanels.end(); - ++panelPos - ) - { - if ( panelPos->bHidden ) - panelPos->pPanel->Dispose(); - } - m_aPanels.clear(); - - if ( m_pConfigListener.is() ) - m_pConfigListener->dispose(); +// m_pPanelDeck->RemoveListener( *this ); +// // remove the panels which are not under the control of the panel deck currently +// for ( PanelDescriptors::iterator panelPos = m_aPanels.begin(); +// panelPos != m_aPanels.end(); +// ++panelPos +// ) +// { +// if ( panelPos->bHidden ) +// panelPos->pPanel->Dispose(); +// } +// m_aPanels.clear(); +// +// if ( m_pConfigListener.is() ) +// m_pConfigListener->dispose(); } - m_pPanelDeck.reset(); +// m_pPanelDeck.reset(); + m_pTaskPane.reset(); } // --------------------------------------------------------------------------------------------------------------------- -void ToolPanelViewShell_Impl::OnToolPanelActivationRequest( const ::rtl::OUString& i_rResourceURL ) +void ToolPanelViewShell_Impl::ActivatePanelByResource( const ::rtl::OUString& i_rResourceURL ) { - // look up the panel which belongs to the given resource - for ( size_t i=0; i( rPanel.pPanel.get() ) ); - ENSURE_OR_CONTINUE( pPanel != NULL, "ToolPanelViewShell::OnToolPanelActivationRequest: illegal panel implementation!" ); - - Reference< XResourceId > xPanelId( pPanel->getResourceId() ); - ::rtl::OUString sPanelURL( xPanelId.is() ? xPanelId->getResourceURL() : ::rtl::OUString() ); - ENSURE_OR_CONTINUE( sPanelURL.getLength(), "illegal panel resource!" ); + // determine position of the requested panel + ::boost::optional< size_t > aPanelPos = GetTaskPane().GetPanelPos( i_rResourceURL ); + OSL_ENSURE( !!aPanelPos, "ToolPanelViewShell_Impl::ActivatePanelByResource: illegal panel resource, or illegal panel deck setup!" ); + if ( !!aPanelPos ) + GetToolPanelDeck().ActivatePanel( *aPanelPos ); +} - if ( sPanelURL == i_rResourceURL ) - { - CustomToolPanel* pCustomPanel = dynamic_cast< CustomToolPanel* >( rPanel.pPanel.get() ); - OSL_ENSURE( ( pCustomPanel != NULL ) == ( rPanel.nId >= PID_FIRST_CUSTOM_PANEL ), - "ToolPanelViewShell::OnToolPanelActivationRequest: inconsistency!" ); - if ( pCustomPanel != NULL ) - { - // if that's a custom tool panel, then temporarily disable the access of the tool panel implementation - // to the XPane object. Otherwise, it would request this resource from the configuration controller during - // the below ActivatePanelDirectly call, which would fail, since the resource is just to be created. - pCustomPanel->LockResourceAccess(); - } - ActivatePanelDirectly( rPanel.nId ); - if ( pCustomPanel != NULL ) - { - pCustomPanel->UnlockResourceAccess(); - } - } +// --------------------------------------------------------------------------------------------------------------------- +void ToolPanelViewShell_Impl::DeactivatePanelByResource( const ::rtl::OUString& i_rPanelResourceURL ) +{ + // determine position of the requested panel + ::boost::optional< size_t > aPanelPos = GetTaskPane().GetPanelPos( i_rPanelResourceURL ); + OSL_ENSURE( !!aPanelPos, "ToolPanelViewShell_Impl::DeactivatePanelByResource: illegal panel resource, or illegal panel deck setup!" ); + if ( !!aPanelPos ) + { + if ( GetToolPanelDeck().GetActivePanel() == *aPanelPos ) + GetToolPanelDeck().ActivatePanel( ::boost::optional< size_t >() ); } } @@ -775,7 +619,7 @@ void ToolPanelViewShell::ArrangeGUIElements() Initialize(); - mpImpl->GetPanelDeck().SetPosSizePixel( Point(), maViewSize ); + mpImpl->GetTaskPane().SetPosSizePixel( Point(), maViewSize ); } // --------------------------------------------------------------------------------------------------------------------- @@ -796,8 +640,8 @@ void ToolPanelViewShell::KeyInput( const KeyEvent& i_rKeyEvent ) const KeyCode nCode = i_rKeyEvent.GetKeyCode(); if ( nCode == KEY_RETURN ) { - if ( !mpImpl->GetPanelDeck().HasChildPathFocus() ) - mpImpl->GetPanelDeck().GrabFocus(); + if ( !mpImpl->GetTaskPane().HasChildPathFocus() ) + mpImpl->GetTaskPane().GrabFocus(); } else ViewShell::KeyInput( i_rKeyEvent, NULL ); @@ -921,14 +765,14 @@ IMPL_LINK(ToolPanelViewShell, MenuSelectHandler, Menu*, pMenu) // Add one entry for every tool panel element to individually make // them visible or hide them. USHORT nIndex = MID_FIRST_PANEL; - for ( size_t i=0; iGetPanelCount(); ++i, ++nIndex ) - { - const PanelDescriptor& rPanelDesc( mpImpl->GetPanel(i) ); - pMenu->InsertItem( nIndex, rPanelDesc.pPanel->GetDisplayName(), MIB_CHECKABLE ); - pMenu->SetUserValue( nIndex, rPanelDesc.nId ); - pMenu->CheckItem( nIndex, !rPanelDesc.bHidden ); - } - pMenu->InsertSeparator(); +// for ( size_t i=0; iGetPanelCount(); ++i, ++nIndex ) +// { +// const PanelDescriptor& rPanelDesc( mpImpl->GetPanel(i) ); +// pMenu->InsertItem( nIndex, rPanelDesc.pPanel->GetDisplayName(), MIB_CHECKABLE ); +// pMenu->SetUserValue( nIndex, rPanelDesc.nId ); +// pMenu->CheckItem( nIndex, !rPanelDesc.bHidden ); +// } +// pMenu->InsertSeparator(); #if OSL_DEBUG_LEVEL > 0 pMenu->InsertItem( MID_LAYOUT_TABS, String::CreateFromAscii( "Tab-Layout (exp.)" ), MIB_CHECKABLE ); @@ -1030,15 +874,15 @@ void ToolPanelViewShell::ConnectToDockingWindow() // Tell the focus manager that we want to pass the focus to our // child. - FocusManager::Instance().RegisterDownLink( GetParentWindow(), &mpImpl->GetPanelDeck() ); + FocusManager::Instance().RegisterDownLink( GetParentWindow(), &mpImpl->GetTaskPane() ); } // --------------------------------------------------------------------------------------------------------------------- bool ToolPanelViewShell::RelocateToParentWindow( ::Window* pParentWindow ) { ::Window* pOldParentWindow = GetParentWindow(); - FocusManager::Instance().RemoveLinks( pOldParentWindow, &mpImpl->GetPanelDeck() ); - FocusManager::Instance().RemoveLinks( &mpImpl->GetPanelDeck(), pOldParentWindow ); + FocusManager::Instance().RemoveLinks( pOldParentWindow, &mpImpl->GetTaskPane() ); + FocusManager::Instance().RemoveLinks( &mpImpl->GetTaskPane(), pOldParentWindow ); PaneDockingWindow* pDockingWindow = dynamic_cast< PaneDockingWindow* >( GetDockingWindow() ); if ( pDockingWindow != NULL ) @@ -1055,36 +899,91 @@ bool ToolPanelViewShell::RelocateToParentWindow( ::Window* pParentWindow ) return true; } -// --------------------------------------------------------------------------------------------------------------------- -::Window* ToolPanelViewShell::GetToolPanelParentWindow() +//--------------------------------------------------------------------------------------------------------------------- +bool ToolPanelViewShell::IsPanelAnchorWindow( const ::Window& i_rWindow ) const +{ + return &mpImpl->GetToolPanelDeck().GetPanelWindowAnchor() == &i_rWindow; +} + +//--------------------------------------------------------------------------------------------------------------------- +namespace { - return mpImpl->GetToolPanelParentWindow(); + typedef std::auto_ptr< ControlFactory > (*ControlFactoryFactory)( ToolPanelViewShell& i_rToolPanelShell ); + + struct PanelFactory + { + ControlFactoryFactory pFactory; + ULONG nHelpID; + PanelFactory( const ControlFactoryFactory i_pFactory, const ULONG i_nHelpID ) + :pFactory( i_pFactory ) + ,nHelpID( i_nHelpID ) + { + } + }; + + const PanelFactory lcl_describePanel( const PanelId i_ePanelId ) + { + switch ( i_ePanelId ) + { + case PID_MASTER_PAGES: + return PanelFactory( &controls::MasterPagesPanel::CreateControlFactory, HID_SD_SLIDE_DESIGNS ); + case PID_LAYOUT: + return PanelFactory( &LayoutMenu::CreateControlFactory, HID_SD_SLIDE_LAYOUTS ); + case PID_TABLE_DESIGN: + return PanelFactory( &controls::TableDesignPanel::CreateControlFactory, HID_SD_TABLE_DESIGN ); + case PID_CUSTOM_ANIMATION: + return PanelFactory( &controls::CustomAnimationPanel::CreateControlFactory, HID_SD_CUSTOM_ANIMATIONS ); + case PID_SLIDE_TRANSITION: + return PanelFactory( &controls::SlideTransitionPanel::CreateControlFactory, HID_SD_SLIDE_TRANSITIONS ); + default: + break; + } + throw RuntimeException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "illegal panel ID" ) ), NULL ); + } } //--------------------------------------------------------------------------------------------------------------------- -void ToolPanelViewShell::DeactivatePanel( const PanelId i_ePanelId ) +Reference< XUIElement > ToolPanelViewShell::CreatePanelUIElement( const Reference< XFrame >& i_rDocFrame, const ::rtl::OUString& i_rPanelResourceURL ) { - mpImpl->DeactivatePanelDirectly( i_ePanelId ); + const PanelId ePanelId( GetStandardPanelId( i_rPanelResourceURL ) ); + ENSURE_OR_RETURN( ePanelId != PID_UNKNOWN, "ToolPanelViewShell::CreatePanelUIElement: illegal panel URL!", NULL ); + + // a TreeNode which will resemble the panel + const PanelFactory aPanelFactory( lcl_describePanel( ePanelId ) ); + ::std::auto_ptr< ControlFactory > pControlFactory( (*aPanelFactory.pFactory)( *this ) ); + ::std::auto_ptr< TreeNode > pNode( pControlFactory->CreateControl( mpImpl->GetToolPanelDeck().GetPanelWindowAnchor() ) ); + ENSURE_OR_THROW( ( pNode.get() != NULL ) && ( pNode->GetWindow() != NULL ), + "illegal node returned by the control factory" ); + pNode->GetWindow()->SetHelpId( aPanelFactory.nHelpID ); + + // create an XToolPanel + Reference< XToolPanel > xPanel( new ToolPanel( pNode ) ); + + // create an XUIElement providing this panel + const Reference< XUIElement > xUIElement( new ToolPanelUIElement( i_rDocFrame, i_rPanelResourceURL, xPanel ) ); + + return xUIElement; } // --------------------------------------------------------------------------------------------------------------------- -void ToolPanelViewShell::ActivatePanel( const PanelId i_ePanelId ) +void ToolPanelViewShell::DeactivatePanel( const ::rtl::OUString& i_rPanelResourceURL ) { - mpImpl->ActivatePanelDirectly( i_ePanelId ); + mpImpl->DeactivatePanelByResource( i_rPanelResourceURL ); } - // ===================================================================================================================== // = ToolPanelViewShell_Impl - implementation // ===================================================================================================================== // --------------------------------------------------------------------------------------------------------------------- ToolPanelViewShell_Impl::ToolPanelViewShell_Impl( ToolPanelViewShell& i_rPanelViewShell, ::Window& i_rPanelDeckParent ) - :m_aPanels() - ,m_rPanelViewShell( i_rPanelViewShell ) - ,m_pPanelDeck( new ToolPanelDeck( i_rPanelDeckParent, i_rPanelViewShell ) ) + :m_rPanelViewShell( i_rPanelViewShell ) + ,m_pTaskPane( new ::sfx2::ModuleTaskPane( i_rPanelDeckParent, i_rPanelViewShell.GetViewShellBase().GetViewFrame()->GetFrame()->GetFrameInterface() ) ) ,m_eCurrentLayout( LAYOUT_DRAWERS ) ,m_bInitialized( false ) { + const String sPaneTitle( SdResId( STR_RIGHT_PANE_TITLE ) ); + GetToolPanelDeck().SetAccessibleName( sPaneTitle ); + GetToolPanelDeck().SetAccessibleDescription( sPaneTitle ); } // --------------------------------------------------------------------------------------------------------------------- @@ -1095,72 +994,30 @@ ToolPanelViewShell_Impl::~ToolPanelViewShell_Impl() // --------------------------------------------------------------------------------------------------------------------- void ToolPanelViewShell_Impl::TogglePanelVisibility( const size_t i_nLogicalPanelIndex ) { - ENSURE_OR_RETURN_VOID( i_nLogicalPanelIndex < m_aPanels.size(), "illegal index" ); - - // get the actual panel index, within the deck - size_t nActualPanelIndex(0); - for ( size_t i=0; i < i_nLogicalPanelIndex; ++i ) - { - if ( !m_aPanels[i].bHidden ) - ++nActualPanelIndex; - } - if ( m_aPanels[ i_nLogicalPanelIndex ].bHidden ) - { - OSL_VERIFY( m_pPanelDeck->InsertPanel( m_aPanels[ i_nLogicalPanelIndex ].pPanel, nActualPanelIndex ) == nActualPanelIndex ); - // if there has not been an active panel before, activate the newly inserted one - ::boost::optional< size_t > aActivePanel( m_pPanelDeck->GetActivePanel() ); - if ( !aActivePanel ) - m_pPanelDeck->ActivatePanelResource( nActualPanelIndex ); - } - else - { - OSL_VERIFY( m_pPanelDeck->RemovePanel( nActualPanelIndex ).get() == m_aPanels[ i_nLogicalPanelIndex ].pPanel.get() ); - } - m_aPanels[ i_nLogicalPanelIndex ].bHidden = !m_aPanels[ i_nLogicalPanelIndex ].bHidden; -} - -// --------------------------------------------------------------------------------------------------------------------- -void ToolPanelViewShell_Impl::DeactivatePanelDirectly( const PanelId i_nPanelId ) -{ - for ( size_t i=0; iGetActivePanel() == i ) - m_pPanelDeck->ActivatePanelDirectly( ::boost::optional< size_t >() ); - return; - } - } -} - -// --------------------------------------------------------------------------------------------------------------------- -void ToolPanelViewShell_Impl::ActivatePanelDirectly( const PanelId i_nPanelId ) -{ - size_t nActualPanelIndex(0); - for ( size_t i=0; iActivatePanelDirectly( nActualPanelIndex ); - return; - } - if ( !m_aPanels[i].bHidden ) - ++nActualPanelIndex; - } - OSL_ENSURE( false, "ToolPanelViewShell::ActivatePanelDirectly: don't have a panel with the given ID!" ); -} - -// --------------------------------------------------------------------------------------------------------------------- -void ToolPanelViewShell_Impl::RegisterPanel( size_t i_nPosition, PanelId i_nPanelId, const ::svt::PToolPanel& i_rPanel ) -{ - if ( i_nPosition >= m_aPanels.size() ) - m_aPanels.resize( i_nPosition + 1 ); - - OSL_PRECOND( m_aPanels[ i_nPosition ].nId == PID_UNKNOWN, "ToolPanelViewShell_Impl::RegisterPanel: " - "already registered a panel for this ID!" ); - m_aPanels[ i_nPosition ] = PanelDescriptor( i_nPanelId, i_rPanel ); + OSL_ENSURE( false, "ToolPanelViewShell_Impl::TogglePanelVisibility: not yet re-implemented!" ); +// ENSURE_OR_RETURN_VOID( i_nLogicalPanelIndex < m_aPanels.size(), "illegal index" ); +// +// // get the actual panel index, within the deck +// size_t nActualPanelIndex(0); +// for ( size_t i=0; i < i_nLogicalPanelIndex; ++i ) +// { +// if ( !m_aPanels[i].bHidden ) +// ++nActualPanelIndex; +// } +// if ( m_aPanels[ i_nLogicalPanelIndex ].bHidden ) +// { +// OSL_VERIFY( m_pPanelDeck->InsertPanel( m_aPanels[ i_nLogicalPanelIndex ].pPanel, nActualPanelIndex ) == nActualPanelIndex ); +// // if there has not been an active panel before, activate the newly inserted one +// ::boost::optional< size_t > aActivePanel( m_pPanelDeck->GetActivePanel() ); +// if ( !aActivePanel ) +// m_pPanelDeck->ActivatePanelResource( nActualPanelIndex ); +// } +// else +// { +// OSL_VERIFY( m_pPanelDeck->RemovePanel( nActualPanelIndex ).get() == m_aPanels[ i_nLogicalPanelIndex ].pPanel.get() ); +// } +// m_aPanels[ i_nLogicalPanelIndex ].bHidden = !m_aPanels[ i_nLogicalPanelIndex ].bHidden; + (void)i_nLogicalPanelIndex; } // --------------------------------------------------------------------------------------------------------------------- @@ -1179,28 +1036,28 @@ void ToolPanelViewShell_Impl::PanelRemoved( const size_t i_nPosition ) // --------------------------------------------------------------------------------------------------------------------- void ToolPanelViewShell_Impl::UpdateDockingWindowTitle() { - PaneDockingWindow* pDockingWindow = dynamic_cast< PaneDockingWindow* >( m_rPanelViewShell.GetDockingWindow() ); - ENSURE_OR_RETURN_VOID( pDockingWindow, "ToolPanelViewShell_Impl::UpdateDockingWindowTitle: no PaneDockingWindow!?" ); - - ::boost::optional< size_t > aActivePanel( m_pPanelDeck->GetActivePanel() ); - if ( !aActivePanel || ( GetLayout() == LAYOUT_DRAWERS ) ) - pDockingWindow->SetTitle( String( SdResId( STR_RIGHT_PANE_TITLE ) ) ); - else - { - size_t nNewActive( *aActivePanel ); - for ( size_t i=0; i < m_aPanels.size(); ++i ) - { - if ( m_aPanels[i].bHidden ) - continue; - - if ( !nNewActive ) - { - pDockingWindow->SetTitle( m_aPanels[i].pPanel->GetDisplayName() ); - break; - } - --nNewActive; - } - } +// PaneDockingWindow* pDockingWindow = dynamic_cast< PaneDockingWindow* >( m_rPanelViewShell.GetDockingWindow() ); +// ENSURE_OR_RETURN_VOID( pDockingWindow, "ToolPanelViewShell_Impl::UpdateDockingWindowTitle: no PaneDockingWindow!?" ); +// +// ::boost::optional< size_t > aActivePanel( m_pPanelDeck->GetActivePanel() ); +// if ( !aActivePanel || ( GetLayout() == LAYOUT_DRAWERS ) ) +// pDockingWindow->SetTitle( String( SdResId( STR_RIGHT_PANE_TITLE ) ) ); +// else +// { +// size_t nNewActive( *aActivePanel ); +// for ( size_t i=0; i < m_aPanels.size(); ++i ) +// { +// if ( m_aPanels[i].bHidden ) +// continue; +// +// if ( !nNewActive ) +// { +// pDockingWindow->SetTitle( m_aPanels[i].pPanel->GetDisplayName() ); +// break; +// } +// --nNewActive; +// } +// } } // --------------------------------------------------------------------------------------------------------------------- @@ -1230,9 +1087,11 @@ void ToolPanelViewShell_Impl::Dying() // --------------------------------------------------------------------------------------------------------------------- Reference< XAccessible > ToolPanelViewShell_Impl::CreateAccessible( ::sd::Window& i_rWindow ) { - ::Window* pAccessibleParent = i_rWindow.GetAccessibleParentWindow(); - m_pPanelDeck->SetAccessibleParentWindow( pAccessibleParent ); - return m_pPanelDeck->GetAccessible(); +// ::Window* pAccessibleParent = i_rWindow.GetAccessibleParentWindow(); +// m_pPanelDeck->SetAccessibleParentWindow( pAccessibleParent ); +// return m_pPanelDeck->GetAccessible(); + (void)i_rWindow; + return Reference< XAccessible >(); } // --------------------------------------------------------------------------------------------------------------------- diff --git a/sd/source/ui/toolpanel/makefile.mk b/sd/source/ui/toolpanel/makefile.mk index f9cd156855d0..a50355d18145 100644 --- a/sd/source/ui/toolpanel/makefile.mk +++ b/sd/source/ui/toolpanel/makefile.mk @@ -58,11 +58,10 @@ SLOFILES = \ $(SLO)$/TaskPaneFocusManager.obj \ $(SLO)$/TaskPaneShellManager.obj \ $(SLO)$/TaskPaneTreeNode.obj \ + $(SLO)$/ToolPanel.obj \ $(SLO)$/ToolPanelViewShell.obj \ - $(SLO)$/ToolPanelDeck.obj \ - $(SLO)$/TaskPaneToolPanel.obj \ - $(SLO)$/CustomToolPanel.obj \ - $(SLO)$/StandardToolPanel.obj \ + $(SLO)$/ToolPanelFactory.obj \ + $(SLO)$/ToolPanelUIElement.obj \ \ $(SLO)$/EmptyWindow.obj \ $(SLO)$/LayoutMenu.obj \ diff --git a/sd/source/ui/unoidl/facreg.cxx b/sd/source/ui/unoidl/facreg.cxx index 959f22e30cf1..4ce4590ff07d 100644 --- a/sd/source/ui/unoidl/facreg.cxx +++ b/sd/source/ui/unoidl/facreg.cxx @@ -145,6 +145,17 @@ extern uno::Sequence SAL_CALL PresentationFactoryProvider_getSupported } } +namespace sd { namespace toolpanel { + +extern uno::Reference SAL_CALL ToolPanelFactory_createInstance( + const uno::Reference& rxContext) + throw(uno::Exception); +extern OUString ToolPanelFactory_getImplementationName(void) throw (uno::RuntimeException); +extern uno::Sequence SAL_CALL ToolPanelFactory_getSupportedServiceNames (void) + throw (uno::RuntimeException); + +} } + namespace sd { namespace presenter { extern uno::Reference SAL_CALL SlideRenderer_createInstance( const uno::Reference& rxContext) @@ -202,6 +213,7 @@ using namespace ::sd; using namespace ::sd::framework; using namespace ::sd::presenter; using namespace ::sd::slidesorter; +using namespace ::sd::toolpanel; @@ -225,6 +237,7 @@ enum FactoryId BasicToolBarFactoryFactoryId, BasicViewFactoryFactoryId, TaskPanelFactoryFactoryId, + ToolPanelFactoryFactoryId, ResourceIdFactoryId, PresentationFactoryProviderFactoryId, SlideRendererFactoryId, @@ -256,6 +269,7 @@ static ::boost::shared_ptr spFactoryMap; (*spFactoryMap)[BasicToolBarFactory_getImplementationName()] = BasicToolBarFactoryFactoryId; (*spFactoryMap)[BasicViewFactory_getImplementationName()] = BasicViewFactoryFactoryId; (*spFactoryMap)[TaskPanelFactory_getImplementationName()] = TaskPanelFactoryFactoryId; + (*spFactoryMap)[ToolPanelFactory_getImplementationName()] = ToolPanelFactoryFactoryId; (*spFactoryMap)[ResourceId_getImplementationName()] = ResourceIdFactoryId; (*spFactoryMap)[PresentationFactoryProvider_getImplementationName()] = PresentationFactoryProviderFactoryId; (*spFactoryMap)[SlideRenderer_getImplementationName()] = SlideRendererFactoryId; @@ -336,6 +350,10 @@ SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( pKey, sd::framework::TaskPanelFactory_getImplementationName(), sd::framework::TaskPanelFactory_getSupportedServiceNames()); + writeInfo( + pKey, + sd::toolpanel::ToolPanelFactory_getImplementationName(), + sd::toolpanel::ToolPanelFactory_getSupportedServiceNames()); writeInfo( pKey, sd::framework::ResourceId_getImplementationName(), @@ -487,6 +505,13 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( sd::framework::TaskPanelFactory_getSupportedServiceNames()); break; + case ToolPanelFactoryFactoryId: + xComponentFactory = ::cppu::createSingleComponentFactory( + sd::toolpanel::ToolPanelFactory_createInstance, + sd::toolpanel::ToolPanelFactory_getImplementationName(), + sd::toolpanel::ToolPanelFactory_getSupportedServiceNames()); + break; + case ResourceIdFactoryId: xComponentFactory = ::cppu::createSingleComponentFactory( sd::framework::ResourceId_createInstance, diff --git a/sd/source/ui/view/drvwshrg.cxx b/sd/source/ui/view/drvwshrg.cxx index 5366c5c1668b..ce0e9f0be16f 100644 --- a/sd/source/ui/view/drvwshrg.cxx +++ b/sd/source/ui/view/drvwshrg.cxx @@ -83,6 +83,7 @@ SFX_IMPL_INTERFACE(DrawViewShell, SfxShell, SdResId(STR_DRAWVIEWSHELL)) { SFX_POPUPMENU_REGISTRATION( SdResId(RID_DRAW_TEXTOBJ_INSIDE_POPUP) ); SFX_CHILDWINDOW_CONTEXT_REGISTRATION( SID_NAVIGATOR ); + SFX_CHILDWINDOW_REGISTRATION( SID_TASKPANE ); SFX_CHILDWINDOW_REGISTRATION( SfxTemplateDialogWrapper::GetChildWindowId() ); SFX_CHILDWINDOW_REGISTRATION( SvxFontWorkChildWindow::GetChildWindowId() ); SFX_CHILDWINDOW_REGISTRATION( SvxColorChildWindow::GetChildWindowId() ); -- cgit From 99f33ef5a21b97f790b6a359a640111076174408 Mon Sep 17 00:00:00 2001 From: "Frank Schoenheit [fs]" Date: Tue, 13 Apr 2010 12:20:58 +0200 Subject: slidecopy: the custom toolpanel example in sd/workben/custompanel is superseded by the one in sfx2/workben/custompanel --- sd/prj/build.lst | 1 - sd/workben/custompanel/Impress.xcu | 34 ----- sd/workben/custompanel/colorpanel.map | 8 -- sd/workben/custompanel/ctp_factory.cxx | 195 -------------------------- sd/workben/custompanel/ctp_factory.hxx | 114 --------------- sd/workben/custompanel/ctp_panel.cxx | 239 -------------------------------- sd/workben/custompanel/ctp_panel.hxx | 98 ------------- sd/workben/custompanel/ctp_services.cxx | 92 ------------ sd/workben/custompanel/delzip | 0 sd/workben/custompanel/description.xml | 16 --- sd/workben/custompanel/makefile.mk | 93 ------------- sd/workben/custompanel/manifest.xml | 8 -- 12 files changed, 898 deletions(-) delete mode 100644 sd/workben/custompanel/Impress.xcu delete mode 100644 sd/workben/custompanel/colorpanel.map delete mode 100644 sd/workben/custompanel/ctp_factory.cxx delete mode 100644 sd/workben/custompanel/ctp_factory.hxx delete mode 100644 sd/workben/custompanel/ctp_panel.cxx delete mode 100644 sd/workben/custompanel/ctp_panel.hxx delete mode 100644 sd/workben/custompanel/ctp_services.cxx delete mode 100644 sd/workben/custompanel/delzip delete mode 100644 sd/workben/custompanel/description.xml delete mode 100644 sd/workben/custompanel/makefile.mk delete mode 100644 sd/workben/custompanel/manifest.xml (limited to 'sd') diff --git a/sd/prj/build.lst b/sd/prj/build.lst index 1b565ac71fb0..bc8bf923f7e5 100644 --- a/sd/prj/build.lst +++ b/sd/prj/build.lst @@ -44,4 +44,3 @@ sd sd\source\ui\framework\factories nmake - all sd_framework_factories sd sd sd\source\ui\framework\tools nmake - all sd_framework_tools sd_inc NULL sd sd\source\ui\annotations nmake - all sd_uiannotations sd_inc NULL sd sd\util nmake - all sd_util sd_app sd_cgm sd_core sd_dlg sd_docsh sd_eppt sd_filt sd_func sd_grf sd_unid sd_view sd_xml sd_html sd_ppt sd_accessibility sd_animations sd_toolpanel sd_toolpanel_controls sd_tools sd_slsshell sd_slsmodel sd_slsview sd_slscontroller sd_slscache sd_notes sd_table sd_slideshow sd_presenter sd_undo sd_helper sd_framework_configuration sd_framework_module sd_framework_tools sd_framework_factories sd_text sd_annotations sd_uiannotations NULL -sd sd\workben\custompanel nmake - all sd_workben_panel sd_inc NULL diff --git a/sd/workben/custompanel/Impress.xcu b/sd/workben/custompanel/Impress.xcu deleted file mode 100644 index 6f8ced4924f3..000000000000 --- a/sd/workben/custompanel/Impress.xcu +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - private:resource/toolpanel/SingleColorView - - - Single Color Panel - - - - - - - - - org.openoffice.example.colorpanel.ResourceFactory - - - - - private:resource/toolpanel/SingleColorView - - - - - - - - diff --git a/sd/workben/custompanel/colorpanel.map b/sd/workben/custompanel/colorpanel.map deleted file mode 100644 index f4ed78b9e970..000000000000 --- a/sd/workben/custompanel/colorpanel.map +++ /dev/null @@ -1,8 +0,0 @@ -UDK_3_0_0 { - global: - component_getImplementationEnvironment; - component_writeInfo; - component_getFactory; - local: - *; -}; diff --git a/sd/workben/custompanel/ctp_factory.cxx b/sd/workben/custompanel/ctp_factory.cxx deleted file mode 100644 index f63e487fdc3e..000000000000 --- a/sd/workben/custompanel/ctp_factory.cxx +++ /dev/null @@ -1,195 +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. - * -************************************************************************/ - -#include "precompiled_sd.hxx" - -#include "ctp_factory.hxx" -#include "ctp_panel.hxx" - -/** === begin UNO includes === **/ -#include -#include -#include -#include -/** === end UNO includes === **/ - -//...................................................................................................................... -namespace sd { namespace colortoolpanel -{ -//...................................................................................................................... - - /** === begin UNO using === **/ - using ::com::sun::star::uno::Reference; - using ::com::sun::star::uno::XInterface; - using ::com::sun::star::uno::UNO_QUERY; - using ::com::sun::star::uno::UNO_QUERY_THROW; - using ::com::sun::star::uno::UNO_SET_THROW; - using ::com::sun::star::uno::Exception; - using ::com::sun::star::uno::RuntimeException; - using ::com::sun::star::uno::Any; - using ::com::sun::star::uno::makeAny; - using ::com::sun::star::uno::Sequence; - using ::com::sun::star::uno::Type; - using ::com::sun::star::uno::XComponentContext; - using ::com::sun::star::drawing::framework::XResourceId; - using ::com::sun::star::drawing::framework::XResource; - using ::com::sun::star::lang::NotInitializedException; - using ::com::sun::star::lang::IllegalArgumentException; - using ::com::sun::star::drawing::framework::XResourceFactoryManager; - using ::com::sun::star::lang::WrappedTargetException; - using ::com::sun::star::lang::XComponent; - /** === end UNO using === **/ - - //================================================================================================================== - //= helper - //================================================================================================================== - namespace - { - const ::rtl::OUString& lcl_getSingleColorViewURL() - { - static ::rtl::OUString s_sSingleColorViewURL( RTL_CONSTASCII_USTRINGPARAM( "private:resource/toolpanel/SingleColorView" ) ); - return s_sSingleColorViewURL; - } - } - - //================================================================================================================== - //= ResourceFactory - //================================================================================================================== - //------------------------------------------------------------------------------------------------------------------ - ResourceFactory::ResourceFactory( const Reference< XComponentContext >& i_rContext ) - :m_xContext( i_rContext ) - { - } - - //------------------------------------------------------------------------------------------------------------------ - ResourceFactory::~ResourceFactory() - { - } - - //------------------------------------------------------------------------------------------------------------------ - Reference< XResource > SAL_CALL ResourceFactory::createResource( const Reference< XResourceId >& i_rResourceId ) throw (RuntimeException, IllegalArgumentException, WrappedTargetException) - { - FactoryGuard aGuard( *this ); - if ( !i_rResourceId.is() ) - throw IllegalArgumentException( ::rtl::OUString::createFromAscii( "illegal resource ID" ), *this, 1 ); - - const ::rtl::OUString sResourceURL( i_rResourceId->getResourceURL() ); - if ( sResourceURL != lcl_getSingleColorViewURL() ) - throw IllegalArgumentException( ::rtl::OUString::createFromAscii( "unsupported resource URL" ), *this, 1 ); - - return new SingleColorPanel( m_xContext, m_xControllerManager->getConfigurationController(), i_rResourceId ); - } - - //------------------------------------------------------------------------------------------------------------------ - void SAL_CALL ResourceFactory::releaseResource( const Reference< XResource >& i_rResource ) throw (RuntimeException) - { - FactoryGuard aGuard( *this ); - - // here, we could decide to actually not destroy the resource, but cache it. In this case, we would need - // to re-parent the VCL window to another, temporary window, or *at least* hide it. - - // However, for the simplicity of this example, we will simply dispose the component here, which will destroy - // all associated resources, including the VCL window. - Reference< XComponent > xComponent( i_rResource, UNO_QUERY_THROW ); - xComponent->dispose(); - } - - //------------------------------------------------------------------------------------------------------------------ - ::rtl::OUString SAL_CALL ResourceFactory::getImplementationName( ) throw (RuntimeException) - { - return getImplementationName_static(); - } - - //------------------------------------------------------------------------------------------------------------------ - ::rtl::OUString SAL_CALL ResourceFactory::getImplementationName_static( ) throw (RuntimeException) - { - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "org.openoffice.comp.example.colorpanel.ResourceFactory" ) ); - } - - //------------------------------------------------------------------------------------------------------------------ - ::sal_Bool SAL_CALL ResourceFactory::supportsService( const ::rtl::OUString& i_rServiceName ) throw (RuntimeException) - { - const Sequence< ::rtl::OUString > aServiceNames( getSupportedServiceNames() ); - for ( const ::rtl::OUString* serviceName = aServiceNames.getConstArray(); - serviceName != aServiceNames.getConstArray() + aServiceNames.getLength(); - ++serviceName - ) - { - if ( i_rServiceName == *serviceName ) - return sal_True; - } - return sal_False; - } - - //------------------------------------------------------------------------------------------------------------------ - Sequence< ::rtl::OUString > SAL_CALL ResourceFactory::getSupportedServiceNames() throw (RuntimeException) - { - return getSupportedServiceNames_static(); - } - - //------------------------------------------------------------------------------------------------------------------ - Sequence< ::rtl::OUString > SAL_CALL ResourceFactory::getSupportedServiceNames_static() throw (RuntimeException) - { - Sequence< ::rtl::OUString > aServiceNames(1); - aServiceNames[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "org.openoffice.example.colorpanel.ResourceFactory" ) ); - return aServiceNames; - } - - //------------------------------------------------------------------------------------------------------------------ - Reference< XInterface > SAL_CALL ResourceFactory::Create( const Reference< XComponentContext >& i_rContext ) throw (RuntimeException) - { - return *( new ResourceFactory( i_rContext ) ); - } - - //------------------------------------------------------------------------------------------------------------------ - void ResourceFactory::checkInitialized( GuardAccess ) const - { - if ( !m_xControllerManager.is() ) - throw NotInitializedException( ::rtl::OUString(), *const_cast< ResourceFactory* >( this ) ); - } - - //------------------------------------------------------------------------------------------------------------------ - void ResourceFactory::checkDisposed( GuardAccess ) const - { - // cannot be disposed currently ... - } - - //------------------------------------------------------------------------------------------------------------------ - void SAL_CALL ResourceFactory::initialize( const Sequence< Any >& i_rArguments ) throw (Exception, RuntimeException) - { - if ( !i_rArguments.getLength() ) - throw IllegalArgumentException(); - - FactoryGuard aGuard( *this, false ); - m_xControllerManager.set( i_rArguments[0], UNO_QUERY_THROW ); - - Reference< XResourceFactoryManager > xFactoryManager( m_xControllerManager->getConfigurationController(), UNO_QUERY_THROW ); - xFactoryManager->addResourceFactory( lcl_getSingleColorViewURL(), this ); - } - -//...................................................................................................................... -} } // namespace sd::colortoolpanel -//...................................................................................................................... diff --git a/sd/workben/custompanel/ctp_factory.hxx b/sd/workben/custompanel/ctp_factory.hxx deleted file mode 100644 index ab6cb3f6a9db..000000000000 --- a/sd/workben/custompanel/ctp_factory.hxx +++ /dev/null @@ -1,114 +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_WORKBENCH_CTP_FACTORY_HXX -#define SD_WORKBENCH_CTP_FACTORY_HXX - -/** === begin UNO includes === **/ -#include -#include -#include -#include -#include -/** === end UNO includes === **/ - -#include -#include - -//...................................................................................................................... -namespace sd { namespace colortoolpanel -{ -//...................................................................................................................... - - class FactoryGuard; - - //================================================================================================================== - //= ResourceFactory - //================================================================================================================== - typedef ::cppu::WeakImplHelper3 < ::com::sun::star::drawing::framework::XResourceFactory - , ::com::sun::star::lang::XServiceInfo - , ::com::sun::star::lang::XInitialization - > ResourceFactory_Base; - class ResourceFactory :public ::cppu::BaseMutex - ,public ResourceFactory_Base - { - public: - ResourceFactory( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& i_rContext - ); - ~ResourceFactory(); - - // XResourceFactory - virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::framework::XResource > SAL_CALL createResource( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::framework::XResourceId >& xResourceId ) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException); - virtual void SAL_CALL releaseResource( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::framework::XResource >& xResource ) 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); - - // XServiceInfo - static versions - static ::rtl::OUString SAL_CALL getImplementationName_static( ) throw (::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames_static( ) throw (::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& i_rContext ) throw (::com::sun::star::uno::RuntimeException); - - // XInitialization - virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); - - public: - struct GuardAccess { friend class FactoryGuard; private: GuardAccess() { } }; - - void checkInitialized( GuardAccess ) const; - void checkDisposed( GuardAccess ) const; - ::osl::Mutex& getMutex( GuardAccess ) { return m_aMutex; } - - private: - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > - m_xContext; - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::framework::XControllerManager > - m_xControllerManager; - }; - - class FactoryGuard - { - public: - FactoryGuard( ResourceFactory& i_rFactory, const bool i_bNeedInit = true ) - :m_aGuard( i_rFactory.getMutex( ResourceFactory::GuardAccess() ) ) - { - i_rFactory.checkDisposed( ResourceFactory::GuardAccess() ); - if ( i_bNeedInit ) - i_rFactory.checkInitialized( ResourceFactory::GuardAccess() ); - } - - protected: - ::osl::MutexGuard m_aGuard; - }; - -//...................................................................................................................... -} } // namespace sd::colortoolpanel -//...................................................................................................................... - -#endif // SD_WORKBENCH_CTP_FACTORY_HXX diff --git a/sd/workben/custompanel/ctp_panel.cxx b/sd/workben/custompanel/ctp_panel.cxx deleted file mode 100644 index 7fb8ed8aeabe..000000000000 --- a/sd/workben/custompanel/ctp_panel.cxx +++ /dev/null @@ -1,239 +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. - * -************************************************************************/ - -#include "precompiled_sd.hxx" - -#include "ctp_panel.hxx" - -/** === begin UNO includes === **/ -#include -#include -#include -#include -#include -#include -#include -#include -#include -/** === end UNO includes === **/ - -#include - -//...................................................................................................................... -namespace sd { namespace colortoolpanel -{ -//...................................................................................................................... - - /** === begin UNO using === **/ - using ::com::sun::star::uno::Reference; - using ::com::sun::star::uno::XInterface; - using ::com::sun::star::uno::UNO_QUERY; - using ::com::sun::star::uno::UNO_QUERY_THROW; - using ::com::sun::star::uno::UNO_SET_THROW; - using ::com::sun::star::uno::Exception; - using ::com::sun::star::uno::RuntimeException; - using ::com::sun::star::uno::Any; - using ::com::sun::star::uno::makeAny; - using ::com::sun::star::uno::Sequence; - using ::com::sun::star::uno::Type; - using ::com::sun::star::drawing::framework::XConfigurationController; - using ::com::sun::star::drawing::framework::XResourceId; - using ::com::sun::star::uno::XComponentContext; - using ::com::sun::star::drawing::framework::XPane; - using ::com::sun::star::awt::XWindow; - using ::com::sun::star::rendering::XCanvas; - using ::com::sun::star::lang::DisposedException; - using ::com::sun::star::awt::XWindowPeer; - using ::com::sun::star::lang::XMultiComponentFactory; - using ::com::sun::star::awt::XToolkit; - using ::com::sun::star::awt::WindowDescriptor; - using ::com::sun::star::awt::WindowClass_SIMPLE; - using ::com::sun::star::awt::Rectangle; - using ::com::sun::star::awt::PaintEvent; - using ::com::sun::star::lang::EventObject; - using ::com::sun::star::awt::XDevice; - using ::com::sun::star::awt::XGraphics; - /** === end UNO using === **/ - namespace WindowAttribute = ::com::sun::star::awt::WindowAttribute; - namespace PosSize = ::com::sun::star::awt::PosSize; - - //================================================================================================================== - //= helpers - //================================================================================================================== - namespace - { - Reference< XWindow > lcl_createPlainWindow_nothrow( const Reference< XComponentContext >& i_rContext, - const Reference< XWindowPeer >& i_rParentWindow ) - { - try - { - ENSURE_OR_THROW( i_rContext.is(), "illegal component context" ); - Reference< XMultiComponentFactory > xFactory( i_rContext->getServiceManager(), UNO_SET_THROW ); - Reference< XToolkit > xToolkit( xFactory->createInstanceWithContext( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.Toolkit" ) ), - i_rContext - ), UNO_QUERY_THROW ); - - WindowDescriptor aWindow; - aWindow.Type = WindowClass_SIMPLE; - aWindow.WindowServiceName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "window" ) ); - aWindow.Parent = i_rParentWindow; - aWindow.WindowAttributes = WindowAttribute::BORDER; - - Reference< XWindowPeer > xWindow( xToolkit->createWindow( aWindow ), UNO_SET_THROW ); - return Reference< XWindow >( xWindow, UNO_QUERY_THROW ); - } - catch( const Exception& ) - { - DBG_UNHANDLED_EXCEPTION(); - } - return NULL; - } - } - //================================================================================================================== - //= class SingleColorPanel - //================================================================================================================== - //------------------------------------------------------------------------------------------------------------------ - SingleColorPanel::SingleColorPanel( const Reference< XComponentContext >& i_rContext, - const Reference< XConfigurationController >& i_rConfigController, const Reference< XResourceId >& i_rResourceId ) - :SingleColorPanel_Base( m_aMutex ) - ,m_xContext( i_rContext ) - ,m_xResourceId( i_rResourceId ) - ,m_xWindow() - { - ENSURE_OR_THROW( i_rConfigController.is(), "invalid configuration controller" ); - ENSURE_OR_THROW( m_xResourceId.is(), "invalid resource id" ); - - // retrieve the parent window for our to-be-created pane window - Reference< XWindow > xParentWindow; - Reference< XWindowPeer > xParentPeer; - try - { - Reference< XResource > xAnchor( i_rConfigController->getResource( m_xResourceId->getAnchor() ), UNO_SET_THROW ); - Reference< XPane > xAnchorPane( xAnchor, UNO_QUERY_THROW ); - xParentWindow.set( xAnchorPane->getWindow(), UNO_SET_THROW ); - xParentPeer.set( xParentWindow, UNO_QUERY_THROW ); - } - catch( const Exception& ) - { - DBG_UNHANDLED_EXCEPTION(); - } - osl_incrementInterlockedCount( &m_refCount ); - if ( xParentWindow.is() ) - { - m_xWindow = lcl_createPlainWindow_nothrow( m_xContext, xParentPeer ); - m_xWindow->addPaintListener( this ); - if ( m_xWindow.is() ) - { - const Rectangle aPanelAnchorSize( xParentWindow->getPosSize() ); - m_xWindow->setPosSize( 0, 0, aPanelAnchorSize.Width, aPanelAnchorSize.Height, PosSize::POSSIZE ); - m_xWindow->setVisible( sal_True ); - } - } - osl_decrementInterlockedCount( &m_refCount ); - } - - //------------------------------------------------------------------------------------------------------------------ - SingleColorPanel::~SingleColorPanel() - { - } - - //------------------------------------------------------------------------------------------------------------------ - Reference< XWindow > SAL_CALL SingleColorPanel::getWindow( ) throw (RuntimeException) - { - ::osl::MutexGuard aGuard( m_aMutex ); - if ( !m_xWindow.get() ) - throw DisposedException( ::rtl::OUString(), *this ); - return m_xWindow; - } - - //------------------------------------------------------------------------------------------------------------------ - Reference< XResourceId > SAL_CALL SingleColorPanel::getResourceId( ) throw (RuntimeException) - { - ::osl::MutexGuard aGuard( m_aMutex ); - if ( !m_xWindow.is() ) - throw DisposedException( ::rtl::OUString(), *this ); - return m_xResourceId; - } - - //------------------------------------------------------------------------------------------------------------------ - ::sal_Bool SAL_CALL SingleColorPanel::isAnchorOnly( ) throw (RuntimeException) - { - ::osl::MutexGuard aGuard( m_aMutex ); - if ( !m_xWindow.is() ) - throw DisposedException( ::rtl::OUString(), *this ); - return sal_False; - } - - //------------------------------------------------------------------------------------------------------------------ - void SAL_CALL SingleColorPanel::windowPaint( const PaintEvent& i_rEvent ) throw (RuntimeException) - { - try - { - const Reference< XDevice > xDevice( i_rEvent.Source, UNO_QUERY_THROW ); - const Reference< XGraphics > xGraphics( xDevice->createGraphics(), UNO_SET_THROW ); - xGraphics->setFillColor( 0x80 << 8 ); - xGraphics->setLineColor( 0x80 << 16 ); - - const Reference< XWindow > xWindow( i_rEvent.Source, UNO_QUERY_THROW ); - const Rectangle aWindowRect( xWindow->getPosSize() ); - xGraphics->drawRect( 0, 0, aWindowRect.Width - 1, aWindowRect.Height - 1 ); - } - catch( const Exception& ) - { - DBG_UNHANDLED_EXCEPTION(); - } - } - - //------------------------------------------------------------------------------------------------------------------ - void SAL_CALL SingleColorPanel::disposing( const EventObject& i_rSource ) throw (RuntimeException) - { - (void)i_rSource; - } - - //------------------------------------------------------------------------------------------------------------------ - void SAL_CALL SingleColorPanel::disposing() - { - ::osl::MutexGuard aGuard( m_aMutex ); - if ( !m_xWindow.is() ) - // already disposed - return; - m_xWindow->removePaintListener( this ); - try - { - Reference< XComponent > xWindowComp( m_xWindow, UNO_QUERY_THROW ); - xWindowComp->dispose(); - } - catch( const Exception& ) - { - DBG_UNHANDLED_EXCEPTION(); - } - m_xWindow.clear(); - } - -//...................................................................................................................... -} } // namespace sd::colortoolpanel -//...................................................................................................................... diff --git a/sd/workben/custompanel/ctp_panel.hxx b/sd/workben/custompanel/ctp_panel.hxx deleted file mode 100644 index b42f17e67aae..000000000000 --- a/sd/workben/custompanel/ctp_panel.hxx +++ /dev/null @@ -1,98 +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_WORKBENCH_CTP_PANEL_HXX -#define SD_WORKBENCH_CTP_PANEL_HXX - -/** === begin UNO includes === **/ -#include -#include -#include -#include -#include -#include -/** === end UNO includes === **/ - -#include -#include - -#include - -//...................................................................................................................... -namespace sd { namespace colortoolpanel -{ -//...................................................................................................................... - - //================================================================================================================== - //= class SingleColorPanel - //================================================================================================================== - typedef ::cppu::WeakComponentImplHelper3 < ::com::sun::star::drawing::framework::XView - , ::com::sun::star::ui::XToolPanel - , ::com::sun::star::awt::XPaintListener - > SingleColorPanel_Base; - class SingleColorPanel :public ::cppu::BaseMutex - ,public SingleColorPanel_Base - { - public: - SingleColorPanel( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& i_rContext, - const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::framework::XConfigurationController >& i_rConfigController, - const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::framework::XResourceId >& i_rResourceId - ); - - // XToolPanel - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > SAL_CALL getWindow( ) throw (::com::sun::star::uno::RuntimeException); - - // XView - // (no methods) - - // XResource - virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::framework::XResourceId > SAL_CALL getResourceId( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL isAnchorOnly( ) throw (::com::sun::star::uno::RuntimeException); - - // XPaintListener - virtual void SAL_CALL windowPaint( const ::com::sun::star::awt::PaintEvent& e ) throw (::com::sun::star::uno::RuntimeException); - - // XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException); - - // XComponent equivalents - virtual void SAL_CALL disposing(); - - protected: - ~SingleColorPanel(); - - private: - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::framework::XResourceId > m_xResourceId; - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > m_xWindow; - }; - -//...................................................................................................................... -} } // namespace sd::colortoolpanel -//...................................................................................................................... - -#endif // SD_WORKBENCH_CTP_PANEL_HXX diff --git a/sd/workben/custompanel/ctp_services.cxx b/sd/workben/custompanel/ctp_services.cxx deleted file mode 100644 index 67fd5af14c7b..000000000000 --- a/sd/workben/custompanel/ctp_services.cxx +++ /dev/null @@ -1,92 +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. - * -************************************************************************/ - -#include "precompiled_sd.hxx" - -#include "ctp_factory.hxx" - -/** === begin UNO includes === **/ -/** === end UNO includes === **/ - -#include - -//...................................................................................................................... -namespace sd { namespace colortoolpanel -{ -//...................................................................................................................... - - /** === begin UNO using === **/ - using ::com::sun::star::uno::Reference; - using ::com::sun::star::uno::XInterface; - using ::com::sun::star::uno::UNO_QUERY; - using ::com::sun::star::uno::UNO_QUERY_THROW; - using ::com::sun::star::uno::UNO_SET_THROW; - using ::com::sun::star::uno::Exception; - using ::com::sun::star::uno::RuntimeException; - using ::com::sun::star::uno::Any; - using ::com::sun::star::uno::makeAny; - using ::com::sun::star::uno::Sequence; - using ::com::sun::star::uno::Type; - /** === end UNO using === **/ - - //================================================================================================================== - //= descriptors for the services implemented in this component - //================================================================================================================== - static struct ::cppu::ImplementationEntry s_aServiceEntries[] = - { - { - ResourceFactory::Create, - ResourceFactory::getImplementationName_static, - ResourceFactory::getSupportedServiceNames_static, - ::cppu::createSingleComponentFactory, NULL, 0 - }, - { 0, 0, 0, 0, 0, 0 } - }; - -//...................................................................................................................... -} } // namespace sd::colortoolpanel -//...................................................................................................................... - -extern "C" -{ - //------------------------------------------------------------------------------------------------------------------ - void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** ) - { - *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; - } - - //------------------------------------------------------------------------------------------------------------------ - sal_Bool SAL_CALL component_writeInfo( void * pServiceManager, void * pRegistryKey ) - { - return ::cppu::component_writeInfoHelper( pServiceManager, pRegistryKey, ::sd::colortoolpanel::s_aServiceEntries ); - } - - //------------------------------------------------------------------------------------------------------------------ - void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) - { - return ::cppu::component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey , ::sd::colortoolpanel::s_aServiceEntries ); - } -} diff --git a/sd/workben/custompanel/delzip b/sd/workben/custompanel/delzip deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/sd/workben/custompanel/description.xml b/sd/workben/custompanel/description.xml deleted file mode 100644 index a1dbdf4f125d..000000000000 --- a/sd/workben/custompanel/description.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - Custom Tool Panel Example - - - - - diff --git a/sd/workben/custompanel/makefile.mk b/sd/workben/custompanel/makefile.mk deleted file mode 100644 index 6df3190892f8..000000000000 --- a/sd/workben/custompanel/makefile.mk +++ /dev/null @@ -1,93 +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. -# -#************************************************************************* - -PRJ=../.. -PRJNAME=sd - -TARGET=colorpanel -ENABLE_EXCEPTIONS=TRUE -LIBTARGET=NO -EXTENSIONNAME:=colored-tool-panel - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -#------------------------------------------------------------------- - -#---- extension version -EXTENSION_VERSION_BASE=0.1 -.IF ( "$(CWS_WORK_STAMP)" == "" ) || ( "$(UPDATER)" == "YES" ) - EXTENSION_VERSION=$(EXTENSION_VERSION_BASE) -.ELSE - EXTENSION_VERSION=$(EXTENSION_VERSION_BASE).cws.$(CWS_WORK_STAMP) -.ENDIF - -#---- extension title package name -EXTENSION_TITLE=Custom Tool Panel Example -EXTENSION_ZIPNAME=$(EXTENSIONNAME)-$(EXTENSION_VERSION_BASE)-$(RTL_OS:l)-$(RTL_ARCH:l) - -#-------------------------------------------------- - -SHL1DLLPRE= -SHL1TARGET=$(TARGET).uno -LIB1TARGET=$(SLB)/$(SHL1TARGET).lib -LIB1OBJFILES= \ - $(SLO)/ctp_factory.obj \ - $(SLO)/ctp_services.obj \ - $(SLO)/ctp_panel.obj - -SHL1STDLIBS= \ - $(CPPULIB) \ - $(SALLIB) \ - $(SALHELPERLIB) \ - $(CPPUHELPERLIB) - -SHL1VERSIONMAP=$(TARGET).map -SHL1LIBS= $(LIB1TARGET) -SHL1DEF= $(MISC)/$(SHL1TARGET).def -SHL1RPATH= OXT -DEF1NAME= $(SHL1TARGET) - -# create Extension ----------------------------- - -COMPONENT_CONFIGDEST=. - -COMPONENT_XCU = \ - $(EXTENSIONDIR)/Impress.xcu - -COMPONENT_LIBRARIES = \ - $(EXTENSIONDIR)$/$(SHL1TARGET)$(DLLPOST) - -# ........ dependencies for packaging the extension ........ -EXTENSION_PACKDEPS=makefile.mk - -# --- Targets ------------------------------------------------------ -.INCLUDE : extension_pre.mk -.INCLUDE : target.mk -.INCLUDE : extension_post.mk - diff --git a/sd/workben/custompanel/manifest.xml b/sd/workben/custompanel/manifest.xml deleted file mode 100644 index 96f62afe4e27..000000000000 --- a/sd/workben/custompanel/manifest.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - -- cgit From 8af9df5ec78b808a4aa7d1288639fbc621f09917 Mon Sep 17 00:00:00 2001 From: "Frank Schoenheit [fs]" Date: Tue, 13 Apr 2010 12:50:50 +0200 Subject: slidecopy: Impress does not support the SID_TASKPANE slot, the task pane is available via SID_RIGHT_PANE --- sd/source/ui/view/drvwshrg.cxx | 1 - 1 file changed, 1 deletion(-) (limited to 'sd') diff --git a/sd/source/ui/view/drvwshrg.cxx b/sd/source/ui/view/drvwshrg.cxx index ce0e9f0be16f..5366c5c1668b 100644 --- a/sd/source/ui/view/drvwshrg.cxx +++ b/sd/source/ui/view/drvwshrg.cxx @@ -83,7 +83,6 @@ SFX_IMPL_INTERFACE(DrawViewShell, SfxShell, SdResId(STR_DRAWVIEWSHELL)) { SFX_POPUPMENU_REGISTRATION( SdResId(RID_DRAW_TEXTOBJ_INSIDE_POPUP) ); SFX_CHILDWINDOW_CONTEXT_REGISTRATION( SID_NAVIGATOR ); - SFX_CHILDWINDOW_REGISTRATION( SID_TASKPANE ); SFX_CHILDWINDOW_REGISTRATION( SfxTemplateDialogWrapper::GetChildWindowId() ); SFX_CHILDWINDOW_REGISTRATION( SvxFontWorkChildWindow::GetChildWindowId() ); SFX_CHILDWINDOW_REGISTRATION( SvxColorChildWindow::GetChildWindowId() ); -- 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/dlg/PaneDockingWindow.cxx | 13 - sd/source/ui/inc/PaneDockingWindow.hxx | 10 - sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx | 12 - sd/source/ui/toolpanel/ToolPanelViewShell.cxx | 380 ++--------------------- 4 files changed, 22 insertions(+), 393 deletions(-) (limited to 'sd') diff --git a/sd/source/ui/dlg/PaneDockingWindow.cxx b/sd/source/ui/dlg/PaneDockingWindow.cxx index 6d20090f21a7..e8bd9941879a 100644 --- a/sd/source/ui/dlg/PaneDockingWindow.cxx +++ b/sd/source/ui/dlg/PaneDockingWindow.cxx @@ -81,17 +81,4 @@ void PaneDockingWindow::StateChanged( StateChangedType nType ) SfxDockingWindow::StateChanged (nType); } -void PaneDockingWindow::EndDocking( const Rectangle& rRect, BOOL bFloatMode ) -{ - SfxDockingWindow::EndDocking( rRect, bFloatMode ); - - if ( maEndDockingHdl.IsSet() ) - maEndDockingHdl.Call( this ); -} - -void PaneDockingWindow::ResetToolBox() -{ - impl_resetToolBox(); -} - } // end of namespace ::sd 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. diff --git a/sd/source/ui/toolpanel/ToolPanelViewShell.cxx b/sd/source/ui/toolpanel/ToolPanelViewShell.cxx index 99d130096e27..2cf0399f1da8 100755 --- a/sd/source/ui/toolpanel/ToolPanelViewShell.cxx +++ b/sd/source/ui/toolpanel/ToolPanelViewShell.cxx @@ -127,33 +127,6 @@ using ::sd::framework::FrameworkHelper; namespace sd { namespace toolpanel { -// ===================================================================================================================== -// = PanelDescriptor -// ===================================================================================================================== -/** is a helper class for ToolPanelViewShell_Impl, holding the details about a single panel which is not - contained in the IToolPanel implementation itself. -*/ -struct PanelDescriptor -{ - PanelId nId; - ::svt::PToolPanel pPanel; - bool bHidden; - - PanelDescriptor() - :nId( PID_UNKNOWN ) - ,pPanel() - ,bHidden( false ) - { - } - - PanelDescriptor( const PanelId i_nPanelId, const ::svt::PToolPanel& i_rPanel ) - :nId( i_nPanelId ) - ,pPanel( i_rPanel ) - ,bHidden( false ) - { - } -}; - // ===================================================================================================================== // = PanelSelectorLayout // ===================================================================================================================== @@ -205,7 +178,7 @@ private: // ===================================================================================================================== /** Inner implementation class of ToolPanelViewShell. */ -class ToolPanelViewShell_Impl : public ::svt::IToolPanelDeckListener +class ToolPanelViewShell_Impl : public ::boost::noncopyable { public: static const size_t mnInvalidId = static_cast< size_t >( -1 ); @@ -223,15 +196,6 @@ public: */ void Cleanup(); - /** sets the given layout for the panel selector - */ - void SetLayout( const PanelSelectorLayout i_eLayout, const bool i_bForce = false ); - - /** returns the current layout - */ - PanelSelectorLayout - GetLayout() const { return m_eCurrentLayout; } - /** activates the panel which has the given resource URL */ void ActivatePanelByResource( const ::rtl::OUString& i_rPanelResourceURL ); @@ -250,22 +214,12 @@ public: ::svt::ToolPanelDeck& GetToolPanelDeck() { return GetTaskPane().GetPanelDeck(); } const ::svt::ToolPanelDeck& GetToolPanelDeck() const { return GetTaskPane().GetPanelDeck(); } - void TogglePanelVisibility( const size_t i_nLogicalPanelIndex ); - Reference< XAccessible > CreateAccessible( ::sd::Window& i_rWindow ); -protected: - // IToolPanelDeckListener overridables - virtual void PanelInserted( const ::svt::PToolPanel& i_pPanel, const size_t i_nPosition ); - virtual void PanelRemoved( const size_t i_nPosition ); - virtual void ActivePanelChanged( const ::boost::optional< size_t >& i_rOldActive, const ::boost::optional< size_t >& i_rNewActive ); - virtual void LayouterChanged( const ::svt::PDeckLayouter& i_rNewLayouter ); - virtual void Dying(); + void ConnectToDockingWindow(); private: - void UpdateDockingWindowTitle(); - struct InitialPanel { ::rtl::OUString sPanelResourceURL; @@ -278,10 +232,9 @@ private: }; InitialPanel DetermineInitialPanel(); - typedef ::std::vector< PanelDescriptor > PanelDescriptors; ToolPanelViewShell& m_rPanelViewShell; ::boost::scoped_ptr< ::sfx2::ModuleTaskPane > m_pTaskPane; - //::boost::scoped_ptr< ToolPanelDeck > m_pPanelDeck; + ::std::auto_ptr< ::sfx2::TaskPaneController > m_pTaskPaneController; ::rtl::Reference< ConfigurationListener > m_pConfigListener; PanelSelectorLayout m_eCurrentLayout; bool m_bInitialized; @@ -354,22 +307,6 @@ void ConfigurationListener::dispose() m_pShellImpl = NULL; } -// ===================================================================================================================== -// = helpers -// ===================================================================================================================== -// --------------------------------------------------------------------------------------------------------------------- -namespace { - -enum MenuId { - MID_UNLOCK_TASK_PANEL = 1, - MID_LOCK_TASK_PANEL = 2, - MID_LAYOUT_TABS = 3, - MID_LAYOUT_DRAWERS = 4, - MID_FIRST_PANEL = 5 -}; - -} // end of anonymouse namespace - // ===================================================================================================================== // = ToolPanelViewShell // ===================================================================================================================== @@ -442,67 +379,21 @@ void ToolPanelViewShell_Impl::Setup() } } -// // add as listener to the panel deck -// m_pPanelDeck->AddListener( *this ); - - // initialize panel selector - SetLayout( LAYOUT_DRAWERS, true ); - // listen at the configuration m_pConfigListener.set( new ConfigurationListener( *this ) ); m_pTaskPane->Show(); } -// --------------------------------------------------------------------------------------------------------------------- -void ToolPanelViewShell_Impl::SetLayout( const PanelSelectorLayout i_eLayout, const bool i_bForce ) -{ - if ( !i_bForce && ( m_eCurrentLayout == i_eLayout ) ) - return; - -// switch ( i_eLayout ) -// { -// case LAYOUT_DRAWERS: -// m_pPanelDeck->SetDrawersLayout(); -// break; -// case LAYOUT_TABS_TOP: -// m_pPanelDeck->SetTabsLayout( ::svt::TABS_TOP, ::svt::TABITEM_IMAGE_ONLY ); -// break; -// case LAYOUT_TABS_BOTTOM: -// m_pPanelDeck->SetTabsLayout( ::svt::TABS_BOTTOM, ::svt::TABITEM_IMAGE_ONLY ); -// break; -// case LAYOUT_TABS_LEFT: -// m_pPanelDeck->SetTabsLayout( ::svt::TABS_LEFT, ::svt::TABITEM_IMAGE_ONLY ); -// break; -// case LAYOUT_TABS_RIGHT: -// m_pPanelDeck->SetTabsLayout( ::svt::TABS_RIGHT, ::svt::TABITEM_IMAGE_ONLY ); -// break; -// } - m_eCurrentLayout = i_eLayout; - UpdateDockingWindowTitle(); -} - // --------------------------------------------------------------------------------------------------------------------- void ToolPanelViewShell_Impl::Cleanup() { if ( m_bInitialized ) { -// m_pPanelDeck->RemoveListener( *this ); -// // remove the panels which are not under the control of the panel deck currently -// for ( PanelDescriptors::iterator panelPos = m_aPanels.begin(); -// panelPos != m_aPanels.end(); -// ++panelPos -// ) -// { -// if ( panelPos->bHidden ) -// panelPos->pPanel->Dispose(); -// } -// m_aPanels.clear(); -// -// if ( m_pConfigListener.is() ) -// m_pConfigListener->dispose(); + if ( m_pConfigListener.is() ) + m_pConfigListener->dispose(); } -// m_pPanelDeck.reset(); + m_pTaskPaneController.reset(); m_pTaskPane.reset(); } @@ -553,7 +444,7 @@ ToolPanelViewShell::ToolPanelViewShell( SfxViewFrame* pFrame, ViewShellBase& rVi GetParentWindow()->SetHelpId(HID_SD_TASK_PANE); - ConnectToDockingWindow(); + mpImpl->ConnectToDockingWindow(); SetPool( &GetDoc()->GetPool() ); @@ -666,138 +557,6 @@ namespace } } -// --------------------------------------------------------------------------------------------------------------------- -IMPL_LINK( ToolPanelViewShell, DockingChanged, PaneDockingWindow*, i_pDockingWindow ) -{ - ENSURE_OR_RETURN( i_pDockingWindow == dynamic_cast< PaneDockingWindow* >( GetDockingWindow() ), "unknown source", 0 ); - - if ( mpImpl->GetLayout() == LAYOUT_DRAWERS ) - return 0L; - - mpImpl->SetLayout( lcl_getTabLayoutFromAlignment( i_pDockingWindow->GetAlignment() ) ); - return 0L; -} - -// --------------------------------------------------------------------------------------------------------------------- -IMPL_LINK(ToolPanelViewShell, ToolboxClickHandler, ToolBox*, pToolBox) -{ - if (pToolBox->GetCurItemId() == mnMenuId) - { - pToolBox->EndSelection(); - - DockingWindow* pDockingWindow = GetDockingWindow(); - ::std::auto_ptr pMenu = CreatePopupMenu ( - pDockingWindow!=NULL && !pDockingWindow->IsFloatingMode()); - pMenu->SetSelectHdl ( - LINK(this, ToolPanelViewShell, MenuSelectHandler)); - - // pass toolbox button rect so the menu can stay open on button up - Rectangle aRect = pToolBox->GetItemRect(mnMenuId); - aRect.SetPos(pToolBox->GetPosPixel() ); - pMenu->Execute (pDockingWindow, aRect, POPUPMENU_EXECUTE_DOWN); - } - - return 0; -} - -// --------------------------------------------------------------------------------------------------------------------- -IMPL_LINK(ToolPanelViewShell, MenuSelectHandler, Menu*, pMenu) -{ - if (pMenu) - { - pMenu->Deactivate(); - switch (pMenu->GetCurItemId()) - { - case MID_UNLOCK_TASK_PANEL: - { - DockingWindow* pDockingWindow = GetDockingWindow(); - if (pDockingWindow != NULL) - pDockingWindow->SetFloatingMode (TRUE); - } - break; - - case MID_LOCK_TASK_PANEL: - { - DockingWindow* pDockingWindow = GetDockingWindow(); - if (pDockingWindow != NULL) - pDockingWindow->SetFloatingMode (FALSE); - } - break; - - case MID_LAYOUT_DRAWERS: - mpImpl->SetLayout( LAYOUT_DRAWERS ); - break; - - case MID_LAYOUT_TABS: - { - PaneDockingWindow* pDockingWindow = dynamic_cast< PaneDockingWindow* >( GetDockingWindow() ); - OSL_ENSURE( pDockingWindow != NULL, "ToolPanelViewShell::MenuSelectHandler: unknown docking window type!" ); - if ( pDockingWindow ) - mpImpl->SetLayout( lcl_getTabLayoutFromAlignment( pDockingWindow->GetAlignment() ) ); - } - break; - - default: - { - size_t nPanelIndex = size_t( pMenu->GetCurItemId() - MID_FIRST_PANEL ); - mpImpl->TogglePanelVisibility( nPanelIndex ); - } - break; - } - } - - return 0; -} - -// --------------------------------------------------------------------------------------------------------------------- -::std::auto_ptr ToolPanelViewShell::CreatePopupMenu ( - bool bIsDocking) -{ - ::std::auto_ptr pMenu (new PopupMenu ()); - FloatingWindow* pFloat = static_cast(pMenu->GetWindow()); - if (pFloat != NULL) - { - pFloat->SetPopupModeFlags ( - pFloat->GetPopupModeFlags() - | FLOATWIN_POPUPMODE_NOMOUSEUPCLOSE); - } - - // Add one entry for every tool panel element to individually make - // them visible or hide them. - USHORT nIndex = MID_FIRST_PANEL; -// for ( size_t i=0; iGetPanelCount(); ++i, ++nIndex ) -// { -// const PanelDescriptor& rPanelDesc( mpImpl->GetPanel(i) ); -// pMenu->InsertItem( nIndex, rPanelDesc.pPanel->GetDisplayName(), MIB_CHECKABLE ); -// pMenu->SetUserValue( nIndex, rPanelDesc.nId ); -// pMenu->CheckItem( nIndex, !rPanelDesc.bHidden ); -// } -// pMenu->InsertSeparator(); - -#if OSL_DEBUG_LEVEL > 0 - pMenu->InsertItem( MID_LAYOUT_TABS, String::CreateFromAscii( "Tab-Layout (exp.)" ), MIB_CHECKABLE ); - pMenu->CheckItem( MID_LAYOUT_TABS, mpImpl->GetLayout() != LAYOUT_DRAWERS ); - pMenu->InsertItem( MID_LAYOUT_DRAWERS, String::CreateFromAscii( "Drawer-Layout" ), MIB_CHECKABLE ); - pMenu->CheckItem( MID_LAYOUT_DRAWERS, mpImpl->GetLayout() == LAYOUT_DRAWERS ); - - pMenu->InsertSeparator(); -#endif - - // Add entry for docking or un-docking the tool panel. - if (bIsDocking) - pMenu->InsertItem ( - MID_UNLOCK_TASK_PANEL, - String(SdResId(STR_TASKPANEL_MASTER_PAGE_MENU_UNLOCK))); - else - pMenu->InsertItem ( - MID_LOCK_TASK_PANEL, - String(SdResId(STR_TASKPANEL_MASTER_PAGE_MENU_LOCK))); - - pMenu->RemoveDisabledEntries (FALSE, FALSE); - - return pMenu; -} - // --------------------------------------------------------------------------------------------------------------------- SdPage* ToolPanelViewShell::GetActualPage() { @@ -856,27 +615,6 @@ Reference< XDrawSubController > ToolPanelViewShell::CreateSubController() return Reference< XDrawSubController >(); } -// --------------------------------------------------------------------------------------------------------------------- -void ToolPanelViewShell::ConnectToDockingWindow() -{ - PaneDockingWindow* pDockingWindow = dynamic_cast(GetDockingWindow()); - if (pDockingWindow != NULL) - { - pDockingWindow->ResetToolBox(); - mnMenuId = pDockingWindow->AddDropDownToolBoxItem ( - String(SdResId(STR_TASKPANEL_MASTER_PAGE_MENU_TITLE)), - HID_SD_TASK_PANE_VIEW_MENU, - LINK(this, ToolPanelViewShell, ToolboxClickHandler)); - - // be notified when the docking position of the window changes - pDockingWindow->SetEndDockingHdl( LINK( this, ToolPanelViewShell, DockingChanged ) ); - } - - // Tell the focus manager that we want to pass the focus to our - // child. - FocusManager::Instance().RegisterDownLink( GetParentWindow(), &mpImpl->GetTaskPane() ); -} - // --------------------------------------------------------------------------------------------------------------------- bool ToolPanelViewShell::RelocateToParentWindow( ::Window* pParentWindow ) { @@ -892,7 +630,7 @@ bool ToolPanelViewShell::RelocateToParentWindow( ::Window* pParentWindow ) ViewShell::RelocateToParentWindow(pParentWindow); - ConnectToDockingWindow(); + mpImpl->ConnectToDockingWindow(); Resize(); @@ -992,96 +730,21 @@ ToolPanelViewShell_Impl::~ToolPanelViewShell_Impl() } // --------------------------------------------------------------------------------------------------------------------- -void ToolPanelViewShell_Impl::TogglePanelVisibility( const size_t i_nLogicalPanelIndex ) +void ToolPanelViewShell_Impl::ConnectToDockingWindow() { - OSL_ENSURE( false, "ToolPanelViewShell_Impl::TogglePanelVisibility: not yet re-implemented!" ); -// ENSURE_OR_RETURN_VOID( i_nLogicalPanelIndex < m_aPanels.size(), "illegal index" ); -// -// // get the actual panel index, within the deck -// size_t nActualPanelIndex(0); -// for ( size_t i=0; i < i_nLogicalPanelIndex; ++i ) -// { -// if ( !m_aPanels[i].bHidden ) -// ++nActualPanelIndex; -// } -// if ( m_aPanels[ i_nLogicalPanelIndex ].bHidden ) -// { -// OSL_VERIFY( m_pPanelDeck->InsertPanel( m_aPanels[ i_nLogicalPanelIndex ].pPanel, nActualPanelIndex ) == nActualPanelIndex ); -// // if there has not been an active panel before, activate the newly inserted one -// ::boost::optional< size_t > aActivePanel( m_pPanelDeck->GetActivePanel() ); -// if ( !aActivePanel ) -// m_pPanelDeck->ActivatePanelResource( nActualPanelIndex ); -// } -// else -// { -// OSL_VERIFY( m_pPanelDeck->RemovePanel( nActualPanelIndex ).get() == m_aPanels[ i_nLogicalPanelIndex ].pPanel.get() ); -// } -// m_aPanels[ i_nLogicalPanelIndex ].bHidden = !m_aPanels[ i_nLogicalPanelIndex ].bHidden; - (void)i_nLogicalPanelIndex; -} - -// --------------------------------------------------------------------------------------------------------------------- -void ToolPanelViewShell_Impl::PanelInserted( const ::svt::PToolPanel& i_pPanel, const size_t i_nPosition ) -{ - (void)i_pPanel; - (void)i_nPosition; -} - -// --------------------------------------------------------------------------------------------------------------------- -void ToolPanelViewShell_Impl::PanelRemoved( const size_t i_nPosition ) -{ - (void)i_nPosition; -} - -// --------------------------------------------------------------------------------------------------------------------- -void ToolPanelViewShell_Impl::UpdateDockingWindowTitle() -{ -// PaneDockingWindow* pDockingWindow = dynamic_cast< PaneDockingWindow* >( m_rPanelViewShell.GetDockingWindow() ); -// ENSURE_OR_RETURN_VOID( pDockingWindow, "ToolPanelViewShell_Impl::UpdateDockingWindowTitle: no PaneDockingWindow!?" ); -// -// ::boost::optional< size_t > aActivePanel( m_pPanelDeck->GetActivePanel() ); -// if ( !aActivePanel || ( GetLayout() == LAYOUT_DRAWERS ) ) -// pDockingWindow->SetTitle( String( SdResId( STR_RIGHT_PANE_TITLE ) ) ); -// else -// { -// size_t nNewActive( *aActivePanel ); -// for ( size_t i=0; i < m_aPanels.size(); ++i ) -// { -// if ( m_aPanels[i].bHidden ) -// continue; -// -// if ( !nNewActive ) -// { -// pDockingWindow->SetTitle( m_aPanels[i].pPanel->GetDisplayName() ); -// break; -// } -// --nNewActive; -// } -// } -} - -// --------------------------------------------------------------------------------------------------------------------- -void ToolPanelViewShell_Impl::ActivePanelChanged( const ::boost::optional< size_t >& i_rOldActive, const ::boost::optional< size_t >& i_rNewActive ) -{ - if ( GetLayout() == LAYOUT_DRAWERS ) - // no adjustment of the title when we use the classical "drawers" layout - return; - - UpdateDockingWindowTitle( ); - (void)i_rOldActive; - (void)i_rNewActive; -} - -// --------------------------------------------------------------------------------------------------------------------- -void ToolPanelViewShell_Impl::LayouterChanged( const ::svt::PDeckLayouter& i_rNewLayouter ) -{ - // not interested in - (void)i_rNewLayouter; -} + m_pTaskPaneController.reset(); + DockingWindow* pDockingWindow( GetAntiImpl().GetDockingWindow() ); + if ( pDockingWindow ) + { + PaneDockingWindow* pPaneDockingWindow = dynamic_cast< PaneDockingWindow* >( pDockingWindow ); + OSL_ENSURE( pPaneDockingWindow, "ToolPanelViewShell_Impl::ConnectToDockingWindow: unsupported docking window type!" ); + if ( pPaneDockingWindow != NULL ) + m_pTaskPaneController.reset( new ::sfx2::TaskPaneController( GetTaskPane(), *pPaneDockingWindow ) ); + } -// --------------------------------------------------------------------------------------------------------------------- -void ToolPanelViewShell_Impl::Dying() -{ + // Tell the focus manager that we want to pass the focus to our + // child. + FocusManager::Instance().RegisterDownLink( GetAntiImpl().GetParentWindow(), &GetTaskPane() ); } // --------------------------------------------------------------------------------------------------------------------- @@ -1090,6 +753,7 @@ Reference< XAccessible > ToolPanelViewShell_Impl::CreateAccessible( ::sd::Window // ::Window* pAccessibleParent = i_rWindow.GetAccessibleParentWindow(); // m_pPanelDeck->SetAccessibleParentWindow( pAccessibleParent ); // return m_pPanelDeck->GetAccessible(); + // TODO: re-implement this (void)i_rWindow; return Reference< XAccessible >(); } -- 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') 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 18ea7f6a93f93b333f3588879733d53f69b0c2f0 Mon Sep 17 00:00:00 2001 From: "Frank Schoenheit [fs]" Date: Wed, 14 Apr 2010 13:31:04 +0200 Subject: slidecopy: when a panel is de/activated, let the drawing framework know of the change --- sd/source/ui/toolpanel/ToolPanelViewShell.cxx | 68 +++++++++++++++++++++++++-- 1 file changed, 63 insertions(+), 5 deletions(-) (limited to 'sd') diff --git a/sd/source/ui/toolpanel/ToolPanelViewShell.cxx b/sd/source/ui/toolpanel/ToolPanelViewShell.cxx index 2cf0399f1da8..fcdf130e27a0 100755 --- a/sd/source/ui/toolpanel/ToolPanelViewShell.cxx +++ b/sd/source/ui/toolpanel/ToolPanelViewShell.cxx @@ -178,7 +178,8 @@ private: // ===================================================================================================================== /** Inner implementation class of ToolPanelViewShell. */ -class ToolPanelViewShell_Impl : public ::boost::noncopyable +class ToolPanelViewShell_Impl :public ::boost::noncopyable + ,public ::svt::IToolPanelDeckListener { public: static const size_t mnInvalidId = static_cast< size_t >( -1 ); @@ -219,6 +220,14 @@ public: void ConnectToDockingWindow(); +private: + // IToolPanelDeckListener overridables + virtual void PanelInserted( const ::svt::PToolPanel& i_pPanel, const size_t i_nPosition ); + virtual void PanelRemoved( const size_t i_nPosition ); + virtual void ActivePanelChanged( const ::boost::optional< size_t >& i_rOldActive, const ::boost::optional< size_t >& i_rNewActive ); + virtual void LayouterChanged( const ::svt::PDeckLayouter& i_rNewLayouter ); + virtual void Dying(); + private: struct InitialPanel { @@ -372,10 +381,7 @@ void ToolPanelViewShell_Impl::Setup() else { ::boost::shared_ptr< FrameworkHelper > pFrameworkHelper( FrameworkHelper::Instance( GetAntiImpl().GetViewShellBase() ) ); - const Reference< XResourceId > xToolPanelId( pFrameworkHelper->CreateResourceId( - FrameworkHelper::msTaskPaneURL, FrameworkHelper::msRightPaneURL, aInitialPanel.sPanelResourceURL ) ); - pFrameworkHelper->GetConfigurationController()->requestResourceActivation( - xToolPanelId, ResourceActivationMode_REPLACE ); + pFrameworkHelper->RequestTaskPanel( aInitialPanel.sPanelResourceURL ); } } @@ -393,6 +399,7 @@ void ToolPanelViewShell_Impl::Cleanup() if ( m_pConfigListener.is() ) m_pConfigListener->dispose(); } + GetToolPanelDeck().RemoveListener( *this ); m_pTaskPaneController.reset(); m_pTaskPane.reset(); } @@ -722,6 +729,8 @@ ToolPanelViewShell_Impl::ToolPanelViewShell_Impl( ToolPanelViewShell& i_rPanelVi const String sPaneTitle( SdResId( STR_RIGHT_PANE_TITLE ) ); GetToolPanelDeck().SetAccessibleName( sPaneTitle ); GetToolPanelDeck().SetAccessibleDescription( sPaneTitle ); + + GetToolPanelDeck().AddListener( *this ); } // --------------------------------------------------------------------------------------------------------------------- @@ -729,6 +738,55 @@ ToolPanelViewShell_Impl::~ToolPanelViewShell_Impl() { } +// --------------------------------------------------------------------------------------------------------------------- +void ToolPanelViewShell_Impl::PanelInserted( const ::svt::PToolPanel& i_pPanel, const size_t i_nPosition ) +{ + // not interested in + (void)i_pPanel; + (void)i_nPosition; +} + +// --------------------------------------------------------------------------------------------------------------------- +void ToolPanelViewShell_Impl::PanelRemoved( const size_t i_nPosition ) +{ + // not interested in + (void)i_nPosition; +} + +// --------------------------------------------------------------------------------------------------------------------- +void ToolPanelViewShell_Impl::ActivePanelChanged( const ::boost::optional< size_t >& i_rOldActive, const ::boost::optional< size_t >& i_rNewActive ) +{ + (void)i_rOldActive; + + ::rtl::OUString sPanelURL; + if ( !!i_rNewActive ) + { + sPanelURL = GetTaskPane().GetPanelResourceURL( *i_rNewActive ); + const PanelId ePanelId( GetStandardPanelId( sPanelURL ) ); + if ( ePanelId == PID_UNKNOWN ) + sPanelURL = ::rtl::OUString(); + } + + if ( sPanelURL.getLength() ) + { + ::boost::shared_ptr< FrameworkHelper > pFrameworkHelper( FrameworkHelper::Instance( GetAntiImpl().GetViewShellBase() ) ); + pFrameworkHelper->RequestTaskPanel( sPanelURL ); + } +} + +// --------------------------------------------------------------------------------------------------------------------- +void ToolPanelViewShell_Impl::LayouterChanged( const ::svt::PDeckLayouter& i_rNewLayouter ) +{ + // not interested in + (void)i_rNewLayouter; +} + +// --------------------------------------------------------------------------------------------------------------------- +void ToolPanelViewShell_Impl::Dying() +{ + // not interested in +} + // --------------------------------------------------------------------------------------------------------------------- void ToolPanelViewShell_Impl::ConnectToDockingWindow() { -- cgit From 8555dec9b440d58f4bc19fc088679a827e2870b5 Mon Sep 17 00:00:00 2001 From: "Frank Schoenheit [fs]" Date: Wed, 14 Apr 2010 14:30:00 +0200 Subject: slidecopy: re-implement CreateAccessible, and fix ActivePanelChanged --- sd/source/ui/toolpanel/ToolPanelViewShell.cxx | 175 ++++++++++++++------------ 1 file changed, 98 insertions(+), 77 deletions(-) (limited to 'sd') diff --git a/sd/source/ui/toolpanel/ToolPanelViewShell.cxx b/sd/source/ui/toolpanel/ToolPanelViewShell.cxx index fcdf130e27a0..336ef3b6622c 100755 --- a/sd/source/ui/toolpanel/ToolPanelViewShell.cxx +++ b/sd/source/ui/toolpanel/ToolPanelViewShell.cxx @@ -83,6 +83,7 @@ #include #include #include +#include #include #include #include @@ -128,16 +129,46 @@ using ::sd::framework::FrameworkHelper; namespace sd { namespace toolpanel { // ===================================================================================================================== -// = PanelSelectorLayout +// = misc helper // ===================================================================================================================== -enum PanelSelectorLayout +// --------------------------------------------------------------------------------------------------------------------- +PanelId GetStandardPanelId( const ::rtl::OUString& i_rTaskPanelResourceURL, const bool i_bIgnoreUnknown ) { - LAYOUT_DRAWERS, - LAYOUT_TABS_RIGHT, - LAYOUT_TABS_LEFT, - LAYOUT_TABS_TOP, - LAYOUT_TABS_BOTTOM -}; + PanelId ePanelId( PID_UNKNOWN ); + + if ( i_rTaskPanelResourceURL.equals( FrameworkHelper::msMasterPagesTaskPanelURL ) ) + { + ePanelId = PID_MASTER_PAGES; + } + else if ( i_rTaskPanelResourceURL.equals( FrameworkHelper::msLayoutTaskPanelURL ) ) + { + ePanelId = PID_LAYOUT; + } + else if ( i_rTaskPanelResourceURL.equals( FrameworkHelper::msTableDesignPanelURL ) ) + { + ePanelId = PID_TABLE_DESIGN; + } + else if ( i_rTaskPanelResourceURL.equals( FrameworkHelper::msCustomAnimationTaskPanelURL ) ) + { + ePanelId = PID_CUSTOM_ANIMATION; + } + else if ( i_rTaskPanelResourceURL.equals( FrameworkHelper::msSlideTransitionTaskPanelURL ) ) + { + ePanelId = PID_SLIDE_TRANSITION; + } + else + { + OSL_ENSURE( i_bIgnoreUnknown, "GetStandardPanelId: cannot translate the given resource URL!" ); + } + + return ePanelId; +} + +// --------------------------------------------------------------------------------------------------------------------- +PanelId GetStandardPanelId( const ::rtl::OUString& i_rTaskPanelResourceURL ) +{ + return GetStandardPanelId( i_rTaskPanelResourceURL, false ); +} // ===================================================================================================================== // = ConfigurationListener - declaration @@ -239,13 +270,14 @@ private: { } }; - InitialPanel DetermineInitialPanel(); + InitialPanel impl_determineInitialPanel(); + ::rtl::OUString impl_getPanelURL( const ::boost::optional< size_t >& i_rPanel ); +private: ToolPanelViewShell& m_rPanelViewShell; ::boost::scoped_ptr< ::sfx2::ModuleTaskPane > m_pTaskPane; ::std::auto_ptr< ::sfx2::TaskPaneController > m_pTaskPaneController; ::rtl::Reference< ConfigurationListener > m_pConfigListener; - PanelSelectorLayout m_eCurrentLayout; bool m_bInitialized; }; @@ -328,7 +360,7 @@ SFX_IMPL_INTERFACE(ToolPanelViewShell, SfxShell, SdResId(STR_TASKPANEVIEWSHELL)) TYPEINIT1(ToolPanelViewShell, ViewShell); // --------------------------------------------------------------------------------------------------------------------- -ToolPanelViewShell_Impl::InitialPanel ToolPanelViewShell_Impl::DetermineInitialPanel() +ToolPanelViewShell_Impl::InitialPanel ToolPanelViewShell_Impl::impl_determineInitialPanel() { // Default to Layout panel, but check whether the requested configuration already contains a tool panel, in this case, // use that one. @@ -371,7 +403,7 @@ void ToolPanelViewShell_Impl::Setup() m_bInitialized = true; // initially activate a panel - const InitialPanel aInitialPanel = DetermineInitialPanel(); + const InitialPanel aInitialPanel = impl_determineInitialPanel(); if ( aInitialPanel.sPanelResourceURL.getLength() ) { if ( aInitialPanel.bActivateDirectly ) @@ -545,25 +577,6 @@ void ToolPanelViewShell::KeyInput( const KeyEvent& i_rKeyEvent ) ViewShell::KeyInput( i_rKeyEvent, NULL ); } -// --------------------------------------------------------------------------------------------------------------------- -namespace -{ - PanelSelectorLayout lcl_getTabLayoutFromAlignment( const SfxChildAlignment i_eAlignment ) - { - switch ( i_eAlignment ) - { - case SFX_ALIGN_LEFT: - return LAYOUT_TABS_LEFT; - case SFX_ALIGN_TOP: - return LAYOUT_TABS_TOP; - case SFX_ALIGN_BOTTOM: - return LAYOUT_TABS_BOTTOM; - default: - return LAYOUT_TABS_RIGHT; - } - } -} - // --------------------------------------------------------------------------------------------------------------------- SdPage* ToolPanelViewShell::GetActualPage() { @@ -723,7 +736,6 @@ void ToolPanelViewShell::DeactivatePanel( const ::rtl::OUString& i_rPanelResourc ToolPanelViewShell_Impl::ToolPanelViewShell_Impl( ToolPanelViewShell& i_rPanelViewShell, ::Window& i_rPanelDeckParent ) :m_rPanelViewShell( i_rPanelViewShell ) ,m_pTaskPane( new ::sfx2::ModuleTaskPane( i_rPanelDeckParent, i_rPanelViewShell.GetViewShellBase().GetViewFrame()->GetFrame()->GetFrameInterface() ) ) - ,m_eCurrentLayout( LAYOUT_DRAWERS ) ,m_bInitialized( false ) { const String sPaneTitle( SdResId( STR_RIGHT_PANE_TITLE ) ); @@ -754,23 +766,54 @@ void ToolPanelViewShell_Impl::PanelRemoved( const size_t i_nPosition ) } // --------------------------------------------------------------------------------------------------------------------- -void ToolPanelViewShell_Impl::ActivePanelChanged( const ::boost::optional< size_t >& i_rOldActive, const ::boost::optional< size_t >& i_rNewActive ) +::rtl::OUString ToolPanelViewShell_Impl::impl_getPanelURL( const ::boost::optional< size_t >& i_rPanel ) { - (void)i_rOldActive; - ::rtl::OUString sPanelURL; - if ( !!i_rNewActive ) + if ( !!i_rPanel ) { - sPanelURL = GetTaskPane().GetPanelResourceURL( *i_rNewActive ); - const PanelId ePanelId( GetStandardPanelId( sPanelURL ) ); + sPanelURL = GetTaskPane().GetPanelResourceURL( *i_rPanel ); + const PanelId ePanelId( GetStandardPanelId( sPanelURL, true ) ); if ( ePanelId == PID_UNKNOWN ) sPanelURL = ::rtl::OUString(); } + return sPanelURL; +} + +// --------------------------------------------------------------------------------------------------------------------- +void ToolPanelViewShell_Impl::ActivePanelChanged( const ::boost::optional< size_t >& i_rOldActive, const ::boost::optional< size_t >& i_rNewActive ) +{ + // update the configuration controller, since this change in the active panel might have been triggered by means other + // than the drawing framework, so it does not yet know about it. + + const ::rtl::OUString sOldPanelURL( impl_getPanelURL( i_rOldActive ) ); + const ::rtl::OUString sNewPanelURL( impl_getPanelURL( i_rNewActive ) ); - if ( sPanelURL.getLength() ) + const ::boost::shared_ptr< FrameworkHelper > pFrameworkHelper( FrameworkHelper::Instance( GetAntiImpl().GetViewShellBase() ) ); + if ( sNewPanelURL.getLength() ) { - ::boost::shared_ptr< FrameworkHelper > pFrameworkHelper( FrameworkHelper::Instance( GetAntiImpl().GetViewShellBase() ) ); - pFrameworkHelper->RequestTaskPanel( sPanelURL ); + // activate the resource belonging to the new panel. This will automatically de-activate the previously active + // panel resource (since ResourceActivationMode_REPLACE is used) + pFrameworkHelper->RequestTaskPanel( sNewPanelURL ); + } + else if ( sOldPanelURL.getLength() ) + { + // there is no new active panel, or it is not one of our standard panels, i.e. it is not covered by the + // resource framework. => Deactivate the old resource. + try + { + Reference< XConfigurationController > xConfigController( pFrameworkHelper->GetConfigurationController(), UNO_QUERY_THROW ); + xConfigController->requestResourceDeactivation( + pFrameworkHelper->CreateResourceId( + sOldPanelURL, + FrameworkHelper::msTaskPaneURL, + FrameworkHelper::msRightPaneURL + ) + ); + } + catch( const Exception& ) + { + DBG_UNHANDLED_EXCEPTION(); + } } } @@ -808,45 +851,23 @@ void ToolPanelViewShell_Impl::ConnectToDockingWindow() // --------------------------------------------------------------------------------------------------------------------- Reference< XAccessible > ToolPanelViewShell_Impl::CreateAccessible( ::sd::Window& i_rWindow ) { -// ::Window* pAccessibleParent = i_rWindow.GetAccessibleParentWindow(); -// m_pPanelDeck->SetAccessibleParentWindow( pAccessibleParent ); -// return m_pPanelDeck->GetAccessible(); - // TODO: re-implement this - (void)i_rWindow; - return Reference< XAccessible >(); -} + Reference< XAccessible > xAccessibleParent; + ::Window* pAccessibleParent = i_rWindow.GetAccessibleParentWindow(); + if ( pAccessibleParent ) + xAccessibleParent.set( pAccessibleParent->GetAccessible() ); -// --------------------------------------------------------------------------------------------------------------------- -PanelId GetStandardPanelId( const ::rtl::OUString& i_rTaskPanelResourceURL ) -{ - PanelId ePanelId( PID_UNKNOWN ); - - if ( i_rTaskPanelResourceURL.equals( FrameworkHelper::msMasterPagesTaskPanelURL ) ) + Reference< XAccessible > xAccessible( GetToolPanelDeck().GetAccessible( FALSE ) ); + if ( !xAccessible.is() ) { - ePanelId = PID_MASTER_PAGES; - } - else if ( i_rTaskPanelResourceURL.equals( FrameworkHelper::msLayoutTaskPanelURL ) ) - { - ePanelId = PID_LAYOUT; - } - else if ( i_rTaskPanelResourceURL.equals( FrameworkHelper::msTableDesignPanelURL ) ) - { - ePanelId = PID_TABLE_DESIGN; - } - else if ( i_rTaskPanelResourceURL.equals( FrameworkHelper::msCustomAnimationTaskPanelURL ) ) - { - ePanelId = PID_CUSTOM_ANIMATION; - } - else if ( i_rTaskPanelResourceURL.equals( FrameworkHelper::msSlideTransitionTaskPanelURL ) ) - { - ePanelId = PID_SLIDE_TRANSITION; - } - else - { - OSL_ENSURE( false, "GetStandardPanelId: cannot translate the given resource URL!" ); + xAccessible = GetToolPanelDeck().GetAccessible( TRUE ); + ENSURE_OR_RETURN( xAccessible.is(), "ToolPanelViewShell_Impl::CreateAccessible: illegal ToolPanelDeck accessible!", NULL ); + if ( xAccessibleParent.is() ) + { + ::comphelper::OAccessibleImplementationAccess::setAccessibleParent( + xAccessible->getAccessibleContext(), xAccessibleParent ); + } } - - return ePanelId; + return xAccessible; } } } // end of namespace ::sd::toolpanel -- 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 +++++++------ sd/source/ui/toolpanel/ToolPanelViewShell.cxx | 18 +++++++++++++++++- 2 files changed, 24 insertions(+), 7 deletions(-) (limited to 'sd') 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 ); diff --git a/sd/source/ui/toolpanel/ToolPanelViewShell.cxx b/sd/source/ui/toolpanel/ToolPanelViewShell.cxx index 336ef3b6622c..204559043647 100755 --- a/sd/source/ui/toolpanel/ToolPanelViewShell.cxx +++ b/sd/source/ui/toolpanel/ToolPanelViewShell.cxx @@ -211,6 +211,7 @@ private: */ class ToolPanelViewShell_Impl :public ::boost::noncopyable ,public ::svt::IToolPanelDeckListener + ,public ::sfx2::IToolPanelCompare { public: static const size_t mnInvalidId = static_cast< size_t >( -1 ); @@ -259,6 +260,9 @@ private: virtual void LayouterChanged( const ::svt::PDeckLayouter& i_rNewLayouter ); virtual void Dying(); + // IToolPanelCompare overridables + virtual short compareToolPanelsURLs( const ::rtl::OUString& i_rLHS, const ::rtl::OUString& i_rRHS ) const; + private: struct InitialPanel { @@ -735,7 +739,7 @@ void ToolPanelViewShell::DeactivatePanel( const ::rtl::OUString& i_rPanelResourc // --------------------------------------------------------------------------------------------------------------------- ToolPanelViewShell_Impl::ToolPanelViewShell_Impl( ToolPanelViewShell& i_rPanelViewShell, ::Window& i_rPanelDeckParent ) :m_rPanelViewShell( i_rPanelViewShell ) - ,m_pTaskPane( new ::sfx2::ModuleTaskPane( i_rPanelDeckParent, i_rPanelViewShell.GetViewShellBase().GetViewFrame()->GetFrame()->GetFrameInterface() ) ) + ,m_pTaskPane( new ::sfx2::ModuleTaskPane( i_rPanelDeckParent, i_rPanelViewShell.GetViewShellBase().GetViewFrame()->GetFrame()->GetFrameInterface(), *this ) ) ,m_bInitialized( false ) { const String sPaneTitle( SdResId( STR_RIGHT_PANE_TITLE ) ); @@ -830,6 +834,18 @@ void ToolPanelViewShell_Impl::Dying() // not interested in } +// --------------------------------------------------------------------------------------------------------------------- +short ToolPanelViewShell_Impl::compareToolPanelsURLs( const ::rtl::OUString& i_rLHS, const ::rtl::OUString& i_rRHS ) const +{ + const PanelId eLHS( GetStandardPanelId( i_rLHS, true ) ); + const PanelId eRHS( GetStandardPanelId( i_rRHS, true ) ); + if ( eLHS < eRHS ) + return -1; + if ( eLHS == eRHS ) + return 0; + return 1; +} + // --------------------------------------------------------------------------------------------------------------------- void ToolPanelViewShell_Impl::ConnectToDockingWindow() { -- cgit From 240aa1eda8e6750fc100e8353e1a7d0f94ac9f73 Mon Sep 17 00:00:00 2001 From: "Frank Schoenheit [fs]" Date: Wed, 14 Apr 2010 21:05:33 +0200 Subject: slidecopy: post-rebase problems --- sd/source/ui/toolpanel/ToolPanelViewShell.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sd') diff --git a/sd/source/ui/toolpanel/ToolPanelViewShell.cxx b/sd/source/ui/toolpanel/ToolPanelViewShell.cxx index 204559043647..26cb270950f3 100755 --- a/sd/source/ui/toolpanel/ToolPanelViewShell.cxx +++ b/sd/source/ui/toolpanel/ToolPanelViewShell.cxx @@ -739,7 +739,7 @@ void ToolPanelViewShell::DeactivatePanel( const ::rtl::OUString& i_rPanelResourc // --------------------------------------------------------------------------------------------------------------------- ToolPanelViewShell_Impl::ToolPanelViewShell_Impl( ToolPanelViewShell& i_rPanelViewShell, ::Window& i_rPanelDeckParent ) :m_rPanelViewShell( i_rPanelViewShell ) - ,m_pTaskPane( new ::sfx2::ModuleTaskPane( i_rPanelDeckParent, i_rPanelViewShell.GetViewShellBase().GetViewFrame()->GetFrame()->GetFrameInterface(), *this ) ) + ,m_pTaskPane( new ::sfx2::ModuleTaskPane( i_rPanelDeckParent, i_rPanelViewShell.GetViewShellBase().GetViewFrame()->GetFrame().GetFrameInterface(), *this ) ) ,m_bInitialized( false ) { const String sPaneTitle( SdResId( STR_RIGHT_PANE_TITLE ) ); -- cgit From bcd227d5f32bfe3ccc181c463be8eb5c528c43a9 Mon Sep 17 00:00:00 2001 From: Christian Lippka Date: Thu, 15 Apr 2010 13:02:34 +0200 Subject: fixed assign layout to not override hide background --- sd/source/ui/view/ViewShellImplementation.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sd') diff --git a/sd/source/ui/view/ViewShellImplementation.cxx b/sd/source/ui/view/ViewShellImplementation.cxx index a5975b9f6ffa..09d4a127d526 100755 --- a/sd/source/ui/view/ViewShellImplementation.cxx +++ b/sd/source/ui/view/ViewShellImplementation.cxx @@ -355,7 +355,7 @@ void ViewShell::Implementation::AssignLayout ( SfxRequest& rRequest, PageKind eP if( pPage->GetPageKind() == PK_HANDOUT ) aVisibleLayers.SetAll(); else - pPage->TRG_GetMasterPageVisibleLayers(); + aVisibleLayers = pPage->TRG_GetMasterPageVisibleLayers(); SfxRequest aRequest (mrViewShell.GetViewShellBase().GetViewFrame(), SID_MODIFYPAGE); aRequest.AppendItem(SfxStringItem (ID_VAL_PAGENAME, pPage->GetName())); -- 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 +- sd/source/ui/view/viewoverlaymanager.cxx | 183 +++++++++++++++++++-------- 2 files changed, 129 insertions(+), 58 deletions(-) (limited to 'sd') 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(); diff --git a/sd/source/ui/view/viewoverlaymanager.cxx b/sd/source/ui/view/viewoverlaymanager.cxx index a3b667217bc9..cbe5582fbadd 100755 --- a/sd/source/ui/view/viewoverlaymanager.cxx +++ b/sd/source/ui/view/viewoverlaymanager.cxx @@ -78,28 +78,20 @@ class ImageButtonHdl; // -------------------------------------------------------------------- -Image ViewOverlayManager::maSmallButtonImages[BMP_PLACEHOLDER_SMALL_END - BMP_PLACEHOLDER_SMALL_START]; -Image ViewOverlayManager::maLargeButtonImages[BMP_PLACEHOLDER_LARGE_END - BMP_PLACEHOLDER_LARGE_START]; +BitmapEx ViewOverlayManager::maSmallButtonImages[BMP_PLACEHOLDER_SMALL_END - BMP_PLACEHOLDER_SMALL_START]; +BitmapEx ViewOverlayManager::maLargeButtonImages[BMP_PLACEHOLDER_LARGE_END - BMP_PLACEHOLDER_LARGE_START]; static USHORT gButtonSlots[] = { SID_INSERT_TABLE, SID_INSERT_DIAGRAM, SID_INSERT_GRAPHIC, SID_INSERT_AVMEDIA }; +static const sal_Char* gSlotStr[] = { ".uno:InsertTable", ".uno:InsertObjectChart", ".uno:InsertGraphic", ".uno:InsertVideo" }; // -------------------------------------------------------------------- -static Image loadImageResource( USHORT nId ) +static BitmapEx loadImageResource( USHORT nId ) { - /* - OUString sURL( OUString( RTL_CONSTASCII_USTRINGPARAM( "private:resource/sd/bitmap/" ) ) ); - sURL += OUString::valueOf( (sal_Int32)nId ); - - BitmapEx aBmpEx; - vcl::ImageRepository::loadImage( sURL, aBmpEx, false ); - return Image( aBmpEx ); - */ - SdResId aResId( nId ); aResId.SetRT( RSC_BITMAP ); - return Image( BitmapEx( aResId ) ); + return BitmapEx( aResId ); } // -------------------------------------------------------------------- @@ -122,6 +114,8 @@ public: /** returns true if the SmartTag consumes this event. */ virtual bool RequestHelp( const HelpEvent& rHEvt ); + BitmapEx createOverlayImage( int nHighlight = -1 ); + protected: virtual void addCustomHandles( SdrHdlList& rHandlerList ); virtual void disposing(); @@ -136,33 +130,36 @@ private: class ImageButtonHdl : public SmartHdl { public: - ImageButtonHdl( const SmartTagReference& xTag, USHORT nSID, const Image& rImage, const Image& rImageMO, const Point& rPnt ); + ImageButtonHdl( const SmartTagReference& xTag, /* USHORT nSID, const Image& rImage, const Image& rImageMO, */ const Point& rPnt ); virtual ~ImageButtonHdl(); virtual void CreateB2dIAObject(); virtual BOOL IsFocusHdl() const; virtual Pointer GetPointer() const; virtual bool isMarkable() const; - virtual void onMouseEnter(); + virtual void onMouseEnter(const MouseEvent& rMEvt); virtual void onMouseLeave(); - USHORT getSlotId() const { return mnSID; } + int getHighlightId() const { return mnHighlightId; } + + void HideTip(); private: rtl::Reference< ChangePlaceholderTag > mxTag; - Image maImage; - Image maImageMO; - USHORT mnSID; + + int mnHighlightId; + Size maImageSize; + ULONG mnTip; }; // -------------------------------------------------------------------- -ImageButtonHdl::ImageButtonHdl( const SmartTagReference& xTag, USHORT nSID, const Image& rImage, const Image& rImageMO, const Point& rPnt ) +ImageButtonHdl::ImageButtonHdl( const SmartTagReference& xTag /*, USHORT nSID, const Image& rImage, const Image& rImageMO*/, const Point& rPnt ) : SmartHdl( xTag, rPnt ) , mxTag( dynamic_cast< ChangePlaceholderTag* >( xTag.get() ) ) -, maImage( rImage ) -, maImageMO( rImageMO ) -, mnSID( nSID ) +, mnHighlightId( -1 ) +, maImageSize( 42, 42 ) +, mnTip( 0 ) { } @@ -170,19 +167,64 @@ ImageButtonHdl::ImageButtonHdl( const SmartTagReference& xTag, USHORT nSID, cons ImageButtonHdl::~ImageButtonHdl() { + HideTip(); } // -------------------------------------------------------------------- -void ImageButtonHdl::onMouseEnter() +void ImageButtonHdl::HideTip() { - Touch(); + if( mnTip ) + { + Help::HideTip( mnTip ); + mnTip = 0; + } +} + +// -------------------------------------------------------------------- + +extern ::rtl::OUString ImplRetrieveLabelFromCommand( const Reference< XFrame >& xFrame, const OUString& aCmdURL ); + +void ImageButtonHdl::onMouseEnter(const MouseEvent& rMEvt) +{ + int nHighlightId = 0; + + if( pHdlList && pHdlList->GetView()) + { + OutputDevice* pDev = pHdlList->GetView()->GetFirstOutputDevice(); + if( pDev == 0 ) + pDev = Application::GetDefaultDevice(); + + Point aMDPos( rMEvt.GetPosPixel() ); + aMDPos -= pDev->LogicToPixel( GetPos() ); + + nHighlightId += aMDPos.X() > maImageSize.Width() ? 1 : 0; + nHighlightId += aMDPos.Y() > maImageSize.Height() ? 2 : 0; + + if( mnHighlightId != nHighlightId ) + { + HideTip(); + + mnHighlightId = nHighlightId; + + if( pHdlList ) + { + Reference< XFrame > xFrame( static_cast< View* >( pHdlList->GetView() )->GetViewShell()->GetViewFrame()->GetFrame().GetFrameInterface() ); + String aHelpText( ImplRetrieveLabelFromCommand( xFrame, OUString::createFromAscii( gSlotStr[nHighlightId] ) ) ); + Rectangle aScreenRect( pDev->LogicToPixel( GetPos() ), maImageSize ); + mnTip = Help::ShowTip( static_cast< ::Window* >( pHdlList->GetView()->GetFirstOutputDevice() ), aScreenRect, aHelpText, 0 ) ; + } + Touch(); + } + } } // -------------------------------------------------------------------- void ImageButtonHdl::onMouseLeave() { + mnHighlightId = -1; + HideTip(); Touch(); } @@ -196,7 +238,10 @@ void ImageButtonHdl::CreateB2dIAObject() const Point aTagPos( GetPos() ); basegfx::B2DPoint aPosition( aTagPos.X(), aTagPos.Y() ); - BitmapEx aBitmapEx( isMouseOver() ? maImageMO.GetBitmapEx() : maImage.GetBitmapEx() ); + BitmapEx aBitmapEx( mxTag->createOverlayImage( mnHighlightId ) ); // maImageMO.GetBitmapEx() : maImage.GetBitmapEx() ); + maImageSize = aBitmapEx.GetSizePixel(); + maImageSize.Width() >>= 1; + maImageSize.Height() >>= 1; if(pHdlList) { @@ -268,16 +313,19 @@ ChangePlaceholderTag::~ChangePlaceholderTag() /** returns true if the ChangePlaceholderTag handled the event. */ bool ChangePlaceholderTag::MouseButtonDown( const MouseEvent& /*rMEvt*/, SmartHdl& rHdl ) { - USHORT nSID = static_cast< ImageButtonHdl& >(rHdl).getSlotId(); - - if( mxPlaceholderObj.get() ) + int nHighlightId = static_cast< ImageButtonHdl& >(rHdl).getHighlightId(); + if( nHighlightId >= 0 ) { - SdrPageView* pPV = mrView.GetSdrPageView(); - mrView.MarkObj(mxPlaceholderObj.get(), pPV, FALSE); - } + USHORT nSID = gButtonSlots[nHighlightId]; - mrView.GetViewShell()->GetViewFrame()->GetDispatcher()->Execute( nSID, SFX_CALLMODE_ASYNCHRON); + if( mxPlaceholderObj.get() ) + { + SdrPageView* pPV = mrView.GetSdrPageView(); + mrView.MarkObj(mxPlaceholderObj.get(), pPV, FALSE); + } + mrView.GetViewShell()->GetViewFrame()->GetDispatcher()->Execute( nSID, SFX_CALLMODE_ASYNCHRON); + } return false; } @@ -318,6 +366,45 @@ bool ChangePlaceholderTag::RequestHelp( const HelpEvent& /*rHEvt*/ ) // -------------------------------------------------------------------- +BitmapEx ChangePlaceholderTag::createOverlayImage( int nHighlight ) +{ + BitmapEx aRet; + if( mxPlaceholderObj.is() ) + { + SdrObject* pPlaceholder = mxPlaceholderObj.get(); + SmartTagReference xThis( this ); + const Rectangle& rSnapRect = pPlaceholder->GetSnapRect(); + const Point aPoint; + + OutputDevice* pDev = mrView.GetFirstOutputDevice(); + if( pDev == 0 ) + pDev = Application::GetDefaultDevice(); + + Size aShapeSizePix = pDev->LogicToPixel(rSnapRect.GetSize()); + long nShapeSizePix = std::min(aShapeSizePix.Width(),aShapeSizePix.Height()); +/* + if( 50 > nShapeSizePix ) + return; + */ + BitmapEx* pImages = (nShapeSizePix > 250) ? &ViewOverlayManager::maLargeButtonImages[0] : &ViewOverlayManager::maSmallButtonImages[0]; + + Size aSize( pImages->GetSizePixel() ); + + aRet.SetSizePixel( Size( aSize.Width() << 1, aSize.Height() << 1 ) ); + + const Rectangle aRectSrc( Point( 0, 0 ), aSize ); + + aRet = pImages[(nHighlight == 0) ? 4 : 0]; + aRet.Expand( aSize.Width(), aSize.Height(), NULL, TRUE ); + + aRet.CopyPixel( Rectangle( Point( aSize.Width(), 0 ), aSize ), aRectSrc, &pImages[(nHighlight == 1) ? 5 : 1] ); + aRet.CopyPixel( Rectangle( Point( 0, aSize.Height() ), aSize ), aRectSrc, &pImages[(nHighlight == 2) ? 6 : 2] ); + aRet.CopyPixel( Rectangle( Point( aSize.Width(), aSize.Height() ), aSize ), aRectSrc, &pImages[(nHighlight == 3) ? 7 : 3] ); + } + + return aRet; +} + void ChangePlaceholderTag::addCustomHandles( SdrHdlList& rHandlerList ) { if( mxPlaceholderObj.is() ) @@ -336,15 +423,10 @@ void ChangePlaceholderTag::addCustomHandles( SdrHdlList& rHandlerList ) if( 50 > nShapeSizePix ) return; - Image* pImages = (nShapeSizePix > 250) ? &ViewOverlayManager::maLargeButtonImages[0] : &ViewOverlayManager::maSmallButtonImages[0]; + BitmapEx* pImages = (nShapeSizePix > 250) ? &ViewOverlayManager::maLargeButtonImages[0] : &ViewOverlayManager::maSmallButtonImages[0]; Size aButtonSize( pDev->PixelToLogic(pImages[0].GetSizePixel()) ); -/* - if( 100 > nShapeSizePix ) - { - aButtonSize.Width() >>= 1; aButtonSize.Height() >>= 1; - } -*/ + const int nColumns = 2; const int nRows = 2; @@ -354,34 +436,22 @@ void ChangePlaceholderTag::addCustomHandles( SdrHdlList& rHandlerList ) Point aPos( rSnapRect.Center() ); aPos.X() -= all_width >> 1; aPos.Y() -= all_height >> 1; - +/* long nStartX = aPos.X(); for( int i = 0, c = 0; i < 4; i++ ) { Image aImg( pImages[i] ); Image aImgMO( pImages[i+4] ); -/* - if( 100 > nShapeSizePix ) - { - BitmapEx b( aImg.GetBitmapEx() ); - const double scale = 0.5; - b.Scale( scale, scale ); - aImg = Image(b); - - b = aImgMO.GetBitmapEx(); - b.Scale( scale, scale ); - aImgMO = Image(b); - } -*/ - ImageButtonHdl* pHdl = new ImageButtonHdl( xThis, gButtonSlots[i], aImg, aImgMO, aPoint ); + */ + ImageButtonHdl* pHdl = new ImageButtonHdl( xThis, /* gButtonSlots[i], aImg, aImgMO, */ aPoint ); pHdl->SetObjHdlNum( SMART_TAG_HDL_NUM ); pHdl->SetPageView( mrView.GetSdrPageView() ); pHdl->SetPos( aPos ); rHandlerList.AddHdl( pHdl ); - +/* if( ++c == nColumns ) { aPos.X() = nStartX; @@ -393,6 +463,7 @@ void ChangePlaceholderTag::addCustomHandles( SdrHdlList& rHandlerList ) aPos.X() += aButtonSize.Width(); } } +*/ } } -- cgit From b9650eb842f8050cb43f6374008d9ac1c9058de4 Mon Sep 17 00:00:00 2001 From: "Frank Schoenheit [fs]" Date: Fri, 16 Apr 2010 15:14:15 +0200 Subject: slidecopy: now using SID_TASK_PANE in all applications, also in Impress. Implies registering the respective child window in the apps, not in SFX. Also implies getting rid of SID_RIGHT_PANE in Impress. Also, renamed SID_TASK_PANE in Impress to SID_SHOW_TOOL_PANEL, which better fits its purpose, and avoids confusion with SID_TASKPANE. --- sd/inc/app.hrc | 4 ++-- sd/sdi/ViewShellBase.sdi | 32 +++------------------------ sd/source/ui/dlg/PaneChildWindows.cxx | 2 +- sd/source/ui/toolpanel/ToolPanelFactory.cxx | 4 ++-- sd/source/ui/toolpanel/ToolPanelViewShell.cxx | 7 +++++- sd/source/ui/view/GraphicViewShellBase.cxx | 4 ++-- sd/source/ui/view/ViewShellBase.cxx | 6 ++--- sd/source/ui/view/ViewShellImplementation.cxx | 2 +- sd/uiconfig/simpress/menubar/menubar.xml | 2 +- 9 files changed, 21 insertions(+), 42 deletions(-) (limited to 'sd') diff --git a/sd/inc/app.hrc b/sd/inc/app.hrc index 53223fa5ff1b..65aec562f084 100644 --- a/sd/inc/app.hrc +++ b/sd/inc/app.hrc @@ -430,7 +430,7 @@ #define SID_LEFT_PANE_IMPRESS (SID_SD_START+414) #define SID_LEFT_PANE_DRAW (SID_SD_START+415) -#define SID_RIGHT_PANE (SID_SD_START+416) + // FREE #define SID_NOTES_WINDOW (SID_SD_START+417) #define SID_SWITCH_SHELL_PANE (SID_SD_START+418) #define SID_LAYER_DIALOG_WIN (SID_SD_START+419) @@ -446,7 +446,7 @@ #define SID_TP_USE_FOR_NEW_PRESENTATIONS (SID_SD_START+427) #define SID_TP_SHOW_LARGE_PREVIEW (SID_SD_START+428) #define SID_TP_SHOW_SMALL_PREVIEW (SID_SD_START+429) -#define SID_TASK_PANE (SID_SD_START+430) +#define SID_SHOW_TOOL_PANEL (SID_SD_START+430) #define SID_INSERT_MASTER_PAGE (SID_SD_START+431) #define SID_DELETE_MASTER_PAGE (SID_SD_START+432) #define SID_RENAME_MASTER_PAGE (SID_SD_START+433) diff --git a/sd/sdi/ViewShellBase.sdi b/sd/sdi/ViewShellBase.sdi index e9cb7119fa89..3602e711db1b 100644 --- a/sd/sdi/ViewShellBase.sdi +++ b/sd/sdi/ViewShellBase.sdi @@ -135,32 +135,6 @@ SfxBoolItem LeftPaneDraw SID_LEFT_PANE_DRAW GroupId = GID_MODIFY; ] -SfxBoolItem RightPane SID_RIGHT_PANE - -[ - /* flags: */ - AutoUpdate = TRUE, - Cachable = Cachable, - FastCall = FALSE, - HasCoreId = FALSE, - HasDialog = TRUE, - ReadOnlyDoc = FALSE, - Toggle = FALSE, - Container = FALSE, - RecordAbsolute = FALSE, - RecordPerSet; - Asynchron; - - Readonly = FALSE, - - /* config: */ - AccelConfig = TRUE, - MenuConfig = TRUE, - StatusBarConfig = FALSE, - ToolBoxConfig = TRUE, - GroupId = GID_MODIFY; -] - SfxVoidItem NotesChildWindow SID_NOTES_WINDOW [ @@ -239,7 +213,7 @@ SfxBoolItem SlideSorterMultiPaneGUI SID_SLIDE_SORTER_MULTI_PANE_GUI GroupId = GID_MODIFY; ] -SfxVoidItem TaskPaneShowPanel SID_TASK_PANE ( +SfxVoidItem TaskPaneShowPanel SID_SHOW_TOOL_PANEL ( SfxBoolItem IsPanelVisible ID_VAL_ISVISIBLE, SfxUInt32Item PanelId ID_VAL_PANEL_INDEX) [ @@ -280,7 +254,7 @@ interface ViewShellBaseView ExecMethod = Execute; StateMethod = GetState; ] - SID_RIGHT_PANE + SID_TASKPANE [ ExecMethod = Execute; StateMethod = GetState; @@ -325,7 +299,7 @@ interface ViewShellBaseView ExecMethod = Execute; StateMethod = GetState; ] - SID_TASK_PANE + SID_SHOW_TOOL_PANEL [ ExecMethod = Execute; StateMethod = GetState; diff --git a/sd/source/ui/dlg/PaneChildWindows.cxx b/sd/source/ui/dlg/PaneChildWindows.cxx index ac2cc083b4fb..26ad4436b7c1 100755 --- a/sd/source/ui/dlg/PaneChildWindows.cxx +++ b/sd/source/ui/dlg/PaneChildWindows.cxx @@ -45,7 +45,7 @@ namespace sd { SFX_IMPL_DOCKINGWINDOW(LeftPaneImpressChildWindow, SID_LEFT_PANE_IMPRESS) SFX_IMPL_DOCKINGWINDOW(LeftPaneDrawChildWindow, SID_LEFT_PANE_DRAW) -SFX_IMPL_DOCKINGWINDOW( ToolPanelChildWindow, SID_RIGHT_PANE) +SFX_IMPL_DOCKINGWINDOW( ToolPanelChildWindow, SID_TASKPANE) //===== PaneChildWindow ======================================================= diff --git a/sd/source/ui/toolpanel/ToolPanelFactory.cxx b/sd/source/ui/toolpanel/ToolPanelFactory.cxx index a0315ed30fd0..db4602c991d0 100644 --- a/sd/source/ui/toolpanel/ToolPanelFactory.cxx +++ b/sd/source/ui/toolpanel/ToolPanelFactory.cxx @@ -172,7 +172,7 @@ namespace sd { namespace toolpanel } } - if ( !pViewFrame || !pViewFrame->HasChildWindow( SID_RIGHT_PANE ) ) + if ( !pViewFrame || !pViewFrame->HasChildWindow( SID_TASKPANE ) ) throw IllegalArgumentException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Illegal frame." ) ), *this, @@ -180,7 +180,7 @@ namespace sd { namespace toolpanel ); // retrieve the task pane - ToolPanelChildWindow* pToolPanelWindow( dynamic_cast< ToolPanelChildWindow* >( pViewFrame->GetChildWindow( SID_RIGHT_PANE ) ) ); + ToolPanelChildWindow* pToolPanelWindow( dynamic_cast< ToolPanelChildWindow* >( pViewFrame->GetChildWindow( SID_TASKPANE ) ) ); if ( !pToolPanelWindow ) throw IllegalArgumentException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "No Impress document, or no Impress Task Pane." ) ), diff --git a/sd/source/ui/toolpanel/ToolPanelViewShell.cxx b/sd/source/ui/toolpanel/ToolPanelViewShell.cxx index 26cb270950f3..0d7eeea99190 100755 --- a/sd/source/ui/toolpanel/ToolPanelViewShell.cxx +++ b/sd/source/ui/toolpanel/ToolPanelViewShell.cxx @@ -34,6 +34,7 @@ #include "taskpane/TaskPaneControlFactory.hxx" #include "controls/MasterPagesPanel.hxx" #include "LayoutMenu.hxx" +#include "DrawDocShell.hxx" #include "controls/TableDesignPanel.hxx" #include "controls/CustomAnimationPanel.hxx" #include "controls/SlideTransitionPanel.hxx" @@ -366,9 +367,13 @@ TYPEINIT1(ToolPanelViewShell, ViewShell); // --------------------------------------------------------------------------------------------------------------------- ToolPanelViewShell_Impl::InitialPanel ToolPanelViewShell_Impl::impl_determineInitialPanel() { + InitialPanel aPanelToActivate; + if ( GetAntiImpl().GetViewShellBase().GetDocShell()->GetDocumentType() == DOCUMENT_TYPE_DRAW ) + // for Draw, rely on SFX's default handling, which is to activate the previously active panel + return aPanelToActivate; + // Default to Layout panel, but check whether the requested configuration already contains a tool panel, in this case, // use that one. - InitialPanel aPanelToActivate; aPanelToActivate.sPanelResourceURL = FrameworkHelper::msLayoutTaskPanelURL; aPanelToActivate.bActivateDirectly = false; try diff --git a/sd/source/ui/view/GraphicViewShellBase.cxx b/sd/source/ui/view/GraphicViewShellBase.cxx index 38409bb2376e..759103760bfe 100644 --- a/sd/source/ui/view/GraphicViewShellBase.cxx +++ b/sd/source/ui/view/GraphicViewShellBase.cxx @@ -100,18 +100,18 @@ void GraphicViewShellBase::Execute (SfxRequest& rRequest) switch (nSlotId) { - case SID_RIGHT_PANE: case SID_NOTES_WINDOW: case SID_SLIDE_SORTER_MULTI_PANE_GUI: case SID_DIAMODE: case SID_OUTLINEMODE: case SID_NOTESMODE: case SID_HANDOUTMODE: - case SID_TASK_PANE: + case SID_SHOW_TOOL_PANEL: // Prevent some Impress-only slots from being executed. rRequest.Cancel(); break; + case SID_TASKPANE: case SID_SWITCH_SHELL: case SID_LEFT_PANE_DRAW: case SID_LEFT_PANE_IMPRESS: diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx index 643025b2b80b..9ffde2a7a331 100644 --- a/sd/source/ui/view/ViewShellBase.cxx +++ b/sd/source/ui/view/ViewShellBase.cxx @@ -809,7 +809,7 @@ void ViewShellBase::Execute (SfxRequest& rRequest) framework::FrameworkHelper::msSlideSorterURL); break; - case SID_RIGHT_PANE: + case SID_TASKPANE: mpImpl->SetPaneVisibility( rRequest, framework::FrameworkHelper::msRightPaneURL, @@ -830,7 +830,7 @@ void ViewShellBase::Execute (SfxRequest& rRequest) // The full screen mode is not supported. Ignore the request. break; - case SID_TASK_PANE: + case SID_SHOW_TOOL_PANEL: mpImpl->ProcessTaskPaneSlot(rRequest); break; @@ -1535,7 +1535,7 @@ void ViewShellBase::Implementation::GetSlotState (SfxItemSet& rSet) xContext, FrameworkHelper::msLeftDrawPaneURL); break; - case SID_RIGHT_PANE: + case SID_TASKPANE: xResourceId = ResourceId::create( xContext, FrameworkHelper::msRightPaneURL); break; diff --git a/sd/source/ui/view/ViewShellImplementation.cxx b/sd/source/ui/view/ViewShellImplementation.cxx index be30956dd5f4..c7166451a78f 100644 --- a/sd/source/ui/view/ViewShellImplementation.cxx +++ b/sd/source/ui/view/ViewShellImplementation.cxx @@ -200,7 +200,7 @@ void ViewShell::Implementation::ProcessModifyPageSlot ( if (pFrame!=NULL && pFrame->GetDispatcher()!=NULL) { pFrame->GetDispatcher()->Execute ( - SID_TASK_PANE, + SID_SHOW_TOOL_PANEL, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, &aMakeToolPaneVisible, &aPanelId, diff --git a/sd/uiconfig/simpress/menubar/menubar.xml b/sd/uiconfig/simpress/menubar/menubar.xml index 5b79fdd1f098..3cf5193fdffa 100644 --- a/sd/uiconfig/simpress/menubar/menubar.xml +++ b/sd/uiconfig/simpress/menubar/menubar.xml @@ -99,7 +99,7 @@ - + -- cgit From 12dd6f83e8034884590142de0a64818737336be9 Mon Sep 17 00:00:00 2001 From: "Frank Schoenheit [fs]" Date: Mon, 19 Apr 2010 15:02:15 +0200 Subject: slidecopy: make the value set somewhat smaller, so there's some space after it ... --- sd/source/ui/table/TableDesignPane.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sd') diff --git a/sd/source/ui/table/TableDesignPane.cxx b/sd/source/ui/table/TableDesignPane.cxx index 678fdf6ccda7..2a8ba4a54663 100644 --- a/sd/source/ui/table/TableDesignPane.cxx +++ b/sd/source/ui/table/TableDesignPane.cxx @@ -389,7 +389,7 @@ void TableDesignPane::updateLayout() mxControls[nId]->SetPaintTransparent(TRUE); mxControls[nId]->SetBackground(); } - aValueSetSize = Size( aPaneSize.Width() - 2 * aOffset.X(), nStylesHeight - mxControls[FL_TABLE_STYLES]->GetSizePixel().Height() - mnOrgOffsetY[FL_TABLE_STYLES] ); + aValueSetSize = Size( pValueSet->GetSizePixel().Width(), nStylesHeight - mxControls[FL_TABLE_STYLES]->GetSizePixel().Height() - mnOrgOffsetY[FL_TABLE_STYLES] ); } else { -- cgit From d1086e1894c8a8d32d8bc1a96a5b77a1533774d9 Mon Sep 17 00:00:00 2001 From: Christian Lippka Date: Tue, 20 Apr 2010 16:57:28 +0200 Subject: #i107213# enable assign table style also for presentation tables --- sd/source/ui/table/TableDesignPane.cxx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'sd') diff --git a/sd/source/ui/table/TableDesignPane.cxx b/sd/source/ui/table/TableDesignPane.cxx index 678fdf6ccda7..2f35d70b0f0d 100755 --- a/sd/source/ui/table/TableDesignPane.cxx +++ b/sd/source/ui/table/TableDesignPane.cxx @@ -343,7 +343,9 @@ void TableDesignPane::onSelectionChanged() } Reference< XShapeDescriptor > xDesc( aSel, UNO_QUERY ); - if( xDesc.is() && xDesc->getShapeType().equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.drawing.TableShape" ) ) ) + if( xDesc.is() && + ( xDesc->getShapeType().equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.drawing.TableShape" ) ) || + xDesc->getShapeType().equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.presentation.TableShape" ) ) ) ) { xNewSelection = Reference< XPropertySet >::query( xDesc ); } -- 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/app/strings.src | 25 +++++++++++++++++++++++++ sd/source/ui/inc/strings.hrc | 4 ++++ sd/source/ui/view/viewoverlaymanager.cxx | 5 +++-- 3 files changed, 32 insertions(+), 2 deletions(-) (limited to 'sd') diff --git a/sd/source/ui/app/strings.src b/sd/source/ui/app/strings.src index 26ed07d656a6..4a08324883bd 100755 --- a/sd/source/ui/app/strings.src +++ b/sd/source/ui/app/strings.src @@ -1235,3 +1235,28 @@ String STR_RESET_LAYOUT { Text[ en-US ] = "Reset Slide Layout"; }; + +String STR_RESET_LAYOUT +{ + Text [ en-US ] = "Comments"; +}; + +String STR_INSERT_TABLE +{ + Text [ en-US ] = "Insert Table"; +}; + +String STR_INSERT_CHART +{ + Text [ en-US ] = "Insert Chart"; +}; + +String STR_INSERT_PICTURE +{ + Text [ en-US ] = "Insert Picture"; +}; + +String STR_INSERT_MOVIE +{ + Text [ en-US ] = "Insert Movie"; +}; 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! diff --git a/sd/source/ui/view/viewoverlaymanager.cxx b/sd/source/ui/view/viewoverlaymanager.cxx index cbe5582fbadd..2bb1d5a20230 100755 --- a/sd/source/ui/view/viewoverlaymanager.cxx +++ b/sd/source/ui/view/viewoverlaymanager.cxx @@ -60,6 +60,7 @@ #include "DrawViewShell.hxx" #include "DrawController.hxx" #include "glob.hrc" +#include "strings.hrc" #include "sdresid.hxx" #include "EventMultiplexer.hxx" #include "ViewShellManager.hxx" @@ -83,6 +84,7 @@ BitmapEx ViewOverlayManager::maLargeButtonImages[BMP_PLACEHOLDER_LARGE_END - BMP static USHORT gButtonSlots[] = { SID_INSERT_TABLE, SID_INSERT_DIAGRAM, SID_INSERT_GRAPHIC, SID_INSERT_AVMEDIA }; static const sal_Char* gSlotStr[] = { ".uno:InsertTable", ".uno:InsertObjectChart", ".uno:InsertGraphic", ".uno:InsertVideo" }; +static USHORT gButtonToolTips[] = { STR_RESET_LAYOUT, STR_INSERT_TABLE, STR_INSERT_CHART, STR_INSERT_PICTURE,STR_INSERT_MOVIE }; // -------------------------------------------------------------------- @@ -209,8 +211,7 @@ void ImageButtonHdl::onMouseEnter(const MouseEvent& rMEvt) if( pHdlList ) { - Reference< XFrame > xFrame( static_cast< View* >( pHdlList->GetView() )->GetViewShell()->GetViewFrame()->GetFrame().GetFrameInterface() ); - String aHelpText( ImplRetrieveLabelFromCommand( xFrame, OUString::createFromAscii( gSlotStr[nHighlightId] ) ) ); + String aHelpText( SdResId( gButtonToolTips[mnHighlightId] ) ); Rectangle aScreenRect( pDev->LogicToPixel( GetPos() ), maImageSize ); mnTip = Help::ShowTip( static_cast< ::Window* >( pHdlList->GetView()->GetFirstOutputDevice() ), aScreenRect, aHelpText, 0 ) ; } -- cgit From be4cb22878a67afb375b0b4bc28292fd7486a7dc Mon Sep 17 00:00:00 2001 From: Christian Lippka Date: Tue, 20 Apr 2010 17:23:49 +0200 Subject: #i107213# finalized layout grippies tooltips --- sd/source/ui/app/strings.src | 5 ----- sd/source/ui/view/viewoverlaymanager.cxx | 1 - 2 files changed, 6 deletions(-) (limited to 'sd') diff --git a/sd/source/ui/app/strings.src b/sd/source/ui/app/strings.src index 4a08324883bd..c6a4d21de7db 100755 --- a/sd/source/ui/app/strings.src +++ b/sd/source/ui/app/strings.src @@ -1236,11 +1236,6 @@ String STR_RESET_LAYOUT Text[ en-US ] = "Reset Slide Layout"; }; -String STR_RESET_LAYOUT -{ - Text [ en-US ] = "Comments"; -}; - String STR_INSERT_TABLE { Text [ en-US ] = "Insert Table"; diff --git a/sd/source/ui/view/viewoverlaymanager.cxx b/sd/source/ui/view/viewoverlaymanager.cxx index 2bb1d5a20230..c626ffd3fef8 100755 --- a/sd/source/ui/view/viewoverlaymanager.cxx +++ b/sd/source/ui/view/viewoverlaymanager.cxx @@ -83,7 +83,6 @@ BitmapEx ViewOverlayManager::maSmallButtonImages[BMP_PLACEHOLDER_SMALL_END - BMP BitmapEx ViewOverlayManager::maLargeButtonImages[BMP_PLACEHOLDER_LARGE_END - BMP_PLACEHOLDER_LARGE_START]; static USHORT gButtonSlots[] = { SID_INSERT_TABLE, SID_INSERT_DIAGRAM, SID_INSERT_GRAPHIC, SID_INSERT_AVMEDIA }; -static const sal_Char* gSlotStr[] = { ".uno:InsertTable", ".uno:InsertObjectChart", ".uno:InsertGraphic", ".uno:InsertVideo" }; static USHORT gButtonToolTips[] = { STR_RESET_LAYOUT, STR_INSERT_TABLE, STR_INSERT_CHART, STR_INSERT_PICTURE,STR_INSERT_MOVIE }; // -------------------------------------------------------------------- -- cgit From ace424d63082a3daf5321f4f9a65638bc6df881f Mon Sep 17 00:00:00 2001 From: Christian Lippka Date: Tue, 20 Apr 2010 17:33:48 +0200 Subject: #i107213# finalized layout grippies tooltips --- sd/source/ui/view/viewoverlaymanager.cxx | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'sd') diff --git a/sd/source/ui/view/viewoverlaymanager.cxx b/sd/source/ui/view/viewoverlaymanager.cxx index c626ffd3fef8..7d84a830d13d 100755 --- a/sd/source/ui/view/viewoverlaymanager.cxx +++ b/sd/source/ui/view/viewoverlaymanager.cxx @@ -210,7 +210,10 @@ void ImageButtonHdl::onMouseEnter(const MouseEvent& rMEvt) if( pHdlList ) { - String aHelpText( SdResId( gButtonToolTips[mnHighlightId] ) ); + SdResId aResId( gButtonToolTips[mnHighlightId] ); + aResId.SetRT( RSC_STRING ); + + String aHelpText( aResId ); Rectangle aScreenRect( pDev->LogicToPixel( GetPos() ), maImageSize ); mnTip = Help::ShowTip( static_cast< ::Window* >( pHdlList->GetView()->GetFirstOutputDevice() ), aScreenRect, aHelpText, 0 ) ; } -- cgit From e88e16842bd35a2593449b0e4cb1a6eeb469aa1a Mon Sep 17 00:00:00 2001 From: sb Date: Wed, 21 Apr 2010 14:55:01 +0200 Subject: sb120: #i111042# disabled failing tests for now --- sd/qa/unoapi/sd.sce | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'sd') diff --git a/sd/qa/unoapi/sd.sce b/sd/qa/unoapi/sd.sce index 84a5216c5ee1..66fe8c0e49d4 100644 --- a/sd/qa/unoapi/sd.sce +++ b/sd/qa/unoapi/sd.sce @@ -1,11 +1,11 @@ -o sd.AccessibleDrawDocumentView -o sd.AccessibleOutlineView #i35935# -o sd.AccessibleSlideView --o sd.DrawController_DrawView --o sd.DrawController_HandoutView --o sd.DrawController_NotesView +#i111042# -o sd.DrawController_DrawView +#i111042# -o sd.DrawController_HandoutView +#i111042# -o sd.DrawController_NotesView -o sd.DrawController_OutlineView --o sd.DrawController_PresentationView +#i111042# -o sd.DrawController_PresentationView -o sd.SdDocLinkTargets -o sd.SdDrawPage -o sd.SdDrawPagesAccess -- cgit From 079c48dcf114e415baeb66957045bd2610ca65a1 Mon Sep 17 00:00:00 2001 From: sb Date: Wed, 21 Apr 2010 15:11:31 +0200 Subject: sb120: #i11043# disabled failing tests for now --- sd/qa/unoapi/sd.sce | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sd') diff --git a/sd/qa/unoapi/sd.sce b/sd/qa/unoapi/sd.sce index 66fe8c0e49d4..e55358b23366 100644 --- a/sd/qa/unoapi/sd.sce +++ b/sd/qa/unoapi/sd.sce @@ -4,7 +4,7 @@ #i111042# -o sd.DrawController_DrawView #i111042# -o sd.DrawController_HandoutView #i111042# -o sd.DrawController_NotesView --o sd.DrawController_OutlineView +#i111043# -o sd.DrawController_OutlineView #i111042# -o sd.DrawController_PresentationView -o sd.SdDocLinkTargets -o sd.SdDrawPage -- cgit From be66917cb7289d8f008ca8eb29308991979763b8 Mon Sep 17 00:00:00 2001 From: "Thomas Lange [tl]" Date: Thu, 22 Apr 2010 13:08:19 +0200 Subject: cws tl80: #i110341# problems with spell check dialog fixed --- sd/source/ui/dlg/SpellDialogChildWindow.cxx | 8 ++++---- sd/source/ui/inc/SpellDialogChildWindow.hxx | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'sd') diff --git a/sd/source/ui/dlg/SpellDialogChildWindow.cxx b/sd/source/ui/dlg/SpellDialogChildWindow.cxx index 95d4277f8f42..7aee12f23bbd 100644 --- a/sd/source/ui/dlg/SpellDialogChildWindow.cxx +++ b/sd/source/ui/dlg/SpellDialogChildWindow.cxx @@ -96,14 +96,14 @@ void SpellDialogChildWindow::InvalidateSpellDialog (void) -::svx::SpellPortions SpellDialogChildWindow::GetNextWrongSentence (void) +::svx::SpellPortions SpellDialogChildWindow::GetNextWrongSentence( bool /*bRecheck*/ ) { ::svx::SpellPortions aResult; if (mpSdOutliner != NULL) { ProvideOutliner(); - aResult = mpSdOutliner->GetNextSpellSentence (); + aResult = mpSdOutliner->GetNextSpellSentence(); } // Close the spell check dialog when there are no more sentences to @@ -125,7 +125,7 @@ void SpellDialogChildWindow::InvalidateSpellDialog (void) void SpellDialogChildWindow::ApplyChangedSentence ( - const ::svx::SpellPortions& rChanged) + const ::svx::SpellPortions& rChanged, bool bRecheck ) { if (mpSdOutliner != NULL) { @@ -133,7 +133,7 @@ void SpellDialogChildWindow::ApplyChangedSentence ( if (pOutlinerView != NULL) mpSdOutliner->ApplyChangedSentence ( pOutlinerView->GetEditView(), - rChanged, false); + rChanged, bRecheck); } } diff --git a/sd/source/ui/inc/SpellDialogChildWindow.hxx b/sd/source/ui/inc/SpellDialogChildWindow.hxx index 898df6865280..4e08dd99b063 100644 --- a/sd/source/ui/inc/SpellDialogChildWindow.hxx +++ b/sd/source/ui/inc/SpellDialogChildWindow.hxx @@ -62,12 +62,12 @@ protected: next sentence with spelling errors. While doing so the view mode may be changed and text shapes are set into edit mode. */ - virtual ::svx::SpellPortions GetNextWrongSentence (void); + virtual ::svx::SpellPortions GetNextWrongSentence( bool bRecheck ); /** This method is responsible for merging corrections made in the spelling dialog back into the document. */ - virtual void ApplyChangedSentence (const ::svx::SpellPortions& rChanged); + virtual void ApplyChangedSentence(const ::svx::SpellPortions& rChanged, bool bRecheck); virtual void GetFocus (void); virtual void LoseFocus (void); -- cgit From e9e5a0227e2db1d6e3b55b6dcc48cba471a17e45 Mon Sep 17 00:00:00 2001 From: "Frank Schoenheit [fs]" Date: Thu, 22 Apr 2010 16:16:37 +0200 Subject: slidecopy: removed accelerator/*/default.xml - they're not used for a long time now ... (accelerator config is now in Accelerators.xcu in officecfg. No need to confuse people with those dead files) --- sd/prj/d.lst | 19 ------------------- 1 file changed, 19 deletions(-) (limited to 'sd') diff --git a/sd/prj/d.lst b/sd/prj/d.lst index fd21f7cd4b5b..14f85e982eab 100644 --- a/sd/prj/d.lst +++ b/sd/prj/d.lst @@ -8,16 +8,6 @@ mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\sdraw\menubar mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\simpress\menubar mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\sdraw\toolbar mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\simpress\toolbar -mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\sdraw\accelerator -mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\simpress\accelerator -mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\sdraw\accelerator\en-US -mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\sdraw\accelerator\de -mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\sdraw\accelerator\es -mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\sdraw\accelerator\fr -mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\simpress\accelerator\en-US -mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\simpress\accelerator\de -mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\simpress\accelerator\es -mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\simpress\accelerator\fr mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\sdraw\statusbar mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\simpress\statusbar @@ -62,15 +52,6 @@ mkdir: %_DEST%\inc%_EXT%\sd ..\uiconfig\simpress\menubar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\simpress\menubar\*.xml ..\uiconfig\sdraw\toolbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\sdraw\toolbar\*.xml ..\uiconfig\simpress\toolbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\simpress\toolbar\*.xml -..\uiconfig\sdraw\accelerator\en-US\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\sdraw\accelerator\en-US\*.xml -..\uiconfig\sdraw\accelerator\de\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\sdraw\accelerator\de\*.xml -..\uiconfig\sdraw\accelerator\es\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\sdraw\accelerator\es\*.xml -..\uiconfig\sdraw\accelerator\fr\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\sdraw\accelerator\fr\*.xml -..\uiconfig\simpress\accelerator\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\simpress\accelerator\*.xml -..\uiconfig\simpress\accelerator\en-US\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\simpress\accelerator\en-US\*.xml -..\uiconfig\simpress\accelerator\de\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\simpress\accelerator\de\*.xml -..\uiconfig\simpress\accelerator\es\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\simpress\accelerator\es\*.xml -..\uiconfig\simpress\accelerator\fr\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\simpress\accelerator\fr\*.xml ..\uiconfig\sdraw\statusbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\sdraw\statusbar\*.xml ..\uiconfig\simpress\statusbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\simpress\statusbar\*.xml -- cgit From b7c38dbce15f379554b955f0f3a27ae316626147 Mon Sep 17 00:00:00 2001 From: "Frank Schoenheit [fs]" Date: Mon, 26 Apr 2010 22:30:32 +0200 Subject: slidecopy: corrected parenthood of the ToolPanelDecks's A11Y object - had a cyclic ancestor chain before ... --- sd/source/ui/toolpanel/ToolPanelViewShell.cxx | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) (limited to 'sd') diff --git a/sd/source/ui/toolpanel/ToolPanelViewShell.cxx b/sd/source/ui/toolpanel/ToolPanelViewShell.cxx index 0d7eeea99190..4c51d92142e9 100755 --- a/sd/source/ui/toolpanel/ToolPanelViewShell.cxx +++ b/sd/source/ui/toolpanel/ToolPanelViewShell.cxx @@ -84,7 +84,6 @@ #include #include #include -#include #include #include #include @@ -872,21 +871,19 @@ void ToolPanelViewShell_Impl::ConnectToDockingWindow() // --------------------------------------------------------------------------------------------------------------------- Reference< XAccessible > ToolPanelViewShell_Impl::CreateAccessible( ::sd::Window& i_rWindow ) { - Reference< XAccessible > xAccessibleParent; - ::Window* pAccessibleParent = i_rWindow.GetAccessibleParentWindow(); - if ( pAccessibleParent ) - xAccessibleParent.set( pAccessibleParent->GetAccessible() ); - Reference< XAccessible > xAccessible( GetToolPanelDeck().GetAccessible( FALSE ) ); if ( !xAccessible.is() ) { + // determine the XAccessible which is the parent of the to-be-created object + ::Window* pAccessibleParent = i_rWindow.GetAccessibleParentWindow(); + OSL_ENSURE( pAccessibleParent, "ToolPanelViewShell_Impl::CreateAccessible: illegal accessible parent provided by the sd::Window!" ); + GetToolPanelDeck().SetAccessibleParentWindow( pAccessibleParent ); + xAccessible = GetToolPanelDeck().GetAccessible( TRUE ); ENSURE_OR_RETURN( xAccessible.is(), "ToolPanelViewShell_Impl::CreateAccessible: illegal ToolPanelDeck accessible!", NULL ); - if ( xAccessibleParent.is() ) - { - ::comphelper::OAccessibleImplementationAccess::setAccessibleParent( - xAccessible->getAccessibleContext(), xAccessibleParent ); - } + OSL_ENSURE( xAccessible->getAccessibleContext().is() + && xAccessible->getAccessibleContext()->getAccessibleParent() == pAccessibleParent->GetAccessible(), + "ToolPanelViewShell_Impl::CreateAccessible: illegal parenthood!" ); } return xAccessible; } -- cgit From 1a13d99d7b09df0ec0b95fbd995ac93d5064afaf Mon Sep 17 00:00:00 2001 From: sb Date: Tue, 27 Apr 2010 17:01:13 +0200 Subject: sb120: #i111199# disabled failing tests for now --- sd/qa/unoapi/sd.sce | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sd') diff --git a/sd/qa/unoapi/sd.sce b/sd/qa/unoapi/sd.sce index e55358b23366..a61eb7b37481 100644 --- a/sd/qa/unoapi/sd.sce +++ b/sd/qa/unoapi/sd.sce @@ -1,5 +1,5 @@ -o sd.AccessibleDrawDocumentView --o sd.AccessibleOutlineView +#i111199 -o sd.AccessibleOutlineView #i35935# -o sd.AccessibleSlideView #i111042# -o sd.DrawController_DrawView #i111042# -o sd.DrawController_HandoutView -- cgit From d41b771550edf1d920f2ecba4d3c846b4a0d4373 Mon Sep 17 00:00:00 2001 From: "Frank Schoenheit [fs]" Date: Wed, 28 Apr 2010 09:41:55 +0200 Subject: slidecopy: make compile on unxsol[i|s]4.pro and unxmacxi[.pro] --- sd/source/ui/toolpanel/LayoutMenu.cxx | 6 +++--- sd/source/ui/toolpanel/LayoutMenu.hxx | 2 +- sd/source/ui/toolpanel/ToolPanelViewShell.cxx | 1 + 3 files changed, 5 insertions(+), 4 deletions(-) (limited to 'sd') diff --git a/sd/source/ui/toolpanel/LayoutMenu.cxx b/sd/source/ui/toolpanel/LayoutMenu.cxx index 67efc0e59d50..0e445ddb57bd 100644 --- a/sd/source/ui/toolpanel/LayoutMenu.cxx +++ b/sd/source/ui/toolpanel/LayoutMenu.cxx @@ -228,14 +228,14 @@ LayoutMenu::LayoutMenu( TreeNode* pParent, ToolPanelViewShell& i_rPanelViewShell mbSelectionUpdatePending(true), mbIsMainViewChangePending(false) { - ImplConstruct( *mrBase.GetDocument()->GetDocSh() ); + implConstruct( *mrBase.GetDocument()->GetDocSh() ); } -void LayoutMenu::ImplConstruct( DrawDocShell& rDocumentShell ) +void LayoutMenu::implConstruct( DrawDocShell& rDocumentShell ) { OSL_ENSURE( mrBase.GetDocument()->GetDocSh() == &rDocumentShell, - "LayoutMenu::ImplConstruct: hmm?" ); + "LayoutMenu::implConstruct: hmm?" ); // if this fires, then my assumption that the rDocumentShell parameter to our first ctor is superfluous ... SetStyle ( diff --git a/sd/source/ui/toolpanel/LayoutMenu.hxx b/sd/source/ui/toolpanel/LayoutMenu.hxx index 86606ef0b69c..86e01e9f803b 100644 --- a/sd/source/ui/toolpanel/LayoutMenu.hxx +++ b/sd/source/ui/toolpanel/LayoutMenu.hxx @@ -228,7 +228,7 @@ private: void UpdateSelection (void); // internal ctor - void ImplConstruct( DrawDocShell& rDocumentShell ); + void implConstruct( DrawDocShell& rDocumentShell ); /** When clicked then set the current page of the view in the center pane. */ diff --git a/sd/source/ui/toolpanel/ToolPanelViewShell.cxx b/sd/source/ui/toolpanel/ToolPanelViewShell.cxx index 4c51d92142e9..b0539b14f41a 100755 --- a/sd/source/ui/toolpanel/ToolPanelViewShell.cxx +++ b/sd/source/ui/toolpanel/ToolPanelViewShell.cxx @@ -159,6 +159,7 @@ PanelId GetStandardPanelId( const ::rtl::OUString& i_rTaskPanelResourceURL, cons else { OSL_ENSURE( i_bIgnoreUnknown, "GetStandardPanelId: cannot translate the given resource URL!" ); + (void)i_bIgnoreUnknown; } return ePanelId; -- cgit From 4fdd19781fa500032b520e042129da35899ed715 Mon Sep 17 00:00:00 2001 From: Wu Yan Date: Wed, 28 Apr 2010 18:45:33 +0800 Subject: findbar01: enhancements for findbar --- sd/source/ui/unoidl/DrawController.cxx | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'sd') diff --git a/sd/source/ui/unoidl/DrawController.cxx b/sd/source/ui/unoidl/DrawController.cxx index acd57f18d85c..e0d5712e33f1 100644 --- a/sd/source/ui/unoidl/DrawController.cxx +++ b/sd/source/ui/unoidl/DrawController.cxx @@ -29,6 +29,7 @@ #include "precompiled_sd.hxx" #include "DrawController.hxx" +#include "DrawDocShell.hxx" #include "DrawSubController.hxx" #include "sdpage.hxx" @@ -54,6 +55,7 @@ #include #include #include +#include using namespace ::std; using ::rtl::OUString; @@ -164,6 +166,16 @@ void SAL_CALL DrawController::dispose (void) { mbDisposing = true; + boost::shared_ptr pViewShell = mpBase->GetMainViewShell(); + if ( pViewShell ) + { + pViewShell->DeactivateCurrentFunction(); + DrawDocShell* pDocShell = pViewShell->GetDocSh(); + if ( pDocShell != NULL ) + pDocShell->SetDocShellFunction(0); + } + pViewShell.reset(); + // When the controller has not been detached from its view // shell, i.e. mpViewShell is not NULL, then tell PaneManager // and ViewShellManager to clear the shell stack. -- cgit From 8f3e68257b1a81aca009384ffc8b5d15f572da2f Mon Sep 17 00:00:00 2001 From: Wu Yan Date: Wed, 28 Apr 2010 18:47:48 +0800 Subject: findbar01: enhancements for findbar --- sd/uiconfig/sdraw/toolbar/findbar.xml | 8 ++++++++ sd/uiconfig/simpress/toolbar/findbar.xml | 8 ++++++++ 2 files changed, 16 insertions(+) create mode 100644 sd/uiconfig/sdraw/toolbar/findbar.xml create mode 100644 sd/uiconfig/simpress/toolbar/findbar.xml (limited to 'sd') diff --git a/sd/uiconfig/sdraw/toolbar/findbar.xml b/sd/uiconfig/sdraw/toolbar/findbar.xml new file mode 100644 index 000000000000..a19743198c7d --- /dev/null +++ b/sd/uiconfig/sdraw/toolbar/findbar.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/sd/uiconfig/simpress/toolbar/findbar.xml b/sd/uiconfig/simpress/toolbar/findbar.xml new file mode 100644 index 000000000000..a19743198c7d --- /dev/null +++ b/sd/uiconfig/simpress/toolbar/findbar.xml @@ -0,0 +1,8 @@ + + + + + + + + -- 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/controller/slidelayoutcontroller.hxx | 1 + sd/source/ui/inc/View.hxx | 1 - sd/source/ui/view/makefile.mk | 1 + 3 files changed, 2 insertions(+), 1 deletion(-) mode change 100755 => 100644 sd/source/ui/controller/slidelayoutcontroller.hxx mode change 100755 => 100644 sd/source/ui/view/makefile.mk (limited to 'sd') diff --git a/sd/source/ui/controller/slidelayoutcontroller.hxx b/sd/source/ui/controller/slidelayoutcontroller.hxx old mode 100755 new mode 100644 index 9e1c1692f953..5e76d3ad74c7 --- a/sd/source/ui/controller/slidelayoutcontroller.hxx +++ b/sd/source/ui/controller/slidelayoutcontroller.hxx @@ -44,6 +44,7 @@ public: virtual ::rtl::OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ); + using svt::PopupWindowController::createPopupWindow; private: bool mbInsertPage; }; 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 * ); diff --git a/sd/source/ui/view/makefile.mk b/sd/source/ui/view/makefile.mk old mode 100755 new mode 100644 index 3ef489cadf94..2cc2a96d46a2 --- a/sd/source/ui/view/makefile.mk +++ b/sd/source/ui/view/makefile.mk @@ -53,6 +53,7 @@ SLOFILES = \ $(SLO)$/sdview2.obj \ $(SLO)$/sdview3.obj \ $(SLO)$/sdview4.obj \ + $(SLO)$/sdview5.obj \ $(SLO)$/viewshel.obj \ $(SLO)$/viewshe2.obj \ $(SLO)$/viewshe3.obj \ -- cgit From 047c1b79eeff67957f97474bc19f48cc919ec3eb Mon Sep 17 00:00:00 2001 From: Christian Lippka Date: Fri, 30 Apr 2010 14:26:46 +0200 Subject: #i107213# fixed tooltips --- sd/source/ui/view/viewoverlaymanager.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sd') diff --git a/sd/source/ui/view/viewoverlaymanager.cxx b/sd/source/ui/view/viewoverlaymanager.cxx index 7d84a830d13d..9f34c859dc2a 100755 --- a/sd/source/ui/view/viewoverlaymanager.cxx +++ b/sd/source/ui/view/viewoverlaymanager.cxx @@ -83,7 +83,7 @@ BitmapEx ViewOverlayManager::maSmallButtonImages[BMP_PLACEHOLDER_SMALL_END - BMP BitmapEx ViewOverlayManager::maLargeButtonImages[BMP_PLACEHOLDER_LARGE_END - BMP_PLACEHOLDER_LARGE_START]; static USHORT gButtonSlots[] = { SID_INSERT_TABLE, SID_INSERT_DIAGRAM, SID_INSERT_GRAPHIC, SID_INSERT_AVMEDIA }; -static USHORT gButtonToolTips[] = { STR_RESET_LAYOUT, STR_INSERT_TABLE, STR_INSERT_CHART, STR_INSERT_PICTURE,STR_INSERT_MOVIE }; +static USHORT gButtonToolTips[] = { STR_INSERT_TABLE, STR_INSERT_CHART, STR_INSERT_PICTURE, STR_INSERT_MOVIE }; // -------------------------------------------------------------------- -- cgit From 3cf0f90f37ce7deeb9a126dd21c9ba3ad588281a Mon Sep 17 00:00:00 2001 From: Christian Lippka Date: Fri, 30 Apr 2010 14:48:52 +0200 Subject: #i107213# deselect previously selected objects before executing placeholder slot --- sd/source/ui/view/viewoverlaymanager.cxx | 65 ++++++++------------------------ 1 file changed, 15 insertions(+), 50 deletions(-) (limited to 'sd') diff --git a/sd/source/ui/view/viewoverlaymanager.cxx b/sd/source/ui/view/viewoverlaymanager.cxx index 9f34c859dc2a..ab165eea600b 100755 --- a/sd/source/ui/view/viewoverlaymanager.cxx +++ b/sd/source/ui/view/viewoverlaymanager.cxx @@ -112,9 +112,6 @@ public: /** returns true if the SmartTag consumes this event. */ virtual bool KeyInput( const KeyEvent& rKEvt ); - /** returns true if the SmartTag consumes this event. */ - virtual bool RequestHelp( const HelpEvent& rHEvt ); - BitmapEx createOverlayImage( int nHighlight = -1 ); protected: @@ -323,8 +320,13 @@ bool ChangePlaceholderTag::MouseButtonDown( const MouseEvent& /*rMEvt*/, SmartHd if( mxPlaceholderObj.get() ) { - SdrPageView* pPV = mrView.GetSdrPageView(); - mrView.MarkObj(mxPlaceholderObj.get(), pPV, FALSE); + // mark placeholder if it is not currently marked (or if also others are marked) + if( !mrView.IsObjMarked( mxPlaceholderObj.get() ) || (mrView.GetMarkedObjectList().GetMarkCount() != 1) ) + { + SdrPageView* pPV = mrView.GetSdrPageView(); + mrView.UnmarkAllObj(pPV ); + mrView.MarkObj(mxPlaceholderObj.get(), pPV, FALSE); + } } mrView.GetViewShell()->GetViewFrame()->GetDispatcher()->Execute( nSID, SFX_CALLMODE_ASYNCHRON); @@ -353,20 +355,6 @@ bool ChangePlaceholderTag::KeyInput( const KeyEvent& rKEvt ) } } -/** returns true if the SmartTag consumes this event. */ -bool ChangePlaceholderTag::RequestHelp( const HelpEvent& /*rHEvt*/ ) -{ -/* - Rectangle aItemRect( rHEvt.GetMousePosPixel(), Size(1,1) ); - String aHelpText(RTL_CONSTASCII_USTRINGPARAM("I'm a help text")); - if( rHEvt.GetMode() == HELPMODE_BALLOON ) - Help::ShowBalloon( static_cast< ::Window* >(mrView.GetFirstOutputDevice()), aItemRect.Center(), aItemRect, aHelpText); - else - Help::ShowQuickHelp( static_cast< ::Window* >(mrView.GetFirstOutputDevice()), aItemRect, aHelpText ); -*/ - return false; -} - // -------------------------------------------------------------------- BitmapEx ChangePlaceholderTag::createOverlayImage( int nHighlight ) @@ -385,10 +373,7 @@ BitmapEx ChangePlaceholderTag::createOverlayImage( int nHighlight ) Size aShapeSizePix = pDev->LogicToPixel(rSnapRect.GetSize()); long nShapeSizePix = std::min(aShapeSizePix.Width(),aShapeSizePix.Height()); -/* - if( 50 > nShapeSizePix ) - return; - */ + BitmapEx* pImages = (nShapeSizePix > 250) ? &ViewOverlayManager::maLargeButtonImages[0] : &ViewOverlayManager::maSmallButtonImages[0]; Size aSize( pImages->GetSizePixel() ); @@ -439,34 +424,14 @@ void ChangePlaceholderTag::addCustomHandles( SdrHdlList& rHandlerList ) Point aPos( rSnapRect.Center() ); aPos.X() -= all_width >> 1; aPos.Y() -= all_height >> 1; -/* - long nStartX = aPos.X(); - for( int i = 0, c = 0; i < 4; i++ ) - { - Image aImg( pImages[i] ); - Image aImgMO( pImages[i+4] ); - */ - ImageButtonHdl* pHdl = new ImageButtonHdl( xThis, /* gButtonSlots[i], aImg, aImgMO, */ aPoint ); - pHdl->SetObjHdlNum( SMART_TAG_HDL_NUM ); - pHdl->SetPageView( mrView.GetSdrPageView() ); - - pHdl->SetPos( aPos ); - - rHandlerList.AddHdl( pHdl ); -/* - if( ++c == nColumns ) - { - aPos.X() = nStartX; - aPos.Y() += aButtonSize.Height(); - c = 0; - } - else - { - aPos.X() += aButtonSize.Width(); - } - } -*/ + ImageButtonHdl* pHdl = new ImageButtonHdl( xThis, aPoint ); + pHdl->SetObjHdlNum( SMART_TAG_HDL_NUM ); + pHdl->SetPageView( mrView.GetSdrPageView() ); + + pHdl->SetPos( aPos ); + + rHandlerList.AddHdl( pHdl ); } } -- cgit From a253d7b98b2bf514eb7449081eb52de2788f3a1a Mon Sep 17 00:00:00 2001 From: sb Date: Mon, 3 May 2010 10:08:20 +0200 Subject: sb120: #i111329# disabled failing tests for now --- sd/qa/unoapi/sd.sce | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sd') diff --git a/sd/qa/unoapi/sd.sce b/sd/qa/unoapi/sd.sce index a61eb7b37481..c964c1ba0090 100644 --- a/sd/qa/unoapi/sd.sce +++ b/sd/qa/unoapi/sd.sce @@ -16,7 +16,7 @@ -o sd.SdMasterPagesAccess -o sd.SdPageLinkTargets -o sd.SdXCustomPresentation --o sd.SdXCustomPresentationAccess +#i111329 -o sd.SdXCustomPresentationAccess #i84994# -o sd.SdXImpressDocument -o sd.SdXPresentation #i87746 -o sd.SdXShape -- cgit From ab9908fa29246f0a310c6ff319b91583e9b61da5 Mon Sep 17 00:00:00 2001 From: Christian Lippka Date: Wed, 5 May 2010 14:21:14 +0200 Subject: #i102023# use LogicToPagePos conversion for snap lines and points --- sd/source/ui/func/fusnapln.cxx | 1 + 1 file changed, 1 insertion(+) mode change 100644 => 100755 sd/source/ui/func/fusnapln.cxx (limited to 'sd') diff --git a/sd/source/ui/func/fusnapln.cxx b/sd/source/ui/func/fusnapln.cxx old mode 100644 new mode 100755 index ab686481b402..fad1cb324fd2 --- a/sd/source/ui/func/fusnapln.cxx +++ b/sd/source/ui/func/fusnapln.cxx @@ -123,6 +123,7 @@ void FuSnapLine::DoExecute( SfxRequest& rReq ) { OSL_ASSERT(pPV!=NULL); aLinePos = (pPV->GetHelpLines())[nHelpLine].GetPos(); + pPV->LogicToPagePos(aLinePos); bLineExist = true; } aNewAttr.Put(SfxUInt32Item(ATTR_SNAPLINE_X, aLinePos.X())); -- cgit From 1875ea687b2c5c45fe3df626c05ca5f483417269 Mon Sep 17 00:00:00 2001 From: Christian Lippka Date: Wed, 5 May 2010 16:36:37 +0200 Subject: #i87750# removed insert sound&video from menu --- sd/uiconfig/sdraw/menubar/menubar.xml | 2 -- sd/uiconfig/sdraw/statusbar/statusbar.xml | 0 sd/uiconfig/sdraw/toolbar/3dobjectsbar.xml | 0 sd/uiconfig/sdraw/toolbar/alignmentbar.xml | 0 sd/uiconfig/sdraw/toolbar/arrowsbar.xml | 0 sd/uiconfig/sdraw/toolbar/arrowshapes.xml | 0 sd/uiconfig/sdraw/toolbar/basicshapes.xml | 0 sd/uiconfig/sdraw/toolbar/bezierobjectbar.xml | 0 sd/uiconfig/sdraw/toolbar/calloutshapes.xml | 0 sd/uiconfig/sdraw/toolbar/choosemodebar.xml | 0 sd/uiconfig/sdraw/toolbar/colorbar.xml | 0 sd/uiconfig/sdraw/toolbar/commentsbar.xml | 0 sd/uiconfig/sdraw/toolbar/connectorsbar.xml | 0 sd/uiconfig/sdraw/toolbar/drawingobjectbar.xml | 0 sd/uiconfig/sdraw/toolbar/ellipsesbar.xml | 0 sd/uiconfig/sdraw/toolbar/extrusionobjectbar.xml | 0 sd/uiconfig/sdraw/toolbar/flowchartshapes.xml | 0 sd/uiconfig/sdraw/toolbar/fontworkobjectbar.xml | 0 sd/uiconfig/sdraw/toolbar/fontworkshapetype.xml | 0 sd/uiconfig/sdraw/toolbar/formcontrols.xml | 0 sd/uiconfig/sdraw/toolbar/formdesign.xml | 0 sd/uiconfig/sdraw/toolbar/formsfilterbar.xml | 0 sd/uiconfig/sdraw/toolbar/formsnavigationbar.xml | 0 sd/uiconfig/sdraw/toolbar/formtextobjectbar.xml | 0 sd/uiconfig/sdraw/toolbar/fullscreenbar.xml | 0 sd/uiconfig/sdraw/toolbar/gluepointsobjectbar.xml | 0 sd/uiconfig/sdraw/toolbar/graffilterbar.xml | 0 sd/uiconfig/sdraw/toolbar/graphicobjectbar.xml | 0 sd/uiconfig/sdraw/toolbar/insertbar.xml | 0 sd/uiconfig/sdraw/toolbar/linesbar.xml | 0 sd/uiconfig/sdraw/toolbar/masterviewtoolbar.xml | 0 sd/uiconfig/sdraw/toolbar/mediaobjectbar.xml | 0 sd/uiconfig/sdraw/toolbar/moreformcontrols.xml | 0 sd/uiconfig/sdraw/toolbar/optimizetablebar.xml | 0 sd/uiconfig/sdraw/toolbar/optionsbar.xml | 0 sd/uiconfig/sdraw/toolbar/positionbar.xml | 0 sd/uiconfig/sdraw/toolbar/rectanglesbar.xml | 0 sd/uiconfig/sdraw/toolbar/standardbar.xml | 0 sd/uiconfig/sdraw/toolbar/starshapes.xml | 0 sd/uiconfig/sdraw/toolbar/symbolshapes.xml | 0 sd/uiconfig/sdraw/toolbar/tableobjectbar.xml | 0 sd/uiconfig/sdraw/toolbar/textbar.xml | 0 sd/uiconfig/sdraw/toolbar/textobjectbar.xml | 0 sd/uiconfig/sdraw/toolbar/toolbar.xml | 0 sd/uiconfig/sdraw/toolbar/viewerbar.xml | 0 sd/uiconfig/sdraw/toolbar/zoombar.xml | 0 sd/uiconfig/simpress/menubar/menubar.xml | 2 -- sd/uiconfig/simpress/statusbar/statusbar.xml | 0 sd/uiconfig/simpress/toolbar/3dobjectsbar.xml | 0 sd/uiconfig/simpress/toolbar/alignmentbar.xml | 0 sd/uiconfig/simpress/toolbar/arrowsbar.xml | 0 sd/uiconfig/simpress/toolbar/arrowshapes.xml | 0 sd/uiconfig/simpress/toolbar/basicshapes.xml | 0 sd/uiconfig/simpress/toolbar/bezierobjectbar.xml | 0 sd/uiconfig/simpress/toolbar/calloutshapes.xml | 0 sd/uiconfig/simpress/toolbar/choosemodebar.xml | 0 sd/uiconfig/simpress/toolbar/colorbar.xml | 0 sd/uiconfig/simpress/toolbar/commentsbar.xml | 0 sd/uiconfig/simpress/toolbar/commontaskbar.xml | 0 sd/uiconfig/simpress/toolbar/connectorsbar.xml | 0 sd/uiconfig/simpress/toolbar/drawingobjectbar.xml | 0 sd/uiconfig/simpress/toolbar/ellipsesbar.xml | 0 sd/uiconfig/simpress/toolbar/extrusionobjectbar.xml | 0 sd/uiconfig/simpress/toolbar/flowchartshapes.xml | 0 sd/uiconfig/simpress/toolbar/fontworkobjectbar.xml | 0 sd/uiconfig/simpress/toolbar/fontworkshapetype.xml | 0 sd/uiconfig/simpress/toolbar/formcontrols.xml | 0 sd/uiconfig/simpress/toolbar/formdesign.xml | 0 sd/uiconfig/simpress/toolbar/formsfilterbar.xml | 0 sd/uiconfig/simpress/toolbar/formsnavigationbar.xml | 0 sd/uiconfig/simpress/toolbar/formtextobjectbar.xml | 0 sd/uiconfig/simpress/toolbar/fullscreenbar.xml | 0 sd/uiconfig/simpress/toolbar/gluepointsobjectbar.xml | 0 sd/uiconfig/simpress/toolbar/graffilterbar.xml | 0 sd/uiconfig/simpress/toolbar/graphicobjectbar.xml | 0 sd/uiconfig/simpress/toolbar/insertbar.xml | 0 sd/uiconfig/simpress/toolbar/linesbar.xml | 0 sd/uiconfig/simpress/toolbar/masterviewtoolbar.xml | 0 sd/uiconfig/simpress/toolbar/mediaobjectbar.xml | 0 sd/uiconfig/simpress/toolbar/moreformcontrols.xml | 0 sd/uiconfig/simpress/toolbar/optimizetablebar.xml | 0 sd/uiconfig/simpress/toolbar/optionsbar.xml | 0 sd/uiconfig/simpress/toolbar/outlinetoolbar.xml | 0 sd/uiconfig/simpress/toolbar/positionbar.xml | 0 sd/uiconfig/simpress/toolbar/rectanglesbar.xml | 0 sd/uiconfig/simpress/toolbar/slideviewobjectbar.xml | 0 sd/uiconfig/simpress/toolbar/slideviewtoolbar.xml | 0 sd/uiconfig/simpress/toolbar/standardbar.xml | 0 sd/uiconfig/simpress/toolbar/starshapes.xml | 0 sd/uiconfig/simpress/toolbar/symbolshapes.xml | 0 sd/uiconfig/simpress/toolbar/tableobjectbar.xml | 0 sd/uiconfig/simpress/toolbar/textbar.xml | 0 sd/uiconfig/simpress/toolbar/textobjectbar.xml | 0 sd/uiconfig/simpress/toolbar/toolbar.xml | 0 sd/uiconfig/simpress/toolbar/viewerbar.xml | 0 sd/uiconfig/simpress/toolbar/zoombar.xml | 0 96 files changed, 4 deletions(-) mode change 100644 => 100755 sd/uiconfig/sdraw/menubar/menubar.xml mode change 100644 => 100755 sd/uiconfig/sdraw/statusbar/statusbar.xml mode change 100644 => 100755 sd/uiconfig/sdraw/toolbar/3dobjectsbar.xml mode change 100644 => 100755 sd/uiconfig/sdraw/toolbar/alignmentbar.xml mode change 100644 => 100755 sd/uiconfig/sdraw/toolbar/arrowsbar.xml mode change 100644 => 100755 sd/uiconfig/sdraw/toolbar/arrowshapes.xml mode change 100644 => 100755 sd/uiconfig/sdraw/toolbar/basicshapes.xml mode change 100644 => 100755 sd/uiconfig/sdraw/toolbar/bezierobjectbar.xml mode change 100644 => 100755 sd/uiconfig/sdraw/toolbar/calloutshapes.xml mode change 100644 => 100755 sd/uiconfig/sdraw/toolbar/choosemodebar.xml mode change 100644 => 100755 sd/uiconfig/sdraw/toolbar/colorbar.xml mode change 100644 => 100755 sd/uiconfig/sdraw/toolbar/commentsbar.xml mode change 100644 => 100755 sd/uiconfig/sdraw/toolbar/connectorsbar.xml mode change 100644 => 100755 sd/uiconfig/sdraw/toolbar/drawingobjectbar.xml mode change 100644 => 100755 sd/uiconfig/sdraw/toolbar/ellipsesbar.xml mode change 100644 => 100755 sd/uiconfig/sdraw/toolbar/extrusionobjectbar.xml mode change 100644 => 100755 sd/uiconfig/sdraw/toolbar/flowchartshapes.xml mode change 100644 => 100755 sd/uiconfig/sdraw/toolbar/fontworkobjectbar.xml mode change 100644 => 100755 sd/uiconfig/sdraw/toolbar/fontworkshapetype.xml mode change 100644 => 100755 sd/uiconfig/sdraw/toolbar/formcontrols.xml mode change 100644 => 100755 sd/uiconfig/sdraw/toolbar/formdesign.xml mode change 100644 => 100755 sd/uiconfig/sdraw/toolbar/formsfilterbar.xml mode change 100644 => 100755 sd/uiconfig/sdraw/toolbar/formsnavigationbar.xml mode change 100644 => 100755 sd/uiconfig/sdraw/toolbar/formtextobjectbar.xml mode change 100644 => 100755 sd/uiconfig/sdraw/toolbar/fullscreenbar.xml mode change 100644 => 100755 sd/uiconfig/sdraw/toolbar/gluepointsobjectbar.xml mode change 100644 => 100755 sd/uiconfig/sdraw/toolbar/graffilterbar.xml mode change 100644 => 100755 sd/uiconfig/sdraw/toolbar/graphicobjectbar.xml mode change 100644 => 100755 sd/uiconfig/sdraw/toolbar/insertbar.xml mode change 100644 => 100755 sd/uiconfig/sdraw/toolbar/linesbar.xml mode change 100644 => 100755 sd/uiconfig/sdraw/toolbar/masterviewtoolbar.xml mode change 100644 => 100755 sd/uiconfig/sdraw/toolbar/mediaobjectbar.xml mode change 100644 => 100755 sd/uiconfig/sdraw/toolbar/moreformcontrols.xml mode change 100644 => 100755 sd/uiconfig/sdraw/toolbar/optimizetablebar.xml mode change 100644 => 100755 sd/uiconfig/sdraw/toolbar/optionsbar.xml mode change 100644 => 100755 sd/uiconfig/sdraw/toolbar/positionbar.xml mode change 100644 => 100755 sd/uiconfig/sdraw/toolbar/rectanglesbar.xml mode change 100644 => 100755 sd/uiconfig/sdraw/toolbar/standardbar.xml mode change 100644 => 100755 sd/uiconfig/sdraw/toolbar/starshapes.xml mode change 100644 => 100755 sd/uiconfig/sdraw/toolbar/symbolshapes.xml mode change 100644 => 100755 sd/uiconfig/sdraw/toolbar/tableobjectbar.xml mode change 100644 => 100755 sd/uiconfig/sdraw/toolbar/textbar.xml mode change 100644 => 100755 sd/uiconfig/sdraw/toolbar/textobjectbar.xml mode change 100644 => 100755 sd/uiconfig/sdraw/toolbar/toolbar.xml mode change 100644 => 100755 sd/uiconfig/sdraw/toolbar/viewerbar.xml mode change 100644 => 100755 sd/uiconfig/sdraw/toolbar/zoombar.xml mode change 100644 => 100755 sd/uiconfig/simpress/menubar/menubar.xml mode change 100644 => 100755 sd/uiconfig/simpress/statusbar/statusbar.xml mode change 100644 => 100755 sd/uiconfig/simpress/toolbar/3dobjectsbar.xml mode change 100644 => 100755 sd/uiconfig/simpress/toolbar/alignmentbar.xml mode change 100644 => 100755 sd/uiconfig/simpress/toolbar/arrowsbar.xml mode change 100644 => 100755 sd/uiconfig/simpress/toolbar/arrowshapes.xml mode change 100644 => 100755 sd/uiconfig/simpress/toolbar/basicshapes.xml mode change 100644 => 100755 sd/uiconfig/simpress/toolbar/bezierobjectbar.xml mode change 100644 => 100755 sd/uiconfig/simpress/toolbar/calloutshapes.xml mode change 100644 => 100755 sd/uiconfig/simpress/toolbar/choosemodebar.xml mode change 100644 => 100755 sd/uiconfig/simpress/toolbar/colorbar.xml mode change 100644 => 100755 sd/uiconfig/simpress/toolbar/commentsbar.xml mode change 100644 => 100755 sd/uiconfig/simpress/toolbar/commontaskbar.xml mode change 100644 => 100755 sd/uiconfig/simpress/toolbar/connectorsbar.xml mode change 100644 => 100755 sd/uiconfig/simpress/toolbar/drawingobjectbar.xml mode change 100644 => 100755 sd/uiconfig/simpress/toolbar/ellipsesbar.xml mode change 100644 => 100755 sd/uiconfig/simpress/toolbar/extrusionobjectbar.xml mode change 100644 => 100755 sd/uiconfig/simpress/toolbar/flowchartshapes.xml mode change 100644 => 100755 sd/uiconfig/simpress/toolbar/fontworkobjectbar.xml mode change 100644 => 100755 sd/uiconfig/simpress/toolbar/fontworkshapetype.xml mode change 100644 => 100755 sd/uiconfig/simpress/toolbar/formcontrols.xml mode change 100644 => 100755 sd/uiconfig/simpress/toolbar/formdesign.xml mode change 100644 => 100755 sd/uiconfig/simpress/toolbar/formsfilterbar.xml mode change 100644 => 100755 sd/uiconfig/simpress/toolbar/formsnavigationbar.xml mode change 100644 => 100755 sd/uiconfig/simpress/toolbar/formtextobjectbar.xml mode change 100644 => 100755 sd/uiconfig/simpress/toolbar/fullscreenbar.xml mode change 100644 => 100755 sd/uiconfig/simpress/toolbar/gluepointsobjectbar.xml mode change 100644 => 100755 sd/uiconfig/simpress/toolbar/graffilterbar.xml mode change 100644 => 100755 sd/uiconfig/simpress/toolbar/graphicobjectbar.xml mode change 100644 => 100755 sd/uiconfig/simpress/toolbar/insertbar.xml mode change 100644 => 100755 sd/uiconfig/simpress/toolbar/linesbar.xml mode change 100644 => 100755 sd/uiconfig/simpress/toolbar/masterviewtoolbar.xml mode change 100644 => 100755 sd/uiconfig/simpress/toolbar/mediaobjectbar.xml mode change 100644 => 100755 sd/uiconfig/simpress/toolbar/moreformcontrols.xml mode change 100644 => 100755 sd/uiconfig/simpress/toolbar/optimizetablebar.xml mode change 100644 => 100755 sd/uiconfig/simpress/toolbar/optionsbar.xml mode change 100644 => 100755 sd/uiconfig/simpress/toolbar/outlinetoolbar.xml mode change 100644 => 100755 sd/uiconfig/simpress/toolbar/positionbar.xml mode change 100644 => 100755 sd/uiconfig/simpress/toolbar/rectanglesbar.xml mode change 100644 => 100755 sd/uiconfig/simpress/toolbar/slideviewobjectbar.xml mode change 100644 => 100755 sd/uiconfig/simpress/toolbar/slideviewtoolbar.xml mode change 100644 => 100755 sd/uiconfig/simpress/toolbar/standardbar.xml mode change 100644 => 100755 sd/uiconfig/simpress/toolbar/starshapes.xml mode change 100644 => 100755 sd/uiconfig/simpress/toolbar/symbolshapes.xml mode change 100644 => 100755 sd/uiconfig/simpress/toolbar/tableobjectbar.xml mode change 100644 => 100755 sd/uiconfig/simpress/toolbar/textbar.xml mode change 100644 => 100755 sd/uiconfig/simpress/toolbar/textobjectbar.xml mode change 100644 => 100755 sd/uiconfig/simpress/toolbar/toolbar.xml mode change 100644 => 100755 sd/uiconfig/simpress/toolbar/viewerbar.xml mode change 100644 => 100755 sd/uiconfig/simpress/toolbar/zoombar.xml (limited to 'sd') diff --git a/sd/uiconfig/sdraw/menubar/menubar.xml b/sd/uiconfig/sdraw/menubar/menubar.xml old mode 100644 new mode 100755 index 9e5d927b263e..816f46a801b7 --- a/sd/uiconfig/sdraw/menubar/menubar.xml +++ b/sd/uiconfig/sdraw/menubar/menubar.xml @@ -163,8 +163,6 @@ - - diff --git a/sd/uiconfig/sdraw/statusbar/statusbar.xml b/sd/uiconfig/sdraw/statusbar/statusbar.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/sdraw/toolbar/3dobjectsbar.xml b/sd/uiconfig/sdraw/toolbar/3dobjectsbar.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/sdraw/toolbar/alignmentbar.xml b/sd/uiconfig/sdraw/toolbar/alignmentbar.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/sdraw/toolbar/arrowsbar.xml b/sd/uiconfig/sdraw/toolbar/arrowsbar.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/sdraw/toolbar/arrowshapes.xml b/sd/uiconfig/sdraw/toolbar/arrowshapes.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/sdraw/toolbar/basicshapes.xml b/sd/uiconfig/sdraw/toolbar/basicshapes.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/sdraw/toolbar/bezierobjectbar.xml b/sd/uiconfig/sdraw/toolbar/bezierobjectbar.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/sdraw/toolbar/calloutshapes.xml b/sd/uiconfig/sdraw/toolbar/calloutshapes.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/sdraw/toolbar/choosemodebar.xml b/sd/uiconfig/sdraw/toolbar/choosemodebar.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/sdraw/toolbar/colorbar.xml b/sd/uiconfig/sdraw/toolbar/colorbar.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/sdraw/toolbar/commentsbar.xml b/sd/uiconfig/sdraw/toolbar/commentsbar.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/sdraw/toolbar/connectorsbar.xml b/sd/uiconfig/sdraw/toolbar/connectorsbar.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/sdraw/toolbar/drawingobjectbar.xml b/sd/uiconfig/sdraw/toolbar/drawingobjectbar.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/sdraw/toolbar/ellipsesbar.xml b/sd/uiconfig/sdraw/toolbar/ellipsesbar.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/sdraw/toolbar/extrusionobjectbar.xml b/sd/uiconfig/sdraw/toolbar/extrusionobjectbar.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/sdraw/toolbar/flowchartshapes.xml b/sd/uiconfig/sdraw/toolbar/flowchartshapes.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/sdraw/toolbar/fontworkobjectbar.xml b/sd/uiconfig/sdraw/toolbar/fontworkobjectbar.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/sdraw/toolbar/fontworkshapetype.xml b/sd/uiconfig/sdraw/toolbar/fontworkshapetype.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/sdraw/toolbar/formcontrols.xml b/sd/uiconfig/sdraw/toolbar/formcontrols.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/sdraw/toolbar/formdesign.xml b/sd/uiconfig/sdraw/toolbar/formdesign.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/sdraw/toolbar/formsfilterbar.xml b/sd/uiconfig/sdraw/toolbar/formsfilterbar.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/sdraw/toolbar/formsnavigationbar.xml b/sd/uiconfig/sdraw/toolbar/formsnavigationbar.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/sdraw/toolbar/formtextobjectbar.xml b/sd/uiconfig/sdraw/toolbar/formtextobjectbar.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/sdraw/toolbar/fullscreenbar.xml b/sd/uiconfig/sdraw/toolbar/fullscreenbar.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/sdraw/toolbar/gluepointsobjectbar.xml b/sd/uiconfig/sdraw/toolbar/gluepointsobjectbar.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/sdraw/toolbar/graffilterbar.xml b/sd/uiconfig/sdraw/toolbar/graffilterbar.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/sdraw/toolbar/graphicobjectbar.xml b/sd/uiconfig/sdraw/toolbar/graphicobjectbar.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/sdraw/toolbar/insertbar.xml b/sd/uiconfig/sdraw/toolbar/insertbar.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/sdraw/toolbar/linesbar.xml b/sd/uiconfig/sdraw/toolbar/linesbar.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/sdraw/toolbar/masterviewtoolbar.xml b/sd/uiconfig/sdraw/toolbar/masterviewtoolbar.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/sdraw/toolbar/mediaobjectbar.xml b/sd/uiconfig/sdraw/toolbar/mediaobjectbar.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/sdraw/toolbar/moreformcontrols.xml b/sd/uiconfig/sdraw/toolbar/moreformcontrols.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/sdraw/toolbar/optimizetablebar.xml b/sd/uiconfig/sdraw/toolbar/optimizetablebar.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/sdraw/toolbar/optionsbar.xml b/sd/uiconfig/sdraw/toolbar/optionsbar.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/sdraw/toolbar/positionbar.xml b/sd/uiconfig/sdraw/toolbar/positionbar.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/sdraw/toolbar/rectanglesbar.xml b/sd/uiconfig/sdraw/toolbar/rectanglesbar.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/sdraw/toolbar/standardbar.xml b/sd/uiconfig/sdraw/toolbar/standardbar.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/sdraw/toolbar/starshapes.xml b/sd/uiconfig/sdraw/toolbar/starshapes.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/sdraw/toolbar/symbolshapes.xml b/sd/uiconfig/sdraw/toolbar/symbolshapes.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/sdraw/toolbar/tableobjectbar.xml b/sd/uiconfig/sdraw/toolbar/tableobjectbar.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/sdraw/toolbar/textbar.xml b/sd/uiconfig/sdraw/toolbar/textbar.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/sdraw/toolbar/textobjectbar.xml b/sd/uiconfig/sdraw/toolbar/textobjectbar.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/sdraw/toolbar/toolbar.xml b/sd/uiconfig/sdraw/toolbar/toolbar.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/sdraw/toolbar/viewerbar.xml b/sd/uiconfig/sdraw/toolbar/viewerbar.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/sdraw/toolbar/zoombar.xml b/sd/uiconfig/sdraw/toolbar/zoombar.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/simpress/menubar/menubar.xml b/sd/uiconfig/simpress/menubar/menubar.xml old mode 100644 new mode 100755 index c1dacd33e0c0..36e75e377cff --- a/sd/uiconfig/simpress/menubar/menubar.xml +++ b/sd/uiconfig/simpress/menubar/menubar.xml @@ -181,8 +181,6 @@ - - diff --git a/sd/uiconfig/simpress/statusbar/statusbar.xml b/sd/uiconfig/simpress/statusbar/statusbar.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/simpress/toolbar/3dobjectsbar.xml b/sd/uiconfig/simpress/toolbar/3dobjectsbar.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/simpress/toolbar/alignmentbar.xml b/sd/uiconfig/simpress/toolbar/alignmentbar.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/simpress/toolbar/arrowsbar.xml b/sd/uiconfig/simpress/toolbar/arrowsbar.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/simpress/toolbar/arrowshapes.xml b/sd/uiconfig/simpress/toolbar/arrowshapes.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/simpress/toolbar/basicshapes.xml b/sd/uiconfig/simpress/toolbar/basicshapes.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/simpress/toolbar/bezierobjectbar.xml b/sd/uiconfig/simpress/toolbar/bezierobjectbar.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/simpress/toolbar/calloutshapes.xml b/sd/uiconfig/simpress/toolbar/calloutshapes.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/simpress/toolbar/choosemodebar.xml b/sd/uiconfig/simpress/toolbar/choosemodebar.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/simpress/toolbar/colorbar.xml b/sd/uiconfig/simpress/toolbar/colorbar.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/simpress/toolbar/commentsbar.xml b/sd/uiconfig/simpress/toolbar/commentsbar.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/simpress/toolbar/commontaskbar.xml b/sd/uiconfig/simpress/toolbar/commontaskbar.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/simpress/toolbar/connectorsbar.xml b/sd/uiconfig/simpress/toolbar/connectorsbar.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/simpress/toolbar/drawingobjectbar.xml b/sd/uiconfig/simpress/toolbar/drawingobjectbar.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/simpress/toolbar/ellipsesbar.xml b/sd/uiconfig/simpress/toolbar/ellipsesbar.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/simpress/toolbar/extrusionobjectbar.xml b/sd/uiconfig/simpress/toolbar/extrusionobjectbar.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/simpress/toolbar/flowchartshapes.xml b/sd/uiconfig/simpress/toolbar/flowchartshapes.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/simpress/toolbar/fontworkobjectbar.xml b/sd/uiconfig/simpress/toolbar/fontworkobjectbar.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/simpress/toolbar/fontworkshapetype.xml b/sd/uiconfig/simpress/toolbar/fontworkshapetype.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/simpress/toolbar/formcontrols.xml b/sd/uiconfig/simpress/toolbar/formcontrols.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/simpress/toolbar/formdesign.xml b/sd/uiconfig/simpress/toolbar/formdesign.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/simpress/toolbar/formsfilterbar.xml b/sd/uiconfig/simpress/toolbar/formsfilterbar.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/simpress/toolbar/formsnavigationbar.xml b/sd/uiconfig/simpress/toolbar/formsnavigationbar.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/simpress/toolbar/formtextobjectbar.xml b/sd/uiconfig/simpress/toolbar/formtextobjectbar.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/simpress/toolbar/fullscreenbar.xml b/sd/uiconfig/simpress/toolbar/fullscreenbar.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/simpress/toolbar/gluepointsobjectbar.xml b/sd/uiconfig/simpress/toolbar/gluepointsobjectbar.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/simpress/toolbar/graffilterbar.xml b/sd/uiconfig/simpress/toolbar/graffilterbar.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/simpress/toolbar/graphicobjectbar.xml b/sd/uiconfig/simpress/toolbar/graphicobjectbar.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/simpress/toolbar/insertbar.xml b/sd/uiconfig/simpress/toolbar/insertbar.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/simpress/toolbar/linesbar.xml b/sd/uiconfig/simpress/toolbar/linesbar.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/simpress/toolbar/masterviewtoolbar.xml b/sd/uiconfig/simpress/toolbar/masterviewtoolbar.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/simpress/toolbar/mediaobjectbar.xml b/sd/uiconfig/simpress/toolbar/mediaobjectbar.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/simpress/toolbar/moreformcontrols.xml b/sd/uiconfig/simpress/toolbar/moreformcontrols.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/simpress/toolbar/optimizetablebar.xml b/sd/uiconfig/simpress/toolbar/optimizetablebar.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/simpress/toolbar/optionsbar.xml b/sd/uiconfig/simpress/toolbar/optionsbar.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/simpress/toolbar/outlinetoolbar.xml b/sd/uiconfig/simpress/toolbar/outlinetoolbar.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/simpress/toolbar/positionbar.xml b/sd/uiconfig/simpress/toolbar/positionbar.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/simpress/toolbar/rectanglesbar.xml b/sd/uiconfig/simpress/toolbar/rectanglesbar.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/simpress/toolbar/slideviewobjectbar.xml b/sd/uiconfig/simpress/toolbar/slideviewobjectbar.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/simpress/toolbar/slideviewtoolbar.xml b/sd/uiconfig/simpress/toolbar/slideviewtoolbar.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/simpress/toolbar/standardbar.xml b/sd/uiconfig/simpress/toolbar/standardbar.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/simpress/toolbar/starshapes.xml b/sd/uiconfig/simpress/toolbar/starshapes.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/simpress/toolbar/symbolshapes.xml b/sd/uiconfig/simpress/toolbar/symbolshapes.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/simpress/toolbar/tableobjectbar.xml b/sd/uiconfig/simpress/toolbar/tableobjectbar.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/simpress/toolbar/textbar.xml b/sd/uiconfig/simpress/toolbar/textbar.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/simpress/toolbar/textobjectbar.xml b/sd/uiconfig/simpress/toolbar/textobjectbar.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/simpress/toolbar/toolbar.xml b/sd/uiconfig/simpress/toolbar/toolbar.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/simpress/toolbar/viewerbar.xml b/sd/uiconfig/simpress/toolbar/viewerbar.xml old mode 100644 new mode 100755 diff --git a/sd/uiconfig/simpress/toolbar/zoombar.xml b/sd/uiconfig/simpress/toolbar/zoombar.xml old mode 100644 new mode 100755 -- cgit From 58dd850178eb0151f03351b0599fcb88e6b499a8 Mon Sep 17 00:00:00 2001 From: Christian Lippka Date: Wed, 5 May 2010 17:39:48 +0200 Subject: #i89450# removed unused code --- sd/inc/Outliner.hxx | 24 - sd/inc/OutlinerIterator.hxx | 31 +- sd/inc/drawdoc.hxx | 14 - sd/inc/sdmod.hxx | 2 - sd/inc/segdefs.hxx | 29 - sd/inc/segdefs_.hxx | 1400 -------------------- sd/inc/shapelist.hxx | 4 - sd/inc/stlpool.hxx | 2 - sd/inc/textapi.hxx | 1 - sd/source/core/CustomAnimationEffect.cxx | 9 - sd/source/core/drawdoc2.cxx | 31 - sd/source/core/drawdoc4.cxx | 77 -- sd/source/core/shapelist.cxx | 19 - sd/source/core/stlpool.cxx | 50 - sd/source/core/text/textapi.cxx | 27 - sd/source/filter/eppt/eppt.hxx | 18 +- sd/source/filter/eppt/epptso.cxx | 37 +- sd/source/filter/html/htmlattr.cxx | 12 - sd/source/filter/html/htmlattr.hxx | 2 - sd/source/filter/html/htmlex.cxx | 9 - sd/source/filter/html/htmlex.hxx | 1 - sd/source/filter/ppt/ppt97animations.cxx | 8 +- sd/source/filter/ppt/ppt97animations.hxx | 3 +- sd/source/filter/ppt/pptatom.cpp | 12 - sd/source/filter/ppt/pptatom.hxx | 8 - sd/source/filter/ppt/pptinanimations.cxx | 58 - sd/source/filter/ppt/pptinanimations.hxx | 7 +- .../ui/accessibility/AccessibleViewForwarder.cxx | 21 - sd/source/ui/animations/AnimationSchemesPane.cxx | 443 ------- sd/source/ui/animations/AnimationSchemesPane.hrc | 50 - sd/source/ui/animations/AnimationSchemesPane.hxx | 114 -- sd/source/ui/animations/AnimationSchemesPane.src | 113 -- .../ui/animations/CustomAnimationCreateDialog.cxx | 7 - .../ui/animations/CustomAnimationSchemesPane.hrc | 32 - .../ui/animations/CustomAnimationSchemesPane.src | 71 - sd/source/ui/animations/makefile.mk | 3 - sd/source/ui/annotations/annotationmanager.cxx | 4 +- sd/source/ui/annotations/annotationmanagerimpl.hxx | 4 +- sd/source/ui/annotations/annotationwindow.cxx | 6 - sd/source/ui/annotations/annotationwindow.hxx | 1 - sd/source/ui/app/optsitem.cxx | 229 ---- sd/source/ui/app/sdmod.cxx | 17 - sd/source/ui/dlg/LayerDialogContent.cxx | 8 - sd/source/ui/dlg/PaneDockingWindow.cxx | 9 - sd/source/ui/dlg/animobjs.cxx | 13 - sd/source/ui/dlg/dlgass.cxx | 15 - sd/source/ui/dlg/dlgassim.cxx | 284 ---- sd/source/ui/dlg/dlgassim.hxx | 51 +- sd/source/ui/dlg/dlgctrls.cxx | 6 - sd/source/ui/dlg/dlgsnap.cxx | 18 +- sd/source/ui/dlg/docprev.cxx | 19 - sd/source/ui/dlg/filedlg.cxx | 88 -- sd/source/ui/dlg/headerfooterdlg.cxx | 6 - sd/source/ui/dlg/inspagob.cxx | 1 - sd/source/ui/dlg/prntopts.cxx | 16 - sd/source/ui/dlg/sdtreelb.cxx | 55 - sd/source/ui/dlg/tpaction.cxx | 45 - sd/source/ui/docshell/docshel4.cxx | 12 - sd/source/ui/docshell/docshell.cxx | 15 - .../configuration/ConfigurationClassifier.cxx | 7 - .../configuration/ConfigurationController.cxx | 26 - .../configuration/ConfigurationTracer.cxx | 8 +- .../configuration/ConfigurationTracer.hxx | 4 +- .../configuration/ConfigurationUpdater.cxx | 8 - .../configuration/ConfigurationUpdater.hxx | 3 - .../ui/framework/configuration/ResourceId.cxx | 11 - .../ui/framework/factories/BasicPaneFactory.cxx | 26 - .../ui/framework/factories/BasicPaneFactory.hxx | 6 - .../ui/framework/factories/TaskPanelFactory.cxx | 17 - .../ui/framework/factories/TaskPanelFactory.hxx | 2 - .../ui/framework/factories/ViewShellWrapper.cxx | 8 - .../ui/framework/module/ReadOnlyModeObserver.cxx | 11 - .../ui/framework/module/ReadOnlyModeObserver.hxx | 6 - sd/source/ui/framework/module/ResourceManager.cxx | 21 - sd/source/ui/framework/module/ResourceManager.hxx | 2 - sd/source/ui/framework/tools/FrameworkHelper.cxx | 22 - sd/source/ui/func/fuconstr.cxx | 7 - sd/source/ui/func/fudraw.cxx | 8 - sd/source/ui/func/fuoutl.cxx | 6 - sd/source/ui/func/fupoor.cxx | 22 - sd/source/ui/func/fusearch.cxx | 9 +- sd/source/ui/func/fuspell.cxx | 166 --- sd/source/ui/func/futransf.cxx | 25 - sd/source/ui/func/makefile.mk | 3 - sd/source/ui/func/outlinfo.cxx | 301 ----- sd/source/ui/func/sdundogr.cxx | 11 - sd/source/ui/func/unoaprms.cxx | 46 - sd/source/ui/inc/AccessibleViewForwarder.hxx | 3 - sd/source/ui/inc/DrawController.hxx | 2 - sd/source/ui/inc/DrawDocShell.hxx | 3 - sd/source/ui/inc/DrawViewShell.hxx | 8 - sd/source/ui/inc/GraphicViewShell.hxx | 5 - sd/source/ui/inc/LayerDialogContent.hxx | 2 - sd/source/ui/inc/MasterPageObserver.hxx | 6 - sd/source/ui/inc/OutlineView.hxx | 2 + sd/source/ui/inc/OutlineViewShell.hxx | 5 - sd/source/ui/inc/PaneDockingWindow.hxx | 6 - sd/source/ui/inc/SdUnoPresView.hxx | 54 - sd/source/ui/inc/SlideSorterViewShell.hxx | 6 - sd/source/ui/inc/SlideView.hxx | 2 - sd/source/ui/inc/TaskPaneViewShell.hxx | 31 - sd/source/ui/inc/ToolBarManager.hxx | 16 - sd/source/ui/inc/View.hxx | 3 - sd/source/ui/inc/ViewShell.hxx | 7 - sd/source/ui/inc/ViewShellBase.hxx | 29 - sd/source/ui/inc/ViewShellManager.hxx | 43 - sd/source/ui/inc/Window.hxx | 2 - sd/source/ui/inc/animobjs.hxx | 1 - sd/source/ui/inc/bmcache.hxx | 2 - sd/source/ui/inc/dlgass.hxx | 3 - sd/source/ui/inc/dlgctrls.hxx | 1 - sd/source/ui/inc/docprev.hxx | 2 - sd/source/ui/inc/filedlg.hxx | 31 - sd/source/ui/inc/framework/FrameworkHelper.hxx | 17 - sd/source/ui/inc/framework/ResourceId.hxx | 2 - sd/source/ui/inc/framework/ViewShellWrapper.hxx | 10 - sd/source/ui/inc/fuconstr.hxx | 1 - sd/source/ui/inc/fudraw.hxx | 2 - sd/source/ui/inc/fuoutl.hxx | 2 - sd/source/ui/inc/fupoor.hxx | 2 - sd/source/ui/inc/fuspell.hxx | 71 - sd/source/ui/inc/futransf.hxx | 2 - sd/source/ui/inc/headerfooterdlg.hxx | 1 - sd/source/ui/inc/optsitem.hxx | 28 - sd/source/ui/inc/outlinfo.hxx | 125 -- sd/source/ui/inc/prntopts.hxx | 1 - sd/source/ui/inc/sdtreelb.hxx | 1 - sd/source/ui/inc/sdundogr.hxx | 1 - sd/source/ui/inc/showview.hxx | 88 -- sd/source/ui/inc/slideshow.hxx | 1 - sd/source/ui/inc/taskpane/ScrollPanel.hxx | 5 - sd/source/ui/inc/taskpane/SubToolPanel.hxx | 18 - sd/source/ui/inc/taskpane/TaskPaneTreeNode.hxx | 17 - sd/source/ui/inc/taskpane/TitledControl.hxx | 7 - sd/source/ui/inc/taskpane/ToolPanel.hxx | 5 - sd/source/ui/inc/tools/PropertySet.hxx | 7 - .../ui/inc/tools/SdGlobalResourceContainer.hxx | 11 - sd/source/ui/inc/tools/SlotStateListener.hxx | 15 - sd/source/ui/inc/tpaction.hxx | 2 - sd/source/ui/inc/unoaprms.hxx | 2 - sd/source/ui/inc/unosrch.hxx | 7 +- sd/source/ui/inc/zoomlist.hxx | 1 - sd/source/ui/presenter/PresenterCanvas.cxx | 16 - sd/source/ui/presenter/PresenterTextView.cxx | 12 - sd/source/ui/slideshow/slideshow.cxx | 7 - sd/source/ui/slideshow/slideshowimpl.cxx | 9 +- sd/source/ui/slideshow/slideshowimpl.hxx | 3 +- sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx | 37 - sd/source/ui/slidesorter/cache/SlsBitmapCache.hxx | 14 - .../ui/slidesorter/cache/SlsGenericPageCache.cxx | 20 - .../ui/slidesorter/cache/SlsGenericPageCache.hxx | 10 - sd/source/ui/slidesorter/cache/SlsIdleDetector.cxx | 66 - sd/source/ui/slidesorter/cache/SlsIdleDetector.hxx | 51 - sd/source/ui/slidesorter/cache/SlsPageCache.cxx | 20 - .../ui/slidesorter/cache/SlsQueueProcessor.cxx | 1 - sd/source/ui/slidesorter/cache/makefile.mk | 1 - .../controller/SlideSorterController.cxx | 69 - .../controller/SlsCurrentSlideManager.cxx | 15 - .../ui/slidesorter/controller/SlsPageSelector.cxx | 11 - .../slidesorter/controller/SlsScrollBarManager.cxx | 20 - .../slidesorter/controller/SlsSelectionCommand.cxx | 20 - .../slidesorter/controller/SlsSelectionCommand.hxx | 13 - .../controller/SlsSelectionFunction.cxx | 89 +- .../ui/slidesorter/controller/SlsSlideFunction.cxx | 6 - .../ui/slidesorter/controller/SlsSlotManager.cxx | 94 -- .../ui/slidesorter/inc/cache/SlsPageCache.hxx | 29 +- .../inc/controller/SlideSorterController.hxx | 18 - .../slidesorter/inc/controller/SlsPageSelector.hxx | 1 - .../inc/controller/SlsScrollBarManager.hxx | 7 - .../inc/controller/SlsSelectionFunction.hxx | 8 - .../inc/controller/SlsSlideFunction.hxx | 2 - .../slidesorter/inc/controller/SlsSlotManager.hxx | 3 - .../ui/slidesorter/inc/model/SlideSorterModel.hxx | 7 - .../ui/slidesorter/inc/model/SlsPageDescriptor.hxx | 11 - .../ui/slidesorter/inc/view/SlideSorterView.hxx | 13 - sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx | 23 - .../inc/view/SlsPageObjectViewContact.hxx | 2 - .../ui/slidesorter/model/SlideSorterModel.cxx | 45 - .../ui/slidesorter/model/SlsPageDescriptor.cxx | 16 - .../ui/slidesorter/shell/SlideSorterService.cxx | 12 - .../ui/slidesorter/shell/SlideSorterService.hxx | 1 - .../ui/slidesorter/shell/SlideSorterViewShell.cxx | 16 - sd/source/ui/slidesorter/view/SlideSorterView.cxx | 70 - sd/source/ui/slidesorter/view/SlsLayouter.cxx | 55 - .../slidesorter/view/SlsPageObjectViewContact.cxx | 15 - .../view/SlsPageObjectViewObjectContact.cxx | 16 - sd/source/ui/toolpanel/EmptyWindow.cxx | 96 -- sd/source/ui/toolpanel/EmptyWindow.hxx | 57 - sd/source/ui/toolpanel/LayoutMenu.cxx | 8 - sd/source/ui/toolpanel/LayoutMenu.hxx | 4 - sd/source/ui/toolpanel/ScrollPanel.cxx | 9 - sd/source/ui/toolpanel/SimpleLayoutWrapper.cxx | 98 -- sd/source/ui/toolpanel/SimpleLayoutWrapper.hxx | 70 - sd/source/ui/toolpanel/SubToolPanel.cxx | 58 - sd/source/ui/toolpanel/TaskPaneShellManager.cxx | 13 - sd/source/ui/toolpanel/TaskPaneTreeNode.cxx | 28 - sd/source/ui/toolpanel/TaskPaneViewShell.cxx | 74 +- sd/source/ui/toolpanel/TestMenu.cxx | 6 +- sd/source/ui/toolpanel/TestMenu.hxx | 3 + sd/source/ui/toolpanel/TestPanel.cxx | 5 +- sd/source/ui/toolpanel/TestPanel.hxx | 4 + sd/source/ui/toolpanel/TitleToolBox.cxx | 116 -- sd/source/ui/toolpanel/TitleToolBox.hxx | 70 - sd/source/ui/toolpanel/TitledControl.cxx | 16 - sd/source/ui/toolpanel/ToolPanel.cxx | 9 - .../toolpanel/controls/AnimationSchemesPanel.cxx | 86 ++ .../toolpanel/controls/AnimationSchemesPanel.hxx | 70 + .../ui/toolpanel/controls/MasterPageContainer.cxx | 148 --- .../ui/toolpanel/controls/MasterPageContainer.hxx | 10 - .../controls/MasterPageContainerProviders.cxx | 40 - .../controls/MasterPageContainerProviders.hxx | 15 - .../ui/toolpanel/controls/MasterPageDescriptor.cxx | 22 - .../ui/toolpanel/controls/MasterPageDescriptor.hxx | 5 - .../ui/toolpanel/controls/MasterPageObserver.cxx | 9 - .../ui/toolpanel/controls/MasterPagesSelector.cxx | 30 - .../ui/toolpanel/controls/MasterPagesSelector.hxx | 6 - sd/source/ui/toolpanel/controls/makefile.mk | 3 +- sd/source/ui/toolpanel/makefile.mk | 3 - sd/source/ui/tools/PropertySet.cxx | 16 - sd/source/ui/tools/SdGlobalResourceContainer.cxx | 25 - sd/source/ui/tools/SlotStateListener.cxx | 18 - sd/source/ui/unoidl/DrawController.cxx | 12 - sd/source/ui/unoidl/SdUnoPresView.cxx | 54 - sd/source/ui/unoidl/makefile.mk | 2 - sd/source/ui/unoidl/unocpres.cxx | 21 - sd/source/ui/unoidl/unocpres.hxx | 1 - sd/source/ui/unoidl/unoobj.cxx | 8 - sd/source/ui/unoidl/unoobj.hxx | 1 - sd/source/ui/unoidl/unopage.cxx | 29 +- sd/source/ui/unoidl/unopage.hxx | 3 +- sd/source/ui/unoidl/unosrch.cxx | 5 - sd/source/ui/unoidl/unovwcrs.cxx | 209 --- sd/source/ui/unoidl/unowcntr.cxx | 25 - sd/source/ui/unoidl/unowcntr.hxx | 3 - sd/source/ui/view/Outliner.cxx | 69 - sd/source/ui/view/OutlinerIterator.cxx | 36 - sd/source/ui/view/ToolBarManager.cxx | 98 +- sd/source/ui/view/ViewShellBase.cxx | 64 - sd/source/ui/view/ViewShellImplementation.cxx | 42 - sd/source/ui/view/ViewShellManager.cxx | 207 --- sd/source/ui/view/bmcache.cxx | 109 -- sd/source/ui/view/drviews1.cxx | 1 - sd/source/ui/view/drviews2.cxx | 42 - sd/source/ui/view/drviews6.cxx | 26 - sd/source/ui/view/drviewsa.cxx | 15 - sd/source/ui/view/grviewsh.cxx | 18 - sd/source/ui/view/makefile.mk | 1 - sd/source/ui/view/outlnvsh.cxx | 25 - sd/source/ui/view/outlview.cxx | 2 + sd/source/ui/view/sdview.cxx | 83 -- sd/source/ui/view/sdview4.cxx | 5 - sd/source/ui/view/sdwindow.cxx | 29 - sd/source/ui/view/showview.cxx | 170 --- sd/source/ui/view/viewshe2.cxx | 40 - sd/source/ui/view/viewshel.cxx | 8 - sd/source/ui/view/zoomlist.cxx | 13 - 256 files changed, 271 insertions(+), 8619 deletions(-) delete mode 100644 sd/inc/segdefs.hxx delete mode 100644 sd/inc/segdefs_.hxx delete mode 100644 sd/source/ui/animations/AnimationSchemesPane.cxx delete mode 100644 sd/source/ui/animations/AnimationSchemesPane.hrc delete mode 100644 sd/source/ui/animations/AnimationSchemesPane.hxx delete mode 100644 sd/source/ui/animations/AnimationSchemesPane.src delete mode 100644 sd/source/ui/animations/CustomAnimationSchemesPane.hrc delete mode 100644 sd/source/ui/animations/CustomAnimationSchemesPane.src mode change 100644 => 100755 sd/source/ui/dlg/dlgsnap.cxx delete mode 100644 sd/source/ui/func/fuspell.cxx delete mode 100644 sd/source/ui/func/outlinfo.cxx delete mode 100644 sd/source/ui/inc/SdUnoPresView.hxx delete mode 100644 sd/source/ui/inc/fuspell.hxx delete mode 100644 sd/source/ui/inc/outlinfo.hxx delete mode 100644 sd/source/ui/inc/showview.hxx delete mode 100644 sd/source/ui/slidesorter/cache/SlsIdleDetector.cxx delete mode 100644 sd/source/ui/slidesorter/cache/SlsIdleDetector.hxx delete mode 100644 sd/source/ui/toolpanel/EmptyWindow.cxx delete mode 100644 sd/source/ui/toolpanel/EmptyWindow.hxx delete mode 100644 sd/source/ui/toolpanel/SimpleLayoutWrapper.cxx delete mode 100644 sd/source/ui/toolpanel/SimpleLayoutWrapper.hxx delete mode 100644 sd/source/ui/toolpanel/TitleToolBox.cxx delete mode 100644 sd/source/ui/toolpanel/TitleToolBox.hxx delete mode 100644 sd/source/ui/unoidl/SdUnoPresView.cxx delete mode 100644 sd/source/ui/unoidl/unovwcrs.cxx delete mode 100644 sd/source/ui/view/showview.cxx (limited to 'sd') diff --git a/sd/inc/Outliner.hxx b/sd/inc/Outliner.hxx index 0c14dec72583..1b608fa7b637 100644 --- a/sd/inc/Outliner.hxx +++ b/sd/inc/Outliner.hxx @@ -136,9 +136,6 @@ public: */ void StartSpelling (void); - /** Proxy for method from base class to avoid compiler warning */ - void StartSpelling(EditView&, unsigned char); - /** Initiate a find and/or replace on the next relevant text object. @return Returns when the search/replace is finished (as @@ -179,13 +176,6 @@ public: enum ChangeHint { CH_VIEW_SHELL_INVALID, CH_VIEW_SHELL_VALID }; - /** Handle a change outside the outliner which may affect the outliner. - At the moment this is restricted to changes of the main view shell - but later may include any changes that are detected now by - DetectChange(). - */ - void HandleOutsideChange (ChangeHint eHint); - int GetIgnoreCurrentPageChangesLevel() const { return mnIgnoreCurrentPageChangesLevel; }; void IncreIgnoreCurrentPageChangesLevel() { mnIgnoreCurrentPageChangesLevel++; }; void DecreIgnoreCurrentPageChangesLevel() { mnIgnoreCurrentPageChangesLevel--; }; @@ -421,15 +411,6 @@ private: */ void EndOfSearch (void); - /** Prepare to commence searching/spell checking on the specified page. - This also creates a proper page iterator. - @param nPageIndex - Index of the page to prepare for searching. The default value - of -1 is a flag for using the first/last page of the current - edit mode/view mode depending on the search direction. - */ - void InitPage (USHORT nPageIndex = (USHORT)-1); - /** Show a dialog that tells the user that the search has ended either because there are no more matches after finding at least one or that no match has been found at all. @@ -521,11 +502,6 @@ private: */ bool HandleFailedSearch (void); - /** Return a parent window for a dialog. The returned window depends on - the search mode. - */ - ::Window* GetParentForDialog (void); - /** Take a position as returned by an object iterator and switch to the view and page on which the object specified by this position is located. diff --git a/sd/inc/OutlinerIterator.hxx b/sd/inc/OutlinerIterator.hxx index ce291a6f5a00..92301f06289c 100644 --- a/sd/inc/OutlinerIterator.hxx +++ b/sd/inc/OutlinerIterator.hxx @@ -109,13 +109,6 @@ public: */ explicit Iterator (IteratorImplBase* pObject); - /** Create a new iterator with the implementation object being the copy - of the provided one. - @param rObject - A copy of this object will become the implementation object. - */ - explicit Iterator (const IteratorImplBase& rObject); - ~Iterator (void); /** Assign the iterator from the given one. The implementation object @@ -240,9 +233,8 @@ private: This specifies whether the returned iterator points to the first, (one past the) last, or current object. @return - Returns an iterator as constructed by one of the + Returns an iterator as constructed by CreateSelectionIterator(), - CreateViewIterator(), or CreateDocumentIterator(). */ Iterator CreateIterator (IteratorLocation aLocation); @@ -269,24 +261,6 @@ private: bool bDirectionIsForward=true, IteratorLocation aLocation=BEGIN); - /** Create an iterator that iterates over all SdrObjects - objects of the mpOutliner outliner that belong to - the current view. - @param pDocument - The document to which the objects belong. - @param pViewShell - The view shell which displays the objects. - @param bDirectionIsForward - The direction of iteration. It defaults to forward. - @param aLocation - This specifies at which object the iterator points initially. - */ - Iterator CreateViewIterator ( - SdDrawDocument* pDocument, - const boost::shared_ptr& rpViewShell, - bool bDirectionIsForward=true, - IteratorLocation aLocation=BEGIN); - /** Create an iterator that iterates over all SdrObjects objects of the mpOutliner outliner. @param pDocument @@ -356,9 +330,6 @@ public: assigned to the data members of this object. */ IteratorPosition (const IteratorPosition& aPosition); - /** Create a new object and set its data members to the given values. - */ - IteratorPosition (SdrObject* pObject, sal_Int32 nText, sal_Int32 nPageIndex, PageKind ePageKind, EditMode eEditMode); /// The destructor is a no-op at the moment. ~IteratorPosition (void); diff --git a/sd/inc/drawdoc.hxx b/sd/inc/drawdoc.hxx index 1d801baa5d3c..6811da762934 100644 --- a/sd/inc/drawdoc.hxx +++ b/sd/inc/drawdoc.hxx @@ -441,7 +441,6 @@ public: CharClass* GetCharClass() const { return mpCharClass; } void RestoreLayerNames(); - void MakeUniqueLayerNames(); void UpdateAllLinks(); @@ -465,18 +464,6 @@ public: static SdDrawDocument* pDocLockedInsertingLinks; // static to prevent recursions while resolving links - /** This method acts as a simplified front end for the more complex - CreatePage() method. - @param nPageNum - The page number as passed to the GetSdPage() - method from which to use certain properties for the new pages. - These include the auto layout. - @return - Returns an index of the inserted pages that can be used with the - GetSdPage() method. - */ - USHORT CreatePage (USHORT nPageNum); - /** Create and insert a set of two new pages: a standard (draw) page and the associated notes page. The new pages are inserted direclty after the specified page set. @@ -687,7 +674,6 @@ namespace sd class ModifyGuard { public: - ModifyGuard( DrawDocShell* pDocShell ); ModifyGuard( SdDrawDocument* pDoc ); ~ModifyGuard(); diff --git a/sd/inc/sdmod.hxx b/sd/inc/sdmod.hxx index 0dad3ca237cb..f0d5cc64a3c4 100644 --- a/sd/inc/sdmod.hxx +++ b/sd/inc/sdmod.hxx @@ -141,8 +141,6 @@ public: SD_DLLPUBLIC SvNumberFormatter* GetNumberFormatter(); - ::com::sun::star::text::WritingMode GetDefaultWritingMode() const; - //virtuelle Methoden fuer den Optionendialog virtual SfxItemSet* CreateItemSet( USHORT nId ); virtual void ApplyItemSet( USHORT nId, const SfxItemSet& rSet ); diff --git a/sd/inc/segdefs.hxx b/sd/inc/segdefs.hxx deleted file mode 100644 index fc06d39b4ac1..000000000000 --- a/sd/inc/segdefs.hxx +++ /dev/null @@ -1,29 +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. - * - ************************************************************************/ -#include - - diff --git a/sd/inc/segdefs_.hxx b/sd/inc/segdefs_.hxx deleted file mode 100644 index a93071b463b6..000000000000 --- a/sd/inc/segdefs_.hxx +++ /dev/null @@ -1,1400 +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. - * - ************************************************************************/ -#define app_01 SEG_SEGCLASS(STARTING_SEG000,STARTING_CODE) -#define app_04 SEG_SEGCLASS(STARTING_SEG000,STARTING_CODE) -#define app_05 SEG_SEGCLASS(STARTING_SEG000,STARTING_CODE) -#define app_0a SEG_SEGCLASS(STARTING_SEG000,STARTING_CODE) -#define app2_01 SEG_SEGCLASS(STARTING_SEG000,STARTING_CODE) -#define app2_03 SEG_SEGCLASS(STARTING_SEG000,STARTING_CODE) -#define app2_06 SEG_SEGCLASS(STARTING_SEG000,STARTING_CODE) -#define app4_01 SEG_SEGCLASS(STARTING_SEG000,STARTING_CODE) -#define splcfg_01 SEG_SEGCLASS(STARTING_SEG000,STARTING_CODE) -#define splcfg_04 SEG_SEGCLASS(STARTING_SEG000,STARTING_CODE) -#define app5_01 SEG_SEGCLASS(STARTING_SEG000,STARTING_CODE) -#define optsitem_01 SEG_SEGCLASS(STARTING_SEG000,STARTING_CODE) -#define optsitem_02 SEG_SEGCLASS(STARTING_SEG000,STARTING_CODE) -#define optsitem_03 SEG_SEGCLASS(STARTING_SEG000,STARTING_CODE) -#define optsitem_04 SEG_SEGCLASS(STARTING_SEG000,STARTING_CODE) -#define optsitem_06 SEG_SEGCLASS(STARTING_SEG000,STARTING_CODE) -#define optsitem_07 SEG_SEGCLASS(STARTING_SEG000,STARTING_CODE) -#define drawdoc2_04 SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define drviewsa_0a SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define drawdoc_11 SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define drawdoc2_03 SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define sdpage_11 SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define drawdoc_0e SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define stlsheet_06 SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define drawview_06 SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define sdview_07 SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define drawview_09 SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define drviews5_08 SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define sdwindow_06 SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define sdview_11 SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define drawview_04 SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define drviews5_01 SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define viewshel_07 SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define fudraw_0b SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define fudraw_04 SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define fusel_04 SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define viewshel_0a SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define drviews4_08 SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define sdwindow_09 SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define drviews4_0b SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define fudraw_09 SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define fusel_07 SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define drviews4_01 SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define drviewsa_06 SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define viewshel_06 SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define fupoor_03 SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define docshel2_04 SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define drviews1_01 SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define drviews5_07 SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define drviews1_02 SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define fupoor_01 SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define fudraw_01 SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define fusel_08 SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define fudraw_0a SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define fupoor_04 SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define fupoor_02 SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define fudraw_02 SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define drviews7_02 SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define viewshel_08 SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define drviews6_07 SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define tbxitem_01 SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define tbxitem_02 SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define docshell_07 SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define drawdoc2_0c SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define docshell_0a SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define docshel4_1d SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define stlsheet_07 SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define sdwindow_20 SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define docshell_08 SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define docshell_06 SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define viewshe2_16 SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define sdwindow_0c SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define fudraw_0e SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define fupoor_12 SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define docshel4_0b SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define drviews1_0b SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define drviews7_01 SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define drviews7_03 SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define sdview_0a SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define tbxitem_03 SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define drviews3_06 SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define sdwindow_07 SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define sdpage_03 SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define viewshe2_01 SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define sdwindow_14 SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define sdwindow_1b SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define sdwindow_1c SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define sdwindow_19 SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define sdwindow_17 SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define sdwindow_18 SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define sdwindow_1a SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define sdwindow_15 SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define sdwindow_0d SEG_SEGCLASS(STARTWORK_SEG001,STARTWORK_CODE) -#define sdwindow_04 SEG_SEGCLASS(STARTWORK_SEG001,STARTWORK_CODE) -#define sdpage2_08 SEG_SEGCLASS(STARTWORK_SEG001,STARTWORK_CODE) -#define sdruler_06 SEG_SEGCLASS(STARTSLICE_SEG000,STARTSLICE_CODE) -#define viewshe2_09 SEG_SEGCLASS(STARTSLICE_SEG000,STARTSLICE_CODE) -#define sdwindow_0e SEG_SEGCLASS(STARTSLICE_SEG000,STARTSLICE_CODE) -#define sdwindow_0f SEG_SEGCLASS(STARTSLICE_SEG000,STARTSLICE_CODE) -#define outlview_0f SEG_SEGCLASS(STARTSLICE_SEG000,STARTSLICE_CODE) -#define outlview_09 SEG_SEGCLASS(STARTSLICE_SEG000,STARTSLICE_CODE) -#define fuoltext_06 SEG_SEGCLASS(STARTSLICE_SEG000,STARTSLICE_CODE) -#define outlnvsh_1c SEG_SEGCLASS(STARTSLICE_SEG000,STARTSLICE_CODE) -#define outlnvsh_11 SEG_SEGCLASS(STARTSLICE_SEG000,STARTSLICE_CODE) -#define outlview_0a SEG_SEGCLASS(STARTSLICE_SEG000,STARTSLICE_CODE) -#define sdwindow_21 SEG_SEGCLASS(STARTSLICE_SEG000,STARTSLICE_CODE) -#define outlnvsh_15 SEG_SEGCLASS(STARTSLICE_SEG000,STARTSLICE_CODE) -#define viewshe2_07 SEG_SEGCLASS(STARTSLICE_SEG000,STARTSLICE_CODE) -#define sdwindow_11 SEG_SEGCLASS(STARTSLICE_SEG000,STARTSLICE_CODE) -#define sdwindow_10 SEG_SEGCLASS(STARTSLICE_SEG000,STARTSLICE_CODE) -#define sdwindow_12 SEG_SEGCLASS(STARTSLICE_SEG000,STARTSLICE_CODE) -#define viewshe2_08 SEG_SEGCLASS(STARTSLICE_SEG000,STARTSLICE_CODE) -#define drviews1_06 SEG_SEGCLASS(STARTSLICE_SEG000,STARTSLICE_CODE) -#define drviews4_02 SEG_SEGCLASS(STARTSLICE_SEG000,STARTSLICE_CODE) -#define drviews5_05 SEG_SEGCLASS(STARTSLICE_SEG000,STARTSLICE_CODE) -#define viewshel_10 SEG_SEGCLASS(STARTSLICE_SEG000,STARTSLICE_CODE) -#define viewshel_12 SEG_SEGCLASS(STARTSLICE_SEG000,STARTSLICE_CODE) -#define sdwindow_13 SEG_SEGCLASS(STARTSLICE_SEG000,STARTSLICE_CODE) -#define drviews1_10 SEG_SEGCLASS(STARTSLICE_SEG000,STARTSLICE_CODE) -#define viewshel_13 SEG_SEGCLASS(STARTSLICE_SEG000,STARTSLICE_CODE) -#define viewshel_0f SEG_SEGCLASS(STARTSLICE_SEG000,STARTSLICE_CODE) -#define sdpage_1f SEG_SEGCLASS(STARTSLICE_SEG000,STARTSLICE_CODE) -#define drviews1_1c SEG_SEGCLASS(STARTSLICE_SEG000,STARTSLICE_CODE) -#define drviews5_06 SEG_SEGCLASS(STARTSLICE_SEG000,STARTSLICE_CODE) -#define drviews5_04 SEG_SEGCLASS(STARTSLICE_SEG000,STARTSLICE_CODE) -#define drviews1_13 SEG_SEGCLASS(STARTSLICE_SEG000,STARTSLICE_CODE) -#define sdruler_03 SEG_SEGCLASS(STARTSLICE_SEG000,STARTSLICE_CODE) -#define sdruler_01 SEG_SEGCLASS(STARTSLICE_SEG000,STARTSLICE_CODE) -#define drviews1_14 SEG_SEGCLASS(STARTSLICE_SEG000,STARTSLICE_CODE) -#define app3_01 SEG_SEGCLASS(STARTSLICE_SEG000,STARTSLICE_CODE) -#define docshel4_1c SEG_SEGCLASS(STARTSLICE_SEG000,STARTSLICE_CODE) -#define drviewsh_01 SEG_SEGCLASS(STARTSLICE_SEG000,STARTSLICE_CODE) -#define docshell_02 SEG_SEGCLASS(STARTSLICE_SEG000,STARTSLICE_CODE) -#define docshel4_0e SEG_SEGCLASS(STARTSLICE_SEG000,STARTSLICE_CODE) -#define drawdoc2_07 SEG_SEGCLASS(STARTSLICE_SEG001,STARTSLICE_CODE) -#define drawdoc2_09 SEG_SEGCLASS(STARTSLICE_SEG001,STARTSLICE_CODE) -#define drawdoc2_0e SEG_SEGCLASS(STARTSLICE_SEG001,STARTSLICE_CODE) -#define sdpage2_05 SEG_SEGCLASS(STARTSLICE_SEG001,STARTSLICE_CODE) -#define sdpage2_07 SEG_SEGCLASS(STARTSLICE_SEG001,STARTSLICE_CODE) -#define drawdoc_04 SEG_SEGCLASS(STARTSLICE_SEG001,STARTSLICE_CODE) -#define sdpage_01 SEG_SEGCLASS(STARTSLICE_SEG001,STARTSLICE_CODE) -#define outlview_0c SEG_SEGCLASS(STARTSLICE_SEG001,STARTSLICE_CODE) -#define sdpage_0e SEG_SEGCLASS(STARTSLICE_SEG001,STARTSLICE_CODE) -#define sdpage_0d SEG_SEGCLASS(STARTSLICE_SEG001,STARTSLICE_CODE) -#define drawdoc2_13 SEG_SEGCLASS(STARTSLICE_SEG001,STARTSLICE_CODE) -#define sdpage_19 SEG_SEGCLASS(STARTSLICE_SEG001,STARTSLICE_CODE) -#define sdpage_04 SEG_SEGCLASS(STARTSLICE_SEG001,STARTSLICE_CODE) -#define sdpage_05 SEG_SEGCLASS(STARTSLICE_SEG001,STARTSLICE_CODE) -#define drawdoc_13 SEG_SEGCLASS(STARTSLICE_SEG001,STARTSLICE_CODE) -#define sdoutl_01 SEG_SEGCLASS(STARTSLICE_SEG001,STARTSLICE_CODE) -#define drawdoc_12 SEG_SEGCLASS(STARTSLICE_SEG001,STARTSLICE_CODE) -#define outlnvsh_01 SEG_SEGCLASS(STARTSLICE_SEG001,STARTSLICE_CODE) -#define sdview_01 SEG_SEGCLASS(STARTSLICE_SEG001,STARTSLICE_CODE) -#define drawdoc2_05 SEG_SEGCLASS(STARTSLICE_SEG001,STARTSLICE_CODE) -#define drtxtob_01 SEG_SEGCLASS(STARTSLICE_SEG001,STARTSLICE_CODE) -#define sdpage_1d SEG_SEGCLASS(STARTSLICE_SEG001,STARTSLICE_CODE) -#define sdpage_1b SEG_SEGCLASS(STARTSLICE_SEG001,STARTSLICE_CODE) -#define sdpage_12 SEG_SEGCLASS(STARTSLICE_SEG001,STARTSLICE_CODE) -#define sdpage_13 SEG_SEGCLASS(STARTSLICE_SEG001,STARTSLICE_CODE) -#define stlpool_03 SEG_SEGCLASS(STARTSLICE_SEG001,STARTSLICE_CODE) -#define stlsheet_01 SEG_SEGCLASS(STARTSLICE_SEG001,STARTSLICE_CODE) -#define app3_02 SEG_SEGCLASS(STARTSLICE_SEG002,STARTSLICE_CODE) -#define fusel_01 SEG_SEGCLASS(STARTSLICE_SEG002,STARTSLICE_CODE) -#define fusel_02 SEG_SEGCLASS(STARTSLICE_SEG002,STARTSLICE_CODE) -#define drviewsa_05 SEG_SEGCLASS(STARTSLICE_SEG002,STARTSLICE_CODE) -#define drawdoc2_0d SEG_SEGCLASS(STARTSLICE_SEG002,STARTSLICE_CODE) -#define outlview_14 SEG_SEGCLASS(STARTSLICE_SEG002,STARTSLICE_CODE) -#define outlview_0b SEG_SEGCLASS(STARTSLICE_SEG002,STARTSLICE_CODE) -#define frmview_04 SEG_SEGCLASS(STARTSLICE_SEG002,STARTSLICE_CODE) -#define sdview_02 SEG_SEGCLASS(STARTSLICE_SEG002,STARTSLICE_CODE) -#define sdview_06 SEG_SEGCLASS(STARTSLICE_SEG002,STARTSLICE_CODE) -#define drawview_02 SEG_SEGCLASS(STARTSLICE_SEG002,STARTSLICE_CODE) -#define outlnvsh_05 SEG_SEGCLASS(STARTSLICE_SEG002,STARTSLICE_CODE) -#define fuoltext_02 SEG_SEGCLASS(STARTSLICE_SEG002,STARTSLICE_CODE) -#define outlview_02 SEG_SEGCLASS(STARTSLICE_SEG002,STARTSLICE_CODE) -#define fuoutl_02 SEG_SEGCLASS(STARTSLICE_SEG002,STARTSLICE_CODE) -#define fuoltext_08 SEG_SEGCLASS(STARTSLICE_SEG002,STARTSLICE_CODE) -#define outlview_12 SEG_SEGCLASS(STARTSLICE_SEG002,STARTSLICE_CODE) -#define outlview_18 SEG_SEGCLASS(STARTSLICE_SEG002,STARTSLICE_CODE) -#define outlview_01 SEG_SEGCLASS(STARTSLICE_SEG002,STARTSLICE_CODE) -#define outlview_13 SEG_SEGCLASS(STARTSLICE_SEG002,STARTSLICE_CODE) -#define outlnvsh_14 SEG_SEGCLASS(STARTSLICE_SEG002,STARTSLICE_CODE) -#define drtxtob_04 SEG_SEGCLASS(STARTSLICE_SEG003,STARTSLICE_CODE) -#define outlview_16 SEG_SEGCLASS(STARTSLICE_SEG003,STARTSLICE_CODE) -#define tbxww_08 SEG_SEGCLASS(STARTSLICE_SEG003,STARTSLICE_CODE) -#define viewshe2_0b SEG_SEGCLASS(STARTSLICE_SEG004,STARTSLICE_CODE) -#define sdpage_1a SEG_SEGCLASS(STARTSLICE_SEG004,STARTSLICE_CODE) -#define sdpage_0a SEG_SEGCLASS(STARTSLICE_SEG004,STARTSLICE_CODE) -#define sdview_03 SEG_SEGCLASS(STARTSLICE_SEG004,STARTSLICE_CODE) -#define outlnvsh_0d SEG_SEGCLASS(STARTSLICE_SEG004,STARTSLICE_CODE) -#define sdview_04 SEG_SEGCLASS(STARTSLICE_SEG004,STARTSLICE_CODE) -#define outlnvsh_0b SEG_SEGCLASS(STARTSLICE_SEG005,STARTSLICE_CODE) -#define drviews1_16 SEG_SEGCLASS(STARTSLICE_SEG005,STARTSLICE_CODE) -#define sdwindow_05 SEG_SEGCLASS(STARTSLICE_SEG005,STARTSLICE_CODE) -#define drviews1_15 SEG_SEGCLASS(STARTSLICE_SEG005,STARTSLICE_CODE) -#define drviews1_12 SEG_SEGCLASS(STARTSLICE_SEG005,STARTSLICE_CODE) -#define outlnvsh_1e SEG_SEGCLASS(STARTSLICE_SEG005,STARTSLICE_CODE) -#define drawdoc2_12 SEG_SEGCLASS(STARTSLICE_SEG005,STARTSLICE_CODE) -#define drawdoc_01 SEG_SEGCLASS(STARTSLICE_SEG005,STARTSLICE_CODE) -#define stlpool_01 SEG_SEGCLASS(STARTSLICE_SEG005,STARTSLICE_CODE) -#define optsitem_14 SEG_SEGCLASS(STARTSLICE_SEG006,STARTSLICE_CODE) -#define optsitem_16 SEG_SEGCLASS(STARTSLICE_SEG006,STARTSLICE_CODE) -#define optsitem_17 SEG_SEGCLASS(STARTSLICE_SEG006,STARTSLICE_CODE) -#define drviews1_1d SEG_SEGCLASS(STARTSLICE_SEG006,STARTSLICE_CODE) -#define stlsheet_05 SEG_SEGCLASS(STARTSLICE_SEG007,STARTSLICE_CODE) -#define drawdoc4_01 SEG_SEGCLASS(STARTSLICE_SEG007,STARTSLICE_CODE) -#define stlpool_07 SEG_SEGCLASS(STARTSLICE_SEG007,STARTSLICE_CODE) -#define drawdoc_10 SEG_SEGCLASS(STARTSLICE_SEG007,STARTSLICE_CODE) -#define outlnvsh_06 SEG_SEGCLASS(STARTSLICE_SEG008,STARTSLICE_CODE) -#define outlview_03 SEG_SEGCLASS(STARTSLICE_SEG008,STARTSLICE_CODE) -#define viewshel_01 SEG_SEGCLASS(STARTSLICE_SEG008,STARTSLICE_CODE) -#define viewshel_02 SEG_SEGCLASS(STARTSLICE_SEG008,STARTSLICE_CODE) -#define sdwindow_01 SEG_SEGCLASS(STARTSLICE_SEG008,STARTSLICE_CODE) -#define frmview_01 SEG_SEGCLASS(STARTSLICE_SEG009,STARTSLICE_CODE) -#define frmview_07 SEG_SEGCLASS(STARTSLICE_SEG009,STARTSLICE_CODE) -#define drviewsa_03 SEG_SEGCLASS(STARTSLICE_SEG009,STARTSLICE_CODE) -#define frmview_03 SEG_SEGCLASS(STARTSLICE_SEG009,STARTSLICE_CODE) -#define outlnvsh_03 SEG_SEGCLASS(STARTSLICE_SEG009,STARTSLICE_CODE) -#define outlnvsh_10 SEG_SEGCLASS(STARTSLICE_SEG009,STARTSLICE_CODE) -#define fuoutl_01 SEG_SEGCLASS(STARTSLICE_SEG009,STARTSLICE_CODE) -#define drviewsa_07 SEG_SEGCLASS(STARTSLICE_SEG009,STARTSLICE_CODE) -#define fuoltext_01 SEG_SEGCLASS(STARTSLICE_SEG009,STARTSLICE_CODE) -#define fuoltext_07 SEG_SEGCLASS(STARTSLICE_SEG009,STARTSLICE_CODE) -#define drawitem_03 SEG_SEGCLASS(STARTSLICE_SEG010,STARTSLICE_CODE) -#define drawitem_06 SEG_SEGCLASS(STARTSLICE_SEG010,STARTSLICE_CODE) -#define docshell_0b SEG_SEGCLASS(STARTSLICE_SEG010,STARTSLICE_CODE) -#define docshell_01 SEG_SEGCLASS(STARTSLICE_SEG010,STARTSLICE_CODE) -#define drawitem_02 SEG_SEGCLASS(STARTSLICE_SEG010,STARTSLICE_CODE) -#define drawitem_08 SEG_SEGCLASS(STARTSLICE_SEG010,STARTSLICE_CODE) -#define drawitem_0c SEG_SEGCLASS(STARTSLICE_SEG010,STARTSLICE_CODE) -#define drawitem_09 SEG_SEGCLASS(STARTSLICE_SEG010,STARTSLICE_CODE) -#define drawitem_0e SEG_SEGCLASS(STARTSLICE_SEG010,STARTSLICE_CODE) -#define drawitem_12 SEG_SEGCLASS(STARTSLICE_SEG010,STARTSLICE_CODE) -#define drawitem_0f SEG_SEGCLASS(STARTSLICE_SEG010,STARTSLICE_CODE) -#define drawitem_14 SEG_SEGCLASS(STARTSLICE_SEG010,STARTSLICE_CODE) -#define drawitem_18 SEG_SEGCLASS(STARTSLICE_SEG010,STARTSLICE_CODE) -#define drawitem_15 SEG_SEGCLASS(STARTSLICE_SEG010,STARTSLICE_CODE) -#define drawitem_1a SEG_SEGCLASS(STARTSLICE_SEG010,STARTSLICE_CODE) -#define drawitem_1e SEG_SEGCLASS(STARTSLICE_SEG010,STARTSLICE_CODE) -#define drawitem_1b SEG_SEGCLASS(STARTSLICE_SEG010,STARTSLICE_CODE) -#define drawitem_20 SEG_SEGCLASS(STARTSLICE_SEG010,STARTSLICE_CODE) -#define drawitem_24 SEG_SEGCLASS(STARTSLICE_SEG010,STARTSLICE_CODE) -#define drawitem_21 SEG_SEGCLASS(STARTSLICE_SEG010,STARTSLICE_CODE) -#define drviews1_11 SEG_SEGCLASS(STARTSLICE_SEG011,STARTSLICE_CODE) -#define drbezob_01 SEG_SEGCLASS(STARTSLICE_SEG011,STARTSLICE_CODE) -#define tabcontr_01 SEG_SEGCLASS(STARTSLICE_SEG011,STARTSLICE_CODE) -#define drawview_01 SEG_SEGCLASS(STARTSLICE_SEG011,STARTSLICE_CODE) -#define drstdob_01 SEG_SEGCLASS(STARTSLICE_SEG011,STARTSLICE_CODE) -#define layertab_01 SEG_SEGCLASS(STARTSLICE_SEG011,STARTSLICE_CODE) -#define sdruler_02 SEG_SEGCLASS(STARTSLICE_SEG011,STARTSLICE_CODE) -#define sdruler_08 SEG_SEGCLASS(STARTSLICE_SEG011,STARTSLICE_CODE) -#define docshel2_03 SEG_SEGCLASS(STARTSLICE_SEG011,STARTSLICE_CODE) -#define docshel2_02 SEG_SEGCLASS(STARTSLICE_SEG011,STARTSLICE_CODE) -#define tbxww_04 SEG_SEGCLASS(STARTSLICE_SEG012,STARTSLICE_CODE) -#define viewshe2_1d SEG_SEGCLASS(STARTSLICE_SEG012,STARTSLICE_CODE) -#define viewshel_04 SEG_SEGCLASS(STARTSLICE_SEG012,STARTSLICE_CODE) -#define docshel2_05 SEG_SEGCLASS(STARTSLICE_SEG012,STARTSLICE_CODE) -#define sdwindow_02 SEG_SEGCLASS(STARTSLICE_SEG012,STARTSLICE_CODE) -#define drtxtob_02 SEG_SEGCLASS(STARTSLICE_SEG012,STARTSLICE_CODE) -#define drstdob_02 SEG_SEGCLASS(STARTSLICE_SEG012,STARTSLICE_CODE) -#define drbezob_02 SEG_SEGCLASS(STARTSLICE_SEG012,STARTSLICE_CODE) -#define sdruler_04 SEG_SEGCLASS(STARTSLICE_SEG012,STARTSLICE_CODE) -#define tabcontr_02 SEG_SEGCLASS(STARTSLICE_SEG013,STARTSLICE_CODE) -#define layertab_02 SEG_SEGCLASS(STARTSLICE_SEG013,STARTSLICE_CODE) -#define drviews1_0a SEG_SEGCLASS(STARTSLICE_SEG013,STARTSLICE_CODE) -#define outlnvsh_1a SEG_SEGCLASS(STARTSLICE_SEG013,STARTSLICE_CODE) -#define app4_02 SEG_SEGCLASS(STARTSLICE_SEG013,STARTSLICE_CODE) -#define docdlg_01 SEG_SEGCLASS(STARTSLICE_SEG013,STARTSLICE_CODE) -#define tabcontr_04 SEG_SEGCLASS(STARTSLICE_SEG013,STARTSLICE_CODE) -#define viewshe2_10 SEG_SEGCLASS(STARTSLICE_SEG013,STARTSLICE_CODE) -#define outlnvsh_08 SEG_SEGCLASS(STARTSLICE_SEG013,STARTSLICE_CODE) -#define outlnvsh_09 SEG_SEGCLASS(STARTSLICE_SEG014,STARTSLICE_CODE) -#define outlnvsh_0a SEG_SEGCLASS(STARTSLICE_SEG014,STARTSLICE_CODE) -#define outlnvsh_18 SEG_SEGCLASS(STARTSLICE_SEG014,STARTSLICE_CODE) -#define outlnvsh_19 SEG_SEGCLASS(STARTSLICE_SEG014,STARTSLICE_CODE) -#define tabcontr_08 SEG_SEGCLASS(STARTSLICE_SEG015,STARTSLICE_CODE) -#define drawdoc2_16 SEG_SEGCLASS(CALLOPT_SEG000,CALLOPT_CODE) -#define drviews2_02 SEG_SEGCLASS(CALLOPT_SEG000,CALLOPT_CODE) -#define drawview_05 SEG_SEGCLASS(CALLOPT_SEG000,CALLOPT_CODE) -#define fucopy_01 SEG_SEGCLASS(CALLOPT_SEG000,CALLOPT_CODE) -#define drawview_03 SEG_SEGCLASS(CALLOPT_SEG000,CALLOPT_CODE) -#define sdview_08 SEG_SEGCLASS(CALLOPT_SEG000,CALLOPT_CODE) -#define drviews1_03 SEG_SEGCLASS(CALLOPT_SEG000,CALLOPT_CODE) -#define sdpage2_06 SEG_SEGCLASS(CALLOPT_SEG000,CALLOPT_CODE) -#define sdview_09 SEG_SEGCLASS(CALLOPT_SEG000,CALLOPT_CODE) -#define fudraw_06 SEG_SEGCLASS(CALLOPT_SEG000,CALLOPT_CODE) -#define sdview2_07 SEG_SEGCLASS(CALLOPT_SEG000,CALLOPT_CODE) -#define drviewsc_01 SEG_SEGCLASS(CALLOPT_SEG000,CALLOPT_CODE) -#define fuoltext_04 SEG_SEGCLASS(CALLOPT_SEG000,CALLOPT_CODE) -#define outlview_19 SEG_SEGCLASS(CALLOPT_SEG000,CALLOPT_CODE) -#define sdview_0e SEG_SEGCLASS(CALLOPT_SEG000,CALLOPT_CODE) -#define futext_04 SEG_SEGCLASS(CALLOPT_SEG000,CALLOPT_CODE) -#define fupoor_05 SEG_SEGCLASS(CALLOPT_SEG000,CALLOPT_CODE) -#define fuconstr_04 SEG_SEGCLASS(CALLOPT_SEG000,CALLOPT_CODE) -#define sdpage2_04 SEG_SEGCLASS(CALLOPT_SEG000,CALLOPT_CODE) -#define viewshel_0b SEG_SEGCLASS(WORKSET_SEG000,WORKSET_CODE) -#define drviews4_09 SEG_SEGCLASS(WORKSET_SEG000,WORKSET_CODE) -#define sdwindow_0a SEG_SEGCLASS(WORKSET_SEG000,WORKSET_CODE) -#define fusel_05 SEG_SEGCLASS(WORKSET_SEG000,WORKSET_CODE) -#define fudraw_05 SEG_SEGCLASS(WORKSET_SEG000,WORKSET_CODE) -#define fupoor_0f SEG_SEGCLASS(WORKSET_SEG000,WORKSET_CODE) -#define drawdoc3_09 SEG_SEGCLASS(WORKSET_SEG000,WORKSET_CODE) -#define fusel_03 SEG_SEGCLASS(WORKSET_SEG000,WORKSET_CODE) -#define viewshel_09 SEG_SEGCLASS(WORKSET_SEG000,WORKSET_CODE) -#define drviews4_07 SEG_SEGCLASS(WORKSET_SEG000,WORKSET_CODE) -#define fudraw_03 SEG_SEGCLASS(WORKSET_SEG000,WORKSET_CODE) -#define sdwindow_08 SEG_SEGCLASS(WORKSET_SEG000,WORKSET_CODE) -#define viewshe2_1b SEG_SEGCLASS(WORKSET_SEG000,WORKSET_CODE) -#define sdwindow_0b SEG_SEGCLASS(WORKSET_SEG000,WORKSET_CODE) -#define drviews4_0a SEG_SEGCLASS(WORKSET_SEG000,WORKSET_CODE) -#define viewshel_0c SEG_SEGCLASS(WORKSET_SEG000,WORKSET_CODE) -#define viewshel_05 SEG_SEGCLASS(SLICES_SEG000,SLICES_CODE) -#define drviews8_01 SEG_SEGCLASS(SLICES_SEG000,SLICES_CODE) -#define drviewsb_01 SEG_SEGCLASS(SLICES_SEG000,SLICES_CODE) -#define outlnvsh_0f SEG_SEGCLASS(SLICES_SEG000,SLICES_CODE) -#define fuarea_01 SEG_SEGCLASS(SLICES_SEG000,SLICES_CODE) -#define fuconpol_05 SEG_SEGCLASS(SLICES_SEG000,SLICES_CODE) -#define sdview_10 SEG_SEGCLASS(SLICES_SEG000,SLICES_CODE) -#define fuconrec_05 SEG_SEGCLASS(SLICES_SEG000,SLICES_CODE) -#define fuconstr_05 SEG_SEGCLASS(SLICES_SEG000,SLICES_CODE) -#define futext_05 SEG_SEGCLASS(SLICES_SEG000,SLICES_CODE) -#define futext_0a SEG_SEGCLASS(SLICES_SEG000,SLICES_CODE) -#define futext_01 SEG_SEGCLASS(SLICES_SEG000,SLICES_CODE) -#define futext_0b SEG_SEGCLASS(SLICES_SEG000,SLICES_CODE) -#define futext_0c SEG_SEGCLASS(SLICES_SEG000,SLICES_CODE) -#define sdview_13 SEG_SEGCLASS(SLICES_SEG000,SLICES_CODE) -#define futext_08 SEG_SEGCLASS(SLICES_SEG000,SLICES_CODE) -#define fuconstr_07 SEG_SEGCLASS(SLICES_SEG000,SLICES_CODE) -#define fuconpol_07 SEG_SEGCLASS(SLICES_SEG000,SLICES_CODE) -#define app6_06 SEG_SEGCLASS(SLICES_SEG000,SLICES_CODE) -#define futext_0f SEG_SEGCLASS(SLICES_SEG000,SLICES_CODE) -#define fuconrec_07 SEG_SEGCLASS(SLICES_SEG000,SLICES_CODE) -#define futext_0d SEG_SEGCLASS(SLICES_SEG000,SLICES_CODE) -#define futext_03 SEG_SEGCLASS(SLICES_SEG000,SLICES_CODE) -#define sdview_14 SEG_SEGCLASS(SLICES_SEG000,SLICES_CODE) -#define futext_0e SEG_SEGCLASS(SLICES_SEG000,SLICES_CODE) -#define futext_02 SEG_SEGCLASS(SLICES_SEG000,SLICES_CODE) -#define futext_10 SEG_SEGCLASS(SLICES_SEG000,SLICES_CODE) -#define fuconbez_05 SEG_SEGCLASS(SLICES_SEG000,SLICES_CODE) -#define fuconstr_02 SEG_SEGCLASS(SLICES_SEG000,SLICES_CODE) -#define fuconpol_02 SEG_SEGCLASS(SLICES_SEG000,SLICES_CODE) -#define fuconpol_08 SEG_SEGCLASS(SLICES_SEG000,SLICES_CODE) -#define fuconstr_08 SEG_SEGCLASS(SLICES_SEG000,SLICES_CODE) -#define fuconrec_08 SEG_SEGCLASS(SLICES_SEG000,SLICES_CODE) -#define futext_09 SEG_SEGCLASS(SLICES_SEG000,SLICES_CODE) -#define fuconstr_01 SEG_SEGCLASS(SLICES_SEG000,SLICES_CODE) -#define fuconpol_01 SEG_SEGCLASS(SLICES_SEG000,SLICES_CODE) -#define fudraw_0d SEG_SEGCLASS(SLICES_SEG001,SLICES_CODE) -#define fupoor_0d SEG_SEGCLASS(SLICES_SEG001,SLICES_CODE) -#define futext_11 SEG_SEGCLASS(SLICES_SEG001,SLICES_CODE) -#define sdwindow_1d SEG_SEGCLASS(SLICES_SEG001,SLICES_CODE) -#define sdwindow_1f SEG_SEGCLASS(SLICES_SEG001,SLICES_CODE) -#define drviews1_08 SEG_SEGCLASS(SLICES_SEG001,SLICES_CODE) -#define sdview2_05 SEG_SEGCLASS(SLICES_SEG001,SLICES_CODE) -#define fuoutl_03 SEG_SEGCLASS(SLICES_SEG001,SLICES_CODE) -#define sdwindow_1e SEG_SEGCLASS(SLICES_SEG001,SLICES_CODE) -#define viewshe2_13 SEG_SEGCLASS(SLICES_SEG001,SLICES_CODE) -#define outlview_08 SEG_SEGCLASS(SLICES_SEG001,SLICES_CODE) -#define outlview_0e SEG_SEGCLASS(SLICES_SEG001,SLICES_CODE) -#define drawdoc2_0b SEG_SEGCLASS(SLICES_SEG001,SLICES_CODE) -#define outlview_0d SEG_SEGCLASS(SLICES_SEG001,SLICES_CODE) -#define outlnvsh_0e SEG_SEGCLASS(SLICES_SEG001,SLICES_CODE) -#define viewshe2_1c SEG_SEGCLASS(SLICES_SEG001,SLICES_CODE) -#define sdwindow_22 SEG_SEGCLASS(SLICES_SEG001,SLICES_CODE) -#define drviews1_09 SEG_SEGCLASS(SLICES_SEG001,SLICES_CODE) -#define sdview2_06 SEG_SEGCLASS(SLICES_SEG001,SLICES_CODE) -#define outlview_1a SEG_SEGCLASS(SLICES_SEG001,SLICES_CODE) -#define fuoltext_09 SEG_SEGCLASS(SLICES_SEG001,SLICES_CODE) -#define fuoltext_0b SEG_SEGCLASS(SLICES_SEG001,SLICES_CODE) -#define viewshe2_12 SEG_SEGCLASS(SLICES_SEG001,SLICES_CODE) -#define outlview_07 SEG_SEGCLASS(SLICES_SEG001,SLICES_CODE) -#define outlview_10 SEG_SEGCLASS(SLICES_SEG001,SLICES_CODE) -#define outlview_11 SEG_SEGCLASS(SLICES_SEG001,SLICES_CODE) -#define drawdoc2_0f SEG_SEGCLASS(SLICES_SEG001,SLICES_CODE) -#define fubullet_01 SEG_SEGCLASS(SLICES_SEG001,SLICES_CODE) -#define drviews4_05 SEG_SEGCLASS(SLICES_SEG002,SLICES_CODE) -#define showwin_03 SEG_SEGCLASS(SLICES_SEG002,SLICES_CODE) -#define fuslshow_0c SEG_SEGCLASS(SLICES_SEG002,SLICES_CODE) -#define fupoor_08 SEG_SEGCLASS(SLICES_SEG002,SLICES_CODE) -#define fusel_06 SEG_SEGCLASS(SLICES_SEG003,SLICES_CODE) -#define sdpage_02 SEG_SEGCLASS(SLICES_SEG003,SLICES_CODE) -#define sdpage2_02 SEG_SEGCLASS(SLICES_SEG003,SLICES_CODE) -#define drawdoc_02 SEG_SEGCLASS(SLICES_SEG003,SLICES_CODE) -#define docshel4_0f SEG_SEGCLASS(SLICES_SEG003,SLICES_CODE) -#define drawdoc3_06 SEG_SEGCLASS(SLICES_SEG003,SLICES_CODE) -#define drawdoc3_0a SEG_SEGCLASS(SLICES_SEG003,SLICES_CODE) -#define docshell_05 SEG_SEGCLASS(SLICES_SEG003,SLICES_CODE) -#define stlsheet_02 SEG_SEGCLASS(SLICES_SEG003,SLICES_CODE) -#define stlpool_02 SEG_SEGCLASS(SLICES_SEG003,SLICES_CODE) -#define stlpool_06 SEG_SEGCLASS(SLICES_SEG003,SLICES_CODE) -#define dragserv_03 SEG_SEGCLASS(SLICES_SEG003,SLICES_CODE) -#define drawdoc_06 SEG_SEGCLASS(SLICES_SEG003,SLICES_CODE) -#define drawdoc3_08 SEG_SEGCLASS(SLICES_SEG003,SLICES_CODE) -#define sdoutl_02 SEG_SEGCLASS(SLICES_SEG003,SLICES_CODE) -#define stlpool_05 SEG_SEGCLASS(SLICES_SEG003,SLICES_CODE) -#define fuprlout_01 SEG_SEGCLASS(SLICES_SEG003,SLICES_CODE) -#define drawdoc_03 SEG_SEGCLASS(SLICES_SEG003,SLICES_CODE) -#define sdpage_18 SEG_SEGCLASS(SLICES_SEG003,SLICES_CODE) -#define sdpage2_01 SEG_SEGCLASS(SLICES_SEG003,SLICES_CODE) -#define drawview_07 SEG_SEGCLASS(SLICES_SEG003,SLICES_CODE) -#define docshel4_0c SEG_SEGCLASS(SLICES_SEG003,SLICES_CODE) -#define sdiocmpt_01 SEG_SEGCLASS(SLICES_SEG003,SLICES_CODE) -#define frmview_06 SEG_SEGCLASS(SLICES_SEG003,SLICES_CODE) -#define stlsheet_03 SEG_SEGCLASS(SLICES_SEG003,SLICES_CODE) -#define sdpage2_03 SEG_SEGCLASS(SLICES_SEG003,SLICES_CODE) -#define drawdoc_05 SEG_SEGCLASS(SLICES_SEG003,SLICES_CODE) -#define docshel4_1e SEG_SEGCLASS(SLICES_SEG003,SLICES_CODE) -#define frmview_05 SEG_SEGCLASS(SLICES_SEG003,SLICES_CODE) -#define drawdoc2_11 SEG_SEGCLASS(SLICES_SEG003,SLICES_CODE) -#define drawdoc2_14 SEG_SEGCLASS(SLICES_SEG003,SLICES_CODE) -#define docshel4_14 SEG_SEGCLASS(SLICES_SEG003,SLICES_CODE) -#define docshel4_0d SEG_SEGCLASS(SLICES_SEG003,SLICES_CODE) -#define stlsheet_04 SEG_SEGCLASS(SLICES_SEG003,SLICES_CODE) -#define viewshe2_1f SEG_SEGCLASS(SLICES_SEG003,SLICES_CODE) -#define app6_0a SEG_SEGCLASS(SLICES_SEG003,SLICES_CODE) -#define sdobjpal_12 SEG_SEGCLASS(SLICES_SEG003,SLICES_CODE) -#define sdobjpal_11 SEG_SEGCLASS(SLICES_SEG003,SLICES_CODE) -#define sdobjpal_14 SEG_SEGCLASS(SLICES_SEG003,SLICES_CODE) -#define sdobjpal_06 SEG_SEGCLASS(SLICES_SEG003,SLICES_CODE) -#define sdobjpal_02 SEG_SEGCLASS(SLICES_SEG003,SLICES_CODE) -#define app6_05 SEG_SEGCLASS(SLICES_SEG003,SLICES_CODE) -#define sdobjpal_04 SEG_SEGCLASS(SLICES_SEG003,SLICES_CODE) -#define sdview_0c SEG_SEGCLASS(SLICES_SEG004,SLICES_CODE) -#define sdobjpal_17 SEG_SEGCLASS(SLICES_SEG004,SLICES_CODE) -#define sdobjpal_0c SEG_SEGCLASS(SLICES_SEG004,SLICES_CODE) -#define sdobjpal_01 SEG_SEGCLASS(SLICES_SEG004,SLICES_CODE) -#define sdobjpal_0d SEG_SEGCLASS(SLICES_SEG004,SLICES_CODE) -#define app6_07 SEG_SEGCLASS(SLICES_SEG004,SLICES_CODE) -#define app6_0b SEG_SEGCLASS(SLICES_SEG004,SLICES_CODE) -#define drviews6_03 SEG_SEGCLASS(SLICES_SEG004,SLICES_CODE) -#define sdobjpal_10 SEG_SEGCLASS(SLICES_SEG004,SLICES_CODE) -#define drviews6_04 SEG_SEGCLASS(SLICES_SEG004,SLICES_CODE) -#define sdobjpal_0e SEG_SEGCLASS(SLICES_SEG004,SLICES_CODE) -#define app6_08 SEG_SEGCLASS(SLICES_SEG004,SLICES_CODE) -#define sdobjpal_0f SEG_SEGCLASS(SLICES_SEG004,SLICES_CODE) -#define fuconstr_03 SEG_SEGCLASS(SLICES_SEG005,SLICES_CODE) -#define fuconrec_03 SEG_SEGCLASS(SLICES_SEG005,SLICES_CODE) -#define fuconbez_03 SEG_SEGCLASS(SLICES_SEG005,SLICES_CODE) -#define fuconarc_03 SEG_SEGCLASS(SLICES_SEG005,SLICES_CODE) -#define futext_12 SEG_SEGCLASS(SLICES_SEG006,SLICES_CODE) -#define frmview_02 SEG_SEGCLASS(SLICES_SEG006,SLICES_CODE) -#define fuconrec_04 SEG_SEGCLASS(SLICES_SEG006,SLICES_CODE) -#define viewshe2_0a SEG_SEGCLASS(SLICES_SEG006,SLICES_CODE) -#define drviews3_01 SEG_SEGCLASS(SLICES_SEG006,SLICES_CODE) -#define drawdoc2_10 SEG_SEGCLASS(SLICES_SEG007,SLICES_CODE) -#define fuoltext_03 SEG_SEGCLASS(SLICES_SEG007,SLICES_CODE) -#define fuoltext_05 SEG_SEGCLASS(SLICES_SEG007,SLICES_CODE) -#define fuconrec_01 SEG_SEGCLASS(SLICES_SEG007,SLICES_CODE) -#define fuconrec_02 SEG_SEGCLASS(SLICES_SEG007,SLICES_CODE) -#define sdview_0f SEG_SEGCLASS(SLICES_SEG008,SLICES_CODE) -#define drtxtob_03 SEG_SEGCLASS(SLICES_SEG008,SLICES_CODE) -#define outlview_15 SEG_SEGCLASS(SLICES_SEG008,SLICES_CODE) -#define fuchar_01 SEG_SEGCLASS(SLICES_SEG008,SLICES_CODE) -#define dlgchar_01 SEG_SEGCLASS(SLICES_SEG008,SLICES_CODE) -#define dlgchar_02 SEG_SEGCLASS(SLICES_SEG008,SLICES_CODE) -#define fuolbull_01 SEG_SEGCLASS(SLICES_SEG008,SLICES_CODE) -#define enumdlg_02 SEG_SEGCLASS(SLICES_SEG008,SLICES_CODE) -#define enumdlg_04 SEG_SEGCLASS(SLICES_SEG008,SLICES_CODE) -#define dlgolbul_01 SEG_SEGCLASS(SLICES_SEG008,SLICES_CODE) -#define enumdlg_03 SEG_SEGCLASS(SLICES_SEG008,SLICES_CODE) -#define enumdlg_07 SEG_SEGCLASS(SLICES_SEG008,SLICES_CODE) -#define enumdlg_05 SEG_SEGCLASS(SLICES_SEG008,SLICES_CODE) -#define enumdlg_0f SEG_SEGCLASS(SLICES_SEG008,SLICES_CODE) -#define enumdlg_10 SEG_SEGCLASS(SLICES_SEG008,SLICES_CODE) -#define enumdlg_0b SEG_SEGCLASS(SLICES_SEG008,SLICES_CODE) -#define enumdlg_06 SEG_SEGCLASS(SLICES_SEG008,SLICES_CODE) -#define enumdlg_01 SEG_SEGCLASS(SLICES_SEG008,SLICES_CODE) -#define enumdlg_0c SEG_SEGCLASS(SLICES_SEG008,SLICES_CODE) -#define enumdlg_09 SEG_SEGCLASS(SLICES_SEG008,SLICES_CODE) -#define enumdlg_0a SEG_SEGCLASS(SLICES_SEG008,SLICES_CODE) -#define enumdlg_0d SEG_SEGCLASS(SLICES_SEG008,SLICES_CODE) -#define enumdlg_0e SEG_SEGCLASS(SLICES_SEG008,SLICES_CODE) -#define sdpage_07 SEG_SEGCLASS(SLICES_SEG009,SLICES_CODE) -#define app1_03 SEG_SEGCLASS(SLICES_SEG009,SLICES_CODE) -#define newfoil_01 SEG_SEGCLASS(SLICES_SEG009,SLICES_CODE) -#define newfoil_03 SEG_SEGCLASS(SLICES_SEG009,SLICES_CODE) -#define newfoil_07 SEG_SEGCLASS(SLICES_SEG009,SLICES_CODE) -#define newfoil_05 SEG_SEGCLASS(SLICES_SEG009,SLICES_CODE) -#define newfoil_02 SEG_SEGCLASS(SLICES_SEG010,SLICES_CODE) -#define newfoil_04 SEG_SEGCLASS(SLICES_SEG010,SLICES_CODE) -#define newfoil_06 SEG_SEGCLASS(SLICES_SEG010,SLICES_CODE) -#define futext_07 SEG_SEGCLASS(SLICES_SEG010,SLICES_CODE) -#define app_02 SEG_SEGCLASS(SLICES_SEG010,SLICES_CODE) -#define sdobjpal_03 SEG_SEGCLASS(SLICES_SEG011,SLICES_CODE) -#define sdobjpal_13 SEG_SEGCLASS(SLICES_SEG011,SLICES_CODE) -#define tabcontr_03 SEG_SEGCLASS(SLICES_SEG011,SLICES_CODE) -#define fuconpol_04 SEG_SEGCLASS(SLICES_SEG011,SLICES_CODE) -#define app2_02 SEG_SEGCLASS(SLICES_SEG011,SLICES_CODE) -#define app1_02 SEG_SEGCLASS(SLICES_SEG011,SLICES_CODE) -#define app6_02 SEG_SEGCLASS(SLICES_SEG011,SLICES_CODE) -#define app2_07 SEG_SEGCLASS(SLICES_SEG012,SLICES_CODE) -#define outlnvsh_1d SEG_SEGCLASS(SLICES_SEG012,SLICES_CODE) -#define drviews1_07 SEG_SEGCLASS(SLICES_SEG012,SLICES_CODE) -#define fuconbez_04 SEG_SEGCLASS(SLICES_SEG012,SLICES_CODE) -#define fupoor_0e SEG_SEGCLASS(SLICES_SEG012,SLICES_CODE) -#define app_08 SEG_SEGCLASS(SLICES_SEG013,SLICES_CODE) -#define sdobjpal_19 SEG_SEGCLASS(SLICES_SEG013,SLICES_CODE) -#define tbxww_01 SEG_SEGCLASS(SLICES_SEG013,SLICES_CODE) -#define tbxww_06 SEG_SEGCLASS(SLICES_SEG013,SLICES_CODE) -#define tbxww_07 SEG_SEGCLASS(SLICES_SEG013,SLICES_CODE) -#define tbxww_05 SEG_SEGCLASS(SLICES_SEG014,SLICES_CODE) -#define fupoor_10 SEG_SEGCLASS(SLICES_SEG014,SLICES_CODE) -#define unchss_01 SEG_SEGCLASS(SLICES_SEG014,SLICES_CODE) -#define drviews6_09 SEG_SEGCLASS(SLICES_SEG014,SLICES_CODE) -#define fuslshow_03 SEG_SEGCLASS(SLICES_SEG014,SLICES_CODE) -#define fader_06 SEG_SEGCLASS(SLICES_SEG014,SLICES_CODE) -#define fader_0e SEG_SEGCLASS(SLICES_SEG014,SLICES_CODE) -#define fader_11 SEG_SEGCLASS(SLICES_SEG014,SLICES_CODE) -#define fader_13 SEG_SEGCLASS(SLICES_SEG014,SLICES_CODE) -#define fader_07 SEG_SEGCLASS(SLICES_SEG014,SLICES_CODE) -#define fuslshow_07 SEG_SEGCLASS(SLICES_SEG014,SLICES_CODE) -#define showview_01 SEG_SEGCLASS(SLICES_SEG014,SLICES_CODE) -#define showwin_07 SEG_SEGCLASS(SLICES_SEG014,SLICES_CODE) -#define fuslshow_11 SEG_SEGCLASS(SLICES_SEG014,SLICES_CODE) -#define fuslshow_0d SEG_SEGCLASS(SLICES_SEG014,SLICES_CODE) -#define fader_1b SEG_SEGCLASS(SLICES_SEG014,SLICES_CODE) -#define fader_08 SEG_SEGCLASS(SLICES_SEG014,SLICES_CODE) -#define fader_15 SEG_SEGCLASS(SLICES_SEG014,SLICES_CODE) -#define fader_16 SEG_SEGCLASS(SLICES_SEG014,SLICES_CODE) -#define fader_1a SEG_SEGCLASS(SLICES_SEG014,SLICES_CODE) -#define showwin_05 SEG_SEGCLASS(SLICES_SEG014,SLICES_CODE) -#define fuslshow_08 SEG_SEGCLASS(SLICES_SEG014,SLICES_CODE) -#define fuslshw2_0b SEG_SEGCLASS(SLICES_SEG014,SLICES_CODE) -#define showview_03 SEG_SEGCLASS(SLICES_SEG014,SLICES_CODE) -#define showview_06 SEG_SEGCLASS(SLICES_SEG014,SLICES_CODE) -#define showview_04 SEG_SEGCLASS(SLICES_SEG014,SLICES_CODE) -#define fuslshw2_01 SEG_SEGCLASS(SLICES_SEG014,SLICES_CODE) -#define fuslshow_0b SEG_SEGCLASS(SLICES_SEG014,SLICES_CODE) -#define fuslshw3_02 SEG_SEGCLASS(SLICES_SEG014,SLICES_CODE) -#define fuslshow_14 SEG_SEGCLASS(SLICES_SEG014,SLICES_CODE) -#define fuslshow_0a SEG_SEGCLASS(SLICES_SEG014,SLICES_CODE) -#define fuslshw3_01 SEG_SEGCLASS(SLICES_SEG014,SLICES_CODE) -#define fuslshow_12 SEG_SEGCLASS(SLICES_SEG014,SLICES_CODE) -#define fuslshw2_0c SEG_SEGCLASS(SLICES_SEG014,SLICES_CODE) -#define fuslshw3_08 SEG_SEGCLASS(SLICES_SEG014,SLICES_CODE) -#define fuslshw3_0b SEG_SEGCLASS(SLICES_SEG014,SLICES_CODE) -#define fuslshw3_0c SEG_SEGCLASS(SLICES_SEG014,SLICES_CODE) -#define fuslshw2_10 SEG_SEGCLASS(SLICES_SEG014,SLICES_CODE) -#define fuslshw3_12 SEG_SEGCLASS(SLICES_SEG014,SLICES_CODE) -#define fuslshw2_0e SEG_SEGCLASS(SLICES_SEG014,SLICES_CODE) -#define fuslshw3_09 SEG_SEGCLASS(SLICES_SEG014,SLICES_CODE) -#define fuslshw2_02 SEG_SEGCLASS(SLICES_SEG014,SLICES_CODE) -#define fader_21 SEG_SEGCLASS(SLICES_SEG014,SLICES_CODE) -#define fader_22 SEG_SEGCLASS(SLICES_SEG014,SLICES_CODE) -#define fuslshw2_0f SEG_SEGCLASS(SLICES_SEG014,SLICES_CODE) -#define fader_0f SEG_SEGCLASS(SLICES_SEG014,SLICES_CODE) -#define tbxww_02 SEG_SEGCLASS(SLICES_SEG015,SLICES_CODE) -#define drviews1_19 SEG_SEGCLASS(SLICES_SEG015,SLICES_CODE) -#define fupage_01 SEG_SEGCLASS(SLICES_SEG015,SLICES_CODE) -#define viewshe2_20 SEG_SEGCLASS(SLICES_SEG015,SLICES_CODE) -#define drawdoc2_06 SEG_SEGCLASS(SLICES_SEG015,SLICES_CODE) -#define dlgpage_01 SEG_SEGCLASS(SLICES_SEG015,SLICES_CODE) -#define sdundogr_05 SEG_SEGCLASS(SLICES_SEG015,SLICES_CODE) -#define fuconbez_07 SEG_SEGCLASS(SLICES_SEG016,SLICES_CODE) -#define fuconstr_06 SEG_SEGCLASS(SLICES_SEG016,SLICES_CODE) -#define fuconrec_06 SEG_SEGCLASS(SLICES_SEG016,SLICES_CODE) -#define fuconbez_06 SEG_SEGCLASS(SLICES_SEG016,SLICES_CODE) -#define fudraw_0c SEG_SEGCLASS(SLICES_SEG016,SLICES_CODE) -#define fuslshow_01 SEG_SEGCLASS(SLICES_SEG016,SLICES_CODE) -#define drawdoc_08 SEG_SEGCLASS(SLICES_SEG016,SLICES_CODE) -#define drawdoc_09 SEG_SEGCLASS(SLICES_SEG016,SLICES_CODE) -#define drawdoc_0a SEG_SEGCLASS(SLICES_SEG016,SLICES_CODE) -#define drawdoc_0b SEG_SEGCLASS(SLICES_SEG016,SLICES_CODE) -#define drawdoc_0c SEG_SEGCLASS(SLICES_SEG016,SLICES_CODE) -#define present_01 SEG_SEGCLASS(SLICES_SEG016,SLICES_CODE) -#define present_03 SEG_SEGCLASS(SLICES_SEG016,SLICES_CODE) -#define present_04 SEG_SEGCLASS(SLICES_SEG016,SLICES_CODE) -#define present_02 SEG_SEGCLASS(SLICES_SEG016,SLICES_CODE) -#define fuslshow_02 SEG_SEGCLASS(SLICES_SEG017,SLICES_CODE) -#define fader_02 SEG_SEGCLASS(SLICES_SEG017,SLICES_CODE) -#define mover_02 SEG_SEGCLASS(SLICES_SEG017,SLICES_CODE) -#define showview_02 SEG_SEGCLASS(SLICES_SEG017,SLICES_CODE) -#define fuslshow_0e SEG_SEGCLASS(SLICES_SEG018,SLICES_CODE) -#define fuslshow_0f SEG_SEGCLASS(SLICES_SEG018,SLICES_CODE) -#define docshel4_11 SEG_SEGCLASS(SLICES_SEG018,SLICES_CODE) -#define docshel4_16 SEG_SEGCLASS(SLICES_SEG018,SLICES_CODE) -#define app6_03 SEG_SEGCLASS(SLICES_SEG018,SLICES_CODE) -#define sdobjpal_21 SEG_SEGCLASS(SLICES_SEG018,SLICES_CODE) -#define app6_04 SEG_SEGCLASS(SLICES_SEG018,SLICES_CODE) -#define fuedibez_03 SEG_SEGCLASS(SLICES_SEG019,SLICES_CODE) -#define fuedibez_0a SEG_SEGCLASS(SLICES_SEG019,SLICES_CODE) -#define fuedibez_04 SEG_SEGCLASS(SLICES_SEG019,SLICES_CODE) -#define fuedibez_05 SEG_SEGCLASS(SLICES_SEG019,SLICES_CODE) -#define fuconbez_01 SEG_SEGCLASS(SLICES_SEG020,SLICES_CODE) -#define fuconbez_08 SEG_SEGCLASS(SLICES_SEG020,SLICES_CODE) -#define fader_01 SEG_SEGCLASS(SLICES_SEG020,SLICES_CODE) -#define fupoor_09 SEG_SEGCLASS(SLICES_SEG020,SLICES_CODE) -#define sdview2_01 SEG_SEGCLASS(SLICES_SEG020,SLICES_CODE) -#define mover_01 SEG_SEGCLASS(SLICES_SEG020,SLICES_CODE) -#define showwin_01 SEG_SEGCLASS(SLICES_SEG020,SLICES_CODE) -#define showwin_02 SEG_SEGCLASS(SLICES_SEG020,SLICES_CODE) -#define dragserv_02 SEG_SEGCLASS(SLICES_SEG021,SLICES_CODE) -#define dragserv_04 SEG_SEGCLASS(SLICES_SEG021,SLICES_CODE) -#define dragserv_05 SEG_SEGCLASS(SLICES_SEG021,SLICES_CODE) -#define dragserv_06 SEG_SEGCLASS(SLICES_SEG021,SLICES_CODE) -#define dragserv_08 SEG_SEGCLASS(SLICES_SEG021,SLICES_CODE) -#define stlpool_09 SEG_SEGCLASS(SLICES_SEG022,SLICES_CODE) -#define stlpool_0a SEG_SEGCLASS(SLICES_SEG022,SLICES_CODE) -#define drviews6_08 SEG_SEGCLASS(SLICES_SEG023,SLICES_CODE) -#define fuslshow_09 SEG_SEGCLASS(SLICES_SEG023,SLICES_CODE) -#define fuedibez_07 SEG_SEGCLASS(SLICES_SEG024,SLICES_CODE) -#define fuconbez_02 SEG_SEGCLASS(SLICES_SEG024,SLICES_CODE) -#define fupoor_0b SEG_SEGCLASS(SLICES_SEG024,SLICES_CODE) -#define sdview2_03 SEG_SEGCLASS(SLICES_SEG024,SLICES_CODE) -#define showwin_04 SEG_SEGCLASS(SLICES_SEG025,SLICES_CODE) -#define showwin_06 SEG_SEGCLASS(SLICES_SEG025,SLICES_CODE) -#define fuinsert_01 SEG_SEGCLASS(SLICES_SEG025,SLICES_CODE) -#define graphpro_01 SEG_SEGCLASS(SLICES_SEG025,SLICES_CODE) -#define graphpro_02 SEG_SEGCLASS(SLICES_SEG025,SLICES_CODE) -#define graphpro_03 SEG_SEGCLASS(SLICES_SEG025,SLICES_CODE) -#define fuinsert_02 SEG_SEGCLASS(SLICES_SEG026,SLICES_CODE) -#define fuprlout_02 SEG_SEGCLASS(SLICES_SEG026,SLICES_CODE) -#define fucopy_02 SEG_SEGCLASS(SLICES_SEG026,SLICES_CODE) -#define fucopy_04 SEG_SEGCLASS(SLICES_SEG026,SLICES_CODE) -#define fuline_01 SEG_SEGCLASS(SLICES_SEG026,SLICES_CODE) -#define unprlout_01 SEG_SEGCLASS(SLICES_SEG027,SLICES_CODE) -#define unmovss_01 SEG_SEGCLASS(SLICES_SEG027,SLICES_CODE) -#define stlsheet_08 SEG_SEGCLASS(SLICES_SEG027,SLICES_CODE) -#define copydlg_01 SEG_SEGCLASS(SLICES_SEG027,SLICES_CODE) -#define copydlg_03 SEG_SEGCLASS(SLICES_SEG027,SLICES_CODE) -#define copydlg_02 SEG_SEGCLASS(SLICES_SEG028,SLICES_CODE) -#define copydlg_04 SEG_SEGCLASS(SLICES_SEG028,SLICES_CODE) -#define docshell_0c SEG_SEGCLASS(SLICES_SEG029,SLICES_CODE) -#define docshel3_01 SEG_SEGCLASS(SLICES_SEG029,SLICES_CODE) -#define fusearch_01 SEG_SEGCLASS(SLICES_SEG029,SLICES_CODE) -#define sdoutl_03 SEG_SEGCLASS(SLICES_SEG029,SLICES_CODE) -#define app2_04 SEG_SEGCLASS(SLICES_SEG029,SLICES_CODE) -#define sdoutl_04 SEG_SEGCLASS(SLICES_SEG029,SLICES_CODE) -#define fusearch_02 SEG_SEGCLASS(SLICES_SEG029,SLICES_CODE) -#define fuspell_01 SEG_SEGCLASS(SLICES_SEG029,SLICES_CODE) -#define fuspell_02 SEG_SEGCLASS(SLICES_SEG029,SLICES_CODE) -#define fusearch_03 SEG_SEGCLASS(SLICES_SEG029,SLICES_CODE) -#define sdoutl_07 SEG_SEGCLASS(SLICES_SEG029,SLICES_CODE) -#define fuspell_03 SEG_SEGCLASS(SLICES_SEG029,SLICES_CODE) -#define sdoutl_05 SEG_SEGCLASS(SLICES_SEG029,SLICES_CODE) -#define viewshe2_04 SEG_SEGCLASS(SLICES_SEG030,SLICES_CODE) -#define viewshe2_05 SEG_SEGCLASS(SLICES_SEG030,SLICES_CODE) -#define sdwindow_16 SEG_SEGCLASS(SLICES_SEG030,SLICES_CODE) -#define outlnvsh_13 SEG_SEGCLASS(SLICES_SEG030,SLICES_CODE) -#define viewshe2_0e SEG_SEGCLASS(SLICES_SEG031,SLICES_CODE) -#define fuzoom_04 SEG_SEGCLASS(SLICES_SEG031,SLICES_CODE) -#define fuzoom_05 SEG_SEGCLASS(SLICES_SEG031,SLICES_CODE) -#define outlnvsh_16 SEG_SEGCLASS(SLICES_SEG031,SLICES_CODE) -#define fuzoom_01 SEG_SEGCLASS(SLICES_SEG032,SLICES_CODE) -#define fuzoom_02 SEG_SEGCLASS(SLICES_SEG032,SLICES_CODE) -#define fuzoom_03 SEG_SEGCLASS(SLICES_SEG032,SLICES_CODE) -#define fuzoom_07 SEG_SEGCLASS(SLICES_SEG032,SLICES_CODE) -#define fuzoom_08 SEG_SEGCLASS(SLICES_SEG032,SLICES_CODE) -#define fuolbull_02 SEG_SEGCLASS(SLICES_SEG032,SLICES_CODE) -#define fuolbull_04 SEG_SEGCLASS(SLICES_SEG032,SLICES_CODE) -#define newfoil_08 SEG_SEGCLASS(SLICES_SEG032,SLICES_CODE) -#define app6_09 SEG_SEGCLASS(SLICES_SEG032,SLICES_CODE) -#define app6_01 SEG_SEGCLASS(SLICES_SEG032,SLICES_CODE) -#define docdlg_04 SEG_SEGCLASS(SLICES_SEG033,SLICES_CODE) -#define docdlg_05 SEG_SEGCLASS(SLICES_SEG033,SLICES_CODE) -#define drviews1_0d SEG_SEGCLASS(SLICES_SEG033,SLICES_CODE) -#define fuconarc_01 SEG_SEGCLASS(SLICES_SEG033,SLICES_CODE) -#define fuconarc_02 SEG_SEGCLASS(SLICES_SEG034,SLICES_CODE) -#define fuconarc_04 SEG_SEGCLASS(SLICES_SEG034,SLICES_CODE) -#define fuconarc_05 SEG_SEGCLASS(SLICES_SEG034,SLICES_CODE) -#define fuconarc_07 SEG_SEGCLASS(SLICES_SEG034,SLICES_CODE) -#define fuconarc_08 SEG_SEGCLASS(SLICES_SEG034,SLICES_CODE) -#define fuedibez_01 SEG_SEGCLASS(SLICES_SEG034,SLICES_CODE) -#define fuedibez_02 SEG_SEGCLASS(SLICES_SEG034,SLICES_CODE) -#define fuedibez_08 SEG_SEGCLASS(SLICES_SEG035,SLICES_CODE) -#define fupoor_0c SEG_SEGCLASS(SLICES_SEG035,SLICES_CODE) -#define fudspord_01 SEG_SEGCLASS(SLICES_SEG035,SLICES_CODE) -#define fudspord_02 SEG_SEGCLASS(SLICES_SEG035,SLICES_CODE) -#define fudspord_03 SEG_SEGCLASS(SLICES_SEG035,SLICES_CODE) -#define fudspord_04 SEG_SEGCLASS(SLICES_SEG035,SLICES_CODE) -#define fudspord_05 SEG_SEGCLASS(SLICES_SEG035,SLICES_CODE) -#define fudspord_07 SEG_SEGCLASS(SLICES_SEG035,SLICES_CODE) -#define fudspord_08 SEG_SEGCLASS(SLICES_SEG035,SLICES_CODE) -#define futempl_01 SEG_SEGCLASS(SLICES_SEG035,SLICES_CODE) -#define drawview_08 SEG_SEGCLASS(SLICES_SEG035,SLICES_CODE) -#define sdview_12 SEG_SEGCLASS(SLICES_SEG035,SLICES_CODE) -#define tabtempl_01 SEG_SEGCLASS(SLICES_SEG035,SLICES_CODE) -#define tabtempl_02 SEG_SEGCLASS(SLICES_SEG035,SLICES_CODE) -#define tabtempl_03 SEG_SEGCLASS(SLICES_SEG035,SLICES_CODE) -#define slidvish_01 SEG_SEGCLASS(SLICES_SEG036,SLICES_CODE) -#define slidvish_03 SEG_SEGCLASS(SLICES_SEG036,SLICES_CODE) -#define slidvish_0c SEG_SEGCLASS(SLICES_SEG036,SLICES_CODE) -#define fuslid_01 SEG_SEGCLASS(SLICES_SEG036,SLICES_CODE) -#define slidvish_18 SEG_SEGCLASS(SLICES_SEG036,SLICES_CODE) -#define slidview_05 SEG_SEGCLASS(SLICES_SEG036,SLICES_CODE) -#define slidview_12 SEG_SEGCLASS(SLICES_SEG036,SLICES_CODE) -#define slidview_06 SEG_SEGCLASS(SLICES_SEG036,SLICES_CODE) -#define slidview_0a SEG_SEGCLASS(SLICES_SEG036,SLICES_CODE) -#define slidview_11 SEG_SEGCLASS(SLICES_SEG036,SLICES_CODE) -#define slidview_01 SEG_SEGCLASS(SLICES_SEG036,SLICES_CODE) -#define slidview_09 SEG_SEGCLASS(SLICES_SEG036,SLICES_CODE) -#define slidview_04 SEG_SEGCLASS(SLICES_SEG036,SLICES_CODE) -#define slidview_0b SEG_SEGCLASS(SLICES_SEG036,SLICES_CODE) -#define slidvish_1c SEG_SEGCLASS(SLICES_SEG036,SLICES_CODE) -#define fuslsel_01 SEG_SEGCLASS(SLICES_SEG036,SLICES_CODE) -#define fuslsel_08 SEG_SEGCLASS(SLICES_SEG036,SLICES_CODE) -#define fuslid_06 SEG_SEGCLASS(SLICES_SEG036,SLICES_CODE) -#define drviews4_06 SEG_SEGCLASS(SLICES_SEG037,SLICES_CODE) -#define sdruler_05 SEG_SEGCLASS(SLICES_SEG037,SLICES_CODE) -#define viewshe2_1e SEG_SEGCLASS(SLICES_SEG037,SLICES_CODE) -#define fuslshow_13 SEG_SEGCLASS(SLICES_SEG037,SLICES_CODE) -#define fuinsfil_01 SEG_SEGCLASS(SLICES_SEG037,SLICES_CODE) -#define fuinsfil_07 SEG_SEGCLASS(SLICES_SEG037,SLICES_CODE) -#define fuinsfil_09 SEG_SEGCLASS(SLICES_SEG037,SLICES_CODE) -#define fuinsfil_02 SEG_SEGCLASS(SLICES_SEG038,SLICES_CODE) -#define fuinsfil_04 SEG_SEGCLASS(SLICES_SEG038,SLICES_CODE) -#define fuprtmpl_01 SEG_SEGCLASS(SLICES_SEG038,SLICES_CODE) -#define prlayout_01 SEG_SEGCLASS(SLICES_SEG038,SLICES_CODE) -#define prlayout_03 SEG_SEGCLASS(SLICES_SEG038,SLICES_CODE) -#define prlayout_05 SEG_SEGCLASS(SLICES_SEG038,SLICES_CODE) -#define prlayout_02 SEG_SEGCLASS(SLICES_SEG038,SLICES_CODE) -#define prlayout_04 SEG_SEGCLASS(SLICES_SEG038,SLICES_CODE) -#define prltempl_03 SEG_SEGCLASS(SLICES_SEG038,SLICES_CODE) -#define prltempl_01 SEG_SEGCLASS(SLICES_SEG038,SLICES_CODE) -#define prltempl_02 SEG_SEGCLASS(SLICES_SEG038,SLICES_CODE) -#define fuprtmpl_02 SEG_SEGCLASS(SLICES_SEG039,SLICES_CODE) -#define docshel4_19 SEG_SEGCLASS(SLICES_SEG039,SLICES_CODE) -#define sdobjpal_08 SEG_SEGCLASS(SLICES_SEG039,SLICES_CODE) -#define sdobjpal_09 SEG_SEGCLASS(SLICES_SEG040,SLICES_CODE) -#define sdobjpal_18 SEG_SEGCLASS(SLICES_SEG041,SLICES_CODE) -#define drviews1_05 SEG_SEGCLASS(SLICES_SEG041,SLICES_CODE) -#define drviews1_0c SEG_SEGCLASS(SLICES_SEG041,SLICES_CODE) -#define fuedibez_06 SEG_SEGCLASS(SLICES_SEG041,SLICES_CODE) -#define unmodpg_01 SEG_SEGCLASS(SLICES_SEG041,SLICES_CODE) -#define unmodpg_06 SEG_SEGCLASS(SLICES_SEG042,SLICES_CODE) -#define drviews5_02 SEG_SEGCLASS(SLICES_SEG042,SLICES_CODE) -#define drviews5_0c SEG_SEGCLASS(SLICES_SEG042,SLICES_CODE) -#define layertab_04 SEG_SEGCLASS(SLICES_SEG043,SLICES_CODE) -#define layertab_08 SEG_SEGCLASS(SLICES_SEG043,SLICES_CODE) -#define sdruler_07 SEG_SEGCLASS(SLICES_SEG043,SLICES_CODE) -#define futxtatt_01 SEG_SEGCLASS(SLICES_SEG043,SLICES_CODE) -#define fusnapln_01 SEG_SEGCLASS(SLICES_SEG043,SLICES_CODE) -#define dlgsnap_01 SEG_SEGCLASS(SLICES_SEG043,SLICES_CODE) -#define dlgsnap_03 SEG_SEGCLASS(SLICES_SEG043,SLICES_CODE) -#define inspage_05 SEG_SEGCLASS(SLICES_SEG044,SLICES_CODE) -#define inspage_06 SEG_SEGCLASS(SLICES_SEG044,SLICES_CODE) -#define sdpage_09 SEG_SEGCLASS(SLICES_SEG045,SLICES_CODE) -#define app_0b SEG_SEGCLASS(UNUSED_SEG000,UNUSED_CODE) -#define app_0c SEG_SEGCLASS(UNUSED_SEG000,UNUSED_CODE) -#define docshell_03 SEG_SEGCLASS(UNUSED_SEG000,UNUSED_CODE) -#define drviewsh_02 SEG_SEGCLASS(UNUSED_SEG000,UNUSED_CODE) -#define slidvish_04 SEG_SEGCLASS(UNUSED_SEG000,UNUSED_CODE) -#define slidvish_05 SEG_SEGCLASS(UNUSED_SEG000,UNUSED_CODE) -#define slidvish_06 SEG_SEGCLASS(UNUSED_SEG000,UNUSED_CODE) -#define slidvish_07 SEG_SEGCLASS(UNUSED_SEG000,UNUSED_CODE) -#define slidvish_08 SEG_SEGCLASS(UNUSED_SEG000,UNUSED_CODE) -#define slidvish_09 SEG_SEGCLASS(UNUSED_SEG000,UNUSED_CODE) -#define slidvish_0a SEG_SEGCLASS(UNUSED_SEG000,UNUSED_CODE) -#define slidvish_0b SEG_SEGCLASS(UNUSED_SEG000,UNUSED_CODE) -#define slidvish_0d SEG_SEGCLASS(UNUSED_SEG000,UNUSED_CODE) -#define slidvish_0e SEG_SEGCLASS(UNUSED_SEG000,UNUSED_CODE) -#define slidvish_0f SEG_SEGCLASS(UNUSED_SEG000,UNUSED_CODE) -#define slidvish_10 SEG_SEGCLASS(UNUSED_SEG000,UNUSED_CODE) -#define slidvish_11 SEG_SEGCLASS(UNUSED_SEG000,UNUSED_CODE) -#define slidvish_12 SEG_SEGCLASS(UNUSED_SEG000,UNUSED_CODE) -#define slidvish_13 SEG_SEGCLASS(UNUSED_SEG000,UNUSED_CODE) -#define slidvish_14 SEG_SEGCLASS(UNUSED_SEG000,UNUSED_CODE) -#define slidvish_15 SEG_SEGCLASS(UNUSED_SEG000,UNUSED_CODE) -#define slidvish_16 SEG_SEGCLASS(UNUSED_SEG000,UNUSED_CODE) -#define slidvish_17 SEG_SEGCLASS(UNUSED_SEG000,UNUSED_CODE) -#define slidvish_19 SEG_SEGCLASS(UNUSED_SEG000,UNUSED_CODE) -#define slidvish_1a SEG_SEGCLASS(UNUSED_SEG000,UNUSED_CODE) -#define slidvish_1b SEG_SEGCLASS(UNUSED_SEG000,UNUSED_CODE) -#define slidvish_1d SEG_SEGCLASS(UNUSED_SEG000,UNUSED_CODE) -#define slidvish_1e SEG_SEGCLASS(UNUSED_SEG000,UNUSED_CODE) -#define slidvish_1f SEG_SEGCLASS(UNUSED_SEG000,UNUSED_CODE) -#define outlnvsh_04 SEG_SEGCLASS(UNUSED_SEG000,UNUSED_CODE) -#define outlnvsh_07 SEG_SEGCLASS(UNUSED_SEG000,UNUSED_CODE) -#define outlnvsh_0c SEG_SEGCLASS(UNUSED_SEG000,UNUSED_CODE) -#define outlnvsh_12 SEG_SEGCLASS(UNUSED_SEG000,UNUSED_CODE) -#define outlnvsh_17 SEG_SEGCLASS(UNUSED_SEG000,UNUSED_CODE) -#define outlnvsh_1b SEG_SEGCLASS(UNUSED_SEG000,UNUSED_CODE) -#define outlnvsh_1f SEG_SEGCLASS(UNUSED_SEG000,UNUSED_CODE) -#define outlnvsh_20 SEG_SEGCLASS(UNUSED_SEG000,UNUSED_CODE) -#define sdobjfac_02 SEG_SEGCLASS(UNUSED_SEG000,UNUSED_CODE) -#define drawdoc2_01 SEG_SEGCLASS(UNUSED_SEG000,UNUSED_CODE) -#define drawdoc2_02 SEG_SEGCLASS(UNUSED_SEG000,UNUSED_CODE) -#define drawdoc2_08 SEG_SEGCLASS(UNUSED_SEG000,UNUSED_CODE) -#define drawdoc2_0a SEG_SEGCLASS(UNUSED_SEG000,UNUSED_CODE) -#define sdattr_09 SEG_SEGCLASS(UNUSED_SEG000,UNUSED_CODE) -#define sdattr_0a SEG_SEGCLASS(UNUSED_SEG000,UNUSED_CODE) -#define sdattr_0b SEG_SEGCLASS(UNUSED_SEG000,UNUSED_CODE) -#define sdattr_0c SEG_SEGCLASS(UNUSED_SEG000,UNUSED_CODE) -#define sdattr_0d SEG_SEGCLASS(UNUSED_SEG000,UNUSED_CODE) -#define sdattr_0e SEG_SEGCLASS(UNUSED_SEG000,UNUSED_CODE) -#define sdattr_0f SEG_SEGCLASS(UNUSED_SEG000,UNUSED_CODE) -#define sdattr_10 SEG_SEGCLASS(UNUSED_SEG000,UNUSED_CODE) -#define sdattr_11 SEG_SEGCLASS(UNUSED_SEG000,UNUSED_CODE) -#define sdattr_12 SEG_SEGCLASS(UNUSED_SEG000,UNUSED_CODE) -#define sdattr_13 SEG_SEGCLASS(UNUSED_SEG000,UNUSED_CODE) -#define sdattr_14 SEG_SEGCLASS(UNUSED_SEG000,UNUSED_CODE) -#define sdattr_15 SEG_SEGCLASS(UNUSED_SEG000,UNUSED_CODE) -#define sdattr_16 SEG_SEGCLASS(UNUSED_SEG000,UNUSED_CODE) -#define anminfo_01 SEG_SEGCLASS(UNUSED_SEG000,UNUSED_CODE) -#define anminfo_02 SEG_SEGCLASS(UNUSED_SEG000,UNUSED_CODE) -#define anminfo_03 SEG_SEGCLASS(UNUSED_SEG000,UNUSED_CODE) -#define anminfo_04 SEG_SEGCLASS(UNUSED_SEG001,UNUSED_CODE) -#define anminfo_05 SEG_SEGCLASS(UNUSED_SEG001,UNUSED_CODE) -#define anminfo_06 SEG_SEGCLASS(UNUSED_SEG001,UNUSED_CODE) -#define anminfo_07 SEG_SEGCLASS(UNUSED_SEG001,UNUSED_CODE) -#define anminfo_08 SEG_SEGCLASS(UNUSED_SEG001,UNUSED_CODE) -#define anminfo_09 SEG_SEGCLASS(UNUSED_SEG001,UNUSED_CODE) -#define app3_03 SEG_SEGCLASS(UNUSED_SEG001,UNUSED_CODE) -#define app4_03 SEG_SEGCLASS(UNUSED_SEG001,UNUSED_CODE) -#define app1_01 SEG_SEGCLASS(UNUSED_SEG001,UNUSED_CODE) -#define docshel3_02 SEG_SEGCLASS(UNUSED_SEG001,UNUSED_CODE) -#define drviews3_05 SEG_SEGCLASS(UNUSED_SEG001,UNUSED_CODE) -#define drviews3_07 SEG_SEGCLASS(UNUSED_SEG001,UNUSED_CODE) -#define drviews3_09 SEG_SEGCLASS(UNUSED_SEG001,UNUSED_CODE) -#define drviews9_01 SEG_SEGCLASS(UNUSED_SEG001,UNUSED_CODE) -#define drviews9_02 SEG_SEGCLASS(UNUSED_SEG001,UNUSED_CODE) -#define drviews9_03 SEG_SEGCLASS(UNUSED_SEG001,UNUSED_CODE) -#define drviews9_04 SEG_SEGCLASS(UNUSED_SEG002,UNUSED_CODE) -#define drviews4_03 SEG_SEGCLASS(UNUSED_SEG002,UNUSED_CODE) -#define drviews4_04 SEG_SEGCLASS(UNUSED_SEG002,UNUSED_CODE) -#define drviews6_01 SEG_SEGCLASS(UNUSED_SEG002,UNUSED_CODE) -#define drviews6_02 SEG_SEGCLASS(UNUSED_SEG002,UNUSED_CODE) -#define drviews6_05 SEG_SEGCLASS(UNUSED_SEG002,UNUSED_CODE) -#define drviews6_06 SEG_SEGCLASS(UNUSED_SEG002,UNUSED_CODE) -#define drviews7_04 SEG_SEGCLASS(UNUSED_SEG002,UNUSED_CODE) -#define drviews7_05 SEG_SEGCLASS(UNUSED_SEG002,UNUSED_CODE) -#define drviews7_06 SEG_SEGCLASS(UNUSED_SEG002,UNUSED_CODE) -#define drviewsa_04 SEG_SEGCLASS(UNUSED_SEG002,UNUSED_CODE) -#define drviewsa_08 SEG_SEGCLASS(UNUSED_SEG002,UNUSED_CODE) -#define drviewsa_09 SEG_SEGCLASS(UNUSED_SEG002,UNUSED_CODE) -#define fuslsel_02 SEG_SEGCLASS(UNUSED_SEG002,UNUSED_CODE) -#define fuslsel_03 SEG_SEGCLASS(UNUSED_SEG002,UNUSED_CODE) -#define fuslsel_04 SEG_SEGCLASS(UNUSED_SEG002,UNUSED_CODE) -#define fuslsel_05 SEG_SEGCLASS(UNUSED_SEG002,UNUSED_CODE) -#define fuslsel_06 SEG_SEGCLASS(UNUSED_SEG002,UNUSED_CODE) -#define fuslsel_07 SEG_SEGCLASS(UNUSED_SEG002,UNUSED_CODE) -#define fuslsel_09 SEG_SEGCLASS(UNUSED_SEG002,UNUSED_CODE) -#define fuslsel_0a SEG_SEGCLASS(UNUSED_SEG002,UNUSED_CODE) -#define fuslsel_0c SEG_SEGCLASS(UNUSED_SEG002,UNUSED_CODE) -#define fuslsel_0d SEG_SEGCLASS(UNUSED_SEG002,UNUSED_CODE) -#define fuslsel_0e SEG_SEGCLASS(UNUSED_SEG002,UNUSED_CODE) -#define fuslsel_0f SEG_SEGCLASS(UNUSED_SEG002,UNUSED_CODE) -#define fuslsel_10 SEG_SEGCLASS(UNUSED_SEG002,UNUSED_CODE) -#define fuslsel_11 SEG_SEGCLASS(UNUSED_SEG002,UNUSED_CODE) -#define fuslsel_12 SEG_SEGCLASS(UNUSED_SEG002,UNUSED_CODE) -#define viewshe2_02 SEG_SEGCLASS(UNUSED_SEG002,UNUSED_CODE) -#define viewshe2_03 SEG_SEGCLASS(UNUSED_SEG002,UNUSED_CODE) -#define viewshe2_06 SEG_SEGCLASS(UNUSED_SEG003,UNUSED_CODE) -#define viewshe2_0f SEG_SEGCLASS(UNUSED_SEG003,UNUSED_CODE) -#define viewshe2_14 SEG_SEGCLASS(UNUSED_SEG003,UNUSED_CODE) -#define viewshe2_17 SEG_SEGCLASS(UNUSED_SEG003,UNUSED_CODE) -#define viewshe2_18 SEG_SEGCLASS(UNUSED_SEG003,UNUSED_CODE) -#define viewshe2_19 SEG_SEGCLASS(UNUSED_SEG003,UNUSED_CODE) -#define viewshe2_1a SEG_SEGCLASS(UNUSED_SEG003,UNUSED_CODE) -#define slidview_02 SEG_SEGCLASS(UNUSED_SEG003,UNUSED_CODE) -#define slidview_03 SEG_SEGCLASS(UNUSED_SEG003,UNUSED_CODE) -#define slidview_07 SEG_SEGCLASS(UNUSED_SEG003,UNUSED_CODE) -#define slidview_08 SEG_SEGCLASS(UNUSED_SEG003,UNUSED_CODE) -#define slidview_0c SEG_SEGCLASS(UNUSED_SEG003,UNUSED_CODE) -#define slidview_0d SEG_SEGCLASS(UNUSED_SEG003,UNUSED_CODE) -#define slidview_0e SEG_SEGCLASS(UNUSED_SEG003,UNUSED_CODE) -#define slidview_0f SEG_SEGCLASS(UNUSED_SEG003,UNUSED_CODE) -#define slidview_10 SEG_SEGCLASS(UNUSED_SEG003,UNUSED_CODE) -#define fuslhide_01 SEG_SEGCLASS(UNUSED_SEG003,UNUSED_CODE) -#define fuslhide_02 SEG_SEGCLASS(UNUSED_SEG003,UNUSED_CODE) -#define fuslprms_01 SEG_SEGCLASS(UNUSED_SEG003,UNUSED_CODE) -#define fuslprms_02 SEG_SEGCLASS(UNUSED_SEG003,UNUSED_CODE) -#define fuslprms_03 SEG_SEGCLASS(UNUSED_SEG003,UNUSED_CODE) -#define fuslprms_04 SEG_SEGCLASS(UNUSED_SEG003,UNUSED_CODE) -#define fuslshow_05 SEG_SEGCLASS(UNUSED_SEG003,UNUSED_CODE) -#define fuslshow_06 SEG_SEGCLASS(UNUSED_SEG003,UNUSED_CODE) -#define fuslshow_15 SEG_SEGCLASS(UNUSED_SEG003,UNUSED_CODE) -#define fuslshow_16 SEG_SEGCLASS(UNUSED_SEG003,UNUSED_CODE) -#define viewshel_03 SEG_SEGCLASS(UNUSED_SEG003,UNUSED_CODE) -#define viewshel_0e SEG_SEGCLASS(UNUSED_SEG003,UNUSED_CODE) -#define viewshel_11 SEG_SEGCLASS(UNUSED_SEG003,UNUSED_CODE) -#define viewshel_14 SEG_SEGCLASS(UNUSED_SEG003,UNUSED_CODE) -#define fuzoom_06 SEG_SEGCLASS(UNUSED_SEG003,UNUSED_CODE) -#define fuscale_01 SEG_SEGCLASS(UNUSED_SEG004,UNUSED_CODE) -#define fuscale_02 SEG_SEGCLASS(UNUSED_SEG004,UNUSED_CODE) -#define fuscale_03 SEG_SEGCLASS(UNUSED_SEG004,UNUSED_CODE) -#define fuscale_04 SEG_SEGCLASS(UNUSED_SEG004,UNUSED_CODE) -#define fuslshw3_03 SEG_SEGCLASS(UNUSED_SEG004,UNUSED_CODE) -#define fuslshw3_04 SEG_SEGCLASS(UNUSED_SEG004,UNUSED_CODE) -#define fuslshw3_05 SEG_SEGCLASS(UNUSED_SEG004,UNUSED_CODE) -#define fuslshw3_06 SEG_SEGCLASS(UNUSED_SEG004,UNUSED_CODE) -#define fuslshw3_07 SEG_SEGCLASS(UNUSED_SEG004,UNUSED_CODE) -#define fuslshw3_0a SEG_SEGCLASS(UNUSED_SEG004,UNUSED_CODE) -#define fuslshw3_0d SEG_SEGCLASS(UNUSED_SEG004,UNUSED_CODE) -#define fuslshw3_0e SEG_SEGCLASS(UNUSED_SEG004,UNUSED_CODE) -#define fuslshw3_0f SEG_SEGCLASS(UNUSED_SEG004,UNUSED_CODE) -#define fuslshw3_10 SEG_SEGCLASS(UNUSED_SEG004,UNUSED_CODE) -#define fuslshw3_11 SEG_SEGCLASS(UNUSED_SEG004,UNUSED_CODE) -#define fuslshw3_13 SEG_SEGCLASS(UNUSED_SEG004,UNUSED_CODE) -#define fuoltext_0a SEG_SEGCLASS(UNUSED_SEG004,UNUSED_CODE) -#define outlview_04 SEG_SEGCLASS(UNUSED_SEG004,UNUSED_CODE) -#define outlview_05 SEG_SEGCLASS(UNUSED_SEG004,UNUSED_CODE) -#define outlview_06 SEG_SEGCLASS(UNUSED_SEG004,UNUSED_CODE) -#define outlview_17 SEG_SEGCLASS(UNUSED_SEG004,UNUSED_CODE) -#define futhes_01 SEG_SEGCLASS(UNUSED_SEG004,UNUSED_CODE) -#define futhes_02 SEG_SEGCLASS(UNUSED_SEG004,UNUSED_CODE) -#define fuinsfil_03 SEG_SEGCLASS(UNUSED_SEG004,UNUSED_CODE) -#define fuinsfil_05 SEG_SEGCLASS(UNUSED_SEG004,UNUSED_CODE) -#define fuinsfil_06 SEG_SEGCLASS(UNUSED_SEG004,UNUSED_CODE) -#define fuinsfil_08 SEG_SEGCLASS(UNUSED_SEG004,UNUSED_CODE) -#define fuprobjs_01 SEG_SEGCLASS(UNUSED_SEG004,UNUSED_CODE) -#define fuprobjs_02 SEG_SEGCLASS(UNUSED_SEG004,UNUSED_CODE) -#define fuolbull_03 SEG_SEGCLASS(UNUSED_SEG004,UNUSED_CODE) -#define docshel4_12 SEG_SEGCLASS(UNUSED_SEG004,UNUSED_CODE) -#define docshel4_1f SEG_SEGCLASS(UNUSED_SEG004,UNUSED_CODE) -#define app7_01 SEG_SEGCLASS(UNUSED_SEG004,UNUSED_CODE) -#define dlgass_01 SEG_SEGCLASS(UNUSED_SEG005,UNUSED_CODE) -#define dlgass_02 SEG_SEGCLASS(UNUSED_SEG005,UNUSED_CODE) -#define dlgass_03 SEG_SEGCLASS(UNUSED_SEG005,UNUSED_CODE) -#define dlgass_04 SEG_SEGCLASS(UNUSED_SEG005,UNUSED_CODE) -#define dlgass_05 SEG_SEGCLASS(UNUSED_SEG005,UNUSED_CODE) -#define dlgass_06 SEG_SEGCLASS(UNUSED_SEG005,UNUSED_CODE) -#define dlgass_07 SEG_SEGCLASS(UNUSED_SEG005,UNUSED_CODE) -#define dlgass_08 SEG_SEGCLASS(UNUSED_SEG005,UNUSED_CODE) -#define dlgass_09 SEG_SEGCLASS(UNUSED_SEG005,UNUSED_CODE) -#define dlgass_0a SEG_SEGCLASS(UNUSED_SEG005,UNUSED_CODE) -#define dlgass_0b SEG_SEGCLASS(UNUSED_SEG005,UNUSED_CODE) -#define dlgass_0c SEG_SEGCLASS(UNUSED_SEG005,UNUSED_CODE) -#define dlgass_0d SEG_SEGCLASS(UNUSED_SEG005,UNUSED_CODE) -#define dlgass_0e SEG_SEGCLASS(UNUSED_SEG005,UNUSED_CODE) -#define dlgass_0f SEG_SEGCLASS(UNUSED_SEG005,UNUSED_CODE) -#define dlgass_10 SEG_SEGCLASS(UNUSED_SEG005,UNUSED_CODE) -#define dlgass_11 SEG_SEGCLASS(UNUSED_SEG005,UNUSED_CODE) -#define dlgass_12 SEG_SEGCLASS(UNUSED_SEG005,UNUSED_CODE) -#define dlgass_13 SEG_SEGCLASS(UNUSED_SEG005,UNUSED_CODE) -#define splcfg_02 SEG_SEGCLASS(UNUSED_SEG005,UNUSED_CODE) -#define splcfg_03 SEG_SEGCLASS(UNUSED_SEG005,UNUSED_CODE) -#define optsitem_05 SEG_SEGCLASS(UNUSED_SEG005,UNUSED_CODE) -#define optsitem_08 SEG_SEGCLASS(UNUSED_SEG005,UNUSED_CODE) -#define optsitem_09 SEG_SEGCLASS(UNUSED_SEG006,UNUSED_CODE) -#define optsitem_0a SEG_SEGCLASS(UNUSED_SEG006,UNUSED_CODE) -#define optsitem_0b SEG_SEGCLASS(UNUSED_SEG006,UNUSED_CODE) -#define optsitem_0c SEG_SEGCLASS(UNUSED_SEG006,UNUSED_CODE) -#define optsitem_0d SEG_SEGCLASS(UNUSED_SEG006,UNUSED_CODE) -#define optsitem_0e SEG_SEGCLASS(UNUSED_SEG006,UNUSED_CODE) -#define optsitem_0f SEG_SEGCLASS(UNUSED_SEG006,UNUSED_CODE) -#define optsitem_10 SEG_SEGCLASS(UNUSED_SEG006,UNUSED_CODE) -#define optsitem_11 SEG_SEGCLASS(UNUSED_SEG006,UNUSED_CODE) -#define optsitem_12 SEG_SEGCLASS(UNUSED_SEG006,UNUSED_CODE) -#define optsitem_13 SEG_SEGCLASS(UNUSED_SEG006,UNUSED_CODE) -#define optsitem_15 SEG_SEGCLASS(UNUSED_SEG006,UNUSED_CODE) -#define optsitem_18 SEG_SEGCLASS(UNUSED_SEG006,UNUSED_CODE) -#define optsitem_19 SEG_SEGCLASS(UNUSED_SEG006,UNUSED_CODE) -#define animobjs_01 SEG_SEGCLASS(UNUSED_SEG006,UNUSED_CODE) -#define animobjs_03 SEG_SEGCLASS(UNUSED_SEG006,UNUSED_CODE) -#define animobjs_04 SEG_SEGCLASS(UNUSED_SEG006,UNUSED_CODE) -#define animobjs_05 SEG_SEGCLASS(UNUSED_SEG006,UNUSED_CODE) -#define animobjs_06 SEG_SEGCLASS(UNUSED_SEG006,UNUSED_CODE) -#define animobjs_07 SEG_SEGCLASS(UNUSED_SEG006,UNUSED_CODE) -#define animobjs_08 SEG_SEGCLASS(UNUSED_SEG006,UNUSED_CODE) -#define animobjs_0a SEG_SEGCLASS(UNUSED_SEG006,UNUSED_CODE) -#define animobjs_0b SEG_SEGCLASS(UNUSED_SEG006,UNUSED_CODE) -#define animobjs_0c SEG_SEGCLASS(UNUSED_SEG006,UNUSED_CODE) -#define animobjs_0d SEG_SEGCLASS(UNUSED_SEG006,UNUSED_CODE) -#define animobjs_0e SEG_SEGCLASS(UNUSED_SEG006,UNUSED_CODE) -#define animobjs_0f SEG_SEGCLASS(UNUSED_SEG006,UNUSED_CODE) -#define animobjs_10 SEG_SEGCLASS(UNUSED_SEG006,UNUSED_CODE) -#define animobjs_11 SEG_SEGCLASS(UNUSED_SEG006,UNUSED_CODE) -#define animobjs_12 SEG_SEGCLASS(UNUSED_SEG006,UNUSED_CODE) -#define animobjs_13 SEG_SEGCLASS(UNUSED_SEG006,UNUSED_CODE) -#define animobjs_14 SEG_SEGCLASS(UNUSED_SEG006,UNUSED_CODE) -#define animobjs_15 SEG_SEGCLASS(UNUSED_SEG006,UNUSED_CODE) -#define animobjs_16 SEG_SEGCLASS(UNUSED_SEG006,UNUSED_CODE) -#define animobjs_17 SEG_SEGCLASS(UNUSED_SEG006,UNUSED_CODE) -#define animobjs_18 SEG_SEGCLASS(UNUSED_SEG006,UNUSED_CODE) -#define animobjs_19 SEG_SEGCLASS(UNUSED_SEG006,UNUSED_CODE) -#define animobjs_1a SEG_SEGCLASS(UNUSED_SEG006,UNUSED_CODE) -#define diactrl_01 SEG_SEGCLASS(UNUSED_SEG006,UNUSED_CODE) -#define diactrl_02 SEG_SEGCLASS(UNUSED_SEG006,UNUSED_CODE) -#define diactrl_03 SEG_SEGCLASS(UNUSED_SEG007,UNUSED_CODE) -#define diactrl_04 SEG_SEGCLASS(UNUSED_SEG007,UNUSED_CODE) -#define diactrl_05 SEG_SEGCLASS(UNUSED_SEG007,UNUSED_CODE) -#define diactrl_06 SEG_SEGCLASS(UNUSED_SEG007,UNUSED_CODE) -#define diactrl_07 SEG_SEGCLASS(UNUSED_SEG007,UNUSED_CODE) -#define diactrl_08 SEG_SEGCLASS(UNUSED_SEG007,UNUSED_CODE) -#define diactrl_09 SEG_SEGCLASS(UNUSED_SEG007,UNUSED_CODE) -#define diactrl_0a SEG_SEGCLASS(UNUSED_SEG007,UNUSED_CODE) -#define diactrl_0b SEG_SEGCLASS(UNUSED_SEG007,UNUSED_CODE) -#define diactrl_0c SEG_SEGCLASS(UNUSED_SEG007,UNUSED_CODE) -#define diactrl_0d SEG_SEGCLASS(UNUSED_SEG007,UNUSED_CODE) -#define diactrl_0e SEG_SEGCLASS(UNUSED_SEG007,UNUSED_CODE) -#define diactrl_0f SEG_SEGCLASS(UNUSED_SEG007,UNUSED_CODE) -#define diactrl_10 SEG_SEGCLASS(UNUSED_SEG007,UNUSED_CODE) -#define diactrl_11 SEG_SEGCLASS(UNUSED_SEG007,UNUSED_CODE) -#define diactrl_12 SEG_SEGCLASS(UNUSED_SEG007,UNUSED_CODE) -#define diactrl_13 SEG_SEGCLASS(UNUSED_SEG007,UNUSED_CODE) -#define diactrl_14 SEG_SEGCLASS(UNUSED_SEG007,UNUSED_CODE) -#define diactrl_15 SEG_SEGCLASS(UNUSED_SEG007,UNUSED_CODE) -#define diactrl_16 SEG_SEGCLASS(UNUSED_SEG007,UNUSED_CODE) -#define diactrl_17 SEG_SEGCLASS(UNUSED_SEG007,UNUSED_CODE) -#define diactrl_18 SEG_SEGCLASS(UNUSED_SEG007,UNUSED_CODE) -#define diactrl_19 SEG_SEGCLASS(UNUSED_SEG007,UNUSED_CODE) -#define diactrl_1a SEG_SEGCLASS(UNUSED_SEG007,UNUSED_CODE) -#define diactrl_1b SEG_SEGCLASS(UNUSED_SEG007,UNUSED_CODE) -#define diactrl_1c SEG_SEGCLASS(UNUSED_SEG007,UNUSED_CODE) -#define diactrl_1d SEG_SEGCLASS(UNUSED_SEG007,UNUSED_CODE) -#define diactrl_1e SEG_SEGCLASS(UNUSED_SEG007,UNUSED_CODE) -#define diactrl_1f SEG_SEGCLASS(UNUSED_SEG007,UNUSED_CODE) -#define diactrl_20 SEG_SEGCLASS(UNUSED_SEG007,UNUSED_CODE) -#define diactrl_21 SEG_SEGCLASS(UNUSED_SEG007,UNUSED_CODE) -#define sdobjpal_05 SEG_SEGCLASS(UNUSED_SEG007,UNUSED_CODE) -#define sdobjpal_07 SEG_SEGCLASS(UNUSED_SEG007,UNUSED_CODE) -#define sdobjpal_0a SEG_SEGCLASS(UNUSED_SEG007,UNUSED_CODE) -#define sdobjpal_15 SEG_SEGCLASS(UNUSED_SEG007,UNUSED_CODE) -#define sdobjpal_16 SEG_SEGCLASS(UNUSED_SEG007,UNUSED_CODE) -#define sdobjpal_20 SEG_SEGCLASS(UNUSED_SEG007,UNUSED_CODE) -#define sdview_05 SEG_SEGCLASS(UNUSED_SEG007,UNUSED_CODE) -#define sdview_0d SEG_SEGCLASS(UNUSED_SEG007,UNUSED_CODE) -#define sdview_15 SEG_SEGCLASS(UNUSED_SEG007,UNUSED_CODE) -#define sdview_16 SEG_SEGCLASS(UNUSED_SEG007,UNUSED_CODE) -#define sdview_17 SEG_SEGCLASS(UNUSED_SEG007,UNUSED_CODE) -#define fuexhtml_01 SEG_SEGCLASS(UNUSED_SEG007,UNUSED_CODE) -#define fuexhtml_02 SEG_SEGCLASS(UNUSED_SEG007,UNUSED_CODE) -#define fuexhtml_03 SEG_SEGCLASS(UNUSED_SEG007,UNUSED_CODE) -#define fuexhtml_04 SEG_SEGCLASS(UNUSED_SEG007,UNUSED_CODE) -#define sdundogr_01 SEG_SEGCLASS(UNUSED_SEG007,UNUSED_CODE) -#define sdundogr_02 SEG_SEGCLASS(UNUSED_SEG007,UNUSED_CODE) -#define sdundogr_03 SEG_SEGCLASS(UNUSED_SEG007,UNUSED_CODE) -#define sdundogr_04 SEG_SEGCLASS(UNUSED_SEG007,UNUSED_CODE) -#define drviews1_0e SEG_SEGCLASS(UNUSED_SEG007,UNUSED_CODE) -#define drviews1_17 SEG_SEGCLASS(UNUSED_SEG007,UNUSED_CODE) -#define drviews1_18 SEG_SEGCLASS(UNUSED_SEG007,UNUSED_CODE) -#define drviews1_1a SEG_SEGCLASS(UNUSED_SEG008,UNUSED_CODE) -#define drviews1_1b SEG_SEGCLASS(UNUSED_SEG008,UNUSED_CODE) -#define undopage_01 SEG_SEGCLASS(UNUSED_SEG008,UNUSED_CODE) -#define undopage_02 SEG_SEGCLASS(UNUSED_SEG008,UNUSED_CODE) -#define undopage_03 SEG_SEGCLASS(UNUSED_SEG008,UNUSED_CODE) -#define undopage_04 SEG_SEGCLASS(UNUSED_SEG008,UNUSED_CODE) -#define undopage_05 SEG_SEGCLASS(UNUSED_SEG008,UNUSED_CODE) -#define undopage_06 SEG_SEGCLASS(UNUSED_SEG008,UNUSED_CODE) -#define undopage_07 SEG_SEGCLASS(UNUSED_SEG008,UNUSED_CODE) -#define undopage_08 SEG_SEGCLASS(UNUSED_SEG008,UNUSED_CODE) -#define undopage_09 SEG_SEGCLASS(UNUSED_SEG008,UNUSED_CODE) -#define undopage_0a SEG_SEGCLASS(UNUSED_SEG008,UNUSED_CODE) -#define undopage_0b SEG_SEGCLASS(UNUSED_SEG008,UNUSED_CODE) -#define undopage_0c SEG_SEGCLASS(UNUSED_SEG008,UNUSED_CODE) -#define fuconarc_06 SEG_SEGCLASS(UNUSED_SEG008,UNUSED_CODE) -#define fuedibez_09 SEG_SEGCLASS(UNUSED_SEG008,UNUSED_CODE) -#define fuconctl_01 SEG_SEGCLASS(UNUSED_SEG008,UNUSED_CODE) -#define fuconctl_02 SEG_SEGCLASS(UNUSED_SEG008,UNUSED_CODE) -#define fuconctl_03 SEG_SEGCLASS(UNUSED_SEG008,UNUSED_CODE) -#define fuconctl_04 SEG_SEGCLASS(UNUSED_SEG008,UNUSED_CODE) -#define fuconctl_05 SEG_SEGCLASS(UNUSED_SEG008,UNUSED_CODE) -#define fuconctl_06 SEG_SEGCLASS(UNUSED_SEG008,UNUSED_CODE) -#define fuconctl_07 SEG_SEGCLASS(UNUSED_SEG008,UNUSED_CODE) -#define fuconctl_08 SEG_SEGCLASS(UNUSED_SEG008,UNUSED_CODE) -#define fuedipo_01 SEG_SEGCLASS(UNUSED_SEG008,UNUSED_CODE) -#define fuedipo_02 SEG_SEGCLASS(UNUSED_SEG008,UNUSED_CODE) -#define fuedipo_03 SEG_SEGCLASS(UNUSED_SEG008,UNUSED_CODE) -#define fuedipo_04 SEG_SEGCLASS(UNUSED_SEG008,UNUSED_CODE) -#define fuedipo_05 SEG_SEGCLASS(UNUSED_SEG008,UNUSED_CODE) -#define fuedipo_06 SEG_SEGCLASS(UNUSED_SEG008,UNUSED_CODE) -#define fuedipo_07 SEG_SEGCLASS(UNUSED_SEG008,UNUSED_CODE) -#define fuedipo_08 SEG_SEGCLASS(UNUSED_SEG008,UNUSED_CODE) -#define drviews8_02 SEG_SEGCLASS(UNUSED_SEG008,UNUSED_CODE) -#define unmodpg_02 SEG_SEGCLASS(UNUSED_SEG008,UNUSED_CODE) -#define unmodpg_03 SEG_SEGCLASS(UNUSED_SEG008,UNUSED_CODE) -#define unmodpg_04 SEG_SEGCLASS(UNUSED_SEG008,UNUSED_CODE) -#define unmodpg_05 SEG_SEGCLASS(UNUSED_SEG008,UNUSED_CODE) -#define fuslid_02 SEG_SEGCLASS(UNUSED_SEG008,UNUSED_CODE) -#define fuslid_03 SEG_SEGCLASS(UNUSED_SEG008,UNUSED_CODE) -#define fuslid_04 SEG_SEGCLASS(UNUSED_SEG008,UNUSED_CODE) -#define fuslid_05 SEG_SEGCLASS(UNUSED_SEG008,UNUSED_CODE) -#define fuslid_07 SEG_SEGCLASS(UNUSED_SEG008,UNUSED_CODE) -#define fader_05 SEG_SEGCLASS(UNUSED_SEG008,UNUSED_CODE) -#define fader_10 SEG_SEGCLASS(UNUSED_SEG008,UNUSED_CODE) -#define fader_12 SEG_SEGCLASS(UNUSED_SEG008,UNUSED_CODE) -#define fader_14 SEG_SEGCLASS(UNUSED_SEG008,UNUSED_CODE) -#define fader_17 SEG_SEGCLASS(UNUSED_SEG008,UNUSED_CODE) -#define fader_18 SEG_SEGCLASS(UNUSED_SEG008,UNUSED_CODE) -#define fader_19 SEG_SEGCLASS(UNUSED_SEG008,UNUSED_CODE) -#define fader_1c SEG_SEGCLASS(UNUSED_SEG008,UNUSED_CODE) -#define fader_1d SEG_SEGCLASS(UNUSED_SEG008,UNUSED_CODE) -#define fader_1e SEG_SEGCLASS(UNUSED_SEG009,UNUSED_CODE) -#define fader_1f SEG_SEGCLASS(UNUSED_SEG009,UNUSED_CODE) -#define fader_20 SEG_SEGCLASS(UNUSED_SEG009,UNUSED_CODE) -#define fader_23 SEG_SEGCLASS(UNUSED_SEG009,UNUSED_CODE) -#define fader_24 SEG_SEGCLASS(UNUSED_SEG009,UNUSED_CODE) -#define fader_25 SEG_SEGCLASS(UNUSED_SEG009,UNUSED_CODE) -#define fader_26 SEG_SEGCLASS(UNUSED_SEG009,UNUSED_CODE) -#define fader_27 SEG_SEGCLASS(UNUSED_SEG009,UNUSED_CODE) -#define fader_28 SEG_SEGCLASS(UNUSED_SEG009,UNUSED_CODE) -#define fader_29 SEG_SEGCLASS(UNUSED_SEG009,UNUSED_CODE) -#define fader_2a SEG_SEGCLASS(UNUSED_SEG009,UNUSED_CODE) -#define fader_2b SEG_SEGCLASS(UNUSED_SEG010,UNUSED_CODE) -#define fader_2c SEG_SEGCLASS(UNUSED_SEG010,UNUSED_CODE) -#define showview_05 SEG_SEGCLASS(UNUSED_SEG010,UNUSED_CODE) -#define showview_07 SEG_SEGCLASS(UNUSED_SEG010,UNUSED_CODE) -#define showview_08 SEG_SEGCLASS(UNUSED_SEG010,UNUSED_CODE) -#define fupoor_06 SEG_SEGCLASS(UNUSED_SEG010,UNUSED_CODE) -#define fupoor_0a SEG_SEGCLASS(UNUSED_SEG010,UNUSED_CODE) -#define fupoor_11 SEG_SEGCLASS(UNUSED_SEG010,UNUSED_CODE) -#define sdwindow_03 SEG_SEGCLASS(UNUSED_SEG010,UNUSED_CODE) -#define bmcache_01 SEG_SEGCLASS(UNUSED_SEG010,UNUSED_CODE) -#define bmcache_02 SEG_SEGCLASS(UNUSED_SEG010,UNUSED_CODE) -#define bmcache_03 SEG_SEGCLASS(UNUSED_SEG010,UNUSED_CODE) -#define diadlg_01 SEG_SEGCLASS(UNUSED_SEG010,UNUSED_CODE) -#define diadlg_02 SEG_SEGCLASS(UNUSED_SEG010,UNUSED_CODE) -#define diadlg_03 SEG_SEGCLASS(UNUSED_SEG010,UNUSED_CODE) -#define diadlg_04 SEG_SEGCLASS(UNUSED_SEG010,UNUSED_CODE) -#define diadlg_05 SEG_SEGCLASS(UNUSED_SEG010,UNUSED_CODE) -#define diadlg_06 SEG_SEGCLASS(UNUSED_SEG010,UNUSED_CODE) -#define diadlg_07 SEG_SEGCLASS(UNUSED_SEG010,UNUSED_CODE) -#define diadlg_08 SEG_SEGCLASS(UNUSED_SEG010,UNUSED_CODE) -#define diadlg_09 SEG_SEGCLASS(UNUSED_SEG010,UNUSED_CODE) -#define diadlg_0a SEG_SEGCLASS(UNUSED_SEG010,UNUSED_CODE) -#define diadlg_0b SEG_SEGCLASS(UNUSED_SEG010,UNUSED_CODE) -#define diadlg_0c SEG_SEGCLASS(UNUSED_SEG010,UNUSED_CODE) -#define unslprms_01 SEG_SEGCLASS(UNUSED_SEG010,UNUSED_CODE) -#define unslprms_02 SEG_SEGCLASS(UNUSED_SEG010,UNUSED_CODE) -#define unslprms_03 SEG_SEGCLASS(UNUSED_SEG010,UNUSED_CODE) -#define unslprms_04 SEG_SEGCLASS(UNUSED_SEG010,UNUSED_CODE) -#define mover_03 SEG_SEGCLASS(UNUSED_SEG010,UNUSED_CODE) -#define mover_05 SEG_SEGCLASS(UNUSED_SEG010,UNUSED_CODE) -#define mover_06 SEG_SEGCLASS(UNUSED_SEG010,UNUSED_CODE) -#define mover_07 SEG_SEGCLASS(UNUSED_SEG010,UNUSED_CODE) -#define mover_08 SEG_SEGCLASS(UNUSED_SEG010,UNUSED_CODE) -#define mover_09 SEG_SEGCLASS(UNUSED_SEG010,UNUSED_CODE) -#define fuslshw2_03 SEG_SEGCLASS(UNUSED_SEG010,UNUSED_CODE) -#define fuslshw2_04 SEG_SEGCLASS(UNUSED_SEG010,UNUSED_CODE) -#define fuslshw2_05 SEG_SEGCLASS(UNUSED_SEG010,UNUSED_CODE) -#define fuslshw2_06 SEG_SEGCLASS(UNUSED_SEG011,UNUSED_CODE) -#define fuslshw2_08 SEG_SEGCLASS(UNUSED_SEG011,UNUSED_CODE) -#define fuslshw2_09 SEG_SEGCLASS(UNUSED_SEG011,UNUSED_CODE) -#define fuslshw2_0a SEG_SEGCLASS(UNUSED_SEG011,UNUSED_CODE) -#define fuslshw2_0d SEG_SEGCLASS(UNUSED_SEG012,UNUSED_CODE) -#define fuslshw2_1a SEG_SEGCLASS(UNUSED_SEG012,UNUSED_CODE) -#define inspagob_01 SEG_SEGCLASS(UNUSED_SEG012,UNUSED_CODE) -#define inspagob_02 SEG_SEGCLASS(UNUSED_SEG012,UNUSED_CODE) -#define inspagob_03 SEG_SEGCLASS(UNUSED_SEG012,UNUSED_CODE) -#define inspagob_04 SEG_SEGCLASS(UNUSED_SEG012,UNUSED_CODE) -#define inspagob_05 SEG_SEGCLASS(UNUSED_SEG012,UNUSED_CODE) -#define unchss_02 SEG_SEGCLASS(UNUSED_SEG012,UNUSED_CODE) -#define unchss_03 SEG_SEGCLASS(UNUSED_SEG012,UNUSED_CODE) -#define unchss_04 SEG_SEGCLASS(UNUSED_SEG012,UNUSED_CODE) -#define unchss_05 SEG_SEGCLASS(UNUSED_SEG012,UNUSED_CODE) -#define unchss_06 SEG_SEGCLASS(UNUSED_SEG012,UNUSED_CODE) -#define prlayout_06 SEG_SEGCLASS(UNUSED_SEG012,UNUSED_CODE) -#define docshel2_01 SEG_SEGCLASS(UNUSED_SEG012,UNUSED_CODE) -#define docshel2_06 SEG_SEGCLASS(UNUSED_SEG012,UNUSED_CODE) -#define docshel2_07 SEG_SEGCLASS(UNUSED_SEG012,UNUSED_CODE) -#define docshel2_08 SEG_SEGCLASS(UNUSED_SEG012,UNUSED_CODE) -#define docshel2_09 SEG_SEGCLASS(UNUSED_SEG012,UNUSED_CODE) -#define docshel2_0a SEG_SEGCLASS(UNUSED_SEG012,UNUSED_CODE) -#define docshel2_0b SEG_SEGCLASS(UNUSED_SEG012,UNUSED_CODE) -#define docshel2_0c SEG_SEGCLASS(UNUSED_SEG012,UNUSED_CODE) -#define docshel2_0d SEG_SEGCLASS(UNUSED_SEG012,UNUSED_CODE) -#define docshel2_0e SEG_SEGCLASS(UNUSED_SEG012,UNUSED_CODE) -#define docshel2_0f SEG_SEGCLASS(UNUSED_SEG012,UNUSED_CODE) -#define docshel2_10 SEG_SEGCLASS(UNUSED_SEG012,UNUSED_CODE) -#define docshel2_11 SEG_SEGCLASS(UNUSED_SEG012,UNUSED_CODE) -#define optdlg_01 SEG_SEGCLASS(UNUSED_SEG012,UNUSED_CODE) -#define optdlg_02 SEG_SEGCLASS(UNUSED_SEG012,UNUSED_CODE) -#define optdlg_04 SEG_SEGCLASS(UNUSED_SEG012,UNUSED_CODE) -#define assclass_01 SEG_SEGCLASS(UNUSED_SEG012,UNUSED_CODE) -#define assclass_02 SEG_SEGCLASS(UNUSED_SEG012,UNUSED_CODE) -#define assclass_03 SEG_SEGCLASS(UNUSED_SEG012,UNUSED_CODE) -#define assclass_04 SEG_SEGCLASS(UNUSED_SEG012,UNUSED_CODE) -#define assclass_05 SEG_SEGCLASS(UNUSED_SEG012,UNUSED_CODE) -#define assclass_06 SEG_SEGCLASS(UNUSED_SEG012,UNUSED_CODE) -#define assclass_07 SEG_SEGCLASS(UNUSED_SEG012,UNUSED_CODE) -#define assclass_08 SEG_SEGCLASS(UNUSED_SEG012,UNUSED_CODE) -#define assclass_09 SEG_SEGCLASS(UNUSED_SEG012,UNUSED_CODE) -#define drtxtob_05 SEG_SEGCLASS(UNUSED_SEG012,UNUSED_CODE) -#define docshel5_01 SEG_SEGCLASS(UNUSED_SEG012,UNUSED_CODE) -#define docshel5_02 SEG_SEGCLASS(UNUSED_SEG012,UNUSED_CODE) -#define docshel5_03 SEG_SEGCLASS(UNUSED_SEG012,UNUSED_CODE) -#define sdclient_01 SEG_SEGCLASS(UNUSED_SEG012,UNUSED_CODE) -#define sdclient_02 SEG_SEGCLASS(UNUSED_SEG012,UNUSED_CODE) -#define sdclient_03 SEG_SEGCLASS(UNUSED_SEG013,UNUSED_CODE) -#define sdclient_04 SEG_SEGCLASS(UNUSED_SEG013,UNUSED_CODE) -#define sdclient_05 SEG_SEGCLASS(UNUSED_SEG013,UNUSED_CODE) -#define sdview2_02 SEG_SEGCLASS(UNUSED_SEG013,UNUSED_CODE) -#define sdview2_04 SEG_SEGCLASS(UNUSED_SEG013,UNUSED_CODE) -#define sdview2_08 SEG_SEGCLASS(UNUSED_SEG013,UNUSED_CODE) -#define sdview2_09 SEG_SEGCLASS(UNUSED_SEG013,UNUSED_CODE) -#define tabcontr_05 SEG_SEGCLASS(UNUSED_SEG013,UNUSED_CODE) -#define tabcontr_06 SEG_SEGCLASS(UNUSED_SEG013,UNUSED_CODE) -#define tabcontr_07 SEG_SEGCLASS(UNUSED_SEG013,UNUSED_CODE) -#define tabcontr_09 SEG_SEGCLASS(UNUSED_SEG013,UNUSED_CODE) -#define tabcontr_0a SEG_SEGCLASS(UNUSED_SEG013,UNUSED_CODE) -#define tabcontr_0b SEG_SEGCLASS(UNUSED_SEG013,UNUSED_CODE) -#define drviews5_03 SEG_SEGCLASS(UNUSED_SEG013,UNUSED_CODE) -#define drviews5_09 SEG_SEGCLASS(UNUSED_SEG013,UNUSED_CODE) -#define drviews5_0a SEG_SEGCLASS(UNUSED_SEG013,UNUSED_CODE) -#define drviews5_0b SEG_SEGCLASS(UNUSED_SEG013,UNUSED_CODE) -#define drviews5_0d SEG_SEGCLASS(UNUSED_SEG013,UNUSED_CODE) -#define layertab_03 SEG_SEGCLASS(UNUSED_SEG013,UNUSED_CODE) -#define layertab_05 SEG_SEGCLASS(UNUSED_SEG013,UNUSED_CODE) -#define layertab_06 SEG_SEGCLASS(UNUSED_SEG013,UNUSED_CODE) -#define layertab_07 SEG_SEGCLASS(UNUSED_SEG013,UNUSED_CODE) -#define layertab_09 SEG_SEGCLASS(UNUSED_SEG013,UNUSED_CODE) -#define layertab_0a SEG_SEGCLASS(UNUSED_SEG013,UNUSED_CODE) -#define layertab_0b SEG_SEGCLASS(UNUSED_SEG013,UNUSED_CODE) -#define dlgctrls_01 SEG_SEGCLASS(UNUSED_SEG013,UNUSED_CODE) -#define sdoutl_06 SEG_SEGCLASS(UNUSED_SEG013,UNUSED_CODE) -#define sdoutl_08 SEG_SEGCLASS(UNUSED_SEG013,UNUSED_CODE) -#define pubdlg_01 SEG_SEGCLASS(UNUSED_SEG013,UNUSED_CODE) -#define pubdlg_02 SEG_SEGCLASS(UNUSED_SEG013,UNUSED_CODE) -#define sdruler_09 SEG_SEGCLASS(UNUSED_SEG013,UNUSED_CODE) -#define prntopts_01 SEG_SEGCLASS(UNUSED_SEG014,UNUSED_CODE) -#define prntopts_02 SEG_SEGCLASS(UNUSED_SEG014,UNUSED_CODE) -#define prntopts_03 SEG_SEGCLASS(UNUSED_SEG014,UNUSED_CODE) -#define prntopts_04 SEG_SEGCLASS(UNUSED_SEG014,UNUSED_CODE) -#define prntopts_05 SEG_SEGCLASS(UNUSED_SEG014,UNUSED_CODE) -#define prntopts_07 SEG_SEGCLASS(UNUSED_SEG014,UNUSED_CODE) -#define fudraw_07 SEG_SEGCLASS(UNUSED_SEG014,UNUSED_CODE) -#define fudraw_08 SEG_SEGCLASS(UNUSED_SEG014,UNUSED_CODE) -#define fulink_01 SEG_SEGCLASS(UNUSED_SEG014,UNUSED_CODE) -#define futransf_01 SEG_SEGCLASS(UNUSED_SEG014,UNUSED_CODE) -#define futransf_02 SEG_SEGCLASS(UNUSED_SEG014,UNUSED_CODE) -#define futransf_03 SEG_SEGCLASS(UNUSED_SEG014,UNUSED_CODE) -#define fuoaprms_01 SEG_SEGCLASS(UNUSED_SEG014,UNUSED_CODE) -#define fuoaprms_02 SEG_SEGCLASS(UNUSED_SEG014,UNUSED_CODE) -#define fuoaprms_03 SEG_SEGCLASS(UNUSED_SEG014,UNUSED_CODE) -#define fuoaprms_04 SEG_SEGCLASS(UNUSED_SEG014,UNUSED_CODE) -#define fuinsert_05 SEG_SEGCLASS(UNUSED_SEG014,UNUSED_CODE) -#define fuinsert_06 SEG_SEGCLASS(UNUSED_SEG014,UNUSED_CODE) -#define fuinsert_09 SEG_SEGCLASS(UNUSED_SEG015,UNUSED_CODE) -#define fuinsert_0a SEG_SEGCLASS(UNUSED_SEG015,UNUSED_CODE) -#define fuinsert_0b SEG_SEGCLASS(UNUSED_SEG015,UNUSED_CODE) -#define fulinend_01 SEG_SEGCLASS(UNUSED_SEG015,UNUSED_CODE) -#define fuconpol_03 SEG_SEGCLASS(UNUSED_SEG015,UNUSED_CODE) -#define fuconpol_06 SEG_SEGCLASS(UNUSED_SEG015,UNUSED_CODE) -#define fucopy_03 SEG_SEGCLASS(UNUSED_SEG015,UNUSED_CODE) -#define fuparagr_01 SEG_SEGCLASS(UNUSED_SEG015,UNUSED_CODE) -#define sdtreelb_02 SEG_SEGCLASS(UNUSED_SEG015,UNUSED_CODE) -#define sdtreelb_03 SEG_SEGCLASS(UNUSED_SEG015,UNUSED_CODE) -#define sdtreelb_04 SEG_SEGCLASS(UNUSED_SEG015,UNUSED_CODE) -#define sdtreelb_05 SEG_SEGCLASS(UNUSED_SEG015,UNUSED_CODE) -#define sdtreelb_06 SEG_SEGCLASS(UNUSED_SEG015,UNUSED_CODE) -#define sdtreelb_07 SEG_SEGCLASS(UNUSED_SEG015,UNUSED_CODE) -#define sdtreelb_08 SEG_SEGCLASS(UNUSED_SEG015,UNUSED_CODE) -#define enumdlg_08 SEG_SEGCLASS(UNUSED_SEG015,UNUSED_CODE) -#define clview_01 SEG_SEGCLASS(UNUSED_SEG015,UNUSED_CODE) -#define clview_02 SEG_SEGCLASS(UNUSED_SEG015,UNUSED_CODE) -#define clview_03 SEG_SEGCLASS(UNUSED_SEG015,UNUSED_CODE) -#define clview_04 SEG_SEGCLASS(UNUSED_SEG015,UNUSED_CODE) -#define clview_05 SEG_SEGCLASS(UNUSED_SEG015,UNUSED_CODE) -#define dragserv_01 SEG_SEGCLASS(UNUSED_SEG015,UNUSED_CODE) -#define dragserv_07 SEG_SEGCLASS(UNUSED_SEG015,UNUSED_CODE) -#define tpoption_01 SEG_SEGCLASS(UNUSED_SEG015,UNUSED_CODE) -#define tpoption_02 SEG_SEGCLASS(UNUSED_SEG015,UNUSED_CODE) -#define tpoption_03 SEG_SEGCLASS(UNUSED_SEG015,UNUSED_CODE) -#define tpoption_04 SEG_SEGCLASS(UNUSED_SEG015,UNUSED_CODE) -#define tpoption_05 SEG_SEGCLASS(UNUSED_SEG015,UNUSED_CODE) -#define tpoption_07 SEG_SEGCLASS(UNUSED_SEG015,UNUSED_CODE) -#define tpoption_08 SEG_SEGCLASS(UNUSED_SEG015,UNUSED_CODE) -#define tpoption_09 SEG_SEGCLASS(UNUSED_SEG015,UNUSED_CODE) -#define tpoption_0a SEG_SEGCLASS(UNUSED_SEG016,UNUSED_CODE) -#define tpoption_0b SEG_SEGCLASS(UNUSED_SEG016,UNUSED_CODE) -#define tpoption_0c SEG_SEGCLASS(UNUSED_SEG016,UNUSED_CODE) -#define tpoption_0d SEG_SEGCLASS(UNUSED_SEG016,UNUSED_CODE) -#define tpoption_0e SEG_SEGCLASS(UNUSED_SEG016,UNUSED_CODE) -#define tpoption_0f SEG_SEGCLASS(UNUSED_SEG016,UNUSED_CODE) -#define tpoption_10 SEG_SEGCLASS(UNUSED_SEG016,UNUSED_CODE) -#define tpscale_01 SEG_SEGCLASS(UNUSED_SEG016,UNUSED_CODE) -#define tpscale_02 SEG_SEGCLASS(UNUSED_SEG016,UNUSED_CODE) -#define tpscale_03 SEG_SEGCLASS(UNUSED_SEG016,UNUSED_CODE) -#define tpscale_04 SEG_SEGCLASS(UNUSED_SEG016,UNUSED_CODE) -#define tpscale_05 SEG_SEGCLASS(UNUSED_SEG016,UNUSED_CODE) -#define tpscale_06 SEG_SEGCLASS(UNUSED_SEG016,UNUSED_CODE) -#define tpscale_07 SEG_SEGCLASS(UNUSED_SEG016,UNUSED_CODE) -#define tpscale_08 SEG_SEGCLASS(UNUSED_SEG016,UNUSED_CODE) -#define tpscale_0b SEG_SEGCLASS(UNUSED_SEG016,UNUSED_CODE) -#define tpscale_0c SEG_SEGCLASS(UNUSED_SEG016,UNUSED_CODE) -#define tpscale_0d SEG_SEGCLASS(UNUSED_SEG016,UNUSED_CODE) -#define tpeffect_01 SEG_SEGCLASS(UNUSED_SEG016,UNUSED_CODE) -#define tpeffect_02 SEG_SEGCLASS(UNUSED_SEG016,UNUSED_CODE) -#define tpeffect_03 SEG_SEGCLASS(UNUSED_SEG016,UNUSED_CODE) -#define tpeffect_04 SEG_SEGCLASS(UNUSED_SEG016,UNUSED_CODE) -#define tpeffect_05 SEG_SEGCLASS(UNUSED_SEG016,UNUSED_CODE) -#define tpeffect_06 SEG_SEGCLASS(UNUSED_SEG016,UNUSED_CODE) -#define tpeffect_07 SEG_SEGCLASS(UNUSED_SEG016,UNUSED_CODE) -#define tpeffect_08 SEG_SEGCLASS(UNUSED_SEG016,UNUSED_CODE) -#define tpeffect_09 SEG_SEGCLASS(UNUSED_SEG016,UNUSED_CODE) -#define tpeffect_0a SEG_SEGCLASS(UNUSED_SEG016,UNUSED_CODE) -#define tpeffect_0b SEG_SEGCLASS(UNUSED_SEG016,UNUSED_CODE) -#define tpeffect_0c SEG_SEGCLASS(UNUSED_SEG016,UNUSED_CODE) -#define tpeffect_0d SEG_SEGCLASS(UNUSED_SEG016,UNUSED_CODE) -#define tpeffect_0e SEG_SEGCLASS(UNUSED_SEG016,UNUSED_CODE) -#define tpeffect_0f SEG_SEGCLASS(UNUSED_SEG016,UNUSED_CODE) -#define tpeffect_10 SEG_SEGCLASS(UNUSED_SEG016,UNUSED_CODE) -#define tpeffect_11 SEG_SEGCLASS(UNUSED_SEG016,UNUSED_CODE) -#define tpeffect_12 SEG_SEGCLASS(UNUSED_SEG016,UNUSED_CODE) -#define tpeffect_13 SEG_SEGCLASS(UNUSED_SEG016,UNUSED_CODE) -#define tpeffect_14 SEG_SEGCLASS(UNUSED_SEG016,UNUSED_CODE) -#define tpeffect_15 SEG_SEGCLASS(UNUSED_SEG016,UNUSED_CODE) -#define tpeffect_16 SEG_SEGCLASS(UNUSED_SEG016,UNUSED_CODE) -#define tpeffect_17 SEG_SEGCLASS(UNUSED_SEG016,UNUSED_CODE) -#define tpeffect_18 SEG_SEGCLASS(UNUSED_SEG016,UNUSED_CODE) -#define tpeffect_19 SEG_SEGCLASS(UNUSED_SEG017,UNUSED_CODE) -#define tpeffect_1a SEG_SEGCLASS(UNUSED_SEG017,UNUSED_CODE) -#define tpeffect_1b SEG_SEGCLASS(UNUSED_SEG017,UNUSED_CODE) -#define tpeffect_1c SEG_SEGCLASS(UNUSED_SEG017,UNUSED_CODE) -#define tpeffect_1d SEG_SEGCLASS(UNUSED_SEG017,UNUSED_CODE) -#define tpeffect_1e SEG_SEGCLASS(UNUSED_SEG017,UNUSED_CODE) -#define tpeffect_1f SEG_SEGCLASS(UNUSED_SEG017,UNUSED_CODE) -#define tpeffect_20 SEG_SEGCLASS(UNUSED_SEG017,UNUSED_CODE) -#define tpeffect_21 SEG_SEGCLASS(UNUSED_SEG017,UNUSED_CODE) -#define tpeffect_22 SEG_SEGCLASS(UNUSED_SEG017,UNUSED_CODE) -#define tpeffect_23 SEG_SEGCLASS(UNUSED_SEG017,UNUSED_CODE) -#define tpeffect_24 SEG_SEGCLASS(UNUSED_SEG017,UNUSED_CODE) -#define tpeffect_25 SEG_SEGCLASS(UNUSED_SEG017,UNUSED_CODE) -#define tpeffect_26 SEG_SEGCLASS(UNUSED_SEG017,UNUSED_CODE) -#define tpeffect_27 SEG_SEGCLASS(UNUSED_SEG017,UNUSED_CODE) -#define tpeffect_28 SEG_SEGCLASS(UNUSED_SEG017,UNUSED_CODE) -#define tpeffect_29 SEG_SEGCLASS(UNUSED_SEG017,UNUSED_CODE) -#define tpeffect_2a SEG_SEGCLASS(UNUSED_SEG017,UNUSED_CODE) -#define tpeffect_2b SEG_SEGCLASS(UNUSED_SEG017,UNUSED_CODE) -#define tpeffect_2c SEG_SEGCLASS(UNUSED_SEG017,UNUSED_CODE) -#define tpeffect_2d SEG_SEGCLASS(UNUSED_SEG017,UNUSED_CODE) -#define tpeffect_2e SEG_SEGCLASS(UNUSED_SEG017,UNUSED_CODE) -#define unoaprms_01 SEG_SEGCLASS(UNUSED_SEG017,UNUSED_CODE) -#define unoaprms_02 SEG_SEGCLASS(UNUSED_SEG017,UNUSED_CODE) -#define unoaprms_03 SEG_SEGCLASS(UNUSED_SEG017,UNUSED_CODE) -#define unoaprms_04 SEG_SEGCLASS(UNUSED_SEG017,UNUSED_CODE) -#define unprlout_02 SEG_SEGCLASS(UNUSED_SEG017,UNUSED_CODE) -#define unprlout_03 SEG_SEGCLASS(UNUSED_SEG017,UNUSED_CODE) -#define unprlout_04 SEG_SEGCLASS(UNUSED_SEG017,UNUSED_CODE) -#define unprlout_05 SEG_SEGCLASS(UNUSED_SEG017,UNUSED_CODE) -#define unprlout_06 SEG_SEGCLASS(UNUSED_SEG017,UNUSED_CODE) -#define unmovss_02 SEG_SEGCLASS(UNUSED_SEG017,UNUSED_CODE) -#define unmovss_03 SEG_SEGCLASS(UNUSED_SEG017,UNUSED_CODE) -#define unmovss_04 SEG_SEGCLASS(UNUSED_SEG017,UNUSED_CODE) -#define unmovss_05 SEG_SEGCLASS(UNUSED_SEG017,UNUSED_CODE) -#define unmovss_06 SEG_SEGCLASS(UNUSED_SEG017,UNUSED_CODE) -#define tabtempl_04 SEG_SEGCLASS(UNUSED_SEG017,UNUSED_CODE) -#define copydlg_05 SEG_SEGCLASS(UNUSED_SEG017,UNUSED_CODE) -#define paragr_01 SEG_SEGCLASS(UNUSED_SEG017,UNUSED_CODE) -#define inspage_07 SEG_SEGCLASS(UNUSED_SEG017,UNUSED_CODE) -#define dlgsnap_02 SEG_SEGCLASS(UNUSED_SEG017,UNUSED_CODE) -#define dlgsnap_04 SEG_SEGCLASS(UNUSED_SEG017,UNUSED_CODE) -#define dlgsnap_05 SEG_SEGCLASS(UNUSED_SEG017,UNUSED_CODE) -#define sdpage_06 SEG_SEGCLASS(UNUSED_SEG017,UNUSED_CODE) -#define sdpage_08 SEG_SEGCLASS(UNUSED_SEG017,UNUSED_CODE) -#define sdpage_0b SEG_SEGCLASS(UNUSED_SEG017,UNUSED_CODE) -#define sdpage_0c SEG_SEGCLASS(UNUSED_SEG017,UNUSED_CODE) -#define sdpage_14 SEG_SEGCLASS(UNUSED_SEG017,UNUSED_CODE) -#define sdpage_15 SEG_SEGCLASS(UNUSED_SEG017,UNUSED_CODE) -#define sdpage_16 SEG_SEGCLASS(UNUSED_SEG017,UNUSED_CODE) -#define sdpage_17 SEG_SEGCLASS(UNUSED_SEG017,UNUSED_CODE) -#define sdpage_1c SEG_SEGCLASS(UNUSED_SEG017,UNUSED_CODE) -#define sdpage_1e SEG_SEGCLASS(UNUSED_SEG017,UNUSED_CODE) -#define drawdoc3_01 SEG_SEGCLASS(UNUSED_SEG017,UNUSED_CODE) -#define drawdoc3_02 SEG_SEGCLASS(UNUSED_SEG017,UNUSED_CODE) -#define drawdoc3_03 SEG_SEGCLASS(UNUSED_SEG017,UNUSED_CODE) -#define drawdoc3_04 SEG_SEGCLASS(UNUSED_SEG018,UNUSED_CODE) -#define drawdoc3_05 SEG_SEGCLASS(UNUSED_SEG018,UNUSED_CODE) -#define drawdoc3_07 SEG_SEGCLASS(UNUSED_SEG018,UNUSED_CODE) -#define drawitem_01 SEG_SEGCLASS(UNUSED_SEG018,UNUSED_CODE) -#define drawitem_04 SEG_SEGCLASS(UNUSED_SEG018,UNUSED_CODE) -#define drawitem_05 SEG_SEGCLASS(UNUSED_SEG018,UNUSED_CODE) -#define drawitem_07 SEG_SEGCLASS(UNUSED_SEG018,UNUSED_CODE) -#define drawitem_0a SEG_SEGCLASS(UNUSED_SEG018,UNUSED_CODE) -#define drawitem_0b SEG_SEGCLASS(UNUSED_SEG018,UNUSED_CODE) -#define drawitem_0d SEG_SEGCLASS(UNUSED_SEG018,UNUSED_CODE) -#define drawitem_10 SEG_SEGCLASS(UNUSED_SEG018,UNUSED_CODE) -#define drawitem_11 SEG_SEGCLASS(UNUSED_SEG018,UNUSED_CODE) -#define drawitem_13 SEG_SEGCLASS(UNUSED_SEG018,UNUSED_CODE) -#define drawitem_16 SEG_SEGCLASS(UNUSED_SEG018,UNUSED_CODE) -#define drawitem_17 SEG_SEGCLASS(UNUSED_SEG018,UNUSED_CODE) -#define drawitem_19 SEG_SEGCLASS(UNUSED_SEG018,UNUSED_CODE) -#define drawitem_1c SEG_SEGCLASS(UNUSED_SEG018,UNUSED_CODE) -#define drawitem_1d SEG_SEGCLASS(UNUSED_SEG018,UNUSED_CODE) -#define drawitem_1f SEG_SEGCLASS(UNUSED_SEG018,UNUSED_CODE) -#define drawitem_22 SEG_SEGCLASS(UNUSED_SEG018,UNUSED_CODE) -#define drawitem_23 SEG_SEGCLASS(UNUSED_SEG018,UNUSED_CODE) -#define stlpool_04 SEG_SEGCLASS(UNUSED_SEG018,UNUSED_CODE) -#define stlpool_0b SEG_SEGCLASS(UNUSED_SEG018,UNUSED_CODE) -#define pglink_01 SEG_SEGCLASS(UNUSED_SEG018,UNUSED_CODE) -#define pglink_02 SEG_SEGCLASS(UNUSED_SEG018,UNUSED_CODE) -#define pglink_03 SEG_SEGCLASS(UNUSED_SEG018,UNUSED_CODE) -#define pglink_04 SEG_SEGCLASS(UNUSED_SEG018,UNUSED_CODE) diff --git a/sd/inc/shapelist.hxx b/sd/inc/shapelist.hxx index 553f438669d2..44a258001fc3 100644 --- a/sd/inc/shapelist.hxx +++ b/sd/inc/shapelist.hxx @@ -60,10 +60,6 @@ namespace sd returns the first shape if pObj is 0 */ SdrObject* getNextShape(SdrObject* pObj) const; - /** returns the shape prior to the given shape in the list or 0 - returns the last shape if pObj is 0 */ - SdrObject* getPreviousShape( SdrObject* pObj ) const; - /** */ SdrObject* getNextShape(); diff --git a/sd/inc/stlpool.hxx b/sd/inc/stlpool.hxx index d49d743b6dee..e8baba1aa79e 100644 --- a/sd/inc/stlpool.hxx +++ b/sd/inc/stlpool.hxx @@ -68,7 +68,6 @@ public: SfxStyleSheetBase* GetActualStyleSheet() { return mpActualStyleSheet; } SfxStyleSheetBase* GetTitleSheet(const String& rLayoutName); - String GetLayoutName() const; // Caller muss Liste loeschen List* CreateOutlineSheetList(const String& rLayoutName); @@ -82,7 +81,6 @@ public: when styles are missing. */ SD_DLLPUBLIC void CreateLayoutStyleSheets(const String& rLayoutName, sal_Bool bCheck = sal_False ); - void EraseLayoutStyleSheets(const String& rLayoutName); List* CreateLayoutSheetNames(const String& rLayoutName) const; void CreateLayoutSheetList(const String& rLayoutName, SdStyleSheetVector& rLayoutSheets); void CopyLayoutSheets(const String& rLayoutName, SdStyleSheetPool& rSourcePool, SdStyleSheetVector& rCreatedSheets ); diff --git a/sd/inc/textapi.hxx b/sd/inc/textapi.hxx index ced8a48c5bb6..6fa186596fba 100644 --- a/sd/inc/textapi.hxx +++ b/sd/inc/textapi.hxx @@ -53,7 +53,6 @@ public: virtual void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException); OutlinerParaObject* CreateText(); - void SetString( const String& rText ); void SetText( OutlinerParaObject& rText ); String GetText(); diff --git a/sd/source/core/CustomAnimationEffect.cxx b/sd/source/core/CustomAnimationEffect.cxx index 7852f7cc8fcf..33b9c233909b 100644 --- a/sd/source/core/CustomAnimationEffect.cxx +++ b/sd/source/core/CustomAnimationEffect.cxx @@ -1809,15 +1809,6 @@ void EffectSequenceHelper::append( const CustomAnimationEffectPtr& pEffect ) // -------------------------------------------------------------------- -void EffectSequenceHelper::insert( EffectSequence::iterator& rPos, const CustomAnimationEffectPtr& pEffect ) -{ - pEffect->setEffectSequence( this ); - maEffects.insert( rPos, pEffect ); - rebuild(); -} - -// -------------------------------------------------------------------- - CustomAnimationEffectPtr EffectSequenceHelper::append( const CustomAnimationPresetPtr& pPreset, const Any& rTarget, double fDuration /* = -1.0 */ ) { CustomAnimationEffectPtr pEffect; diff --git a/sd/source/core/drawdoc2.cxx b/sd/source/core/drawdoc2.cxx index 092549428a42..14614dbf1337 100644 --- a/sd/source/core/drawdoc2.cxx +++ b/sd/source/core/drawdoc2.cxx @@ -1342,37 +1342,6 @@ void SdDrawDocument::CheckMasterPages() } } - - - -USHORT SdDrawDocument::CreatePage (USHORT nPageNum) -{ - PageKind ePageKind = PK_STANDARD; - - // Get current page. - SdPage* pActualPage = GetSdPage(nPageNum, ePageKind); - - // Get background flags. - SdrLayerAdmin& rLayerAdmin = GetLayerAdmin(); - BYTE aBckgrnd = rLayerAdmin.GetLayerID(String(SdResId(STR_LAYER_BCKGRND)), FALSE); - BYTE aBckgrndObj = rLayerAdmin.GetLayerID(String(SdResId(STR_LAYER_BCKGRNDOBJ)), FALSE); - SetOfByte aVisibleLayers = pActualPage->TRG_GetMasterPageVisibleLayers(); - - // Get layout from current page. - AutoLayout eAutoLayout = pActualPage->GetAutoLayout(); - - return CreatePage ( - pActualPage, ePageKind, - // No names for the new slides. - String(), String(), - eAutoLayout, eAutoLayout, - aVisibleLayers.IsSet(aBckgrnd), - aVisibleLayers.IsSet(aBckgrndObj)); -} - - - - USHORT SdDrawDocument::CreatePage ( SdPage* pActualPage, PageKind ePageKind, diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx index b615c7e76c05..89f74de30494 100644 --- a/sd/source/core/drawdoc4.cxx +++ b/sd/source/core/drawdoc4.cxx @@ -242,26 +242,6 @@ void SdDrawDocument::CreateLayoutTemplates() rISet.Put(SvxLRSpaceItem(EE_PARA_LRSPACE)); rISet.Put(SvxULSpaceItem(EE_PARA_ULSPACE)); - // only change paragraph text direction, - // if this is a new document and - // text direction is set explicitly to RTL -/* - if( mpDocSh && - mpDocSh->IsNewDocument() && - SD_MOD()->GetDefaultWritingMode() == ::com::sun::star::text::WritingMode_RL_TB ) - { - SvxAdjustItem aAdjust( SVX_ADJUST_RIGHT ); - SvxFrameDirectionItem aFrameDirectionItem( FRMDIR_HORI_RIGHT_TOP, EE_PARA_WRITINGDIR ); - - rISet.Put( aAdjust ); - rISet.Put( aFrameDirectionItem ); - - pItemPool->SetPoolDefaultItem( aAdjust ); - pItemPool->SetPoolDefaultItem( aFrameDirectionItem ); - } - else - rISet.Put( SvxAdjustItem() ); -*/ rISet.Put( SdrTextLeftDistItem( 250 ) ); // sj: (i33745) using text frame distances seems to be a better default rISet.Put( SdrTextRightDistItem( 250 ) ); rISet.Put( SdrTextUpperDistItem( 125 ) ); @@ -1119,57 +1099,6 @@ void SdDrawDocument::ImpOnlineSpellCallback(SpellCallbackInfo* pInfo, SdrObject* } } -/************************************************************************* -|* -|* Sprachabhaengige Namen der StandardLayer durch eindeutigen Namen ersetzen -|* -\************************************************************************/ - -void SdDrawDocument::MakeUniqueLayerNames() -{ - String aLayerLayout(SdResId(STR_LAYER_LAYOUT)); - String aLayerBckgrnd(SdResId(STR_LAYER_BCKGRND)); - String aLayerBckgrndObj(SdResId(STR_LAYER_BCKGRNDOBJ)); - String aLayerControls(SdResId(STR_LAYER_CONTROLS)); - String aLayerMeasurelines(SdResId(STR_LAYER_MEASURELINES)); - SdrLayerAdmin& rLayerAdmin = GetLayerAdmin(); - USHORT nStandardLayer = 5; - USHORT nLayerCount = Min(rLayerAdmin.GetLayerCount(), nStandardLayer); - - for (USHORT nLayer = 0; nLayer < nLayerCount; nLayer++) - { - // Die sprachabhaengigen Namen der Default-Layer werden nicht mehr - // gespeichert. Es werden stattdessen eindeutige Namen verwendet. - SdrLayer* pLayer = rLayerAdmin.GetLayer(nLayer); - - if (pLayer) - { - String aLayerName(pLayer->GetName()); - - if (aLayerName == aLayerLayout) - { - pLayer->SetName( String( RTL_CONSTASCII_USTRINGPARAM( "LAYER_LAYOUT" ))); - } - else if (aLayerName == aLayerBckgrnd) - { - pLayer->SetName( String( RTL_CONSTASCII_USTRINGPARAM( "LAYER_BCKGRND" ))); - } - else if (aLayerName == aLayerBckgrndObj) - { - pLayer->SetName( String( RTL_CONSTASCII_USTRINGPARAM( "LAYER_BACKGRNDOBJ" ))); - } - else if (aLayerName == aLayerControls) - { - pLayer->SetName( String( RTL_CONSTASCII_USTRINGPARAM( "LAYER_CONTROLS" ))); - } - else if (aLayerName == aLayerMeasurelines) - { - pLayer->SetName( String( RTL_CONSTASCII_USTRINGPARAM( "LAYER_MEASURELINES" ))); - } - } - } -} - /************************************************************************* |* |* Eindeutige Namen der StandardLayer durch sprachabhaengige Namen ersetzen @@ -1545,12 +1474,6 @@ SdStyleSheetPool* SdDrawDocument::GetSdStyleSheetPool() const return dynamic_cast< SdStyleSheetPool* >( GetStyleSheetPool() ); } -ModifyGuard::ModifyGuard( DrawDocShell* pDocShell ) -: mpDocShell( pDocShell ), mpDoc( 0 ) -{ - init(); -} - ModifyGuard::ModifyGuard( SdDrawDocument* pDoc ) : mpDocShell( 0 ), mpDoc( pDoc ) { diff --git a/sd/source/core/shapelist.cxx b/sd/source/core/shapelist.cxx index daefe45c3cb1..4bb14b642f79 100644 --- a/sd/source/core/shapelist.cxx +++ b/sd/source/core/shapelist.cxx @@ -132,25 +132,6 @@ SdrObject* ShapeList::getNextShape(SdrObject* pObj) const return 0; } -SdrObject* ShapeList::getPreviousShape( SdrObject* pObj ) const -{ - if( pObj ) - { - ListImpl::const_iterator aIter( std::find( maShapeList.begin(), maShapeList.end(), pObj ) ); - if( (aIter != maShapeList.end()) && (aIter != maShapeList.begin()) ) - { - aIter--; - return (*aIter); - } - } - else if( !maShapeList.empty() ) - { - return (*--maShapeList.end()); - } - - return 0; -} - void ShapeList::ObjectInDestruction(const SdrObject& rObject) { ListImpl::iterator aIter( std::find( maShapeList.begin(), maShapeList.end(), &rObject ) ); diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx index e592ba45a27e..25ccc7d708ff 100644 --- a/sd/source/core/stlpool.cxx +++ b/sd/source/core/stlpool.cxx @@ -144,30 +144,6 @@ SfxStyleSheetBase* SdStyleSheetPool::GetTitleSheet(const String& rLayoutName) return pResult; } -// ---------------------------------------------------------- -// find layout name of first layout -// ---------------------------------------------------------- - -String SdStyleSheetPool::GetLayoutName() const -{ - String aName( SdResId(STR_LAYOUT_DEFAULT_NAME ) ); - sal_uInt32 nCount = aStyles.size(); - - for( sal_uInt32 n = 0; n < nCount; n++ ) - { - aName = aStyles[n]->GetName(); - sal_uInt16 nPos = aName.SearchAscii( SD_LT_SEPARATOR ); - if( nPos != STRING_NOTFOUND ) - break; - } - - sal_uInt16 nPos = aName.Search( sal_Unicode( ' ' )); - if( nPos != STRING_NOTFOUND ) - aName.Erase( nPos ); // removing blanks and number (e.g. "Gliederung 1") - - return aName; -} - /************************************************************************* |* |* eine Liste der Gliederungstextvorlagen fuer ein Praesentationlayout @@ -571,32 +547,6 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const String& rLayoutName, sal_Bo DBG_ASSERT( !bCheck || !bCreated, "missing layout style sheets detected!" ); } -/************************************************************************* -|* -|* StyleSheets des genannten Praesentationslayouts loeschen -|* -\************************************************************************/ - -void SdStyleSheetPool::EraseLayoutStyleSheets(const String& rLayoutName) -{ - SfxStyleSheetBase* pSheet = NULL; - - List* pNameList = CreateLayoutSheetNames(rLayoutName); - - String* pName = (String*)pNameList->First(); - while (pName) - { - pSheet = Find(*pName, SD_STYLE_FAMILY_MASTERPAGE); - DBG_ASSERT(pSheet, "EraseLayoutStyleSheets: Vorlage nicht gefunden"); - if (pSheet) - Remove(pSheet); - delete pName; - pName = (String*)pNameList->Next(); - } - delete pNameList; -} - - /************************************************************************* |* |* Graphik-StyleSheets aus dem Quellpool in diesen Pool kopieren diff --git a/sd/source/core/text/textapi.cxx b/sd/source/core/text/textapi.cxx index 0856e867f4e1..ab6c69ee8fdc 100644 --- a/sd/source/core/text/textapi.cxx +++ b/sd/source/core/text/textapi.cxx @@ -118,7 +118,6 @@ public: void Dispose(); void SetText( OutlinerParaObject& rText ); - void SetString( const String& rText ); OutlinerParaObject* CreateText(); String GetText(); SdDrawDocument* GetDoc() { return pImpl->mpDoc; } @@ -177,16 +176,6 @@ OutlinerParaObject* TextApiObject::CreateText() return mpSource->CreateText(); } -void TextApiObject::SetString( const String& rText ) -{ - SdrModel* pModel = mpSource->GetDoc(); - if( pModel && pModel->IsUndoEnabled() ) - pModel->AddUndo( new UndoTextAPIChanged( *pModel, this ) ); - - mpSource->SetString( rText ); - maSelection.nStartPara = 0xffff; -} - void TextApiObject::SetText( OutlinerParaObject& rText ) { SdrModel* pModel = mpSource->GetDoc(); @@ -288,22 +277,6 @@ void TextAPIEditSource::SetText( OutlinerParaObject& rText ) } } -void TextAPIEditSource::SetString( const String& rText ) -{ - if ( pImpl->mpDoc ) - { - if( !pImpl->mpOutliner ) - { - //init draw model first - pImpl->mpOutliner = new Outliner( pImpl->mpDoc, OUTLINERMODE_TEXTOBJECT ); - pImpl->mpDoc->SetCalcFieldValueHdl( pImpl->mpOutliner ); - } - else - pImpl->mpOutliner->Clear(); - pImpl->mpOutliner->Insert( rText ); - } -} - OutlinerParaObject* TextAPIEditSource::CreateText() { if ( pImpl->mpDoc && pImpl->mpOutliner ) diff --git a/sd/source/filter/eppt/eppt.hxx b/sd/source/filter/eppt/eppt.hxx index f3ec27d8093c..3d8797beb328 100644 --- a/sd/source/filter/eppt/eppt.hxx +++ b/sd/source/filter/eppt/eppt.hxx @@ -476,7 +476,6 @@ class GroupTable ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > & GetCurrentGroupAccess() const { return mpGroupEntry[ mnCurrentGroupEntry - 1 ]->mXIndexAccess; }; sal_uInt32 GetGroupsClosed(); - void SkipCurrentGroup(); void ResetGroupTable( sal_uInt32 nCount ); void ClearGroupTable(); sal_Bool EnterGroup( ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > & rIndex ); @@ -534,7 +533,7 @@ class PortionObj : public PropStateValue protected : void ImplClear(); - void ImplConstruct( PortionObj& rPortionObj ); + void ImplConstruct( const PortionObj& rPortionObj ); sal_uInt32 ImplGetTextField( ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & rXTextRangeRef, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXPropSetRef, String& rURL ); sal_uInt32 ImplCalculateTextPositions( sal_uInt32 nCurrentTextPosition ); @@ -567,13 +566,13 @@ class PortionObj : public PropStateValue sal_Bool bLast, FontCollection& rFontCollection ); PortionObj( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXPropSetRef, FontCollection& rFontCollection ); - PortionObj( PortionObj& rPortionObj ); + PortionObj( const PortionObj& rPortionObj ); ~PortionObj(); void Write( SvStream* pStrm, sal_Bool bLast ); sal_uInt32 Count() const { return mnTextSize; }; - PortionObj& operator=( PortionObj& rPortionObj ); + PortionObj& operator=( const PortionObj& rPortionObj ); }; struct ParaFlags @@ -594,10 +593,9 @@ class ParagraphObj : public List, public PropStateValue, public SOParagraph protected : - void ImplConstruct( ParagraphObj& rParagraphObj ); + void ImplConstruct( const ParagraphObj& rParagraphObj ); void ImplClear(); sal_uInt32 ImplCalculateTextPositions( sal_uInt32 nCurrentTextPosition ); - ::com::sun::star::awt::Size ImplMapSize( const ::com::sun::star::awt::Size& rSize ); void ImplGetParagraphValues( PPTExBulletProvider& rBuProv, sal_Bool bGetPropStateValue = FALSE ); void ImplGetNumberingLevel( PPTExBulletProvider& rBuProv, sal_Int16 nDepth, sal_Bool bIsBullet, sal_Bool bGetPropStateValue = FALSE ); @@ -631,7 +629,7 @@ class ParagraphObj : public List, public PropStateValue, public SOParagraph ParagraphObj( ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextContent > & rXTextContentRef, ParaFlags, FontCollection& rFontCollection, PPTExBulletProvider& rBuProv ); - ParagraphObj( ParagraphObj& rParargraphObj ); + ParagraphObj( const ParagraphObj& rParargraphObj ); ParagraphObj( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXPropSetRef, PPTExBulletProvider& rBuProv ); @@ -641,7 +639,7 @@ class ParagraphObj : public List, public PropStateValue, public SOParagraph void Write( SvStream* pStrm ); sal_uInt32 Count() const { return mnTextSize; }; - ParagraphObj& operator=( ParagraphObj& rParagraphObj ); + ParagraphObj& operator=( const ParagraphObj& rParagraphObj ); }; struct ImplTextObj @@ -659,13 +657,13 @@ struct ImplTextObj class TextObj { - ImplTextObj* mpImplTextObj; + mutable ImplTextObj* mpImplTextObj; void ImplCalculateTextPositions(); public : TextObj( ::com::sun::star::uno::Reference< ::com::sun::star::text::XSimpleText > & rXText, int nInstance, FontCollection& rFontCollection, PPTExBulletProvider& rBuProv ); - TextObj( TextObj& rTextObj ); + TextObj( const TextObj& rTextObj ); ~TextObj(); void Write( SvStream* pStrm ); diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx index f07245d1ff31..7915bc8b0340 100644 --- a/sd/source/filter/eppt/epptso.cxx +++ b/sd/source/filter/eppt/epptso.cxx @@ -312,14 +312,6 @@ sal_Bool GroupTable::GetNextGroupEntry() // --------------------------------------------------------------------------------------------- -void GroupTable::SkipCurrentGroup() -{ - if ( mnCurrentGroupEntry ) - delete ( mpGroupEntry[ --mnCurrentGroupEntry ] ); -} - -// --------------------------------------------------------------------------------------------- - FontCollectionEntry::~FontCollectionEntry() { } @@ -1869,7 +1861,7 @@ PortionObj::PortionObj( ::com::sun::star::uno::Reference< ::com::sun::star::text } } -PortionObj::PortionObj( PortionObj& rPortionObj ) +PortionObj::PortionObj( const PortionObj& rPortionObj ) : PropStateValue( rPortionObj ) { ImplConstruct( rPortionObj ); @@ -2097,7 +2089,7 @@ void PortionObj::ImplClear() delete[] mpText; } -void PortionObj::ImplConstruct( PortionObj& rPortionObj ) +void PortionObj::ImplConstruct( const PortionObj& rPortionObj ) { mbLastPortion = rPortionObj.mbLastPortion; mnTextSize = rPortionObj.mnTextSize; @@ -2291,7 +2283,7 @@ sal_uInt32 PortionObj::ImplGetTextField( ::com::sun::star::uno::Reference< ::com return nRetValue; } -PortionObj& PortionObj::operator=( PortionObj& rPortionObj ) +PortionObj& PortionObj::operator=( const PortionObj& rPortionObj ) { if ( this != &rPortionObj ) { @@ -2369,7 +2361,7 @@ ParagraphObj::ParagraphObj( const ::com::sun::star::uno::Reference< ::com::sun:: } } -ParagraphObj::ParagraphObj( ParagraphObj& rObj ) +ParagraphObj::ParagraphObj( const ParagraphObj& rObj ) : List() , PropStateValue() , SOParagraph() @@ -2878,7 +2870,7 @@ void ParagraphObj::ImplGetParagraphValues( PPTExBulletProvider& rBuProv, sal_Boo meBiDi = ePropState; } -void ParagraphObj::ImplConstruct( ParagraphObj& rParagraphObj ) +void ParagraphObj::ImplConstruct( const ParagraphObj& rParagraphObj ) { mnTextSize = rParagraphObj.mnTextSize; mnTextAdjust = rParagraphObj.mnTextAdjust; @@ -2891,8 +2883,9 @@ void ParagraphObj::ImplConstruct( ParagraphObj& rParagraphObj ) mbForbiddenRules = rParagraphObj.mbForbiddenRules; mnBiDi = rParagraphObj.mnBiDi; - for ( void* pPtr = rParagraphObj.First(); pPtr; pPtr = rParagraphObj.Next() ) - Insert( new PortionObj( *(PortionObj*)pPtr ), LIST_APPEND ); + ParagraphObj& rOther = const_cast(rParagraphObj); + for ( const void* pPtr = rOther.First(); pPtr; pPtr = rOther.Next() ) + Insert( new PortionObj( *(const PortionObj*)pPtr ), LIST_APPEND ); maTabStop = rParagraphObj.maTabStop; bExtendedParameters = rParagraphObj.bExtendedParameters; @@ -2917,16 +2910,6 @@ void ParagraphObj::ImplConstruct( ParagraphObj& rParagraphObj ) nBulletId = rParagraphObj.nBulletId; } -::com::sun::star::awt::Size ParagraphObj::ImplMapSize( const ::com::sun::star::awt::Size& rSize ) -{ - Size aSize( OutputDevice::LogicToLogic( Size( rSize.Width, rSize.Height ), maMapModeSrc, maMapModeDest ) ); - if ( !aSize.Width() ) - aSize.Width()++; - if ( !aSize.Height() ) - aSize.Height()++; - return ::com::sun::star::awt::Size( aSize.Width(), aSize.Height() ); -} - sal_uInt32 ParagraphObj::ImplCalculateTextPositions( sal_uInt32 nCurrentTextPosition ) { mnTextSize = 0; @@ -2935,7 +2918,7 @@ sal_uInt32 ParagraphObj::ImplCalculateTextPositions( sal_uInt32 nCurrentTextPosi return mnTextSize; } -ParagraphObj& ParagraphObj::operator=( ParagraphObj& rParagraphObj ) +ParagraphObj& ParagraphObj::operator=( const ParagraphObj& rParagraphObj ) { if ( this != &rParagraphObj ) { @@ -2998,7 +2981,7 @@ TextObj::TextObj( ::com::sun::star::uno::Reference< ::com::sun::star::text::XSim ImplCalculateTextPositions(); } -TextObj::TextObj( TextObj& rTextObj ) +TextObj::TextObj( const TextObj& rTextObj ) { mpImplTextObj = rTextObj.mpImplTextObj; mpImplTextObj->mnRefCount++; diff --git a/sd/source/filter/html/htmlattr.cxx b/sd/source/filter/html/htmlattr.cxx index 5adcbd5fc56a..4bcb73535ba1 100644 --- a/sd/source/filter/html/htmlattr.cxx +++ b/sd/source/filter/html/htmlattr.cxx @@ -100,15 +100,3 @@ void SdHtmlAttrPreview::SetColors( Color& aBack, Color& aText, Color& aLink, m_aVLinkColor = aVLink; m_aALinkColor = aALink; } - -// ===================================================================== -// ===================================================================== -void SdHtmlAttrPreview::GetColors( Color& aBack, Color& aText, Color& aLink, - Color& aVLink, Color& aALink ) const -{ - aBack = m_aBackColor; - aText = m_aTextColor; - aLink = m_aLinkColor; - aVLink = m_aVLinkColor; - aALink = m_aALinkColor; -} diff --git a/sd/source/filter/html/htmlattr.hxx b/sd/source/filter/html/htmlattr.hxx index b076b2a29307..1caa16822ab1 100644 --- a/sd/source/filter/html/htmlattr.hxx +++ b/sd/source/filter/html/htmlattr.hxx @@ -46,8 +46,6 @@ public: void SetColors( Color& aBack, Color& aText, Color& aLink, Color& aVLink, Color& aALink ); - void GetColors( Color& aBack, Color& aText, Color& aLink, - Color& aVLink, Color& aALink ) const; }; #endif // _SD_HTMLATTR_HXX diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx index 82fabc73aed2..9de46771e14c 100644 --- a/sd/source/filter/html/htmlex.cxx +++ b/sd/source/filter/html/htmlex.cxx @@ -3371,15 +3371,6 @@ BOOL HtmlErrorContext::GetString( ULONG, String& rCtxStr ) // ===================================================================== -void HtmlErrorContext::SetContext( USHORT nResId ) -{ - mnResId = nResId; - maURL1.Erase(); - maURL2.Erase(); -} - -// ===================================================================== - void HtmlErrorContext::SetContext( USHORT nResId, const String& rURL ) { mnResId = nResId; diff --git a/sd/source/filter/html/htmlex.hxx b/sd/source/filter/html/htmlex.hxx index 34ca8182d22f..43bc12419f84 100644 --- a/sd/source/filter/html/htmlex.hxx +++ b/sd/source/filter/html/htmlex.hxx @@ -88,7 +88,6 @@ public: virtual BOOL GetString( ULONG nErrId, String& rCtxStr ); - void SetContext( USHORT nResId ); void SetContext( USHORT nResId, const String& rURL ); void SetContext( USHORT nResId, const String& rURL1, const String& rURL2 ); }; diff --git a/sd/source/filter/ppt/ppt97animations.cxx b/sd/source/filter/ppt/ppt97animations.cxx index a4a3564d35b0..25ac858ca319 100644 --- a/sd/source/filter/ppt/ppt97animations.cxx +++ b/sd/source/filter/ppt/ppt97animations.cxx @@ -84,11 +84,6 @@ Ppt97Animation::Ppt97Animation( SvStream& rInputStream ) m_aAtom.ReadStream( rInputStream ); } -Ppt97Animation::Ppt97Animation() - : MEMBER_CONSTRUCTOR_LIST() -{ -} - Ppt97Animation::Ppt97Animation( const Ppt97Animation& rAnimation ) : MEMBER_CONSTRUCTOR_LIST() { @@ -163,11 +158,12 @@ bool Ppt97Animation::HasAfterEffect_DimAtNextEffect() const { return m_aAtom.nAfterEffect == 2; } +#ifdef FUTURE bool Ppt97Animation::HasAfterEffect_DimAfterEffect() const { return m_aAtom.nAfterEffect == 3; } - +#endif UINT32 Ppt97Animation::GetSoundRef() const { return m_aAtom.nSoundRef; diff --git a/sd/source/filter/ppt/ppt97animations.hxx b/sd/source/filter/ppt/ppt97animations.hxx index 4aa24ab12de8..c68ba9a19382 100644 --- a/sd/source/filter/ppt/ppt97animations.hxx +++ b/sd/source/filter/ppt/ppt97animations.hxx @@ -95,7 +95,6 @@ class Ppt97Animation public: //public methods Ppt97Animation( SvStream& rIn ); - Ppt97Animation(); Ppt97Animation( const Ppt97Animation& rAnimation ); Ppt97Animation& operator= ( const Ppt97Animation& rAnimation ); bool operator < ( const Ppt97Animation& rAnimation ) const;//later is greater @@ -129,7 +128,9 @@ private: //private methods bool HasAfterEffect() const; bool HasAfterEffect_ChangeColor() const; bool HasAfterEffect_DimAtNextEffect() const; +#ifdef FUTURE bool HasAfterEffect_DimAfterEffect() const; +#endif bool HasStopPreviousSound() const; bool HasReverseOrder() const; //true if the text paragraphs should be animated in reverse order sal_Int32 GetParagraphLevel() const; //paragraph level that is animated ( that paragraph and higher levels ) diff --git a/sd/source/filter/ppt/pptatom.cpp b/sd/source/filter/ppt/pptatom.cpp index 21a0c3c3f9f8..e48cdcc0acd6 100644 --- a/sd/source/filter/ppt/pptatom.cpp +++ b/sd/source/filter/ppt/pptatom.cpp @@ -109,15 +109,3 @@ const Atom* Atom::findNextChildAtom( sal_uInt16 nRecType, const Atom* pLast ) co return pChild; } - -/** returns the next child atom after pLast with nRecType and nRecInstance or NULL */ -const Atom* Atom::findNextChildAtom( sal_uInt16 nRecType, sal_uInt16 nRecInstance, const Atom* pLast ) const -{ - const Atom* pChild = pLast != NULL ? pLast->mpNextAtom : mpFirstChild; - while( pChild && (pChild->maRecordHeader.nRecType != nRecType) && (pChild->maRecordHeader.nRecInstance != nRecInstance) ) - { - pChild = findNextChildAtom( pChild ); - } - - return pChild; -} diff --git a/sd/source/filter/ppt/pptatom.hxx b/sd/source/filter/ppt/pptatom.hxx index 0b13dc314584..7cadad0e7dcd 100644 --- a/sd/source/filter/ppt/pptatom.hxx +++ b/sd/source/filter/ppt/pptatom.hxx @@ -61,9 +61,6 @@ public: /** returns the first child atom with nRecType and nRecInstance or NULL */ inline const Atom* findFirstChildAtom( sal_uInt16 nRecType, sal_uInt16 nRecInstance ) const; - /** returns the next child atom after pLast with nRecType and nRecInstance or NULL */ - const Atom* findNextChildAtom( sal_uInt16 nRecType, sal_uInt16 nRecInstance, const Atom* pLast ) const; - /** returns the first child atom or NULL */ inline const Atom* findFirstChildAtom() const; @@ -114,11 +111,6 @@ inline const DffRecordHeader& Atom::getHeader() const return maRecordHeader; } -inline const Atom* Atom::findFirstChildAtom( sal_uInt16 nRecType, sal_uInt16 nRecInstance ) const -{ - return findNextChildAtom( nRecType, nRecInstance, NULL ); -} - inline const Atom* Atom::findFirstChildAtom() const { return mpFirstChild; diff --git a/sd/source/filter/ppt/pptinanimations.cxx b/sd/source/filter/ppt/pptinanimations.cxx index 16fc1a99dd8a..10b0b152b8f4 100644 --- a/sd/source/filter/ppt/pptinanimations.cxx +++ b/sd/source/filter/ppt/pptinanimations.cxx @@ -1522,52 +1522,6 @@ void AnimationImporter::importTimeContainer( const Atom* pAtom, const Reference< // -------------------------------------------------------------------- -/* todo: for now we dump sub containers into its parent container, what else to do with it? */ -void AnimationImporter::importAnimationSubContainer( const Atom* pAtom, const Reference< XAnimationNode >& xNode ) -{ - DBG_ASSERT( pAtom && xNode.is(), "invalid call to ppt::AnimationImporter::importTimeContainer()!"); - if( pAtom && xNode.is() ) - { - // import sub containers - const Atom* pChildAtom = pAtom->findFirstChildAtom(); - - while( pChildAtom ) - { - switch( pChildAtom->getType() ) - { - case DFF_msofbtAnimNode: - case DFF_msofbtAnimEvent: - case DFF_msofbtAnimValue: - case DFF_msofbtAnimAction: - case DFF_msofbtAnimPropertySet: - break; - case DFF_msofbtAnimCommand: - { - const OUString aServiceName( OUString::createFromAscii("com.sun.star.animations.Command") ); - Reference< XAnimationNode > xChildNode( ::comphelper::getProcessServiceFactory()->createInstance(aServiceName), UNO_QUERY ); - importAnimationNodeContainer( pChildAtom, xChildNode ); - Reference< XTimeContainer > xParentContainer( xNode, UNO_QUERY ); - if( xParentContainer.is() && xChildNode.is() ) - xParentContainer->appendChild( xChildNode ); - } - break; - - default: - { - dump_atom_header( pChildAtom, true, false ); - dump_atom( pChildAtom ); - dump_atom_header( pChildAtom, false, false ); - } - break; - } - - pChildAtom = pAtom->findNextChildAtom( pChildAtom ); - } - } -} - -// -------------------------------------------------------------------- - void AnimationImporter::importAnimationNodeContainer( const Atom* pAtom, const Reference< XAnimationNode >& xNode ) { DBG_ASSERT( pAtom && xNode.is(), "invalid call to ppt::AnimationImporter::importAnimationNodeContainer()!"); @@ -3894,14 +3848,6 @@ void AnimationImporter::dump_atom( const Atom* , bool ) { } -void AnimationImporter::dump( sal_uInt32 , bool ) -{ -} - -void AnimationImporter::dump_anim_group( const Atom* , const AnimationNode& , const PropertySet& , bool ) -{ -} - void AnimationImporter::dump_target( ::com::sun::star::uno::Any& ) { } @@ -3922,10 +3868,6 @@ void AnimationImporter::dump( const char * ) { } -void AnimationImporter::dump( const rtl::OUString& ) -{ -} - void AnimationImporter::dump( const char * , sal_Int32 ) { } diff --git a/sd/source/filter/ppt/pptinanimations.hxx b/sd/source/filter/ppt/pptinanimations.hxx index d29449361861..24f423029e82 100644 --- a/sd/source/filter/ppt/pptinanimations.hxx +++ b/sd/source/filter/ppt/pptinanimations.hxx @@ -62,7 +62,6 @@ private: void importAnimationContainer( const Atom* pAtom, const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xParent ); void importTimeContainer( const Atom* pAtom, const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode ); void importAnimationNodeContainer( const Atom* pAtom, const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode ); - void importAnimationSubContainer( const Atom* pAtom, const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode ); void importAnimateSetContainer( const Atom* pAtom, const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode ); void importAnimateFilterContainer( const Atom* pAtom, const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode ); @@ -109,18 +108,18 @@ private: #ifdef DBG_ANIM_LOG FILE * mpFile; + void dump_anim_group( const Atom* pAtom, const AnimationNode& rNode, const PropertySet& rSet, bool bOpen ); + void dump( const rtl::OUString& rString ); + void dump( sal_uInt32 nLen, bool bNewLine = true ); #endif void dump_atom_header( const Atom* pAtom, bool bOpen, bool bAppend ); void dump_atom( const Atom* pAtom, bool bNewLine = true ); - void dump( sal_uInt32 nLen, bool bNewLine = true ); - void dump_anim_group( const Atom* pAtom, const AnimationNode& rNode, const PropertySet& rSet, bool bOpen ); void dump_target( ::com::sun::star::uno::Any& rAny ); void dump( ::com::sun::star::uno::Any& rAny ); void dump( const PropertySet& rSet ); void dump( const AnimationNode& rNode ); void dump( const char * pText ); - void dump( const rtl::OUString& rString ); void dump( const char * pText, sal_Int32 nInt ); void dump( const char * pText, double fDouble ); void dump( const char * pText, const char * pText2 ); diff --git a/sd/source/ui/accessibility/AccessibleViewForwarder.cxx b/sd/source/ui/accessibility/AccessibleViewForwarder.cxx index 70734ac23198..de5342afd23f 100644 --- a/sd/source/ui/accessibility/AccessibleViewForwarder.cxx +++ b/sd/source/ui/accessibility/AccessibleViewForwarder.cxx @@ -44,18 +44,6 @@ namespace accessibility { May change in the future. */ -AccessibleViewForwarder::AccessibleViewForwarder (SdrPaintView* pView, USHORT nWindowId) - : mpView (pView), - mnWindowId (nWindowId), - mrDevice (pView->GetPaintWindow((sal_uInt32)nWindowId)->GetOutputDevice()) -{ - OSL_ASSERT (mpView != NULL); - // empty -} - - - - AccessibleViewForwarder::AccessibleViewForwarder (SdrPaintView* pView, OutputDevice& rDevice) : mpView (pView), mnWindowId (0), @@ -86,15 +74,6 @@ AccessibleViewForwarder::~AccessibleViewForwarder (void) -void AccessibleViewForwarder::SetView (SdrPaintView* pView) -{ - mpView = pView; - OSL_ASSERT (mpView != NULL); -} - - - - sal_Bool AccessibleViewForwarder::IsValid (void) const { return sal_True; diff --git a/sd/source/ui/animations/AnimationSchemesPane.cxx b/sd/source/ui/animations/AnimationSchemesPane.cxx deleted file mode 100644 index 337dc64331fd..000000000000 --- a/sd/source/ui/animations/AnimationSchemesPane.cxx +++ /dev/null @@ -1,443 +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. - * - ************************************************************************/ - -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_sd.hxx" -#include "AnimationSchemesPane.hxx" -#include "AnimationSchemesPane.hrc" -#include "CustomAnimation.hrc" - -#include "TransitionPreset.hxx" -#include "sdresid.hxx" -#include "ViewShellBase.hxx" -#include "DrawDocShell.hxx" -#include "SlideSorterViewShell.hxx" -#include "drawdoc.hxx" -#include "filedlg.hxx" -#include "strings.hrc" -#include "EventMultiplexer.hxx" -#include - -#ifndef _SVT_CONTROLDIMS_HRC_ -#include -#endif -#include -#include -#include -#include - -#include - - -using namespace ::com::sun::star; - -using ::com::sun::star::uno::Reference; -using ::com::sun::star::uno::Sequence; -using ::rtl::OUString; -using ::com::sun::star::uno::RuntimeException; - -// ______________________ -// -// Local Helper Functions -// ______________________ - -namespace -{ - -typedef ::boost::shared_ptr - SharedPageSelection; -SharedPageSelection lcl_getSelectedPages (::sd::ViewShellBase& rBase) -{ - ::sd::slidesorter::SlideSorterViewShell*pSlideSorterViewShell - = ::sd::slidesorter::SlideSorterViewShell::GetSlideSorter(rBase); - DBG_ASSERT( pSlideSorterViewShell, "No Slide-Sorter available" ); - - if (pSlideSorterViewShell != NULL) - { - return pSlideSorterViewShell->GetPageSelection(); - } - else - { - return SharedPageSelection(new sd::slidesorter::SlideSorterViewShell::PageSelection()); - } -} - -// void lcl_ApplyToPages( ::std::vector< SdPage * > aPages, const ::sd::impl::TransitionEffect & rEffect ) -// { -// ::std::vector< SdPage * >::const_iterator aIt( aPages.begin()); -// const ::std::vector< SdPage * >::const_iterator aEndIt( aPages.end()); -// for( ; aIt != aEndIt; ++aIt ) -// { -// rEffect.applyTo( *(*aIt) ); -// } -// } - -} // anonymous namespace - -namespace sd -{ - -// ____________________ -// -// AnimationSchemesPane -// ____________________ - -AnimationSchemesPane::AnimationSchemesPane( - ::Window * pParent, - ViewShellBase & rBase, - SdDrawDocument* pDoc ) : - Control( pParent, SdResId( DLG_ANIMATION_SCHEMES_PANE ) ), - - mrBase( rBase ), - mpDrawDoc( pDoc ), - maFL_APPLY_SCHEME( this, SdResId( FL_APPLY_SCHEME ) ), - maLB_ANIMATION_SCHEMES( this, SdResId( LB_ANIMATION_SCHEMES ) ), - maFL_EMPTY1( this, SdResId( FL_EMPTY1 ) ), - maPB_APPLY_TO_ALL( this, SdResId( PB_APPLY_TO_ALL ) ), - maPB_PLAY( this, SdResId( PB_PLAY ) ), - maPB_SLIDE_SHOW( this, SdResId( PB_SLIDE_SHOW ) ), - maFL_EMPTY2( this, SdResId( FL_EMPTY2 ) ), - maCB_AUTO_PREVIEW( this, SdResId( CB_AUTO_PREVIEW ) ), - - maSTR_NO_SCHEME( SdResId( STR_NO_SCHEME ) ), - mbHasSelection( false ), - mbUpdatingControls( false ), - mbIsMainViewChangePending( false ) -{ - // use no resource ids from here on - FreeResource(); - - if( pDoc ) - mxModel.set( pDoc->getUnoModel(), uno::UNO_QUERY ); - // TODO: get correct view - if( mxModel.is()) - mxView.set( mxModel->getCurrentController(), uno::UNO_QUERY ); - - // fill list box of slide transitions - maLB_ANIMATION_SCHEMES.InsertEntry( maSTR_NO_SCHEME ); - - // set defaults - maCB_AUTO_PREVIEW.Check(); // automatic preview on - - // update control states before adding handlers - updateLayout(); - updateControls(); - - // set handlers - maPB_APPLY_TO_ALL.SetClickHdl( LINK( this, AnimationSchemesPane, ApplyToAllButtonClicked )); - maPB_PLAY.SetClickHdl( LINK( this, AnimationSchemesPane, PlayButtonClicked )); - maPB_SLIDE_SHOW.SetClickHdl( LINK( this, AnimationSchemesPane, SlideShowButtonClicked )); - - maLB_ANIMATION_SCHEMES.SetSelectHdl( LINK( this, AnimationSchemesPane, SchemeSelected )); - - addListener(); -} - -AnimationSchemesPane::~AnimationSchemesPane() -{ - removeListener(); -} - -void AnimationSchemesPane::Resize() -{ - updateLayout(); -} - -void AnimationSchemesPane::onSelectionChanged() -{ - updateControls(); -} - -void AnimationSchemesPane::onChangeCurrentPage() -{ - updateControls(); -} - -void AnimationSchemesPane::updateLayout() -{ - ::Size aPaneSize( GetSizePixel() ); - - // start layouting elements from bottom to top. The remaining space is used - // for the topmost list box - ::Point aOffset( LogicToPixel( Point( 3, 3 ), MAP_APPFONT ) ); - long nOffsetX = aOffset.getX(); - long nOffsetY = aOffset.getY(); - long nOffsetBtnX = LogicToPixel( Point( 6, 1 ), MAP_APPFONT ).getX(); - - ::Point aUpperLeft( nOffsetX, aPaneSize.getHeight() - nOffsetY ); - long nMaxWidth = aPaneSize.getWidth() - 2 * nOffsetX; - - // auto preview check-box - ::Size aCtrlSize = maCB_AUTO_PREVIEW.GetSizePixel(); - aCtrlSize.setWidth( maCB_AUTO_PREVIEW.CalcMinimumSize( nMaxWidth ).getWidth()); - aUpperLeft.setY( aUpperLeft.getY() - aCtrlSize.getHeight()); - maCB_AUTO_PREVIEW.SetPosSizePixel( aUpperLeft, aCtrlSize ); - - // fixed line above check-box - aCtrlSize = maFL_EMPTY2.GetSizePixel(); - aCtrlSize.setWidth( nMaxWidth ); - aUpperLeft.setY( aUpperLeft.getY() - aCtrlSize.getHeight()); - maFL_EMPTY2.SetPosSizePixel( aUpperLeft, aCtrlSize ); - - // buttons "Play" and "Slide Show" - long nPlayButtonWidth = maPB_PLAY.CalcMinimumSize().getWidth() + 2 * nOffsetBtnX; - long nSlideShowButtonWidth = maPB_SLIDE_SHOW.CalcMinimumSize().getWidth() + 2 * nOffsetBtnX; - - if( (nPlayButtonWidth + nSlideShowButtonWidth + nOffsetX) <= nMaxWidth ) - { - // place buttons side by side - aCtrlSize = maPB_PLAY.GetSizePixel(); - aUpperLeft.setY( aUpperLeft.getY() - aCtrlSize.getHeight()); - aCtrlSize.setWidth( nPlayButtonWidth ); - maPB_PLAY.SetPosSizePixel( aUpperLeft, aCtrlSize ); - - aUpperLeft.setX( aUpperLeft.getX() + nPlayButtonWidth + nOffsetX ); - aCtrlSize.setWidth( nSlideShowButtonWidth ); - maPB_SLIDE_SHOW.SetPosSizePixel( aUpperLeft, aCtrlSize ); - aUpperLeft.setX( nOffsetX ); - } - else - { - // place buttons on top of each other - aCtrlSize = maPB_SLIDE_SHOW.GetSizePixel(); - aUpperLeft.setY( aUpperLeft.getY() - aCtrlSize.getHeight()); - aCtrlSize.setWidth( nSlideShowButtonWidth ); - maPB_SLIDE_SHOW.SetPosSizePixel( aUpperLeft, aCtrlSize ); - - aCtrlSize = maPB_PLAY.GetSizePixel(); - aUpperLeft.setY( aUpperLeft.getY() - aCtrlSize.getHeight() - nOffsetY ); - aCtrlSize.setWidth( nPlayButtonWidth ); - maPB_PLAY.SetPosSizePixel( aUpperLeft, aCtrlSize ); - } - - // "Apply to All Slides" button - aCtrlSize = maPB_APPLY_TO_ALL.GetSizePixel(); - aCtrlSize.setWidth( maPB_APPLY_TO_ALL.CalcMinimumSize( nMaxWidth ).getWidth() + 2 * nOffsetBtnX ); - aUpperLeft.setY( aUpperLeft.getY() - aCtrlSize.getHeight() - nOffsetY ); - maPB_APPLY_TO_ALL.SetPosSizePixel( aUpperLeft, aCtrlSize ); - - // fixed line above "Apply to All Slides" button - aCtrlSize = maFL_EMPTY1.GetSizePixel(); - aCtrlSize.setWidth( nMaxWidth ); - aUpperLeft.setY( aUpperLeft.getY() - aCtrlSize.getHeight()); - maFL_EMPTY1.SetPosSizePixel( aUpperLeft, aCtrlSize ); - - // fixed line "Apply to selected slides" - aCtrlSize = maFL_APPLY_SCHEME.GetSizePixel(); - aCtrlSize.setWidth( nMaxWidth ); - ::Point aUpperLeftCorner( nOffsetX, nOffsetY ); - maFL_APPLY_SCHEME.SetPosSizePixel( aUpperLeftCorner, aCtrlSize ); - aUpperLeftCorner.setY( aUpperLeftCorner.getY() + aCtrlSize.getHeight() + nOffsetY ); - aUpperLeft.setY( aUpperLeft.getY() - nOffsetY ); - - // list box animation scheme - aCtrlSize.setWidth( nMaxWidth ); - aCtrlSize.setHeight( aUpperLeft.getY() - aUpperLeftCorner.getY() ); - maLB_ANIMATION_SCHEMES.SetPosSizePixel( aUpperLeftCorner, aCtrlSize ); -} - -void AnimationSchemesPane::updateControls() -{ - SharedPageSelection aSelectedPages( lcl_getSelectedPages( mrBase )); - if( aSelectedPages->empty()) - { - mbHasSelection = false; - return; - } - mbHasSelection = true; - - DBG_ASSERT( ! mbUpdatingControls, "Multiple Control Updates" ); - mbUpdatingControls = true; - - // get model data for first page -#ifdef DBG_UTIL - SdPage * pFirstPage = aSelectedPages->front(); - DBG_ASSERT( pFirstPage, "Invalid Page" ); -#endif - -// // merge with other pages -// ::std::vector< SdPage * >::const_iterator aIt( aSelectedPages.begin()); -// const ::std::vector< SdPage * >::const_iterator aEndIt( aSelectedPages.end()); - -// // start with second page (note aIt != aEndIt, because ! aSelectedPages.empty()) -// for( ++aIt ;aIt != aEndIt; ++aIt ) -// { -// if( *aIt ) -// // merge -// } - - mbUpdatingControls = false; - - updateControlState(); -} - -void AnimationSchemesPane::updateControlState() -{ - maLB_ANIMATION_SCHEMES.Enable( mbHasSelection ); - - maPB_APPLY_TO_ALL.Enable( mbHasSelection ); - maPB_PLAY.Enable( mbHasSelection ); -// maPB_SLIDE_SHOW.Enable( TRUE ); - maCB_AUTO_PREVIEW.Enable( mbHasSelection ); -} - -void AnimationSchemesPane::getAnimationSchemeFromControls() const -{ - // TODO: Implement -} - -void AnimationSchemesPane::applyToSelectedPages() -{ - if( ! mbUpdatingControls ) - { - SharedPageSelection aSelectedPages( lcl_getSelectedPages( mrBase )); - if( ! aSelectedPages->empty()) - { -// lcl_ApplyToPages( aSelectedPages, getAnimationSchemeFromControls() ); - } - if( maCB_AUTO_PREVIEW.IsEnabled() && - maCB_AUTO_PREVIEW.IsChecked()) - { - playCurrentScheme(); - } - } -} - -void AnimationSchemesPane::playCurrentScheme() -{ - // TODO: Implement a preview in the center view -} - -void AnimationSchemesPane::addListener() -{ - Link aLink( LINK(this,AnimationSchemesPane,EventMultiplexerListener) ); - mrBase.GetEventMultiplexer()->AddEventListener( - aLink, - tools::EventMultiplexerEvent::EID_EDIT_VIEW_SELECTION - | tools::EventMultiplexerEvent::EID_CURRENT_PAGE - | tools::EventMultiplexerEvent::EID_MAIN_VIEW_REMOVED - | tools::EventMultiplexerEvent::EID_MAIN_VIEW_ADDED - | tools::EventMultiplexerEvent::EID_CONFIGURATION_UPDATED); -} - -void AnimationSchemesPane::removeListener() -{ - Link aLink( LINK(this,AnimationSchemesPane,EventMultiplexerListener) ); - mrBase.GetEventMultiplexer()->RemoveEventListener( aLink ); -} - -IMPL_LINK(AnimationSchemesPane,EventMultiplexerListener, - tools::EventMultiplexerEvent*,pEvent) -{ - switch (pEvent->meEventId) - { - case tools::EventMultiplexerEvent::EID_EDIT_VIEW_SELECTION: - onSelectionChanged(); - break; - - case tools::EventMultiplexerEvent::EID_CURRENT_PAGE: - onChangeCurrentPage(); - break; - - case tools::EventMultiplexerEvent::EID_MAIN_VIEW_REMOVED: - mxView = Reference(); - onSelectionChanged(); - onChangeCurrentPage(); - break; - - case tools::EventMultiplexerEvent::EID_MAIN_VIEW_ADDED: - mbIsMainViewChangePending = true; - break; - - case tools::EventMultiplexerEvent::EID_CONFIGURATION_UPDATED: - if (mbIsMainViewChangePending) - { - mbIsMainViewChangePending = false; - mxView = Reference::query( mxModel->getCurrentController() ); - onSelectionChanged(); - onChangeCurrentPage(); - } - break; - } - return 0; -} - -IMPL_LINK( AnimationSchemesPane, ApplyToAllButtonClicked, void *, EMPTYARG ) -{ - DBG_ASSERT( mpDrawDoc, "Invalid Draw Document!" ); - if( !mpDrawDoc ) - return 0; - - ::std::vector< SdPage * > aPages; - - sal_uInt16 nPageCount = mpDrawDoc->GetSdPageCount( PK_STANDARD ); - aPages.reserve( nPageCount ); - for( sal_uInt16 i=0; iGetSdPage( i, PK_STANDARD ); - if( pPage ) - aPages.push_back( pPage ); - } - -// if( ! aPages.empty()) -// lcl_ApplyToPages( aPages, getAnimationSchemeFromControls() ); - - return 0; -} - - -IMPL_LINK( AnimationSchemesPane, PlayButtonClicked, void *, EMPTYARG ) -{ - playCurrentScheme(); - return 0; -} - -IMPL_LINK( AnimationSchemesPane, SlideShowButtonClicked, void *, EMPTYARG ) -{ - mrBase.StartPresentation(); - return 0; -} - -IMPL_LINK( AnimationSchemesPane, SchemeSelected, void *, EMPTYARG ) -{ - applyToSelectedPages(); - return 0; -} - -::Window * createAnimationSchemesPanel( ::Window* pParent, ViewShellBase& rBase ) -{ - ::Window* pWindow = 0; - - DrawDocShell* pDocSh = rBase.GetDocShell(); - if( pDocSh ) - pWindow = new AnimationSchemesPane( pParent, rBase, pDocSh->GetDoc() ); - - return pWindow; -} - - -} // namespace sd diff --git a/sd/source/ui/animations/AnimationSchemesPane.hrc b/sd/source/ui/animations/AnimationSchemesPane.hrc deleted file mode 100644 index 2b9ec9be3611..000000000000 --- a/sd/source/ui/animations/AnimationSchemesPane.hrc +++ /dev/null @@ -1,50 +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_ANIMATIONSCHEMESPANE_HRC -#define _SD_ANIMATIONSCHEMESPANE_HRC - -#define FL_APPLY_SCHEME 1 -// spec: 1 -#define LB_ANIMATION_SCHEMES 2 - -#define FL_EMPTY1 3 -// spec: 2 -#define PB_APPLY_TO_ALL 4 -// spec: 3 -#define PB_PLAY 5 -// spec: 4 -#define PB_SLIDE_SHOW 6 - -#define FL_EMPTY2 7 -// spec: 5 -#define CB_AUTO_PREVIEW 8 - -#define STR_NO_SCHEME 9 - - -#endif // _SD_ANIMATIONSCHEMESPANE_HRC diff --git a/sd/source/ui/animations/AnimationSchemesPane.hxx b/sd/source/ui/animations/AnimationSchemesPane.hxx deleted file mode 100644 index 8528e5e6ef64..000000000000 --- a/sd/source/ui/animations/AnimationSchemesPane.hxx +++ /dev/null @@ -1,114 +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_ANIMATIONSCHEMESPANE_HXX -#define SD_ANIMATIONSCHEMESPANE_HXX - -#include -#include -#include -#ifndef _SV_BUTTON_HXX -#include -#endif -#include -#include -#include - -#include - -class SdDrawDocument; -class SdPage; - -namespace sd { namespace tools { -class EventMultiplexerEvent; -} } - -namespace sd -{ - -class ViewShellBase; - -class AnimationSchemesPane : public Control -{ -public: - explicit AnimationSchemesPane( - ::Window * pParent, - ViewShellBase & rBase, - SdDrawDocument* pDoc ); - virtual ~AnimationSchemesPane(); - - virtual void Resize(); - - void onSelectionChanged(); - void onChangeCurrentPage(); - -private: - void updateLayout(); - void updateControls(); - void updateControlState(); - - void applyToSelectedPages(); - void playCurrentScheme(); - - void addListener(); - void removeListener(); - - void getAnimationSchemeFromControls() const; - - DECL_LINK( ApplyToAllButtonClicked, void * ); - DECL_LINK( PlayButtonClicked, void * ); - DECL_LINK( SlideShowButtonClicked, void * ); - - DECL_LINK( SchemeSelected, void * ); - DECL_LINK(EventMultiplexerListener, tools::EventMultiplexerEvent*); - -private: - ViewShellBase & mrBase; - SdDrawDocument * mpDrawDoc; - - FixedLine maFL_APPLY_SCHEME; - ListBox maLB_ANIMATION_SCHEMES; - FixedLine maFL_EMPTY1; - PushButton maPB_APPLY_TO_ALL; - PushButton maPB_PLAY; - PushButton maPB_SLIDE_SHOW; - FixedLine maFL_EMPTY2; - CheckBox maCB_AUTO_PREVIEW; - - String maSTR_NO_SCHEME; - - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawView > mxView; - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > mxModel; - - bool mbHasSelection; - bool mbUpdatingControls; - bool mbIsMainViewChangePending; -}; - -} // namespace sd - -// SD_ANIMATIONSCHEMESPANE_HXX -#endif diff --git a/sd/source/ui/animations/AnimationSchemesPane.src b/sd/source/ui/animations/AnimationSchemesPane.src deleted file mode 100644 index 12447c917930..000000000000 --- a/sd/source/ui/animations/AnimationSchemesPane.src +++ /dev/null @@ -1,113 +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. - * - ************************************************************************/ - -#include "CustomAnimation.hrc" -#include "AnimationSchemesPane.hrc" -#include "helpids.h" - -#ifndef _SVT_CONTROLDIMS_HRC_ -#include -#endif - -// Note: Sizes of 1 usually mean they are auto-calculated - -Control DLG_ANIMATION_SCHEMES_PANE -{ - OutputSize = TRUE; - Size = MAP_APPFONT( 1, 1 ); - - Text [ en-US ] = "Animation Schemes"; - - FixedLine FL_APPLY_SCHEME - { - Size = MAP_APPFONT( 1, RSC_CD_FIXEDLINE_HEIGHT ); - Text [ en-US ] = "Apply to selected slides "; - }; - - ListBox LB_ANIMATION_SCHEMES - { - HelpId = HID_SD_ANIMATIONSCHEMESPANE_LB_ANIMATION_SCHEMES; - Border = TRUE ; - TabStop = TRUE ; - - Size = MAP_APPFONT( 1, 1 ); - }; - - FixedLine FL_EMPTY1 - { - Size = MAP_APPFONT( 1, RSC_CD_FIXEDLINE_HEIGHT ); - }; - - PushButton PB_APPLY_TO_ALL - { - HelpId = HID_SD_ANIMATIONSCHEMESPANE_PB_APPLY_TO_ALL; - Size = MAP_APPFONT( 1, RSC_CD_PUSHBUTTON_HEIGHT ); - TabStop = TRUE ; - - Text [ en-US ] = "Apply to All Slides"; - }; - - - PushButton PB_PLAY - { - HelpId = HID_SD_ANIMATIONSCHEMESPANE_PB_PLAY; - Size = MAP_APPFONT( 1, RSC_CD_PUSHBUTTON_HEIGHT ); - TabStop = TRUE ; - - Text [ en-US ] = "Play"; - }; - - PushButton PB_SLIDE_SHOW - { - HelpId = HID_SD_ANIMATIONSCHEMESPANE_PB_SLIDE_SHOW; - Size = MAP_APPFONT( 1, RSC_CD_PUSHBUTTON_HEIGHT ); - TabStop = TRUE ; - - Text [ en-US ] = "Slide Show"; - }; - - FixedLine FL_EMPTY2 - { - Size = MAP_APPFONT( 1, RSC_CD_FIXEDLINE_HEIGHT ); - }; - - Checkbox CB_AUTO_PREVIEW - { - HelpId = HID_SD_ANIMATIONSCHEMESPANE_CB_AUTO_PREVIEW; - Size = MAP_APPFONT( 1, RSC_CD_CHECKBOX_HEIGHT ); - TabStop = TRUE ; - - Text [ en-US ] = "Automatic preview"; - }; - - // -------------------- - - String STR_NO_SCHEME - { - Text [ en-US ] = "No Animation"; - }; -}; diff --git a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx index 3ac3d1f24a07..f76b84d29826 100644 --- a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx +++ b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx @@ -92,7 +92,6 @@ extern void fillDurationComboBox( ComboBox* pBox ); class CategoryListBox : public ListBox { public: - CategoryListBox( Window* pParent, WinBits nStyle = WB_BORDER ); CategoryListBox( Window* pParent, const ResId& rResId ); ~CategoryListBox(); @@ -110,12 +109,6 @@ private: Link maDoubleClickHdl; }; -CategoryListBox::CategoryListBox( Window* pParent, WinBits nStyle /* = WB_BORDER */ ) -: ListBox( pParent, nStyle ) -{ - EnableUserDraw( TRUE ); -} - CategoryListBox::CategoryListBox( Window* pParent, const ResId& rResId ) : ListBox( pParent, rResId ) { diff --git a/sd/source/ui/animations/CustomAnimationSchemesPane.hrc b/sd/source/ui/animations/CustomAnimationSchemesPane.hrc deleted file mode 100644 index 70168d2662cf..000000000000 --- a/sd/source/ui/animations/CustomAnimationSchemesPane.hrc +++ /dev/null @@ -1,32 +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_CUSTOMANIMATIONSCHEMESPANE_HRC -#define _SD_CUSTOMANIMATIONSCHEMESPANE_HRC - - -#endif // _SD_CUSTOMANIMATIONSCHEMESPANE_HRC \ No newline at end of file diff --git a/sd/source/ui/animations/CustomAnimationSchemesPane.src b/sd/source/ui/animations/CustomAnimationSchemesPane.src deleted file mode 100644 index 1499b79bbb4b..000000000000 --- a/sd/source/ui/animations/CustomAnimationSchemesPane.src +++ /dev/null @@ -1,71 +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. - * - ************************************************************************/ - -#include "CustomAnimation.hrc" - -ModalDialog DLG_CUSTOMANIMATION_SCHEMES_PANE -{ - DialogControl = TRUE; - - Text [ en-US ] = "Animation Schemes"; - - Fixedline 1 - { - Text [ en-US ] = "Apply to selected slides"; - }; - - PushButton 1 - { - Text [ en-US ] = "Apply to All Slides"; - }; - - PushButton 2 - { - Text [ en-US ] = "Play"; - }; - - PushButton 3 - { - Text [ en-US ] = "Slide Show"; - }; - - Checkbox 4 - { - Text [ en-US ] = "Automatic preview"; - }; - - String 2 - { - Text [ en-US ] = "No Animation"; - }; - - String 3 - { - Text [ en-US ] = "Recently used Schemes"; - }; -}; - diff --git a/sd/source/ui/animations/makefile.mk b/sd/source/ui/animations/makefile.mk index 2194dad6eafc..db010bf4ef23 100644 --- a/sd/source/ui/animations/makefile.mk +++ b/sd/source/ui/animations/makefile.mk @@ -42,16 +42,13 @@ ENABLE_EXCEPTIONS=TRUE SRS1NAME=$(TARGET) SRC1FILES =\ - AnimationSchemesPane.src\ CustomAnimationPane.src\ CustomAnimationDialog.src\ CustomAnimationCreateDialog.src\ SlideTransitionPane.src\ - CustomAnimationSchemesPane.src\ CustomAnimation.src SLOFILES = \ - $(SLO)$/AnimationSchemesPane.obj \ $(SLO)$/CustomAnimationCreateDialog.obj\ $(SLO)$/CustomAnimationDialog.obj\ $(SLO)$/CustomAnimationPane.obj \ diff --git a/sd/source/ui/annotations/annotationmanager.cxx b/sd/source/ui/annotations/annotationmanager.cxx index aa42fec50f9c..1e64617edab8 100644 --- a/sd/source/ui/annotations/annotationmanager.cxx +++ b/sd/source/ui/annotations/annotationmanager.cxx @@ -971,7 +971,7 @@ IMPL_LINK(AnnotationManagerImpl,EventMultiplexerListener, } return 0; } - +#if 0 OUString AnnotationManagerImpl::GetHelpText( ::com::sun::star::uno::Reference< ::com::sun::star::office::XAnnotation >& xAnnotation ) { OUString sRet; @@ -994,7 +994,7 @@ OUString AnnotationManagerImpl::GetHelpText( ::com::sun::star::uno::Reference< : return sRet; } - +#endif void AnnotationManagerImpl::ExecuteAnnotationContextMenu( Reference< XAnnotation > xAnnotation, ::Window* pParent, const Rectangle& rContextRect, bool bButtonMenu /* = false */ ) { diff --git a/sd/source/ui/annotations/annotationmanagerimpl.hxx b/sd/source/ui/annotations/annotationmanagerimpl.hxx index 43b53d8467f9..70b95c2a509b 100755 --- a/sd/source/ui/annotations/annotationmanagerimpl.hxx +++ b/sd/source/ui/annotations/annotationmanagerimpl.hxx @@ -99,9 +99,9 @@ public: void onTagDeselected( AnnotationTag& rTag ); void onSelectionChanged(); - +#if 0 rtl::OUString GetHelpText( ::com::sun::star::uno::Reference< ::com::sun::star::office::XAnnotation >& xAnnotation ); - +#endif void addListener(); void removeListener(); diff --git a/sd/source/ui/annotations/annotationwindow.cxx b/sd/source/ui/annotations/annotationwindow.cxx index ad6709c776ce..3ba99307fd41 100644 --- a/sd/source/ui/annotations/annotationwindow.cxx +++ b/sd/source/ui/annotations/annotationwindow.cxx @@ -493,12 +493,6 @@ void AnnotationWindow::ResizeIfNeccessary(long aOldHeight, long aNewHeight) } } -void AnnotationWindow::SetReadonly(bool bSet) -{ - mbReadonly = bSet; - getView()->SetReadOnly(bSet); -} - void AnnotationWindow::SetLanguage(const SvxLanguageItem aNewItem) { Engine()->SetModifyHdl( Link() ); diff --git a/sd/source/ui/annotations/annotationwindow.hxx b/sd/source/ui/annotations/annotationwindow.hxx index ba82d4e862d3..264cb2fa1afe 100644 --- a/sd/source/ui/annotations/annotationwindow.hxx +++ b/sd/source/ui/annotations/annotationwindow.hxx @@ -144,7 +144,6 @@ class AnnotationWindow : public FloatingWindow void Rescale(); - void SetReadonly(bool bSet); bool IsReadOnly() { return mbReadonly;} bool IsProtected() { return mbProtected; } diff --git a/sd/source/ui/app/optsitem.cxx b/sd/source/ui/app/optsitem.cxx index e3181f792d04..4355da3011c9 100755 --- a/sd/source/ui/app/optsitem.cxx +++ b/sd/source/ui/app/optsitem.cxx @@ -222,22 +222,6 @@ SdOptionsLayout::SdOptionsLayout( USHORT nConfigId, BOOL bUseConfig ) : // ----------------------------------------------------------------------------- -void SdOptionsLayout::SetDefaults() -{ - SetRulerVisible( TRUE ); - SetHelplines( TRUE ); - SetHandlesBezier( FALSE ); - SetMoveOutline( TRUE ); - SetDragStripes( FALSE ); - if ( isMetricSystem() ) - SetMetric( FUNIT_CM ); // default for countries with metric system - else - SetMetric( FUNIT_INCH ); // default for others - SetDefTab( 1250 ); -} - -// ----------------------------------------------------------------------------- - BOOL SdOptionsLayout::operator==( const SdOptionsLayout& rOpt ) const { return( IsRulerVisible() == rOpt.IsRulerVisible() && @@ -406,12 +390,6 @@ SdOptionsContents::SdOptionsContents( USHORT nConfigId, BOOL bUseConfig ) : // ----------------------------------------------------------------------------- -void SdOptionsContents::SetDefaults() -{ -} - -// ----------------------------------------------------------------------------- - BOOL SdOptionsContents::operator==(const SdOptionsContents&) const { return true; @@ -459,14 +437,6 @@ BOOL SdOptionsContents::WriteData( Any* pValues ) const |* \************************************************************************/ -SdOptionsContentsItem::SdOptionsContentsItem( USHORT _nWhich ) -: SfxPoolItem ( _nWhich ) -, maOptionsContents ( 0, FALSE ) -{ -} - -// ---------------------------------------------------------------------- - SdOptionsContentsItem::SdOptionsContentsItem(USHORT _nWhich, SdOptions*, ::sd::FrameView*) : SfxPoolItem ( _nWhich ) , maOptionsContents ( 0, FALSE ) @@ -542,40 +512,6 @@ SdOptionsMisc::SdOptionsMisc( USHORT nConfigId, BOOL bUseConfig ) : // ----------------------------------------------------------------------------- -void SdOptionsMisc::SetDefaults() -{ - SetStartWithTemplate( TRUE ); - SetMarkedHitMovesAlways( TRUE ); - SetMoveOnlyDragging( FALSE ); - SetCrookNoContortion( FALSE ); - SetQuickEdit( GetConfigId() != SDCFG_DRAW ); - SetMasterPagePaintCaching( TRUE ); - SetDragWithCopy( FALSE ); - SetPickThrough( TRUE ); - SetBigHandles( FALSE ); - SetDoubleClickTextEdit( TRUE ); - SetClickChangeRotation( FALSE ); - SetStartWithActualPage( FALSE ); - SetSummationOfParagraphs( FALSE ); - SetSolidDragging( TRUE ); - SetSolidMarkHdl( TRUE ); - // #90356# - SetShowUndoDeleteWarning( TRUE ); - // The default for 6.1-and-above documents is to use printer-independent - // formatting. - SetPrinterIndependentLayout (1); - // #97016# - SetDefaultObjectSizeWidth(8000); - SetDefaultObjectSizeHeight(5000); - SetPreviewNewEffects(true); - SetPreviewChangedEffects(false); - SetPreviewTransitions(true); - SetDisplay(0); - SetShowComments(true); -} - -// ----------------------------------------------------------------------------- - BOOL SdOptionsMisc::operator==( const SdOptionsMisc& rOpt ) const { return( IsStartWithTemplate() == rOpt.IsStartWithTemplate() && @@ -909,22 +845,6 @@ SdOptionsSnap::SdOptionsSnap( USHORT nConfigId, BOOL bUseConfig ) : // ----------------------------------------------------------------------------- -void SdOptionsSnap::SetDefaults() -{ - SetSnapHelplines( TRUE ); - SetSnapBorder( TRUE ); - SetSnapFrame( FALSE ); - SetSnapPoints( FALSE ); - SetOrtho( FALSE ); - SetBigOrtho( TRUE ); - SetRotate( FALSE ); - SetSnapArea( 5 ); - SetAngle( 1500 ); - SetEliminatePolyPointLimitAngle( 1500 ); -} - -// ----------------------------------------------------------------------------- - BOOL SdOptionsSnap::operator==( const SdOptionsSnap& rOpt ) const { return( IsSnapHelplines() == rOpt.IsSnapHelplines() && @@ -1098,13 +1018,6 @@ SdOptionsZoom::SdOptionsZoom( USHORT nConfigId, BOOL bUseConfig ) : // ----------------------------------------------------------------------------- -void SdOptionsZoom::SetDefaults() -{ - SetScale( 1, 1 ); -} - -// ----------------------------------------------------------------------------- - BOOL SdOptionsZoom::operator==( const SdOptionsZoom& rOpt ) const { INT32 nX1, nX2, nY1, nY2; @@ -1158,63 +1071,6 @@ BOOL SdOptionsZoom::WriteData( Any* pValues ) const return TRUE; } -/************************************************************************* -|* -|* SdOptionsZoomItem -|* -\************************************************************************/ - -SdOptionsZoomItem::SdOptionsZoomItem( USHORT _nWhich ) -: SfxPoolItem ( _nWhich ) -, maOptionsZoom ( 0, FALSE ) -{ -} - -// ---------------------------------------------------------------------- - -SdOptionsZoomItem::SdOptionsZoomItem( USHORT _nWhich, SdOptions* pOpts, ::sd::FrameView* ) -: SfxPoolItem ( _nWhich ) -, maOptionsZoom ( 0, FALSE ) -{ - if( pOpts ) - { - INT32 nX, nY; - - pOpts->GetScale( nX, nY ); - maOptionsZoom.SetScale( nX, nY ); - } -} - -// ---------------------------------------------------------------------- - -SfxPoolItem* SdOptionsZoomItem::Clone( SfxItemPool* ) const -{ - return new SdOptionsZoomItem( *this ); -} - - -// ---------------------------------------------------------------------- - -int SdOptionsZoomItem::operator==( const SfxPoolItem& rAttr ) const -{ - const bool bSameType = SfxPoolItem::operator==(rAttr); - DBG_ASSERT( bSameType, "SdOptionsZoomItem::operator==(), differen pool item type!" ); - return bSameType && ( maOptionsZoom == static_cast< const SdOptionsZoomItem& >(rAttr).maOptionsZoom ); -} - -// ----------------------------------------------------------------------- - -void SdOptionsZoomItem::SetOptions( SdOptions* pOpts ) const -{ - if( pOpts ) - { - INT32 nX, nY; - - maOptionsZoom.GetScale( nX, nY ); - pOpts->SetScale( nX, nY ); - } -} - /************************************************************************* |* |* SdOptionsGrid @@ -1366,13 +1222,6 @@ BOOL SdOptionsGrid::WriteData( Any* pValues ) const |* \************************************************************************/ -SdOptionsGridItem::SdOptionsGridItem( USHORT _nWhich ) : - SvxGridItem( _nWhich ) -{ -} - -// ----------------------------------------------------------------------------- - SdOptionsGridItem::SdOptionsGridItem( USHORT _nWhich, SdOptions* pOpts, ::sd::FrameView* pView ) : SvxGridItem( _nWhich ) { @@ -1458,33 +1307,6 @@ SdOptionsPrint::SdOptionsPrint( USHORT nConfigId, BOOL bUseConfig ) : // ----------------------------------------------------------------------------- -void SdOptionsPrint::SetDefaults() -{ - SetDraw( TRUE ); - SetNotes( FALSE ); - SetHandout( FALSE ); - SetOutline( FALSE ); - SetDate( FALSE ); - SetTime( FALSE ); - SetPagename( FALSE ); - SetHiddenPages( TRUE ); - SetPagesize( FALSE ); - SetPagetile( FALSE ); - SetWarningPrinter( TRUE ); - SetWarningSize( FALSE ); - SetWarningOrientation( FALSE ); - SetBooklet( FALSE ); - SetFrontPage( TRUE ); - SetBackPage( TRUE ); - SetCutPage( FALSE ); - SetPaperbin( FALSE ); - SetOutputQuality( 0 ); - SetHandoutHorizontal( TRUE ); - SetHandoutPages( 6 ); -} - -// ----------------------------------------------------------------------------- - BOOL SdOptionsPrint::operator==( const SdOptionsPrint& rOpt ) const { return( IsDraw() == rOpt.IsDraw() && @@ -1630,31 +1452,6 @@ BOOL SdOptionsPrint::WriteData( Any* pValues ) const return TRUE; } -void SdOptionsPrint::SetPrinterOptions( const SdOptionsPrint* pOptions ) -{ - bDraw = pOptions->bDraw; - bNotes = pOptions->bNotes; - bHandout = pOptions->bHandout; - bOutline = pOptions->bOutline; - bDate = pOptions->bDate; - bTime = pOptions->bTime; - bPagename = pOptions->bPagename; - bHiddenPages = pOptions->bHiddenPages; - bPagesize = pOptions->bPagesize; - bPagetile = pOptions->bPagetile; - bWarningPrinter = pOptions->bWarningPrinter; - bWarningSize = pOptions->bWarningSize; - bWarningOrientation = pOptions->bWarningOrientation; - bBooklet = pOptions->bBooklet; - bFront = pOptions->bFront; - bBack = pOptions->bBack; - bCutPage = pOptions->bCutPage; - bPaperbin = pOptions->bPaperbin; - nQuality = pOptions->nQuality; - mnHandoutPages = pOptions->mnHandoutPages; - mbHandoutHorizontal = pOptions->mbHandoutHorizontal; -} - /************************************************************************* |* |* SdOptionsPrintItem @@ -1766,32 +1563,6 @@ SdOptions::~SdOptions() // ---------------------------------------------------------------------- -void SdOptions::SetRangeDefaults( ULONG nOptionsRange ) -{ - if( nOptionsRange & SD_OPTIONS_LAYOUT ) - SdOptionsLayout::SetDefaults(); - - if( nOptionsRange & SD_OPTIONS_CONTENTS ) - SdOptionsContents::SetDefaults(); - - if( nOptionsRange & SD_OPTIONS_MISC ) - SdOptionsMisc::SetDefaults(); - - if( nOptionsRange & SD_OPTIONS_SNAP ) - SdOptionsSnap::SetDefaults(); - - if( nOptionsRange & SD_OPTIONS_ZOOM ) - SdOptionsZoom::SetDefaults(); - - if( nOptionsRange & SD_OPTIONS_GRID ) - SdOptionsGrid::SetDefaults(); - - if( nOptionsRange & SD_OPTIONS_PRINT ) - SdOptionsPrint::SetDefaults(); -} - -// ---------------------------------------------------------------------- - void SdOptions::StoreConfig( ULONG nOptionsRange ) { if( nOptionsRange & SD_OPTIONS_LAYOUT ) diff --git a/sd/source/ui/app/sdmod.cxx b/sd/source/ui/app/sdmod.cxx index fb180509cff9..ccbc7c8f5665 100644 --- a/sd/source/ui/app/sdmod.cxx +++ b/sd/source/ui/app/sdmod.cxx @@ -336,20 +336,3 @@ OutputDevice* SdModule::GetRefDevice (::sd::DrawDocShell& ) { return GetVirtualRefDevice(); } - - -/************************************************************************* -|* -\************************************************************************/ - -::com::sun::star::text::WritingMode SdModule::GetDefaultWritingMode() const -{ -/* - const SvtLanguageOptions aLanguageOptions; - - return( aLanguageOptions.IsCTLFontEnabled() ? - ::com::sun::star::text::WritingMode_RL_TB : - ::com::sun::star::text::WritingMode_LR_TB ); -*/ - return ::com::sun::star::text::WritingMode_LR_TB; -} diff --git a/sd/source/ui/dlg/LayerDialogContent.cxx b/sd/source/ui/dlg/LayerDialogContent.cxx index 7420319ab491..975d277c7dff 100644 --- a/sd/source/ui/dlg/LayerDialogContent.cxx +++ b/sd/source/ui/dlg/LayerDialogContent.cxx @@ -86,14 +86,6 @@ LayerDialogContent::~LayerDialogContent (void) -LayerTabBar& LayerDialogContent::GetLayerTabBar (void) -{ - return maLayerTabBar; -} - - - - BOOL LayerDialogContent::Close (void) { return SfxDockingWindow::Close(); diff --git a/sd/source/ui/dlg/PaneDockingWindow.cxx b/sd/source/ui/dlg/PaneDockingWindow.cxx index c0dcd76f0fae..20c952c9c597 100644 --- a/sd/source/ui/dlg/PaneDockingWindow.cxx +++ b/sd/source/ui/dlg/PaneDockingWindow.cxx @@ -94,15 +94,6 @@ PaneDockingWindow::~PaneDockingWindow (void) -void PaneDockingWindow::SetTitle (const String& rsTitle) -{ - msTitle = rsTitle; - Invalidate(); -} - - - - void PaneDockingWindow::Resize (void) { SfxDockingWindow::Resize(); diff --git a/sd/source/ui/dlg/animobjs.cxx b/sd/source/ui/dlg/animobjs.cxx index 2ac4801aba0c..e179a0ba9f86 100644 --- a/sd/source/ui/dlg/animobjs.cxx +++ b/sd/source/ui/dlg/animobjs.cxx @@ -691,19 +691,6 @@ void AnimationWindow::ResetAttrs() // ----------------------------------------------------------------------- -void AnimationWindow::WaitInEffect( ULONG nMilliSeconds ) const -{ - ULONG nEnd = Time::GetSystemTicks() + nMilliSeconds; - ULONG nCurrent = Time::GetSystemTicks(); - while (nCurrent < nEnd) - { - nCurrent = Time::GetSystemTicks(); - Application::Reschedule(); - } -} - -// ----------------------------------------------------------------------- - void AnimationWindow::WaitInEffect( ULONG nMilliSeconds, ULONG nTime, SfxProgress* pProgress ) const { diff --git a/sd/source/ui/dlg/dlgass.cxx b/sd/source/ui/dlg/dlgass.cxx index d398724a3074..1eb3a3d0cedc 100644 --- a/sd/source/ui/dlg/dlgass.cxx +++ b/sd/source/ui/dlg/dlgass.cxx @@ -1928,21 +1928,6 @@ SfxObjectShellLock AssistentDlg::GetDocument() return mpImpl->GetDocument(); } -String AssistentDlg::GetTopic() const -{ - return mpImpl->mpPage4AskTopicEDT->GetText(); -} - -String AssistentDlg::GetUserName() const -{ - return mpImpl->mpPage4AskNameEDT->GetText(); -} - -String AssistentDlg::GetInformation() const -{ - return mpImpl->mpPage4AskInfoEDT->GetText(); -} - OutputType AssistentDlg::GetOutputMedium() const { if(mpImpl->mpPage2Medium1RB->IsChecked()) diff --git a/sd/source/ui/dlg/dlgassim.cxx b/sd/source/ui/dlg/dlgassim.cxx index 40bfae16c2a4..f9dcf5046189 100644 --- a/sd/source/ui/dlg/dlgassim.cxx +++ b/sd/source/ui/dlg/dlgassim.cxx @@ -207,287 +207,3 @@ void SdPageListControl::DataChanged( const DataChangedEvent& rDCEvt ) SvTreeListBox::DataChanged( rDCEvt ); } -// ==================================================================== -// TemplateCache -// ==================================================================== - -// Kennung fuer die Config Datei mit den Cache Daten -static const UINT16 nMagic = (UINT16)0x4127; - -TemplateCacheInfo::TemplateCacheInfo() -{ - m_bImpress = FALSE; - m_bValid = FALSE; - m_bModified = TRUE; -} - -TemplateCacheInfo::TemplateCacheInfo( const String& rFile, const DateTime& rDateTime, BOOL bImpress ) -{ - m_aFile = rFile; - m_aDateTime = rDateTime; - m_bImpress = bImpress; - m_bValid = FALSE; - m_bModified = TRUE; -} - -SvStream& operator >> (SvStream& rIn, TemplateCacheInfo& rInfo) -{ - rIn.ReadByteString( rInfo.m_aFile, RTL_TEXTENCODING_UTF8 ); - USHORT nDay, nMonth, nYear; - rIn >> nDay; - rIn >> nMonth; - rIn >> nYear; - rInfo.m_aDateTime.SetDay( nDay ); - rInfo.m_aDateTime.SetMonth( nMonth ); - rInfo.m_aDateTime.SetYear( nYear); - - USHORT nHour, nMin, nSec, n100Sec; - - rIn >> nHour; - rIn >> nMin; - rIn >> nSec; - rIn >> n100Sec; - - rInfo.m_aDateTime.SetHour( nHour ); - rInfo.m_aDateTime.SetMin( nMin ); - rInfo.m_aDateTime.SetSec( nSec ); - rInfo.m_aDateTime.Set100Sec( n100Sec ); - - rIn >> rInfo.m_bImpress; - - rInfo.m_bModified = FALSE; - - return rIn; -} - -SvStream& operator << (SvStream& rOut, const TemplateCacheInfo& rInfo) -{ - USHORT nTemp; - - rOut.WriteByteString( rInfo.m_aFile, RTL_TEXTENCODING_UTF8 ); - - nTemp = rInfo.m_aDateTime.GetDay(); - rOut << nTemp; - - nTemp = rInfo.m_aDateTime.GetMonth(); - rOut << nTemp; - - nTemp = rInfo.m_aDateTime.GetYear(); - rOut << nTemp; - - nTemp = rInfo.m_aDateTime.GetHour(); - rOut << nTemp; - - nTemp = rInfo.m_aDateTime.GetMin(); - rOut << nTemp; - - nTemp = rInfo.m_aDateTime.GetSec(); - rOut << nTemp; - - nTemp = rInfo.m_aDateTime.Get100Sec(); - rOut << nTemp; - - rOut << rInfo.m_bImpress; - - return rOut; -} - -TemplateCache::TemplateCache() -{ -} - -TemplateCache::~TemplateCache() -{ - Clear(); -} - -void TemplateCache::Clear() -{ - for( TemplateCacheDirEntry* pDir = m_aDirs.First(); pDir; pDir = m_aDirs.Next() ) - { - for( TemplateCacheInfo* pEntry = pDir->m_aFiles.First(); pEntry; pEntry = pDir->m_aFiles.Next() ) - delete pEntry; - delete pDir; - } -} - -void TemplateCache::Load() -{ - INetURLObject aURL( SvtPathOptions().GetUserConfigPath() ); - aURL.Append( String( RTL_CONSTASCII_USTRINGPARAM( "template.sod" ) ) ); - SfxMedium aMedium( aURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_READ | STREAM_NOCREATE, TRUE ); // Download - SvStream* pStream = aMedium.GetInStream(); - - if( !pStream ) - return; - - UINT16 aCheck; - *pStream >> aCheck; - - if(aCheck != nMagic) - return; - - UINT16 nDirs; - *pStream >> nDirs; - - for( UINT16 nDir = 0; pStream->GetError() == SVSTREAM_OK && nDir < nDirs; nDir++ ) - { - TemplateCacheDirEntry* pDir = new TemplateCacheDirEntry(); - m_aDirs.Insert(pDir); - - pStream->ReadByteString( pDir->m_aPath, RTL_TEXTENCODING_UTF8 ); - - UINT16 nFiles; - *pStream >> nFiles; - - for( UINT16 nFile = 0; pStream->GetError() == SVSTREAM_OK && nFile < nFiles; nFile++ ) - { - TemplateCacheInfo* pEntry = new TemplateCacheInfo(); - *pStream >> *pEntry; - pDir->m_aFiles.Insert(pEntry); - } - } - - if( pStream->GetError() != SVSTREAM_OK ) - { - // Ein I/O Problem ist doch kein Beinbruch, dann wird der Cache halt neu erzeugt - Clear(); - } -} - -void TemplateCache::Save() -{ - INetURLObject aURL( SvtPathOptions().GetUserConfigPath() ); - aURL.Append( String( RTL_CONSTASCII_USTRINGPARAM( "template.sod" ) ) ); - SfxMedium aMedium( aURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_WRITE | STREAM_TRUNC, FALSE ); // Download - SvStream* pStream = aMedium.GetInStream(); - - if( !pStream ) - return; - - UINT16 nCheck = nMagic; - *pStream << nCheck; - - const UINT16 nDirs = (UINT16) m_aDirs.Count(); - *pStream << nDirs; - - for( TemplateCacheDirEntry* pDir = m_aDirs.First(); - pStream->GetError() == SVSTREAM_OK && pDir; - pDir = m_aDirs.Next() ) - { - pStream->WriteByteString( pDir->m_aPath, RTL_TEXTENCODING_UTF8 ); - - const UINT16 nFiles = (UINT16) pDir->m_aFiles.Count(); - *pStream << nFiles; - - for( TemplateCacheInfo* pEntry = pDir->m_aFiles.First(); - pStream->GetError() == SVSTREAM_OK && pEntry; - pEntry = pDir->m_aFiles.Next() ) - { - *pStream << *pEntry; - } - } -} - -TemplateCacheDirEntry* TemplateCache::GetDirEntry( const String& rPath ) -{ - TemplateCacheDirEntry* pDir = m_aDirs.GetCurObject(); - if( pDir && pDir->m_aPath == rPath ) - return pDir; - - for( pDir = m_aDirs.First(); pDir; pDir = m_aDirs.Next() ) - { - if( pDir->m_aPath == rPath ) - return pDir; - } - - return NULL; -} - -TemplateCacheInfo* TemplateCache::GetFileInfo( const String& rPath ) -{ - INetURLObject aUrl( rPath ); - String aPath( aUrl.GetPath() ); - String aName( aUrl.GetName( INetURLObject::DECODE_UNAMBIGUOUS ) ); - - DBG_ASSERT( aUrl.GetProtocol() != INET_PROT_NOT_VALID, "invalid URL" ); - - TemplateCacheDirEntry* pDir = GetDirEntry( aPath ); - - if( NULL != pDir ) - { - for( TemplateCacheInfo* pEntry = pDir->m_aFiles.First(); pEntry; pEntry = pDir->m_aFiles.Next() ) - { - if( pEntry->GetFile() == aName ) - return pEntry; - } - } - - return NULL; -} - -TemplateCacheInfo* TemplateCache::AddFileInfo( const String& rPath ) -{ - INetURLObject aUrl( rPath ); - String aPath( aUrl.GetPath() ); - String aName( aUrl.GetName( INetURLObject::DECODE_UNAMBIGUOUS ) ); - - DBG_ASSERT( aUrl.GetProtocol() != INET_PROT_NOT_VALID, "invalid URL" ); - - TemplateCacheDirEntry* pDir = GetDirEntry( aPath ); - TemplateCacheInfo* pEntry = NULL; - - if( pDir == NULL ) - { - pDir = new TemplateCacheDirEntry(); - pDir->m_aPath = aPath; - m_aDirs.Insert(pDir); - } - - if( NULL != pDir ) - { - for( pEntry = pDir->m_aFiles.First(); pEntry; pEntry = pDir->m_aFiles.Next() ) - { - if( pEntry->GetFile() == aName) - return pEntry; - } - - pEntry = new TemplateCacheInfo(); - pEntry->SetFile( aName ); - pDir->m_aFiles.Insert(pEntry); - } - - return pEntry; -} - -BOOL TemplateCache::ClearInvalidEntrys() -{ - BOOL bModified = FALSE; - - for( TemplateCacheDirEntry* pDir = m_aDirs.First(); pDir; pDir = m_aDirs.Next() ) - { - for( TemplateCacheInfo* pEntry = pDir->m_aFiles.First(); pEntry; pEntry = pDir->m_aFiles.Next() ) - { - if(!pEntry->IsValid()) - { - pDir->m_aFiles.Remove(pEntry); - delete pEntry; - bModified = TRUE; - } - else if( pEntry->IsModified() ) - { - bModified = TRUE; - } - } - - if( pDir->m_aFiles.Count() == 0 ) - { - m_aDirs.Remove(pDir); - delete pDir; - } - } - - return bModified; -} - - diff --git a/sd/source/ui/dlg/dlgassim.hxx b/sd/source/ui/dlg/dlgassim.hxx index dc3e7f636e8d..35bbd41de448 100644 --- a/sd/source/ui/dlg/dlgassim.hxx +++ b/sd/source/ui/dlg/dlgassim.hxx @@ -56,37 +56,7 @@ public: }; -class TemplateCacheInfo -{ -private: - DateTime m_aDateTime; - String m_aFile; - BOOL m_bImpress; - BOOL m_bValid; - BOOL m_bModified; - -public: - TemplateCacheInfo(); - TemplateCacheInfo( const String& rFile, const DateTime& rDateTime, BOOL bImpress ); - - BOOL IsValid() const { return m_bValid; } - void SetValid( BOOL bValid = TRUE ) { m_bValid = bValid; } - - BOOL IsImpress() const { return m_bImpress; } - void SetImpress( BOOL bImpress = TRUE ) { m_bImpress = bImpress; } - - const String& GetFile() const { return m_aFile; } - void SetFile( const String& rFile ) { m_aFile = rFile; } - - const DateTime& GetDateTime() const { return m_aDateTime; } - void SetDateTime( const DateTime& rDateTime ) { m_aDateTime = rDateTime; } - - BOOL IsModified() const { return m_bModified; } - void SetModified( BOOL bModified = TRUE ) { m_bModified = bModified; } - - friend SvStream& operator >> (SvStream& rIn, TemplateCacheInfo& rInfo); - friend SvStream& operator << (SvStream& rOut, const TemplateCacheInfo& rInfo); -}; +class TemplateCacheInfo; DECLARE_LIST( TemplateCacheInfoList, TemplateCacheInfo * ) @@ -98,22 +68,3 @@ public: }; DECLARE_LIST( TemplateCacheDirEntryList, TemplateCacheDirEntry * ) - -class TemplateCache -{ -private: - TemplateCacheDirEntryList m_aDirs; - TemplateCacheDirEntry* GetDirEntry( const String& rPath ); - void Clear(); -public: - TemplateCache(); - ~TemplateCache(); - - void Load(); - void Save(); - - TemplateCacheInfo* GetFileInfo( const String& rPath ); - TemplateCacheInfo* AddFileInfo( const String& rPath ); - - BOOL ClearInvalidEntrys(); -}; diff --git a/sd/source/ui/dlg/dlgctrls.cxx b/sd/source/ui/dlg/dlgctrls.cxx index 14c1209875ef..1a5a612d37ad 100644 --- a/sd/source/ui/dlg/dlgctrls.cxx +++ b/sd/source/ui/dlg/dlgctrls.cxx @@ -51,12 +51,6 @@ FadeEffectLB::FadeEffectLB( Window* pParent, SdResId Id ) { } -FadeEffectLB::FadeEffectLB( Window* pParent, WinBits aWB ) -: ListBox( pParent, aWB ), - mpImpl( new FadeEffectLBImpl ) -{ -} - FadeEffectLB::~FadeEffectLB() { delete mpImpl; diff --git a/sd/source/ui/dlg/dlgsnap.cxx b/sd/source/ui/dlg/dlgsnap.cxx old mode 100644 new mode 100755 index 2b78a649eaef..6cd220d5a5bc --- a/sd/source/ui/dlg/dlgsnap.cxx +++ b/sd/source/ui/dlg/dlgsnap.cxx @@ -96,27 +96,35 @@ SdSnapLineDlg::SdSnapLineDlg( DBG_ASSERT( pPool, "Wo ist der Pool?" ); SfxMapUnit ePoolUnit = pPool->GetMetric( SID_ATTR_FILL_HATCH ); - // Hier werden die Max- und MinWerte in Ahaengigkeit von der + // #i48497# Consider page origin + SdrPageView* pPV = pView->GetSdrPageView(); + Point aLeftTop(aWorkArea.Left()+1, aWorkArea.Top()+1); + pPV->LogicToPagePos(aLeftTop); + Point aRightBottom(aWorkArea.Right()-2, aWorkArea.Bottom()-2); + pPV->LogicToPagePos(aRightBottom); + + // Hier werden die Max- und MinWerte in Abhaengigkeit von der // WorkArea, PoolUnit und der FieldUnit: - SetMetricValue( aMtrFldX, aWorkArea.Left(), ePoolUnit ); + SetMetricValue( aMtrFldX, aLeftTop.X(), ePoolUnit ); + long nValue = static_cast(aMtrFldX.GetValue()); nValue = Fraction( nValue ) / aUIScale; aMtrFldX.SetMin( nValue ); aMtrFldX.SetFirst( nValue ); - SetMetricValue( aMtrFldX, aWorkArea.Right()+1, ePoolUnit ); + SetMetricValue( aMtrFldX, aRightBottom.X(), ePoolUnit ); nValue = static_cast(aMtrFldX.GetValue()); nValue = Fraction( nValue ) / aUIScale; aMtrFldX.SetMax( nValue ); aMtrFldX.SetLast( nValue ); - SetMetricValue( aMtrFldY, aWorkArea.Top(), ePoolUnit ); + SetMetricValue( aMtrFldY, aLeftTop.Y(), ePoolUnit ); nValue = static_cast(aMtrFldY.GetValue()); nValue = Fraction( nValue ) / aUIScale; aMtrFldY.SetMin( nValue ); aMtrFldY.SetFirst( nValue ); - SetMetricValue( aMtrFldY, aWorkArea.Bottom()+1, ePoolUnit ); + SetMetricValue( aMtrFldY, aRightBottom.Y(), ePoolUnit ); nValue = static_cast(aMtrFldY.GetValue()); nValue = Fraction( nValue ) / aUIScale; aMtrFldY.SetMax( nValue ); diff --git a/sd/source/ui/dlg/docprev.cxx b/sd/source/ui/dlg/docprev.cxx index 71a7145425b7..a42ce43a2c6d 100644 --- a/sd/source/ui/dlg/docprev.cxx +++ b/sd/source/ui/dlg/docprev.cxx @@ -45,7 +45,6 @@ #include "DrawDocShell.hxx" #include "ViewShell.hxx" #include "ViewShellBase.hxx" -#include "showview.hxx" #include "drawview.hxx" #include "sdpage.hxx" #include "sfx2/viewfrm.hxx" @@ -81,17 +80,6 @@ SdDocPreviewWin::SdDocPreviewWin( Window* pParent, const ResId& rResId ) SetBackground( aEmpty ); } -SdDocPreviewWin::SdDocPreviewWin( Window* pParent ) -: Control(pParent, 0 ), pMetaFile( 0 ), bInEffect(FALSE), mpObj(NULL), mnShowPage(0) -{ - SetBorderStyle( WINDOW_BORDER_MONO ); - svtools::ColorConfig aColorConfig; - Wallpaper aEmpty; - SetBackground( aEmpty ); - Resize(); - Show(); -} - SdDocPreviewWin::~SdDocPreviewWin() { delete pMetaFile; @@ -104,13 +92,6 @@ void SdDocPreviewWin::Resize() mxSlideShow->resize( GetSizePixel() ); } -void SdDocPreviewWin::SetGDIFile( GDIMetaFile* pFile ) -{ - delete pMetaFile; - pMetaFile = pFile; - Invalidate(); -} - void SdDocPreviewWin::CalcSizeAndPos( GDIMetaFile* pFile, Size& rSize, Point& rPoint ) { Size aTmpSize = pFile ? pFile->GetPrefSize() : Size(1,1 ); diff --git a/sd/source/ui/dlg/filedlg.cxx b/sd/source/ui/dlg/filedlg.cxx index 182c70954111..71fad02f24a7 100644 --- a/sd/source/ui/dlg/filedlg.cxx +++ b/sd/source/ui/dlg/filedlg.cxx @@ -69,7 +69,6 @@ private: using sfx2::FileDialogHelper::Execute; #endif - friend class SdExportFileDialog; friend class SdOpenSoundFileDialog; css::uno::Reference< css::ui::dialogs::XFilePickerControlAccess > mxControlAccess; @@ -95,8 +94,6 @@ public: // overwritten from FileDialogHelper, to receive user feedback virtual void SAL_CALL ControlStateChanged( const css::ui::dialogs::FilePickerEvent& aEvent ); - - sal_Bool SelectionBoxState() const; }; // ------------------------------------------------------------------------ @@ -313,91 +310,6 @@ ErrCode SdFileDialog_Imp::Execute() return FileDialogHelper::Execute(); } -// ------------------------------------------------------------------------ -sal_Bool SdFileDialog_Imp::SelectionBoxState() const -{ - if ( !mbUsableSelection || !mxControlAccess.is() ) - return sal_False; - - sal_Bool bState(0); - try - { - mxControlAccess->getValue( css::ui::dialogs::ExtendedFilePickerElementIds::CHECKBOX_SELECTION, 0 ) >>= bState; - } - catch( css::lang::IllegalArgumentException ) - { -#ifdef DBG_UTIL - DBG_ERROR( "Cannot access \"selection\" checkbox" ); -#endif - } - - return bState; -} - - -// -------------------------------------------------------------------- -// ----------- SdExportFileDialog --------------------------- -// -------------------------------------------------------------------- - -// these are simple forwarders -SdExportFileDialog::SdExportFileDialog(BOOL bHaveCheckbox) : - mpImpl( new SdFileDialog_Imp( css::ui::dialogs::TemplateDescription::FILESAVE_AUTOEXTENSION_SELECTION, - bHaveCheckbox ) ) -{ - // setup filter - const String aHTMLFilter( SdResId( STR_EXPORT_HTML_NAME ) ); - GraphicFilter* pFilter = GraphicFilter::GetGraphicFilter(); - const USHORT nFilterCount = pFilter->GetExportFormatCount(); - - // add HTML filter - mpImpl->AddFilter( aHTMLFilter, String( SdResId( STR_EXPORT_HTML_FILTER ) ) ); - - // add other graphic filters - for ( USHORT i = 0; i < nFilterCount; i++ ) - { - mpImpl->AddFilter( pFilter->GetExportFormatName( i ), - pFilter->GetExportWildcard( i ) ); - } - - // set dialog title - mpImpl->SetTitle( String( SdResId( STR_EXPORT_DIALOG_TITLE ) ) ); -} - -// ------------------------------------------------------------------------ -SdExportFileDialog::~SdExportFileDialog() -{ -} - -// ------------------------------------------------------------------------ -ErrCode SdExportFileDialog::Execute() -{ - return mpImpl->Execute(); -} - -String SdExportFileDialog::GetPath() const -{ - return mpImpl->GetPath(); -} - -// ------------------------------------------------------------------------ -void SdExportFileDialog::SetPath( const String& rPath ) -{ - mpImpl->SetDisplayDirectory( rPath ); -} - -// ------------------------------------------------------------------------ -String SdExportFileDialog::ReqCurrentFilter() const -{ - return mpImpl->GetCurrentFilter(); -} - -// ------------------------------------------------------------------------ -BOOL SdExportFileDialog::IsExportSelection() const -{ - return mpImpl->SelectionBoxState(); -} - - // -------------------------------------------------------------------- // ----------- SdOpenSoundFileDialog ----------------------- // -------------------------------------------------------------------- diff --git a/sd/source/ui/dlg/headerfooterdlg.cxx b/sd/source/ui/dlg/headerfooterdlg.cxx index 294e61f3fe40..b48a1682bba6 100644 --- a/sd/source/ui/dlg/headerfooterdlg.cxx +++ b/sd/source/ui/dlg/headerfooterdlg.cxx @@ -291,12 +291,6 @@ HeaderFooterDialog::~HeaderFooterDialog() // ----------------------------------------------------------------------- -void HeaderFooterDialog::initTabPages() -{ -} - -// ----------------------------------------------------------------------- - IMPL_LINK( HeaderFooterDialog, ActivatePageHdl, TabControl *, pTabCtrl ) { const USHORT nId = pTabCtrl->GetCurPageId(); diff --git a/sd/source/ui/dlg/inspagob.cxx b/sd/source/ui/dlg/inspagob.cxx index f16e90dd7791..5d260367f383 100644 --- a/sd/source/ui/dlg/inspagob.cxx +++ b/sd/source/ui/dlg/inspagob.cxx @@ -142,7 +142,6 @@ List* SdInsertPagesObjsDlg::GetList( USHORT nType ) // wird das gesamte Dokument (und nicht mehr!) eingefuegt. if( aLbTree.GetSelectionCount() == 0 || ( aLbTree.IsSelected( aLbTree.First() ) ) ) - //return( aLbTree.GetBookmarkList( nType ) ); return( NULL ); // #37350# } return( aLbTree.GetSelectEntryList( nType ) ); diff --git a/sd/source/ui/dlg/prntopts.cxx b/sd/source/ui/dlg/prntopts.cxx index ea7a702e539e..3c9aad38c332 100644 --- a/sd/source/ui/dlg/prntopts.cxx +++ b/sd/source/ui/dlg/prntopts.cxx @@ -41,15 +41,6 @@ #include "app.hrc" #include #include -// STATIC DATA ----------------------------------------------------------- - -static USHORT pPrintOptRanges[] = -{ - ATTR_OPTIONS_PRINT, - ATTR_OPTIONS_PRINT, - 0 -}; - /************************************************************************* |* @@ -236,13 +227,6 @@ SfxTabPage* SdPrintOptions::Create( Window* pWindow, //----------------------------------------------------------------------- -USHORT* SdPrintOptions::GetRanges() -{ - return pPrintOptRanges; -} - -//----------------------------------------------------------------------- - IMPL_LINK( SdPrintOptions, ClickCheckboxHdl, CheckBox *, pCbx ) { // there must be at least one of them checked diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx index 9dbf8e22629c..d44d99ed3c64 100644 --- a/sd/source/ui/dlg/sdtreelb.cxx +++ b/sd/source/ui/dlg/sdtreelb.cxx @@ -728,61 +728,6 @@ List* SdPageObjsTLB::GetSelectEntryList( USHORT nDepth ) return( pList ); } -/************************************************************************* -|* -|* Alle Pages (und Objekte) des Docs zurueckgeben -|* nType == 0 -> Seiten -|* nType == 1 -> Objekte -|* -\************************************************************************/ - -List* SdPageObjsTLB::GetBookmarkList( USHORT nType ) -{ - List* pList = NULL; - - if( GetBookmarkDoc() ) - { - SdPage* pPage = NULL; - String* pName = NULL; - USHORT nPage = 0; - const USHORT nMaxPages = mpBookmarkDoc->GetSdPageCount( PK_STANDARD ); - - while( nPage < nMaxPages ) - { - pPage = mpBookmarkDoc->GetSdPage( nPage, PK_STANDARD ); - - if( nType == 0 ) // Seitennamen einfuegen - { - if( !pList ) - pList = new List(); - - pName = new String( pPage->GetRealName() ); - pList->Insert( pName, LIST_APPEND ); - } - else // Objektnamen einfuegen - { - // Ueber Objekte der Seite iterieren - SdrObjListIter aIter( *pPage, IM_DEEPWITHGROUPS ); - while( aIter.IsMore() ) - { - SdrObject* pObj = aIter.Next(); - String aStr( GetObjectName( pObj ) ); - if( aStr.Len() ) - { - if( !pList ) - pList = new List(); - - pName = new String( aStr ); - pList->Insert( pName, LIST_APPEND ); - } - } - } - nPage++; - } - } - return( pList ); -} - /************************************************************************* |* |* Eintraege werden erst auf Anforderung (Doppelklick) eingefuegt diff --git a/sd/source/ui/dlg/tpaction.cxx b/sd/source/ui/dlg/tpaction.cxx index ebe0243f7d99..af2668fc9dad 100644 --- a/sd/source/ui/dlg/tpaction.cxx +++ b/sd/source/ui/dlg/tpaction.cxx @@ -86,15 +86,6 @@ using namespace ::com::sun::star; using namespace com::sun::star::uno; using namespace com::sun::star::lang; -static USHORT pActionRanges[] = -{ - ATTR_ANIMATION_TRANSPCOLOR, - ATTR_ANIMATION_TRANSPCOLOR, - ATTR_ACTION_START, - ATTR_ACTION_END, - 0 -}; - #define DOCUMENT_TOKEN (sal_Unicode('#')) /************************************************************************* @@ -423,13 +414,6 @@ SfxTabPage* SdTPAction::Create( Window* pWindow, //------------------------------------------------------------------------ -USHORT* SdTPAction::GetRanges() -{ - return( pActionRanges ); -} - -//------------------------------------------------------------------------ - void SdTPAction::UpdateTree() { if( !bTreeUpdated && mpDoc && mpDoc->GetDocSh() && mpDoc->GetDocSh()->GetMedium() ) @@ -849,35 +833,6 @@ void SdTPAction::SetEditText( String const & rStr ) } } -String SdTPAction::GetMacroName( const String& rMacroPath ) -{ - String result = rMacroPath; - - // try to get name by parsing the macro path - // using the new URI parsing services - - Reference< XMultiServiceFactory > xSMgr = - ::comphelper::getProcessServiceFactory(); - - Reference< com::sun::star::uri::XUriReferenceFactory > - xFactory( xSMgr->createInstance( - ::rtl::OUString::createFromAscii( - "com.sun.star.uri.UriReferenceFactory" ) ), UNO_QUERY ); - - if ( xFactory.is() ) - { - Reference< com::sun::star::uri::XVndSunStarScriptUrl > - xUrl( xFactory->parse( rMacroPath ), UNO_QUERY ); - - if ( xUrl.is() ) - { - result = xUrl->getName(); - } - } - - return result; -} - //------------------------------------------------------------------------ String SdTPAction::GetEditText( BOOL bFullDocDestination ) diff --git a/sd/source/ui/docshell/docshel4.cxx b/sd/source/ui/docshell/docshel4.cxx index 29218a7b985a..a033661e7c85 100644 --- a/sd/source/ui/docshell/docshel4.cxx +++ b/sd/source/ui/docshell/docshel4.cxx @@ -312,18 +312,6 @@ BOOL DrawDocShell::InitNew( const ::com::sun::star::uno::Reference< ::com::sun:: |* \************************************************************************/ -sal_Bool DrawDocShell::IsNewDocument() const -{ - return( mbNewDocument && - ( !GetMedium() || GetMedium()->GetURLObject().GetProtocol() == INET_PROT_NOT_VALID ) ); -} - -/************************************************************************* -|* -|* Load: Pools und Dokument laden -|* -\************************************************************************/ - BOOL DrawDocShell::Load( SfxMedium& rMedium ) { mbNewDocument = sal_False; diff --git a/sd/source/ui/docshell/docshell.cxx b/sd/source/ui/docshell/docshell.cxx index f284651b91e5..78b1b9434ad0 100644 --- a/sd/source/ui/docshell/docshell.cxx +++ b/sd/source/ui/docshell/docshell.cxx @@ -548,21 +548,6 @@ void DrawDocShell::SetModified( BOOL bSet /* = TRUE */ ) } } -::Window* DrawDocShell::GetWindow() const -{ - SfxViewFrame* pFrame = GetFrame(); - if( pFrame == NULL ) - pFrame = SfxViewFrame::GetFirst( this ); - - if( pFrame ) - return &(pFrame->GetWindow()); - else - { - DBG_ASSERT( 0, "No active window for DrawDocShell found! (next gpf is caused by this assertion)" ); - return NULL; - } -} - /************************************************************************* |* |* Callback fuer ExecuteSpellPopup() diff --git a/sd/source/ui/framework/configuration/ConfigurationClassifier.cxx b/sd/source/ui/framework/configuration/ConfigurationClassifier.cxx index c8256bc2c0a6..55e22361ad3a 100644 --- a/sd/source/ui/framework/configuration/ConfigurationClassifier.cxx +++ b/sd/source/ui/framework/configuration/ConfigurationClassifier.cxx @@ -87,15 +87,12 @@ const ConfigurationClassifier::ResourceIdVector& ConfigurationClassifier::GetC2m - const ConfigurationClassifier::ResourceIdVector& ConfigurationClassifier::GetC1andC2 (void) const { return maC1andC2; } - - void ConfigurationClassifier::PartitionResources ( const ::com::sun::star::uno::Sequence >& rS1, const ::com::sun::star::uno::Sequence >& rS2) @@ -222,8 +219,6 @@ void ConfigurationClassifier::CopyResources ( } - - void ConfigurationClassifier::TraceResourceIdVector ( const sal_Char* pMessage, const ResourceIdVector& rResources) const @@ -240,6 +235,4 @@ void ConfigurationClassifier::TraceResourceIdVector ( } - - } } // end of namespace sd::framework diff --git a/sd/source/ui/framework/configuration/ConfigurationController.cxx b/sd/source/ui/framework/configuration/ConfigurationController.cxx index 68bf55bb7495..99b8b8fc5278 100644 --- a/sd/source/ui/framework/configuration/ConfigurationController.cxx +++ b/sd/source/ui/framework/configuration/ConfigurationController.cxx @@ -101,8 +101,6 @@ public: const Reference& rxController); ~Implementation (void); - void Initialize (const Reference& rxController); - Reference mxControllerManager; /** The Broadcaster class implements storing and calling of listeners. @@ -119,8 +117,6 @@ public: ViewShellBase* mpBase; - bool mbIsInitialized; - ::boost::shared_ptr mpResourceFactoryContainer; ::boost::shared_ptr mpResourceManager; @@ -705,7 +701,6 @@ ConfigurationController::Implementation::Implementation ( mpBroadcaster(new ConfigurationControllerBroadcaster(&rController)), mxRequestedConfiguration(new Configuration(&rController, true)), mpBase(NULL), - mbIsInitialized(false), mpResourceFactoryContainer(new ResourceFactoryManager(mxControllerManager)), mpResourceManager( new ConfigurationControllerResourceManager(mpResourceFactoryContainer,mpBroadcaster)), @@ -721,27 +716,6 @@ ConfigurationController::Implementation::Implementation ( -void ConfigurationController::Implementation::Initialize ( - const Reference& rxController) -{ - mxControllerManager = Reference(rxController, UNO_QUERY_THROW); - - mpConfigurationUpdater->SetControllerManager(mxControllerManager); - - // Tunnel through the controller to obtain a ViewShellBase. - Reference xTunnel (rxController, UNO_QUERY_THROW); - if (xTunnel.is()) - { - ::sd::DrawController* pController = reinterpret_cast( - xTunnel->getSomething(sd::DrawController::getUnoTunnelId())); - if (pController != NULL) - mpBase = pController->GetViewShellBase(); - } -} - - - - ConfigurationController::Implementation::~Implementation (void) { } diff --git a/sd/source/ui/framework/configuration/ConfigurationTracer.cxx b/sd/source/ui/framework/configuration/ConfigurationTracer.cxx index 63e45f8bb110..1781f6e038f4 100644 --- a/sd/source/ui/framework/configuration/ConfigurationTracer.cxx +++ b/sd/source/ui/framework/configuration/ConfigurationTracer.cxx @@ -60,12 +60,12 @@ void ConfigurationTracer::TraceConfiguration ( +#ifdef DEBUG void ConfigurationTracer::TraceBoundResources ( const Reference& rxConfiguration, const Reference& rxResourceId, const int nIndentation) { -#ifdef DEBUG Sequence > aResourceList ( rxConfiguration->getResources(rxResourceId, ::rtl::OUString(), AnchorBindingMode_DIRECT)); const ::rtl::OUString sIndentation (::rtl::OUString::createFromAscii(" ")); @@ -77,11 +77,7 @@ void ConfigurationTracer::TraceBoundResources ( OSL_TRACE("%s\n", OUStringToOString(sLine, RTL_TEXTENCODING_UTF8).getStr()); TraceBoundResources(rxConfiguration, aResourceList[nIndex], nIndentation+1); } -#else - (void)rxConfiguration; - (void)rxResourceId; - (void)nIndentation; -#endif } +#endif } } // end of namespace sd::framework diff --git a/sd/source/ui/framework/configuration/ConfigurationTracer.hxx b/sd/source/ui/framework/configuration/ConfigurationTracer.hxx index 8a789a051584..b04206fd65e1 100644 --- a/sd/source/ui/framework/configuration/ConfigurationTracer.hxx +++ b/sd/source/ui/framework/configuration/ConfigurationTracer.hxx @@ -32,7 +32,6 @@ namespace sd { namespace framework { - /** Print debug information about configurations to the standard error output channel. */ @@ -43,13 +42,14 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::framework::XConfiguration>& rxConfiguration, const char* pMessage); - +#ifdef DEBUG static void TraceBoundResources ( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::framework::XConfiguration>& rxConfiguration, const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::framework::XResourceId>& rxResourceId, const int nIndentation); +#endif }; } } // end of namespace sd::framework diff --git a/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx b/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx index 5db5cb436739..50a68706745d 100644 --- a/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx +++ b/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx @@ -162,14 +162,6 @@ Reference ConfigurationUpdater::GetCurrentConfiguration (void) c -Reference ConfigurationUpdater::GetRequestedConfiguration (void) const -{ - return mxRequestedConfiguration; -} - - - - bool ConfigurationUpdater::IsUpdatePossible (void) { return ! mbUpdateBeingProcessed diff --git a/sd/source/ui/framework/configuration/ConfigurationUpdater.hxx b/sd/source/ui/framework/configuration/ConfigurationUpdater.hxx index 87c92be5e5c4..a9f3e09f2a64 100644 --- a/sd/source/ui/framework/configuration/ConfigurationUpdater.hxx +++ b/sd/source/ui/framework/configuration/ConfigurationUpdater.hxx @@ -84,9 +84,6 @@ public: css::uno::Reference< css::drawing::framework::XConfiguration> GetCurrentConfiguration (void) const; - css::uno::Reference< - css::drawing::framework::XConfiguration> GetRequestedConfiguration (void) const; - friend class ConfigurationUpdaterLock; /** Return a lock of the called ConfigurationUpdater. While the returned object exists no update of the current configuration is diff --git a/sd/source/ui/framework/configuration/ResourceId.cxx b/sd/source/ui/framework/configuration/ResourceId.cxx index 32894411547a..15d7c3a6f4ec 100644 --- a/sd/source/ui/framework/configuration/ResourceId.cxx +++ b/sd/source/ui/framework/configuration/ResourceId.cxx @@ -592,17 +592,6 @@ bool ResourceId::IsBoundToAnchor ( -bool ResourceId::IsValid (void) const -{ - return maResourceURLs.size() == 0 - || maResourceURLs[0].getLength()>0 - || maResourceURLs.size() == 1; - -} - - - - void ResourceId::ParseResourceURL (void) { ::osl::Guard< ::osl::Mutex > aGuard (::osl::Mutex::getGlobalMutex()); diff --git a/sd/source/ui/framework/factories/BasicPaneFactory.cxx b/sd/source/ui/framework/factories/BasicPaneFactory.cxx index 969844f7650d..5ee2ae9433d4 100644 --- a/sd/source/ui/framework/factories/BasicPaneFactory.cxx +++ b/sd/source/ui/framework/factories/BasicPaneFactory.cxx @@ -551,32 +551,6 @@ Reference BasicPaneFactory::CreateChildWindowPane ( return xPane; } - - - -bool BasicPaneFactory::IsBoundToChildWindow (const Reference& rxResourceId) const -{ - if ( ! rxResourceId.is()) - return false; - - Reference xAnchorId (rxResourceId->getAnchor()); - if ( ! xAnchorId.is()) - return false; - - const OUString sAnchorURL (xAnchorId->getResourceURL()); - if (sAnchorURL == FrameworkHelper::msLeftImpressPaneURL) - return true; - else if (sAnchorURL == FrameworkHelper::msLeftDrawPaneURL) - return true; - else if (sAnchorURL == FrameworkHelper::msRightPaneURL) - return true; - else - return false; -} - - - - void BasicPaneFactory::ThrowIfDisposed (void) const throw (lang::DisposedException) { diff --git a/sd/source/ui/framework/factories/BasicPaneFactory.hxx b/sd/source/ui/framework/factories/BasicPaneFactory.hxx index 1f442656d1d9..891845a5a1aa 100644 --- a/sd/source/ui/framework/factories/BasicPaneFactory.hxx +++ b/sd/source/ui/framework/factories/BasicPaneFactory.hxx @@ -159,12 +159,6 @@ private: css::drawing::framework::XResourceId>& rxPaneId, const PaneDescriptor& rDescriptor); - /** Return when the specified resource is bound to one of the - child windows. - */ - bool IsBoundToChildWindow ( - const css::uno::Reference& rxResourceId) const; - void ThrowIfDisposed (void) const throw (css::lang::DisposedException); }; diff --git a/sd/source/ui/framework/factories/TaskPanelFactory.cxx b/sd/source/ui/framework/factories/TaskPanelFactory.cxx index 8942833d2483..19eb50d67f0d 100644 --- a/sd/source/ui/framework/factories/TaskPanelFactory.cxx +++ b/sd/source/ui/framework/factories/TaskPanelFactory.cxx @@ -267,23 +267,6 @@ void SAL_CALL TaskPanelFactory::releaseResource ( -//============================================================================= - -void TaskPanelFactory::ThrowIfDisposed (void) const - throw (lang::DisposedException) -{ - if (rBHelper.bDisposed || rBHelper.bInDispose) - { - throw lang::DisposedException ( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( - "TaskPanelFactory object has already been disposed")), - const_cast(static_cast(this))); - } -} - - - - //===== ToolPanelResource ===================================================== namespace { diff --git a/sd/source/ui/framework/factories/TaskPanelFactory.hxx b/sd/source/ui/framework/factories/TaskPanelFactory.hxx index 1130a106a56c..70550bd45bee 100644 --- a/sd/source/ui/framework/factories/TaskPanelFactory.hxx +++ b/sd/source/ui/framework/factories/TaskPanelFactory.hxx @@ -89,8 +89,6 @@ public: private: ViewShellBase* mpViewShellBase; - - void ThrowIfDisposed (void) const throw (css::lang::DisposedException); }; } } // end of namespace sd::framework diff --git a/sd/source/ui/framework/factories/ViewShellWrapper.cxx b/sd/source/ui/framework/factories/ViewShellWrapper.cxx index 0a3aeccade7c..04b730e75581 100644 --- a/sd/source/ui/framework/factories/ViewShellWrapper.cxx +++ b/sd/source/ui/framework/factories/ViewShellWrapper.cxx @@ -101,14 +101,6 @@ void SAL_CALL ViewShellWrapper::disposing (void) -bool ViewShellWrapper::IsUnique (void) -{ - return m_refCount==1; -} - - - - //----- XResource ------------------------------------------------------------- Reference SAL_CALL ViewShellWrapper::getResourceId (void) diff --git a/sd/source/ui/framework/module/ReadOnlyModeObserver.cxx b/sd/source/ui/framework/module/ReadOnlyModeObserver.cxx index cf9b095072b1..090247e7f68c 100644 --- a/sd/source/ui/framework/module/ReadOnlyModeObserver.cxx +++ b/sd/source/ui/framework/module/ReadOnlyModeObserver.cxx @@ -145,17 +145,6 @@ void ReadOnlyModeObserver::AddStatusListener ( -void ReadOnlyModeObserver::RemoveStatusListener ( - const Reference& rxListener) -{ - mpBroadcaster->removeListener( - getCppuType((Reference*)NULL), - rxListener); -} - - - - bool ReadOnlyModeObserver::ConnectToDispatch (void) { if ( ! mxDispatch.is()) diff --git a/sd/source/ui/framework/module/ReadOnlyModeObserver.hxx b/sd/source/ui/framework/module/ReadOnlyModeObserver.hxx index f01649bdf8bd..d783d6d83abf 100644 --- a/sd/source/ui/framework/module/ReadOnlyModeObserver.hxx +++ b/sd/source/ui/framework/module/ReadOnlyModeObserver.hxx @@ -91,12 +91,6 @@ public: const ::com::sun::star::uno::Reference< com::sun::star::frame::XStatusListener>& rxListener); - /** Remove the given listener. - */ - void RemoveStatusListener ( - const ::com::sun::star::uno::Reference< - com::sun::star::frame::XStatusListener>& rxListener); - // XEventListener virtual void SAL_CALL disposing ( diff --git a/sd/source/ui/framework/module/ResourceManager.cxx b/sd/source/ui/framework/module/ResourceManager.cxx index 8f79ed41f24b..fcd90ca6454b 100644 --- a/sd/source/ui/framework/module/ResourceManager.cxx +++ b/sd/source/ui/framework/module/ResourceManager.cxx @@ -291,25 +291,4 @@ void SAL_CALL ResourceManager::disposing ( } } - - - -void ResourceManager::Trace (void) const -{ - OSL_TRACE("main views with resource %s:", - ::rtl::OUStringToOString( - FrameworkHelper::ResourceIdToString(mxResourceId), RTL_TEXTENCODING_UTF8).getStr()); - - MainViewContainer::const_iterator iDescriptor; - for (iDescriptor=mpActiveMainViewContainer->begin(); - iDescriptor!=mpActiveMainViewContainer->end(); - ++iDescriptor) - { - OSL_TRACE(" %s", - ::rtl::OUStringToOString(*iDescriptor, RTL_TEXTENCODING_UTF8).getStr()); - } -} - - - } } // end of namespace sd::framework diff --git a/sd/source/ui/framework/module/ResourceManager.hxx b/sd/source/ui/framework/module/ResourceManager.hxx index 23cb1ed7dd48..d00ee78c2de3 100644 --- a/sd/source/ui/framework/module/ResourceManager.hxx +++ b/sd/source/ui/framework/module/ResourceManager.hxx @@ -126,8 +126,6 @@ private: const ::com::sun::star::uno::Reference< com::sun::star::drawing::framework::XConfiguration>& rxConfiguration); void UpdateForMainViewShell (void); - - void Trace (void) const; }; } } // end of namespace sd::framework diff --git a/sd/source/ui/framework/tools/FrameworkHelper.cxx b/sd/source/ui/framework/tools/FrameworkHelper.cxx index 25790e736473..9edb584a9e29 100644 --- a/sd/source/ui/framework/tools/FrameworkHelper.cxx +++ b/sd/source/ui/framework/tools/FrameworkHelper.cxx @@ -982,28 +982,6 @@ void SAL_CALL FrameworkHelper::DisposeListener::disposing (const lang::EventObje -//----- DispatchCaller -------------------------------------------------------- - -DispatchCaller::DispatchCaller ( - SfxDispatcher& rDispatcher, - USHORT nSId) - : mrDispatcher(rDispatcher), - mnSId(nSId) -{ -} - - - - -void DispatchCaller::operator() (bool bEventSeen) -{ - (void)bEventSeen; - mrDispatcher.Execute(mnSId, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD); -} - - - - //===== FrameworkHelperResourceIdFilter ======================================= FrameworkHelperResourceIdFilter::FrameworkHelperResourceIdFilter ( diff --git a/sd/source/ui/func/fuconstr.cxx b/sd/source/ui/func/fuconstr.cxx index 26119b6a03b9..c0d8235e97fb 100644 --- a/sd/source/ui/func/fuconstr.cxx +++ b/sd/source/ui/func/fuconstr.cxx @@ -72,13 +72,6 @@ FuConstruct::FuConstruct ( { } -FunctionReference FuConstruct::Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ) -{ - FunctionReference xFunc( new FuConstruct( pViewSh, pWin, pView, pDoc, rReq ) ); - xFunc->DoExecute(rReq); - return xFunc; -} - void FuConstruct::DoExecute( SfxRequest& rReq ) { FuDraw::DoExecute( rReq ); diff --git a/sd/source/ui/func/fudraw.cxx b/sd/source/ui/func/fudraw.cxx index bbe13c114931..5cc3cc49ca88 100644 --- a/sd/source/ui/func/fudraw.cxx +++ b/sd/source/ui/func/fudraw.cxx @@ -99,14 +99,6 @@ FuDraw::FuDraw(ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, { } -FunctionReference FuDraw::Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq, bool bPermanent ) -{ - FuDraw* pFunc; - FunctionReference xFunc( pFunc = new FuDraw( pViewSh, pWin, pView, pDoc, rReq ) ); - pFunc->SetPermanent(bPermanent); - return xFunc; -} - /************************************************************************* |* |* Destruktor diff --git a/sd/source/ui/func/fuoutl.cxx b/sd/source/ui/func/fuoutl.cxx index 2bb056f55e42..c0ef53f144b3 100644 --- a/sd/source/ui/func/fuoutl.cxx +++ b/sd/source/ui/func/fuoutl.cxx @@ -60,12 +60,6 @@ FuOutline::FuOutline ( { } -FunctionReference FuOutline::Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ) -{ - FunctionReference xFunc( new FuOutline( pViewSh, pWin, pView, pDoc, rReq ) ); - return xFunc; -} - /************************************************************************* |* |* Command, weiterleiten an OutlinerView diff --git a/sd/source/ui/func/fupoor.cxx b/sd/source/ui/func/fupoor.cxx index bb6f6e7b6908..45c444da151f 100644 --- a/sd/source/ui/func/fupoor.cxx +++ b/sd/source/ui/func/fupoor.cxx @@ -244,16 +244,6 @@ IMPL_LINK_INLINE_START( FuPoor, ScrollHdl, Timer *, EMPTYARG ) } IMPL_LINK_INLINE_END( FuPoor, ScrollHdl, Timer *, pTimer ) -/************************************************************************* -|* -|* String in Applikations-Statuszeile ausgeben -|* -\************************************************************************/ - -void FuPoor::WriteStatus(const String& ) -{ -} - /************************************************************************* |* |* Tastaturereignisse bearbeiten @@ -1118,18 +1108,6 @@ void FuPoor::StartDelayToScrollTimer () aDelayToScrollTimer.Start (); } -/************************************************************************* -|* -|* Handler fuer Maustaste -|* -\************************************************************************/ - -long FuPoor::diffPoint (long pos1, long pos2) -{ - return (pos1 > pos2) ? pos1 - pos2 - : pos2 - pos1; -} - /************************************************************************* |* |* Help-event diff --git a/sd/source/ui/func/fusearch.cxx b/sd/source/ui/func/fusearch.cxx index 82007fe61893..04fcf124cc14 100644 --- a/sd/source/ui/func/fusearch.cxx +++ b/sd/source/ui/func/fusearch.cxx @@ -38,7 +38,6 @@ #include #include #include "fupoor.hxx" -#include "fuspell.hxx" // wegen SidArraySpell[] #ifndef SD_WINDOW_SHELL_HXX #include "Window.hxx" #endif @@ -55,6 +54,14 @@ class SfxRequest; namespace sd { +static USHORT SidArraySpell[] = { + SID_DRAWINGMODE, + SID_OUTLINEMODE, + SID_DIAMODE, + SID_NOTESMODE, + SID_HANDOUTMODE, + 0 }; + TYPEINIT1( FuSearch, FuPoor ); /************************************************************************* diff --git a/sd/source/ui/func/fuspell.cxx b/sd/source/ui/func/fuspell.cxx deleted file mode 100644 index 526efb0087e4..000000000000 --- a/sd/source/ui/func/fuspell.cxx +++ /dev/null @@ -1,166 +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. - * - ************************************************************************/ - -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_sd.hxx" - - -#include "fuspell.hxx" - -#include -#include - -#include -#include "fupoor.hxx" -#include "Outliner.hxx" -#include "drawdoc.hxx" -#include "DrawViewShell.hxx" -#include "OutlineViewShell.hxx" -#include "ViewShellBase.hxx" - -#include "app.hrc" - -class SfxRequest; - -namespace sd { - -USHORT SidArraySpell[] = { - SID_DRAWINGMODE, - SID_OUTLINEMODE, - SID_DIAMODE, - SID_NOTESMODE, - SID_HANDOUTMODE, - 0 }; - -TYPEINIT1( FuSpell, FuPoor ); - -/************************************************************************* -|* -|* Konstruktor -|* -\************************************************************************/ - -FuSpell::FuSpell ( - ViewShell* pViewSh, - ::sd::Window* pWin, - ::sd::View* pView, - SdDrawDocument* pDoc, - SfxRequest& rReq ) - : FuPoor(pViewSh, pWin, pView, pDoc, rReq), - pSdOutliner(NULL), - bOwnOutliner(FALSE) -{ -} - -FunctionReference FuSpell::Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ) -{ - FunctionReference xFunc( new FuSpell( pViewSh, pWin, pView, pDoc, rReq ) ); - xFunc->DoExecute(rReq); - return xFunc; -} - -void FuSpell::DoExecute( SfxRequest& ) -{ - mpViewShell->GetViewFrame()->GetBindings().Invalidate( SidArraySpell ); - - if ( mpViewShell->ISA(DrawViewShell) ) - { - bOwnOutliner = TRUE; - pSdOutliner = new ::sd::Outliner( mpDoc, OUTLINERMODE_TEXTOBJECT ); - } - else if ( mpViewShell->ISA(OutlineViewShell) ) - { - bOwnOutliner = FALSE; - pSdOutliner = mpDoc->GetOutliner(); - } - - if (pSdOutliner) - pSdOutliner->PrepareSpelling(); -} - - - -/************************************************************************* -|* -|* Destruktor -|* -\************************************************************************/ - -FuSpell::~FuSpell() -{ - mpDocSh->GetViewShell()->GetViewFrame()->GetBindings().Invalidate( SidArraySpell ); - - if (pSdOutliner) - pSdOutliner->EndSpelling(); - - if (bOwnOutliner) - delete pSdOutliner; -} - -/************************************************************************* -|* -|* Pruefung starten -|* -\************************************************************************/ - -void FuSpell::StartSpelling() -{ - // Get current main view shell. - ViewShellBase* pBase (ViewShellBase::GetViewShellBase ( - mpDocSh->GetViewShell()->GetViewFrame())); - if (pBase != NULL) - mpViewShell = pBase->GetMainViewShell().get(); - else - mpViewShell = NULL; - if (mpViewShell != NULL) - { - if ( pSdOutliner && mpViewShell->ISA(DrawViewShell) && !bOwnOutliner ) - { - pSdOutliner->EndSpelling(); - - bOwnOutliner = TRUE; - pSdOutliner = new ::sd::Outliner( mpDoc, OUTLINERMODE_TEXTOBJECT ); - pSdOutliner->PrepareSpelling(); - } - else if ( pSdOutliner && mpViewShell->ISA(OutlineViewShell) && bOwnOutliner ) - { - pSdOutliner->EndSpelling(); - delete pSdOutliner; - - bOwnOutliner = FALSE; - pSdOutliner = mpDoc->GetOutliner(); - pSdOutliner->PrepareSpelling(); - } - - if (pSdOutliner) - pSdOutliner->StartSpelling(); - } -} - - - -} // end of namespace sd diff --git a/sd/source/ui/func/futransf.cxx b/sd/source/ui/func/futransf.cxx index f62b1b087aee..31797f3c8a03 100644 --- a/sd/source/ui/func/futransf.cxx +++ b/sd/source/ui/func/futransf.cxx @@ -136,29 +136,4 @@ void FuTransform::DoExecute( SfxRequest& rReq ) } } -/************************************************************************* -|* -|* Function ResizeObject -|* -\************************************************************************/ - -Point FuTransform::GetPoint( Rectangle aRect, RECT_POINT eRP ) -{ - - switch( eRP ) - { - case RP_LT: return( Point( aRect.Left(), aRect.Top() ) ); - case RP_MT: return( Point( aRect.Center().X(), aRect.Top() ) ); - case RP_RT: return( Point( aRect.Right(), aRect.Top() ) ); - case RP_LM: return( Point( aRect.Left(), aRect.Center().Y() ) ); - case RP_MM: return( Point( aRect.Center().X(), aRect.Center().Y() ) ); - case RP_RM: return( Point( aRect.Right(), aRect.Center().Y() ) ); - case RP_LB: return( Point( aRect.Left(), aRect.Bottom() ) ); - case RP_MB: return( Point( aRect.Center().X(), aRect.Bottom() ) ); - case RP_RB: return( Point( aRect.Right(), aRect.Bottom() ) ); - } - return( Point ( 0, 0 ) ); // Sollte nicht vorkommen ! -} - - } // end of namespace sd diff --git a/sd/source/ui/func/makefile.mk b/sd/source/ui/func/makefile.mk index 9ec946325239..a7567c5c0ff2 100644 --- a/sd/source/ui/func/makefile.mk +++ b/sd/source/ui/func/makefile.mk @@ -84,7 +84,6 @@ SLOFILES = \ $(SLO)$/fuolbull.obj \ $(SLO)$/fucopy.obj \ $(SLO)$/fulink.obj \ - $(SLO)$/fuspell.obj \ $(SLO)$/futhes.obj \ $(SLO)$/fusearch.obj \ $(SLO)$/fuinsfil.obj \ @@ -98,7 +97,6 @@ SLOFILES = \ $(SLO)$/fumorph.obj \ $(SLO)$/fuexpand.obj \ $(SLO)$/fusumry.obj \ - $(SLO)$/outlinfo.obj \ $(SLO)$/fucushow.obj \ $(SLO)$/fuvect.obj \ $(SLO)$/bulmaper.obj \ @@ -173,7 +171,6 @@ LIB3OBJFILES= \ $(SLO)$/fumorph.obj \ $(SLO)$/fuexpand.obj \ $(SLO)$/fusumry.obj \ - $(SLO)$/outlinfo.obj \ $(SLO)$/fucushow.obj \ $(SLO)$/fuvect.obj \ $(SLO)$/bulmaper.obj \ diff --git a/sd/source/ui/func/outlinfo.cxx b/sd/source/ui/func/outlinfo.cxx deleted file mode 100644 index 0a52da329b20..000000000000 --- a/sd/source/ui/func/outlinfo.cxx +++ /dev/null @@ -1,301 +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. - * - ************************************************************************/ - -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_sd.hxx" - -#include -#include -#include -#include -#include -#include "drawdoc.hxx" -#include "outlinfo.hxx" -#include - -// #101500# -#include - -#ifndef _COM_SUN_STAR_I18N_SCRIPTTYPE_HDL_ -#include -#endif -#include -#include - -#ifndef _COM_SUN_STAR_I18N_CHARACTERITERATORMODE_HDL_ -#include -#endif -#include - -using namespace ::com::sun::star::uno; -using namespace ::com::sun::star::lang; -using namespace ::com::sun::star::i18n; - -// ---------------- -// - OutlinerInfo - -// ---------------- - -OutlinerInfo::OutlinerInfo() : - pParagraphs ( NULL ), - nParaCount ( 0UL ), - nExtraData ( 0L ) -{ -} - -// ----------------------------------------------------------------------------- - -OutlinerInfo::~OutlinerInfo() -{ - Clear(); -} - -// ----------------------------------------------------------------------------- - -void OutlinerInfo::SetTextObj( SdDrawDocument* pDoc, SdrRectObj* pObj, OutputDevice* pOut ) -{ - Clear(); - - SdrOutliner& rOutliner = pDoc->GetDrawOutliner(); - - mpOut = pOut; - rOutliner.SetText( *pObj->GetOutlinerParaObject() ); - - aObjBound = pObj->GetCurrentBoundRect(); - nParaCount = rOutliner.GetParagraphCount(); - nExtraData = 0L; - - if( nParaCount ) - { - mbVertical = rOutliner.IsVertical(); - pObj->TakeTextRect( rOutliner, aParaBound, TRUE ); - - if( IsVertical() ) - aTextOffset = aParaBound.TopRight(); - else - aTextOffset = aParaBound.TopLeft(); - - nCurPara = 0; - bInit = TRUE; - - rOutliner.SetDrawPortionHdl( LINK( this, OutlinerInfo, DrawPortionHdl ) ); - pParagraphs = new OutlinerParagraph[ nParaCount ]; - rOutliner.StripPortions(); - rOutliner.SetDrawPortionHdl( Link() ); - - if( 1 == nParaCount ) - pParagraphs[ 0 ].aRect = aParaBound; - else if( IsVertical() ) - { - pParagraphs[ 0 ].aRect.Right() = aParaBound.Right(); - - for( USHORT i = 0; i < nParaCount; i++ ) - { - if( i > 0 ) - pParagraphs[i].aRect.Right() = pParagraphs[ i - 1 ].aRect.Left(); - - pParagraphs[i].aRect.Left() = pParagraphs[i].aRect.Right() - rOutliner.GetTextHeight( i ); - } - } - else - { - pParagraphs[ 0 ].aRect.Top() = aParaBound.Top(); - - for( USHORT i = 0; i < nParaCount; i++ ) - { - if( i > 0 ) - pParagraphs[ i ].aRect.Top() = pParagraphs[ i - 1 ].aRect.Bottom(); - - pParagraphs[ i ].aRect.Bottom() = pParagraphs[ i ].aRect.Top() + rOutliner.GetTextHeight( i ); - } - } - } - else - { - pParagraphs = NULL; - aParaBound = Rectangle(); - aTextOffset = Point(); - } - - nCurPara = 0; - bInit = FALSE; -} - -// ----------------------------------------------------------------------------- - -void OutlinerInfo::Clear() -{ - for( void* pChar = aCharacterList.First(); pChar; pChar = aCharacterList.Next() ) - delete (OutlinerCharacter*) pChar; - aCharacterList.Clear(); - - delete[] pParagraphs; - pParagraphs = NULL; - - nCurPara = nParaCount = 0UL; - aObjBound = aParaBound = Rectangle(); - aTextOffset = Point(); -} - -// ----------------------------------------------------------------------------- - -const Rectangle& OutlinerInfo::GetParaRect( const ULONG nPara ) const -{ - DBG_ASSERT( nPara < nParaCount, "Para out of range!" ); - return pParagraphs[ nPara ].aRect; -} - -// ----------------------------------------------------------------------------- - -BOOL OutlinerInfo::GetParaCharCount( const ULONG nPara ) const -{ - DBG_ASSERT( nPara < nParaCount, "Para out of range!" ); - return (0 != pParagraphs[ nPara ].nCharCount); -} - -// ----------------------------------------------------------------------------- - -IMPL_LINK(OutlinerInfo, DrawPortionHdl, DrawPortionInfo*, pInfo) -{ - // #101500# - Point aStart; - sal_Bool bIsVertical(IsVertical()); - mpOut->SetFont((const Font&)pInfo->mrFont); - FontMetric aFontMetric(mpOut->GetFontMetric()); - sal_Bool bUseBreakIterator(sal_False); - - // initialize BreakIterator - Reference < com::sun::star::i18n::XBreakIterator > xBreak; - Reference < XMultiServiceFactory > xMSF = ::comphelper::getProcessServiceFactory(); - Reference < XInterface > xInterface = xMSF->createInstance(::rtl::OUString::createFromAscii("com.sun.star.i18n.BreakIterator")); - ::com::sun::star::lang::Locale aFontLocale = SvxCreateLocale(pInfo->mrFont.GetLanguage()); - - if(xInterface.is()) - { - Any x = xInterface->queryInterface(::getCppuType((const Reference< XBreakIterator >*)0)); - x >>= xBreak; - } - - if(xBreak.is()) - { - bUseBreakIterator = sal_True; - } - - if(bIsVertical) - { - aStart.X() = pInfo->mrStartPos.X() + aTextOffset.X() - aFontMetric.GetDescent(); - aStart.Y() = pInfo->mrStartPos.Y() + aTextOffset.Y(); - - const Point aTopLeft(aStart.X(), aParaBound.Top()); - const Point aBottomRight(aStart.X() + aFontMetric.GetLineHeight(), aParaBound.Bottom()); - const Rectangle aCurRect(aTopLeft, aBottomRight); - - if(pInfo->mnPara != nCurPara) - { - nCurPara = pInfo->mnPara; - pParagraphs[nCurPara].aRect = aCurRect; - } - else - { - pParagraphs[nCurPara].aRect.Union(aCurRect); - } - } - else - { - aStart.X() = pInfo->mrStartPos.X() + aTextOffset.X(); - aStart.Y() = pInfo->mrStartPos.Y() + aTextOffset.Y() - aFontMetric.GetAscent(); - - const Point aTopLeft(aParaBound.Left(), aStart.Y()); - const Point aBottomRight(aParaBound.Right(), aStart.Y() + aFontMetric.GetLineHeight()); - const Rectangle aCurRect(aTopLeft, aBottomRight); - - if(pInfo->mnPara != nCurPara) - { - nCurPara = pInfo->mnPara; - pParagraphs[nCurPara].aRect = aCurRect; - } - else - { - pParagraphs[nCurPara].aRect.Union(aCurRect); - } - } - - if(pInfo->mnTextLen && (0xFFFF != pInfo->mnIndex)) - { - pParagraphs[nCurPara].nCharCount += pInfo->mnTextLen; - sal_uInt16 nInsertIndex(0xffff); - - if(pInfo->IsRTL()) - nInsertIndex = (sal_uInt16)aCharacterList.Count(); - - for(sal_uInt16 nCharIndex(0); nCharIndex < pInfo->mnTextLen; ) - { - xub_StrLen nNextGlyphLen(1); - sal_Bool bIsSingleSpace(sal_False); - - if(bUseBreakIterator) - { - sal_Int32 nDone(0L); - nNextGlyphLen = (xub_StrLen)xBreak->nextCharacters( pInfo->mrText, pInfo->mnTextStart, aFontLocale, - CharacterIteratorMode::SKIPCELL, 1, nDone) - (pInfo->mnTextStart); - } - - if(!bIsSingleSpace) - { - Size aGlyphSize(pInfo->mrFont.GetPhysTxtSize(mpOut, - pInfo->mrText, nCharIndex + pInfo->mnTextStart, nNextGlyphLen)); - - if(bIsVertical) - { - ::std::swap(aGlyphSize.Width(), aGlyphSize.Height()); - } - - const Rectangle aRect(aStart, aGlyphSize); - - aCharacterList.Insert(new OutlinerCharacter( - aRect, - pInfo->mnPara, - pInfo->mrFont.GetColor()), - nInsertIndex); - - long dx = 0; - if( pInfo->mpDXArray ) - dx = (pInfo->mpDXArray)[nCharIndex]; - - if(bIsVertical) - aStart.Y() = pInfo->mrStartPos.Y() + aTextOffset.Y() + dx; - else - aStart.X() = pInfo->mrStartPos.X() + aTextOffset.X() + dx; - } - - nCharIndex = nCharIndex + nNextGlyphLen; - } - } - - return 0L; -} - -// eof diff --git a/sd/source/ui/func/sdundogr.cxx b/sd/source/ui/func/sdundogr.cxx index daea6eef49a2..7b7a361bba80 100644 --- a/sd/source/ui/func/sdundogr.cxx +++ b/sd/source/ui/func/sdundogr.cxx @@ -116,14 +116,3 @@ void SdUndoGroup::AddAction(SdUndoAction* pAction) { aCtn.Insert(pAction, CONTAINER_APPEND); } - -/************************************************************************* -|* -|* Zeiger auf eine Aktion liefern -|* -\************************************************************************/ - -SdUndoAction* SdUndoGroup::GetAction(ULONG nAction) const -{ - return (SdUndoAction*)aCtn.GetObject(nAction); -} diff --git a/sd/source/ui/func/unoaprms.cxx b/sd/source/ui/func/unoaprms.cxx index 684487d0c592..933e961ed927 100644 --- a/sd/source/ui/func/unoaprms.cxx +++ b/sd/source/ui/func/unoaprms.cxx @@ -37,52 +37,6 @@ TYPEINIT1(SdAnimationPrmsUndoAction, SdUndoAction); -/************************************************************************* -|* -|* 2. Ctor, der den ersten (inline) nach der Version 4.0 einmal ersetzen -|* soll (mit 3. Parameter dann) -|* Hier werden die Member mit den Animations-Informationen vorbelegt, -|* um nicht immer alle inline-Methoden aufrufen zu muessen, auch im -|* Hinblick auf zukuenftige Erweiterungen (neue Member etc.) -|* -\************************************************************************/ - -SdAnimationPrmsUndoAction::SdAnimationPrmsUndoAction( - SdDrawDocument* pTheDoc, - SdrObject* pObj ) : - SdUndoAction ( pTheDoc ), - pObject ( pObj ), - bInfoCreated ( FALSE ) // Fuer Animationsreihenfolge existiert Info -{ - SdAnimationInfo* pInfo = pTheDoc->GetAnimationInfo( pObject ); - if( pInfo ) - { - bNewActive = bOldActive = pInfo->mbActive; - eNewEffect = eOldEffect = pInfo->meEffect; - eNewTextEffect = eOldTextEffect = pInfo->meTextEffect; - eNewSpeed = eOldSpeed = pInfo->meSpeed; - bNewDimPrevious = bOldDimPrevious= pInfo->mbDimPrevious; - aNewDimColor = aOldDimColor = pInfo->maDimColor; - bNewDimHide = bOldDimHide = pInfo->mbDimHide; - bNewSoundOn = bOldSoundOn = pInfo->mbSoundOn; - aNewSoundFile = aOldSoundFile = pInfo->maSoundFile; - bNewPlayFull = bOldPlayFull = pInfo->mbPlayFull; - - pNewPathObj = pOldPathObj = pInfo->mpPathObj; - - eNewClickAction = eOldClickAction = pInfo->meClickAction; - aNewBookmark = aOldBookmark = pInfo->GetBookmark(); -// bNewInvisibleInPres = bOldInvisibleInPres= pInfo->mbInvisibleInPresentation; - nNewVerb = nOldVerb = pInfo->mnVerb; - nNewPresOrder = nOldPresOrder = pInfo->mnPresOrder; - - eNewSecondEffect = eOldSecondEffect = pInfo->meSecondEffect; - eNewSecondSpeed = eOldSecondSpeed = pInfo->meSecondSpeed; - bNewSecondSoundOn = bOldSecondSoundOn = pInfo->mbSecondSoundOn; - bNewSecondPlayFull = bOldSecondPlayFull = pInfo->mbSecondPlayFull; - } -} - /************************************************************************* |* |* Undo() diff --git a/sd/source/ui/inc/AccessibleViewForwarder.hxx b/sd/source/ui/inc/AccessibleViewForwarder.hxx index 33e0bbf725ab..5c8fba1e6b2d 100644 --- a/sd/source/ui/inc/AccessibleViewForwarder.hxx +++ b/sd/source/ui/inc/AccessibleViewForwarder.hxx @@ -53,13 +53,10 @@ class AccessibleViewForwarder public: //===== internal ======================================================== - AccessibleViewForwarder (SdrPaintView* pView, USHORT nWindowId); AccessibleViewForwarder (SdrPaintView* pView, OutputDevice& rDevice); virtual ~AccessibleViewForwarder (void); - void SetView (SdrPaintView* pView); - //===== IAccessibleViewforwarder ======================================== /** This method informs you about the state of the forwarder. Do not diff --git a/sd/source/ui/inc/DrawController.hxx b/sd/source/ui/inc/DrawController.hxx index 5afda083abbc..c8744b2201ac 100644 --- a/sd/source/ui/inc/DrawController.hxx +++ b/sd/source/ui/inc/DrawController.hxx @@ -126,8 +126,6 @@ public: void SetSubController ( const css::uno::Reference& rxSubController); - ::com::sun::star::awt::Rectangle GetVisArea (void) const; - /** Call this method when the VisArea has changed. */ void FireVisAreaChanged (const Rectangle& rVisArea) throw(); diff --git a/sd/source/ui/inc/DrawDocShell.hxx b/sd/source/ui/inc/DrawDocShell.hxx index f2b77d01f96c..4ad4b0d09392 100644 --- a/sd/source/ui/inc/DrawDocShell.hxx +++ b/sd/source/ui/inc/DrawDocShell.hxx @@ -115,7 +115,6 @@ public: sd::ViewShell* GetViewShell() { return mpViewShell; } ::sd::FrameView* GetFrameView(); - ::Window* GetWindow() const; ::sd::FunctionReference GetDocShellFunction() const { return mxDocShellFunction; } void SetDocShellFunction( const ::sd::FunctionReference& xFunction ); @@ -164,8 +163,6 @@ public: UINT16 GetStyleFamily() const { return mnStyleFamily; } void SetStyleFamily( UINT16 nSF ) { mnStyleFamily = nSF; } - sal_Bool IsNewDocument() const; - /** executes the SID_OPENDOC slot to let the framework open a document with the given URL and this document as a referer */ void OpenBookmark( const String& rBookmarkURL ); diff --git a/sd/source/ui/inc/DrawViewShell.hxx b/sd/source/ui/inc/DrawViewShell.hxx index e48d3cef142b..e0fcf4d8cb5b 100644 --- a/sd/source/ui/inc/DrawViewShell.hxx +++ b/sd/source/ui/inc/DrawViewShell.hxx @@ -93,11 +93,6 @@ public: PageKind ePageKind = PK_STANDARD, FrameView* pFrameView = NULL); - DrawViewShell( - SfxViewFrame* pFrame, - ::Window* pParentWindow, - const DrawViewShell& rShell); - virtual ~DrawViewShell (void); virtual void Init (bool bIsMainViewShell); @@ -198,9 +193,6 @@ public: void ExecFormText(SfxRequest& rReq); void GetFormTextState(SfxItemSet& rSet); - void ExecObjPalette(SfxRequest& rReq); - void GetObjPaletteState(SfxItemSet& rSet); - void ExecAnimationWin(SfxRequest& rReq); void GetAnimationWinState(SfxItemSet& rSet); diff --git a/sd/source/ui/inc/GraphicViewShell.hxx b/sd/source/ui/inc/GraphicViewShell.hxx index 39e12e47d1e1..6b5d96be95c6 100644 --- a/sd/source/ui/inc/GraphicViewShell.hxx +++ b/sd/source/ui/inc/GraphicViewShell.hxx @@ -52,11 +52,6 @@ public: SFX_DECL_VIEWFACTORY(GraphicViewShell); SFX_DECL_INTERFACE(SD_IF_SDGRAPHICVIEWSHELL) - GraphicViewShell ( - SfxViewFrame* pFrame, - ::Window* pParentWindow, - const DrawViewShell& rShell); - /** Create a new view shell for the Draw application. @param rViewShellBase The new object will be stacked on this view shell base. diff --git a/sd/source/ui/inc/LayerDialogContent.hxx b/sd/source/ui/inc/LayerDialogContent.hxx index f06b785737b0..3c0b00025307 100644 --- a/sd/source/ui/inc/LayerDialogContent.hxx +++ b/sd/source/ui/inc/LayerDialogContent.hxx @@ -50,8 +50,6 @@ public: ViewShellBase& rBase); virtual ~LayerDialogContent (void); - LayerTabBar& GetLayerTabBar (void); - protected: virtual BOOL Close (void); virtual void Resize (void); diff --git a/sd/source/ui/inc/MasterPageObserver.hxx b/sd/source/ui/inc/MasterPageObserver.hxx index 4e74d922d256..caaa8c175f68 100644 --- a/sd/source/ui/inc/MasterPageObserver.hxx +++ b/sd/source/ui/inc/MasterPageObserver.hxx @@ -80,12 +80,6 @@ public: */ void RemoveEventListener (const Link& rEventListener); - /** Return a set of the names of master pages for the given document. - This convenience method exists because this set is part of the - internal data structure and thus takes no time to create. - */ - MasterPageNameSet GetMasterPageNames (SdDrawDocument& rDocument); - private: static ::osl::Mutex maMutex; diff --git a/sd/source/ui/inc/OutlineView.hxx b/sd/source/ui/inc/OutlineView.hxx index 710ee3a96cf7..78481294bf94 100644 --- a/sd/source/ui/inc/OutlineView.hxx +++ b/sd/source/ui/inc/OutlineView.hxx @@ -162,7 +162,9 @@ public: */ void IgnoreCurrentPageChanges (bool bIgnore); +#if 0 sal_Int32 GetPageNumberWidthPixel(); +#endif void InvalidateSlideNumberArea(); diff --git a/sd/source/ui/inc/OutlineViewShell.hxx b/sd/source/ui/inc/OutlineViewShell.hxx index 0bc083b12b2e..6c3848f39926 100644 --- a/sd/source/ui/inc/OutlineViewShell.hxx +++ b/sd/source/ui/inc/OutlineViewShell.hxx @@ -67,11 +67,6 @@ public: ::Window* pParentWindow, FrameView* pFrameView = NULL); - OutlineViewShell ( - SfxViewFrame* pFrame, - ::Window* pParentWindow, - const OutlineViewShell& rShell); - virtual ~OutlineViewShell (void); virtual void Shutdown (void); diff --git a/sd/source/ui/inc/PaneDockingWindow.hxx b/sd/source/ui/inc/PaneDockingWindow.hxx index 03e6cf96c0f0..9d07ab9beefc 100644 --- a/sd/source/ui/inc/PaneDockingWindow.hxx +++ b/sd/source/ui/inc/PaneDockingWindow.hxx @@ -93,12 +93,6 @@ public: */ USHORT AddMenu (const String& rsMenuName, ULONG nHelpId, const Link& rCallback); - /** 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; 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/SlideSorterViewShell.hxx b/sd/source/ui/inc/SlideSorterViewShell.hxx index 6f8ebb285886..4e6033d67ad1 100644 --- a/sd/source/ui/inc/SlideSorterViewShell.hxx +++ b/sd/source/ui/inc/SlideSorterViewShell.hxx @@ -53,12 +53,6 @@ public: TYPEINFO(); SFX_DECL_INTERFACE(SD_IF_SDSLIDESORTERVIEWSHELL) - static SfxShell* CreateInstance ( - sal_Int32 nId, - SfxShell* pParent, - void* pUserData, - ViewShellBase& rBase); - static ::boost::shared_ptr Create( SfxViewFrame* pFrame, ViewShellBase& rViewShellBase, diff --git a/sd/source/ui/inc/SlideView.hxx b/sd/source/ui/inc/SlideView.hxx index 3764347f2a4b..17f7f17e3a9a 100644 --- a/sd/source/ui/inc/SlideView.hxx +++ b/sd/source/ui/inc/SlideView.hxx @@ -36,7 +36,6 @@ class SdPage; namespace sd { -class ShowView; class SlideViewShell; class Window; @@ -129,7 +128,6 @@ private: List aDelayedPaints; SlideViewShell* pSlideViewShell; BitmapCache* pCache; - ShowView* pShowView; VirtualDevice* mpVDev; USHORT nAllowInvalidateSmph; USHORT nPagesPerRow; diff --git a/sd/source/ui/inc/TaskPaneViewShell.hxx b/sd/source/ui/inc/TaskPaneViewShell.hxx index d9f432029dc2..f502ee03c87f 100644 --- a/sd/source/ui/inc/TaskPaneViewShell.hxx +++ b/sd/source/ui/inc/TaskPaneViewShell.hxx @@ -44,7 +44,6 @@ class PopupMenu; namespace sd { namespace toolpanel { class TaskPaneShellManager; -class TitleToolBox; class TitleBar; class TitledControl; class ToolPanel; @@ -101,9 +100,6 @@ public: 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; @@ -121,12 +117,6 @@ public: */ 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. @@ -200,27 +190,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/ToolBarManager.hxx b/sd/source/ui/inc/ToolBarManager.hxx index 2caead9a3c5d..d8b84d1d7b61 100644 --- a/sd/source/ui/inc/ToolBarManager.hxx +++ b/sd/source/ui/inc/ToolBarManager.hxx @@ -144,14 +144,6 @@ public: TBG__LAST = TBG_MASTER_MODE }; - /** Only after calls with bValid= may the tool bar manager use - the frame::XLayoutManager to change the visible tool bars. Call - this method when the controller is attached to or detachted from the - frame. When called with then ResetAllToolBars() is - executed. - */ - void SetValid (bool bValid); - /** Reset the set of visible object bars in the specified group. Tool bars in other groups are not affected. @param rParentShell @@ -209,10 +201,6 @@ public: ToolBarGroup eGroup, const ::rtl::OUString& rsToolBarName); - void RemoveToolBarShell ( - ToolBarGroup eGroup, - ShellId nToolBarId); - /** This is basically a shortcut for ResetToolBars(),AddToolBar(). The main difference is, that all sub shells of the specified parent shell are deactivated as well. @@ -275,10 +263,6 @@ public: }; friend class UpdateLock; - /** Return whether updates of tool bars are locked. - */ - bool IsUpdateLocked (void) const; - void ToolBarsDestroyed(void); private: diff --git a/sd/source/ui/inc/View.hxx b/sd/source/ui/inc/View.hxx index a0d7bf179886..c4f9ab6e7d19 100644 --- a/sd/source/ui/inc/View.hxx +++ b/sd/source/ui/inc/View.hxx @@ -160,10 +160,7 @@ public: void SetMarkedOriginalSize(); - VirtualDevice* CreatePageVDev(USHORT nSdPage, PageKind ePageKind, ULONG nWidthPixel); - void LockRedraw(BOOL bLock); - bool IsRedrawLocked (void) const; BOOL IsMorphingAllowed() const; BOOL IsVectorizeAllowed() const; diff --git a/sd/source/ui/inc/ViewShell.hxx b/sd/source/ui/inc/ViewShell.hxx index 64bc5cbc02b7..ffefb9de7359 100644 --- a/sd/source/ui/inc/ViewShell.hxx +++ b/sd/source/ui/inc/ViewShell.hxx @@ -141,10 +141,6 @@ public: ::Window* pParentWindow, ViewShellBase& rViewShellBase, bool bAllowCenter = true); - ViewShell ( - SfxViewFrame *pFrame, - ::Window* pParentWindow, - const ViewShell& rShell); virtual ~ViewShell (void); /** The Init method has to be called from the outside directly @@ -235,7 +231,6 @@ public: void InitWindows(const Point& rViewOrigin, const Size& rViewSize, const Point& rWinPos, BOOL bUpdate = FALSE); void InvalidateWindows(); - void UpdateWindows(); /** This method is still used by the OutlineViewShell to update the model according to the content of the outline view. This in turn updates the previews in the slide sorter. @@ -243,8 +238,6 @@ public: virtual void UpdatePreview (SdPage* pPage, BOOL bInit = FALSE); void DrawMarkRect(const Rectangle& rRect) const; - void DrawFilledRect( const Rectangle& rRect, const Color& rLColor, - const Color& rFColor ) const; void ExecReq( SfxRequest &rReq ); diff --git a/sd/source/ui/inc/ViewShellBase.hxx b/sd/source/ui/inc/ViewShellBase.hxx index 5e1acbe2a6ac..13dbd6e6cd53 100644 --- a/sd/source/ui/inc/ViewShellBase.hxx +++ b/sd/source/ui/inc/ViewShellBase.hxx @@ -55,7 +55,6 @@ class ToolBarManager; class UpdateLockManager; class ViewShell; class ViewShellManager; -class CustomHandleManager; /** SfxViewShell descendant that the stacked Draw/Impress shells are based on. @@ -110,10 +109,6 @@ public: DrawDocShell* GetDocShell (void) const; SdDrawDocument* GetDocument (void) const; - /** Callback function for retrieving item values related to menu entries. - */ - void GetMenuState (SfxItemSet& rSet); - /** Callback function for general slot calls. At the moment these are slots for switching the pane docking windows on and off. */ @@ -163,12 +158,6 @@ public: PrintDialog *pPrintDialog, BOOL bSilent, BOOL bIsAPI ); - /// Forwarded to the print manager. - USHORT SetPrinterOptDlg ( - SfxPrinter* pNewPrinter, - USHORT nDiffFlags = SFX_PRINTER_ALL, - BOOL _bShowDialog = TRUE); - virtual void PreparePrint (PrintDialog* pPrintDialog); /// Forward methods to main sub shell. @@ -259,8 +248,6 @@ public: */ ::Window* GetViewWindow (void); - CustomHandleManager& getCustomHandleManager() const; - /** 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; @@ -293,22 +280,6 @@ public: virtual void addCustomHandler( SdrView& rSourceView, ViewShell::ShellType eShellType, SdrHdlList& rHandlerList ) = 0; }; -class CustomHandleManager : public ICustomhandleSupplier -{ -public: - CustomHandleManager( ViewShellBase& rViewShellBase ); - virtual ~CustomHandleManager(); - - void registerSupplier( ICustomhandleSupplier* pSupplier ); - void unRegisterSupplier( ICustomhandleSupplier* pSupplier ); - - virtual void addCustomHandler( SdrView& rSourceView, ViewShell::ShellType eShellType, SdrHdlList& rHandlerList ); - -private: - ViewShellBase& mrViewShellBase; - std::set< ICustomhandleSupplier* > maSupplier; -}; - } // end of namespace sd #endif diff --git a/sd/source/ui/inc/ViewShellManager.hxx b/sd/source/ui/inc/ViewShellManager.hxx index 27f88b72bf11..d674e7d07eff 100644 --- a/sd/source/ui/inc/ViewShellManager.hxx +++ b/sd/source/ui/inc/ViewShellManager.hxx @@ -90,23 +90,6 @@ public: ViewShell* pViewShell, const SharedShellFactory& rpFactory); - /** Create a new (or possibly recycle an existing) instance of a view - shell that is specified by the given id. When called multiple times - with the same id then multiple instances of the associated view - shell are created. Use the returned pointer to distinguish between - these. - @param nId - The id of the shell to activate. - @return - A pointer to the activated shell is returned. Use this pointer - to identify the shell in other method calls. When an activation - is not possible then NULL is returned. - */ - ViewShell* ActivateViewShell ( - ShellId nId, - ::Window* pParentWindow, - FrameView* pFrameView); - /** Activate the given view shell. */ void ActivateViewShell (ViewShell* pViewShell); @@ -156,10 +139,6 @@ public: */ void DeactivateSubShell (const ViewShell& rParentShell, ShellId nId); - /** Deactivate all sub shells of the given view shell. - */ - void DeactivateAllSubShells (const ViewShell& rParentShell); - /** Move the specified sub shells to the top position among the sub shells of the parent view shell. The rest of the SFX shell stack does not change (but the all shells above the sub shells have to be @@ -173,14 +152,6 @@ public: void InvalidateAllSubShells ( ViewShell* pViewShell); - /** Call this method to when a 'secondary' shell is moved to or from the - stack, e.g. an object bar. As a result a pending - TakeShellsFromStack() is executed and at the next UnlockUpdate() to - lock level 0 the shells are asked about their secondary shells to - push on the shell stack. - */ - void InvalidateShellStack (const SfxShell* pShell); - /** Move the specified view shell to the top most position on the stack of view shells in relation to the other view shells. After this the only shells that are higher on the stack are its object bars. @@ -211,20 +182,6 @@ public: */ SfxShell* GetTopShell (void) const; - /** Return the id of the given shell. - */ - ShellId GetShellId (const SfxShell* pShell) const; - - /** Replace the references to one SfxUndoManager to that of another at all - shells on the SFX shell stack. Call this method when an undo - manager is about to be destroyed. - @param pManager - The undo manager to be replaced. - @param pReplacement - The undo manager that replaces pManager. - */ - void ReplaceUndoManager (SfxUndoManager* pManager, SfxUndoManager* pReplacement); - /** Use this class to safely lock updates of the view shell stack. */ class UpdateLock diff --git a/sd/source/ui/inc/Window.hxx b/sd/source/ui/inc/Window.hxx index dbf2a1ed40a6..8dd522d8212d 100644 --- a/sd/source/ui/inc/Window.hxx +++ b/sd/source/ui/inc/Window.hxx @@ -66,8 +66,6 @@ public: void SetViewShell (ViewShell* pViewSh); - void ShareViewArea(::sd::Window* pOtherWin); - /** Set the zoom factor to the specified value and center the display area arround the zoom center. @param nZoom diff --git a/sd/source/ui/inc/animobjs.hxx b/sd/source/ui/inc/animobjs.hxx index 846863c3a68a..7a7a34362c48 100644 --- a/sd/source/ui/inc/animobjs.hxx +++ b/sd/source/ui/inc/animobjs.hxx @@ -172,7 +172,6 @@ private: void UpdateControl( ULONG nPos, BOOL bDisableCtrls = FALSE ); void ResetAttrs(); - void WaitInEffect( ULONG nMilliSeconds ) const; void WaitInEffect( ULONG nMilliSeconds, ULONG nTime, SfxProgress* pStbMgr ) const; Fraction GetScale(); diff --git a/sd/source/ui/inc/bmcache.hxx b/sd/source/ui/inc/bmcache.hxx index 26658333dca3..c04f7d2ed2c4 100644 --- a/sd/source/ui/inc/bmcache.hxx +++ b/sd/source/ui/inc/bmcache.hxx @@ -45,8 +45,6 @@ public: : nMaxSize(nMaxSizeKB), nCurSize(0) {} virtual ~BitmapCache(); - void Add(const SdPage* pPage, const Bitmap& rBmp, long nZoomPercent); - const GraphicObject* Get(const SdPage* pPage, long& rZoomPercent, long nZoomTolerancePercent); void Remove(const SdPage* pPage); }; diff --git a/sd/source/ui/inc/dlgass.hxx b/sd/source/ui/inc/dlgass.hxx index 418d72618b4c..523b86cf66a8 100644 --- a/sd/source/ui/inc/dlgass.hxx +++ b/sd/source/ui/inc/dlgass.hxx @@ -64,9 +64,6 @@ public: DECL_LINK( FinishHdl, OKButton * ); SfxObjectShellLock GetDocument(); - String GetTopic() const; - String GetUserName() const; - String GetInformation() const; OutputType GetOutputMedium() const; BOOL IsSummary() const; StartType GetStartType() const; diff --git a/sd/source/ui/inc/dlgctrls.hxx b/sd/source/ui/inc/dlgctrls.hxx index df48868d473d..72b5921d8e86 100644 --- a/sd/source/ui/inc/dlgctrls.hxx +++ b/sd/source/ui/inc/dlgctrls.hxx @@ -50,7 +50,6 @@ class SD_DLLPUBLIC FadeEffectLB : public ListBox { public: FadeEffectLB( Window* pParent, SdResId Id ); - FadeEffectLB( Window* pParent, WinBits aWB ); ~FadeEffectLB(); virtual void Fill(); diff --git a/sd/source/ui/inc/docprev.hxx b/sd/source/ui/inc/docprev.hxx index 0827371da3be..76b8fe06f318 100644 --- a/sd/source/ui/inc/docprev.hxx +++ b/sd/source/ui/inc/docprev.hxx @@ -70,10 +70,8 @@ protected: public: SdDocPreviewWin( Window* pParent, const ResId& rResId ); - SdDocPreviewWin( Window* pParent ); ~SdDocPreviewWin(); void SetObjectShell( SfxObjectShell* pObj, sal_uInt16 nShowPage = 0 ); - void SetGDIFile( GDIMetaFile* pFile ); virtual void Resize(); void startPreview(); diff --git a/sd/source/ui/inc/filedlg.hxx b/sd/source/ui/inc/filedlg.hxx index 74b4c5d1d6a6..2aaa7be9f123 100644 --- a/sd/source/ui/inc/filedlg.hxx +++ b/sd/source/ui/inc/filedlg.hxx @@ -40,40 +40,9 @@ class SdFileDialog_Imp; -/******************************************************************************/ - -/** - The class SdExportFileDialog wraps the FileDialogHelper, displaying the - FILESAVE_AUTOEXTENSION_SELECTION dialog template. The interface is a downstripped - version of the aforementioned class, with similar semantics. - */ -class SdExportFileDialog -{ - const std::auto_ptr< SdFileDialog_Imp > mpImpl; - - // forbidden and not implemented - SdExportFileDialog (); - SdExportFileDialog (const SdExportFileDialog &); - SdExportFileDialog & operator= (const SdExportFileDialog &); - -public: - explicit SdExportFileDialog( BOOL haveCheckbox ); - ~SdExportFileDialog(); - - ErrCode Execute(); - String GetPath() const; - void SetPath( const String& rPath ); - - String ReqDisplayDirectory() const; - - String ReqCurrentFilter() const; - BOOL IsExportSelection() const; // whether the "selection" checkbox is checked. -}; - /******************************************************************************/ - /** The class SdOpenSoundFileDialog wraps the FileDialogHelper, displaying the FILEOPEN_PLAY dialog template and performing the 'preview' functionality diff --git a/sd/source/ui/inc/framework/FrameworkHelper.hxx b/sd/source/ui/inc/framework/FrameworkHelper.hxx index a25839b3e637..58c663449bbc 100644 --- a/sd/source/ui/inc/framework/FrameworkHelper.hxx +++ b/sd/source/ui/inc/framework/FrameworkHelper.hxx @@ -383,23 +383,6 @@ private: }; - -/** This functor wraps a slot call. It is used to call a slot after an - asynchronous configuration update, eg after switching views. -*/ -class DispatchCaller -{ - SfxDispatcher& mrDispatcher; - USHORT mnSId; -public: - /** Create a new DispatchCaller object that, when executed, will call - the given slot at the given dispatcher. - */ - DispatchCaller(SfxDispatcher& rDispatcher, USHORT nSId); - void operator() (bool bEventSeen); -}; - - } } // end of namespace sd::framework diff --git a/sd/source/ui/inc/framework/ResourceId.hxx b/sd/source/ui/inc/framework/ResourceId.hxx index a4d5390d15d0..e8124e895ee6 100644 --- a/sd/source/ui/inc/framework/ResourceId.hxx +++ b/sd/source/ui/inc/framework/ResourceId.hxx @@ -236,8 +236,6 @@ private: const ::std::vector& rResourceURLs, css::drawing::framework::AnchorBindingMode eMode) const; - bool IsValid (void) const; - void ParseResourceURL (void); }; diff --git a/sd/source/ui/inc/framework/ViewShellWrapper.hxx b/sd/source/ui/inc/framework/ViewShellWrapper.hxx index 96846e5c08d7..a7fbc3dde82a 100644 --- a/sd/source/ui/inc/framework/ViewShellWrapper.hxx +++ b/sd/source/ui/inc/framework/ViewShellWrapper.hxx @@ -90,16 +90,6 @@ 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 diff --git a/sd/source/ui/inc/fuconstr.hxx b/sd/source/ui/inc/fuconstr.hxx index c4199986a5b6..390060a16e3c 100644 --- a/sd/source/ui/inc/fuconstr.hxx +++ b/sd/source/ui/inc/fuconstr.hxx @@ -50,7 +50,6 @@ public: TYPEINFO(); - static FunctionReference Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); virtual void DoExecute( SfxRequest& rReq ); // Mouse- & Key-Events diff --git a/sd/source/ui/inc/fudraw.hxx b/sd/source/ui/inc/fudraw.hxx index 77427a7f346e..23f68eda327b 100644 --- a/sd/source/ui/inc/fudraw.hxx +++ b/sd/source/ui/inc/fudraw.hxx @@ -50,8 +50,6 @@ class FuDraw public: TYPEINFO(); - static FunctionReference Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq, bool bPermanent ); - virtual BOOL KeyInput(const KeyEvent& rKEvt); virtual BOOL MouseMove(const MouseEvent& rMEvt); virtual BOOL MouseButtonUp(const MouseEvent& rMEvt); diff --git a/sd/source/ui/inc/fuoutl.hxx b/sd/source/ui/inc/fuoutl.hxx index a8743fea8a50..92299387849a 100644 --- a/sd/source/ui/inc/fuoutl.hxx +++ b/sd/source/ui/inc/fuoutl.hxx @@ -54,8 +54,6 @@ class FuOutline public: TYPEINFO(); - static FunctionReference Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); - virtual BOOL Command(const CommandEvent& rCEvt); virtual void ScrollStart(); diff --git a/sd/source/ui/inc/fupoor.hxx b/sd/source/ui/inc/fupoor.hxx index c3c95a384a38..2650e99767b5 100644 --- a/sd/source/ui/inc/fupoor.hxx +++ b/sd/source/ui/inc/fupoor.hxx @@ -98,7 +98,6 @@ public: virtual void ScrollEnd() {} // ForceScroll aufgerufen void SetWindow(::sd::Window* pWin) { mpWindow = pWin; } - void WriteStatus(const String& aStr); // Statuszeile schreiben // #97016# II virtual void SelectionHasChanged(); @@ -145,7 +144,6 @@ protected: virtual ~FuPoor (void); DECL_LINK( DelayHdl, Timer * ); - long diffPoint (long pos1, long pos2); void ImpForceQuadratic(Rectangle& rRect); diff --git a/sd/source/ui/inc/fuspell.hxx b/sd/source/ui/inc/fuspell.hxx deleted file mode 100644 index 1bb37d3a873d..000000000000 --- a/sd/source/ui/inc/fuspell.hxx +++ /dev/null @@ -1,71 +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_FU_SPELL_HXX -#define SD_FU_SPELL_HXX - -#include "fupoor.hxx" - -namespace sd { - -extern USHORT SidArraySpell[]; - -class Outliner; - -class FuSpell - : public FuPoor -{ -public: - TYPEINFO(); - - static FunctionReference Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); - virtual void DoExecute( SfxRequest& rReq ); - - void StartSpelling(); - - ::sd::Outliner* GetOutliner() const { return pSdOutliner; } - -protected: - virtual ~FuSpell (void); - - ::sd::Outliner* pSdOutliner; - BOOL bOwnOutliner; - -private: - FuSpell ( - ViewShell* pViewSh, - ::sd::Window* pWin, - ::sd::View* pView, - SdDrawDocument* pDoc, - SfxRequest& rReq); -}; - -} // end of namespace sd - -#endif - - diff --git a/sd/source/ui/inc/futransf.hxx b/sd/source/ui/inc/futransf.hxx index be554e941400..85041334c7f0 100644 --- a/sd/source/ui/inc/futransf.hxx +++ b/sd/source/ui/inc/futransf.hxx @@ -51,8 +51,6 @@ private: ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq); - - Point GetPoint( Rectangle aRect, RECT_POINT eRP ); }; } // end of namespace sd diff --git a/sd/source/ui/inc/headerfooterdlg.hxx b/sd/source/ui/inc/headerfooterdlg.hxx index 382727475f84..fa0c4d9282c0 100644 --- a/sd/source/ui/inc/headerfooterdlg.hxx +++ b/sd/source/ui/inc/headerfooterdlg.hxx @@ -65,7 +65,6 @@ private: SdPage* mpCurrentPage; ViewShell* mpViewShell; - void initTabPages(); void apply( bool bToAll, bool bForceSlides ); void change( SdUndoGroup* pUndoGroup, SdPage* pPage, const HeaderFooterSettings& rNewSettings ); diff --git a/sd/source/ui/inc/optsitem.hxx b/sd/source/ui/inc/optsitem.hxx index dcf53fc6ffc3..13088dfc64cb 100644 --- a/sd/source/ui/inc/optsitem.hxx +++ b/sd/source/ui/inc/optsitem.hxx @@ -163,7 +163,6 @@ public: SdOptionsLayout( USHORT nConfigId, BOOL bUseConfig ); virtual ~SdOptionsLayout() {} - void SetDefaults(); BOOL operator==( const SdOptionsLayout& rOpt ) const; BOOL IsRulerVisible() const { Init(); return (BOOL) bRuler; } @@ -220,7 +219,6 @@ public: SdOptionsContents( USHORT nConfigId, BOOL bUseConfig ); virtual ~SdOptionsContents() {} - void SetDefaults(); BOOL operator==( const SdOptionsContents& rOpt ) const; }; @@ -230,7 +228,6 @@ class SD_DLLPUBLIC SdOptionsContentsItem : public SfxPoolItem { public: - SdOptionsContentsItem( USHORT nWhich); SdOptionsContentsItem( USHORT nWhich, SdOptions* pOpts, ::sd::FrameView* pView = NULL ); virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; @@ -301,7 +298,6 @@ public: SdOptionsMisc( USHORT nConfigId, BOOL bUseConfig ); virtual ~SdOptionsMisc() {} - void SetDefaults(); BOOL operator==( const SdOptionsMisc& rOpt ) const; BOOL IsStartWithTemplate() const { Init(); return (BOOL) bStartWithTemplate; } @@ -427,7 +423,6 @@ public: SdOptionsSnap( USHORT nConfigId, BOOL bUseConfig ); virtual ~SdOptionsSnap() {} - void SetDefaults(); BOOL operator==( const SdOptionsSnap& rOpt ) const; BOOL IsSnapHelplines() const { Init(); return (BOOL) bSnapHelplines; } @@ -494,7 +489,6 @@ public: SdOptionsZoom( USHORT nConfigId, BOOL bUseConfig ); virtual ~SdOptionsZoom() {} - void SetDefaults(); BOOL operator==( const SdOptionsZoom& rOpt ) const; void GetScale( INT32& rX, INT32& rY ) const { Init(); rX = nX; rY = nY; } @@ -503,23 +497,6 @@ public: // ----------------------------------------------------------------------------- -class SdOptionsZoomItem : public SfxPoolItem -{ -public: - - SdOptionsZoomItem( USHORT nWhich); - SdOptionsZoomItem( USHORT nWhich, SdOptions* pOpts, ::sd::FrameView* pView = NULL ); - - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual int operator==( const SfxPoolItem& ) const; - - void SetOptions( SdOptions* pOpts ) const; - - SdOptionsZoom& GetOptionsZoom() { return maOptionsZoom; } -private: - SdOptionsZoom maOptionsZoom; -}; - // ----------------- // - SdOptionsGrid - // ----------------- @@ -569,7 +546,6 @@ class SdOptionsGridItem : public SvxGridItem { public: - SdOptionsGridItem( USHORT nWhich ); SdOptionsGridItem( USHORT nWhich, SdOptions* pOpts, ::sd::FrameView* pView = NULL ); void SetOptions( SdOptions* pOpts ) const; @@ -616,9 +592,6 @@ public: SdOptionsPrint( USHORT nConfigId, BOOL bUseConfig ); virtual ~SdOptionsPrint() {} - void SetPrinterOptions( const SdOptionsPrint* pOptions ); - - void SetDefaults(); BOOL operator==( const SdOptionsPrint& rOpt ) const; BOOL IsDraw() const { Init(); return (BOOL) bDraw; } @@ -700,7 +673,6 @@ public: SdOptions( USHORT nConfigId ); virtual ~SdOptions(); - void SetRangeDefaults( ULONG nOptionRange ); void StoreConfig( ULONG nOptionRange = SD_OPTIONS_ALL ); }; diff --git a/sd/source/ui/inc/outlinfo.hxx b/sd/source/ui/inc/outlinfo.hxx deleted file mode 100644 index 4f277c0fa320..000000000000 --- a/sd/source/ui/inc/outlinfo.hxx +++ /dev/null @@ -1,125 +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 _OUTLINFO_HXX -#define _OUTLINFO_HXX - -#include -#include - -// --------------- -// - SdLaserInfo - -// --------------- - -struct OutlinerCharacter -{ - Rectangle aRect; - ULONG nPara; - Color aColor; - - // #101500# Removed CharCode, it's only used in one place to compare - // for single space character. This can be done at creation, too. - //USHORT nCharCode; - - OutlinerCharacter( const Rectangle& _rRect, ULONG _nPara, const Color& _rCol /* #101500#, USHORT _nCharCode*/ ) - : aRect( _rRect ), - nPara( _nPara ), - aColor( _rCol ) - { - } -}; - -// ----------------------------------------------------------------------------- - -struct OutlinerParagraph -{ - Rectangle aRect; - ULONG nCharCount; - - OutlinerParagraph() : nCharCount( 0 ) {} - ~OutlinerParagraph() {}; -}; - -// ---------------- -// - OutlinerInfo - -// ---------------- - -class DrawPortionInfo; -class SdDrawDocument; -class SdrRectObj; - -class OutlinerInfo -{ -private: - - List aCharacterList; - Rectangle aObjBound; - Rectangle aParaBound; - Point aTextOffset; - OutlinerParagraph* pParagraphs; - OutputDevice* mpOut; - ULONG nParaCount; - ULONG nCurPara; - long nExtraData; - BOOL bInit; - BOOL mbVertical; - - OutlinerInfo( const OutlinerInfo& ) {} - OutlinerInfo& operator=( const OutlinerInfo& ) { return *this; } - - DECL_LINK( DrawPortionHdl, DrawPortionInfo* ); - -public: - - OutlinerInfo(); - ~OutlinerInfo(); - - void Clear(); - - void SetTextObj( SdDrawDocument* pDoc, SdrRectObj* pObj, OutputDevice* _pOut ); - - const Rectangle& GetObjRect() const { return aObjBound; } - const Rectangle& GetTextRect() const { return aParaBound; } - const Point& GetTextOffset() const { return aTextOffset; } - - ULONG GetParaCount() const { return nParaCount; } - - const Rectangle& GetParaRect( const ULONG nPara ) const; - BOOL GetParaCharCount( const ULONG nPara ) const; - - ULONG GetCharacterCount() const { return aCharacterList.Count(); } - OutlinerCharacter* GetCharacter( ULONG nPos ) const { return (OutlinerCharacter*) aCharacterList.GetObject( nPos ); }; - OutlinerCharacter* GetFirstCharacter() { return (OutlinerCharacter*) aCharacterList.First(); } - OutlinerCharacter* GetNextCharacter() { return (OutlinerCharacter*) aCharacterList.Next(); } - - void SetExtraData( const long _nExtraData = 0L ) { nExtraData = _nExtraData; } - long GetExtraData() const { return nExtraData; } - - BOOL IsVertical() const { return mbVertical; } -}; - -#endif diff --git a/sd/source/ui/inc/prntopts.hxx b/sd/source/ui/inc/prntopts.hxx index 288bcfb3e359..da9bc20c02d6 100644 --- a/sd/source/ui/inc/prntopts.hxx +++ b/sd/source/ui/inc/prntopts.hxx @@ -94,7 +94,6 @@ public: ~SdPrintOptions(); static SfxTabPage* Create( Window*, const SfxItemSet& ); - static USHORT* GetRanges(); virtual BOOL FillItemSet( SfxItemSet& ); virtual void Reset( const SfxItemSet & ); diff --git a/sd/source/ui/inc/sdtreelb.hxx b/sd/source/ui/inc/sdtreelb.hxx index 948a55d3754c..dc98929a9ed1 100644 --- a/sd/source/ui/inc/sdtreelb.hxx +++ b/sd/source/ui/inc/sdtreelb.hxx @@ -210,7 +210,6 @@ public: BOOL SelectEntry( const String& rName ); String GetSelectEntry(); List* GetSelectEntryList( USHORT nDepth ); - List* GetBookmarkList( USHORT nType ); SdDrawDocument* GetBookmarkDoc(SfxMedium* pMedium = NULL); ::sd::DrawDocShell* GetDropDocSh() { return(mpDropDocSh); } diff --git a/sd/source/ui/inc/sdundogr.hxx b/sd/source/ui/inc/sdundogr.hxx index b4665dbe5a46..f02977234475 100644 --- a/sd/source/ui/inc/sdundogr.hxx +++ b/sd/source/ui/inc/sdundogr.hxx @@ -48,7 +48,6 @@ public: virtual void Redo(); void AddAction(SdUndoAction* pAction); - SdUndoAction* GetAction(ULONG nAction) const; ULONG Count() const { return aCtn.Count(); } }; diff --git a/sd/source/ui/inc/showview.hxx b/sd/source/ui/inc/showview.hxx deleted file mode 100644 index 748effbe1985..000000000000 --- a/sd/source/ui/inc/showview.hxx +++ /dev/null @@ -1,88 +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_SHOW_VIEW_HXX -#define SD_SHOW_VIEW_HXX - -#include - -class SdDrawDocument; - -namespace sd { - -class ViewShell; - -/************************************************************************* -|* -|* Beschreibung ShowView ist die View fuer die Diashow -|* -\************************************************************************/ - -class ShowView - : public FmFormView -{ -public: - // wenn waehrend des Zeichnens Plugins 'connected' - // werden sollen, muss pWWin ein Zeiger auf das Fenster - // sein, das das Plugin benutzen soll - ShowView ( - SdDrawDocument* pDoc, - OutputDevice* pOut, - ViewShell* pViewShell, - ::Window* pWin = NULL); - virtual ~ShowView (void); - - SdDrawDocument& GetDoc() const { return *pDrDoc; } - - void SetAllowInvalidate(BOOL bFlag); - BOOL IsInvalidateAllowed() const; - - void SetAllowMasterPageCaching(BOOL bAllow) - { bAllowMasterPageCaching = bAllow; } - BOOL IsMasterPageCachingAllowed() const - { return(bAllowMasterPageCaching); } - - virtual void CompleteRedraw(OutputDevice* pOutDev, const Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector = 0L); - virtual void InvalidateOneWin(::Window& rWin); - virtual void InvalidateOneWin(::Window& rWin, const Rectangle& rRect); - - virtual void DoConnect(SdrOle2Obj* pOleObj); - -private: - SdDrawDocument* pDrDoc; - ViewShell* mpViewSh; - Window* pWindowForPlugIns; - USHORT nAllowInvalidateSmph; - BOOL bAllowMasterPageCaching; - -}; - -} // end of namespace sd - -#endif - - diff --git a/sd/source/ui/inc/slideshow.hxx b/sd/source/ui/inc/slideshow.hxx index bc4df5aa44f5..eda80feeb825 100644 --- a/sd/source/ui/inc/slideshow.hxx +++ b/sd/source/ui/inc/slideshow.hxx @@ -173,7 +173,6 @@ public: ShowWindow* getShowWindow(); // a.k.a. FuSlideShow::GetShowWindow() int getAnimationMode(); // a.k.a. FuSlideShow::GetAnimationMode() sal_Int32 getCurrentPageNumber(); // a.k.a. FuSlideShow::GetCurrentPage() - sal_Int32 getCurrentPageIndex(); sal_Int32 getFirstPageNumber(); sal_Int32 getLastPageNumber(); bool isEndless(); diff --git a/sd/source/ui/inc/taskpane/ScrollPanel.hxx b/sd/source/ui/inc/taskpane/ScrollPanel.hxx index 019e06d9dd44..00a2225efbbb 100644 --- a/sd/source/ui/inc/taskpane/ScrollPanel.hxx +++ b/sd/source/ui/inc/taskpane/ScrollPanel.hxx @@ -127,11 +127,6 @@ public: Rectangle& aRectangle, ::Window* pWindow); -protected: - /** Initiate a rearrangement of the controls. - */ - void ListHasChanged (void); - private: ::Control maScrollWindow; ScrollBar maVerticalScrollBar; diff --git a/sd/source/ui/inc/taskpane/SubToolPanel.hxx b/sd/source/ui/inc/taskpane/SubToolPanel.hxx index 9524cdddf748..2a56ee6d74dc 100644 --- a/sd/source/ui/inc/taskpane/SubToolPanel.hxx +++ b/sd/source/ui/inc/taskpane/SubToolPanel.hxx @@ -69,19 +69,6 @@ public: SubToolPanel (TreeNode* pParent); virtual ~SubToolPanel (void); - /** Add a control to the sub panel. - @param rTitle - The title that will be shown in the two title bars that - belong to the control. - @param nHelpId - The help id is set at the title bar not the actual control. - */ - void AddControl ( - ::std::auto_ptr pControl, - const String& rTitle, - ULONG nHelpId); - void AddControl (::std::auto_ptr pControl); - virtual void Paint (const Rectangle& rRect); /** Initiate a rearrangement of the controls and title bars. @@ -107,11 +94,6 @@ public: ::com::sun::star::accessibility::XAccessible>& rxParent); using Window::GetWindow; -protected: - /** Initiate a rearrangement of the controls. - */ - void ListHasChanged (void); - private: ::Window maWindowFiller; bool mbIsRearrangePending; diff --git a/sd/source/ui/inc/taskpane/TaskPaneTreeNode.hxx b/sd/source/ui/inc/taskpane/TaskPaneTreeNode.hxx index 250e73124854..cd55832ec4c2 100644 --- a/sd/source/ui/inc/taskpane/TaskPaneTreeNode.hxx +++ b/sd/source/ui/inc/taskpane/TaskPaneTreeNode.hxx @@ -69,15 +69,6 @@ public: TreeNode (TreeNode* pParent); virtual ~TreeNode (void); - /** Returns if the node has no children, i.e. is a leaf of a - tree. In this case mpControlContainer is NULL. - */ - bool IsLeaf (void); - - /** Returns true if the node has no parent, i.e. is the root of a tree. - */ - bool IsRoot (void); - void SetParentNode (TreeNode* pNewParent); TreeNode* GetParentNode (void); @@ -187,14 +178,6 @@ public: */ void AddStateChangeListener (const Link& rListener); - /** Remove the listener form the list of state change listeners. - @param rListener - It is OK to specify a listener that is not currently - registered. Only when the listener is registered it is - removed. Otherwise the call is ignored. - */ - void RemoveStateChangeListener (const Link& rListener); - /** Call the state change listeners and pass a state change event with the specified event id. The source field is set to this. @param pChild diff --git a/sd/source/ui/inc/taskpane/TitledControl.hxx b/sd/source/ui/inc/taskpane/TitledControl.hxx index a5a319ca5219..9dfc06e2df58 100644 --- a/sd/source/ui/inc/taskpane/TitledControl.hxx +++ b/sd/source/ui/inc/taskpane/TitledControl.hxx @@ -134,13 +134,6 @@ public: 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 - called. - */ - void SetUserData (void* pUserData); - void* GetUserData (void) const; - virtual bool IsShowing (void) const; virtual void Show (bool bVisible); diff --git a/sd/source/ui/inc/taskpane/ToolPanel.hxx b/sd/source/ui/inc/taskpane/ToolPanel.hxx index f2c573a21c06..c3b61a5d22de 100644 --- a/sd/source/ui/inc/taskpane/ToolPanel.hxx +++ b/sd/source/ui/inc/taskpane/ToolPanel.hxx @@ -101,11 +101,6 @@ public: using Window::GetWindow; -protected: - /** Initiate a rearrangement of the controls. - */ - void ListHasChanged (void); - private: TaskPaneViewShell& mrViewShell; diff --git a/sd/source/ui/inc/tools/PropertySet.hxx b/sd/source/ui/inc/tools/PropertySet.hxx index c74253092adf..998b4f0e2142 100644 --- a/sd/source/ui/inc/tools/PropertySet.hxx +++ b/sd/source/ui/inc/tools/PropertySet.hxx @@ -62,13 +62,6 @@ public: virtual void SAL_CALL disposing (void); - - /** Create an UnknownPropertyException, but do not yet throw it. This - method fills in the fields of the exception. - */ - css::beans::UnknownPropertyException CreateUnknownPropertyException ( - const rtl::OUString& rsPropertyName); - // XPropertySet virtual css::uno::Reference diff --git a/sd/source/ui/inc/tools/SdGlobalResourceContainer.hxx b/sd/source/ui/inc/tools/SdGlobalResourceContainer.hxx index d86ac3cf6433..d0661a61636b 100644 --- a/sd/source/ui/inc/tools/SdGlobalResourceContainer.hxx +++ b/sd/source/ui/inc/tools/SdGlobalResourceContainer.hxx @@ -92,17 +92,6 @@ public: */ void AddResource (const ::css::uno::Reference& rxResource); - /** Tell the container that it is not any longer responsible for the - specified resource. - @return - When the specified resource has previously added to the - container the resource is returned (which is, of course, the - same pointer as the given one.) Otherwise a NULL pointer is - returned. - */ - ::std::auto_ptr ReleaseResource ( - SdGlobalResource* pResource); - protected: friend class ::SdModule; friend class ::std::auto_ptr; diff --git a/sd/source/ui/inc/tools/SlotStateListener.hxx b/sd/source/ui/inc/tools/SlotStateListener.hxx index 418e4dbf1766..1f45aef331ab 100644 --- a/sd/source/ui/inc/tools/SlotStateListener.hxx +++ b/sd/source/ui/inc/tools/SlotStateListener.hxx @@ -57,13 +57,6 @@ class SlotStateListener public SlotStateListenerInterfaceBase { public: - /** Create a new object that has yet to be told about the the frame and - slots to listen to and the callback that state changes are relayed - to. When you want to listen to one single slot then you can use the - three argument variant of this constructor. - */ - SlotStateListener (void); - /** This convenience version of the constructor takes all parameters that are necessary to observe a single slot. See descriptions of the SetCallback(), ConnectToFrame(), and ObserveSlot() methods for @@ -105,14 +98,6 @@ public: */ void ObserveSlot (const ::rtl::OUString& rSlotName); - /** Return whether the called SlotStateListener is connected to a slot. - One reason for returning is that the SlotStateListener has - been created before the controller and frame have been properly - initialized. - */ - bool IsValid (void) const; - - //===== frame::XStatusListener ========================================== /** Called by slot state change broadcasters. In turn the callback is diff --git a/sd/source/ui/inc/tpaction.hxx b/sd/source/ui/inc/tpaction.hxx index d07f24a2dcc2..2ee8bbe6771a 100644 --- a/sd/source/ui/inc/tpaction.hxx +++ b/sd/source/ui/inc/tpaction.hxx @@ -114,7 +114,6 @@ private: void SetActualAnimationEffect( ::com::sun::star::presentation::AnimationEffect eAE ); void SetEditText( String const & rStr ); String GetEditText( BOOL bURL = FALSE ); - String GetMacroName( const String& rPath ); USHORT GetClickActionSdResId( ::com::sun::star::presentation::ClickAction eCA ); USHORT GetAnimationEffectSdResId( ::com::sun::star::presentation::AnimationEffect eAE ); @@ -123,7 +122,6 @@ public: ~SdTPAction(); static SfxTabPage* Create( Window*, const SfxItemSet& ); - static USHORT* GetRanges(); virtual BOOL FillItemSet( SfxItemSet& ); virtual void Reset( const SfxItemSet & ); diff --git a/sd/source/ui/inc/unoaprms.hxx b/sd/source/ui/inc/unoaprms.hxx index 9cc3555dce3b..a2a80963ad63 100644 --- a/sd/source/ui/inc/unoaprms.hxx +++ b/sd/source/ui/inc/unoaprms.hxx @@ -97,8 +97,6 @@ public: bInfoCreated (bCreated) {} - SdAnimationPrmsUndoAction( SdDrawDocument* pTheDoc, SdrObject* pObj ); - void SetActive(BOOL bTheOldActive, BOOL bTheNewActive) { bOldActive = bTheOldActive; bNewActive = bTheNewActive; } void SetEffect(::com::sun::star::presentation::AnimationEffect eTheOldEffect, ::com::sun::star::presentation::AnimationEffect eTheNewEffect) diff --git a/sd/source/ui/inc/unosrch.hxx b/sd/source/ui/inc/unosrch.hxx index e30605181c4c..b19f3751e836 100644 --- a/sd/source/ui/inc/unosrch.hxx +++ b/sd/source/ui/inc/unosrch.hxx @@ -58,9 +58,10 @@ protected: ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > GetCurrentShape() const throw(); public: - SdUnoSearchReplaceShape( ::com::sun::star::drawing::XDrawPage* xPage ) throw(); // danger, these c'tors are only usable if - SdUnoSearchReplaceShape( ::com::sun::star::drawing::XShape* xShape ) throw(); // the given shape or page is derived from - virtual ~SdUnoSearchReplaceShape() throw(); // this class!!! + // danger, this c'tor is only usable if the given shape or page is derived + // from this class!!! + SdUnoSearchReplaceShape( ::com::sun::star::drawing::XDrawPage* xPage ) throw(); + virtual ~SdUnoSearchReplaceShape() throw(); // XReplaceable virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XReplaceDescriptor > SAL_CALL createReplaceDescriptor( ) throw(::com::sun::star::uno::RuntimeException); diff --git a/sd/source/ui/inc/zoomlist.hxx b/sd/source/ui/inc/zoomlist.hxx index 1e31eaa598ac..6957bfed25ce 100644 --- a/sd/source/ui/inc/zoomlist.hxx +++ b/sd/source/ui/inc/zoomlist.hxx @@ -44,7 +44,6 @@ public: virtual ~ZoomList(); void InsertZoomRect(const Rectangle& rRect); - Rectangle GetCurrentZoomRect() const; Rectangle GetNextZoomRect(); Rectangle GetPreviousZoomRect(); BOOL IsNextPossible() const; diff --git a/sd/source/ui/presenter/PresenterCanvas.cxx b/sd/source/ui/presenter/PresenterCanvas.cxx index 8a87a10e43d0..a1f583a4e40c 100644 --- a/sd/source/ui/presenter/PresenterCanvas.cxx +++ b/sd/source/ui/presenter/PresenterCanvas.cxx @@ -908,22 +908,6 @@ css::rendering::ViewState PresenterCanvas::MergeViewState ( -Reference PresenterCanvas::GetSharedCanvas (void) const -{ - return mxSharedCanvas; -} - - - - -void PresenterCanvas::SetClip (const awt::Rectangle& rClipRectangle) -{ - maClipRectangle = rClipRectangle; -} - - - - awt::Point PresenterCanvas::GetOffset (const Reference& rxBaseWindow) { mbOffsetUpdatePending = false; diff --git a/sd/source/ui/presenter/PresenterTextView.cxx b/sd/source/ui/presenter/PresenterTextView.cxx index 3734f488d370..ba90a92939ca 100644 --- a/sd/source/ui/presenter/PresenterTextView.cxx +++ b/sd/source/ui/presenter/PresenterTextView.cxx @@ -113,7 +113,6 @@ public: void SetFontDescriptor (const awt::FontDescriptor& rFontDescriptor); sal_Int32 GetTop (void) const; void SetTop (const sal_Int32 nTop); - void ClearText (void); void SetText (const OUString& Text); sal_Int32 ParseDistance (const OUString& rsDistance) const; Reference GetBitmap (void); @@ -533,17 +532,6 @@ void PresenterTextView::Implementation::SetTop (const sal_Int32 nTop) -void PresenterTextView::Implementation::ClearText (void) -{ - DBG_ASSERT(mpEditEngine!=NULL, "EditEngine missing"); - msText = OUString(); - mnTotalHeight = 0; - mxBitmap = NULL; -} - - - - void PresenterTextView::Implementation::SetText (const OUString& rText) { DBG_ASSERT(mpEditEngine!=NULL, "EditEngine missing"); diff --git a/sd/source/ui/slideshow/slideshow.cxx b/sd/source/ui/slideshow/slideshow.cxx index c951f68d9b74..187d0d5ea715 100644 --- a/sd/source/ui/slideshow/slideshow.cxx +++ b/sd/source/ui/slideshow/slideshow.cxx @@ -947,13 +947,6 @@ sal_Int32 SlideShow::getCurrentPageNumber() // --------------------------------------------------------- -sal_Int32 SlideShow::getCurrentPageIndex() -{ - return mxController.is() ? mxController->getCurrentSlideIndex() : 0; -} - -// --------------------------------------------------------- - void SlideShow::jumpToBookmark( const OUString& sBookmark ) { if( mxController.is() ) diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx index d58cfcb3f6c9..c2adccc82a80 100644 --- a/sd/source/ui/slideshow/slideshowimpl.cxx +++ b/sd/source/ui/slideshow/slideshowimpl.cxx @@ -3724,14 +3724,7 @@ Reference< XSlideShow > SAL_CALL SlideshowImpl::getSlideShow() throw (RuntimeExc // -------------------------------------------------------------------- -PresentationSettingsEx::PresentationSettingsEx() -: mbRehearseTimings(sal_False) -, mbPreview(sal_False) -, mpParentWindow( 0 ) -{ -} - -PresentationSettingsEx::PresentationSettingsEx( PresentationSettingsEx& r ) +PresentationSettingsEx::PresentationSettingsEx( const PresentationSettingsEx& r ) : PresentationSettings( r ) , mbRehearseTimings(r.mbRehearseTimings) , mbPreview(r.mbPreview) diff --git a/sd/source/ui/slideshow/slideshowimpl.hxx b/sd/source/ui/slideshow/slideshowimpl.hxx index 48dca432671c..cb33c4a740c7 100644 --- a/sd/source/ui/slideshow/slideshowimpl.hxx +++ b/sd/source/ui/slideshow/slideshowimpl.hxx @@ -112,8 +112,7 @@ struct PresentationSettingsEx : public PresentationSettings css::uno::Reference< css::drawing::XDrawPage > mxStartPage; css::uno::Reference< css::animations::XAnimationNode > mxAnimationNode; - PresentationSettingsEx(); - PresentationSettingsEx( PresentationSettingsEx& ); + PresentationSettingsEx( const PresentationSettingsEx& ); PresentationSettingsEx( PresentationSettings& ); void SetArguments( const css::uno::Sequence< css::beans::PropertyValue >& rArguments ) throw (css::lang::IllegalArgumentException); diff --git a/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx b/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx index 47818b73d193..1bbecbef3d66 100644 --- a/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx +++ b/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx @@ -178,14 +178,6 @@ void BitmapCache::Clear (void) -bool BitmapCache::IsEmpty (void) const -{ - return mpBitmapContainer->empty(); -} - - - - bool BitmapCache::IsFull (void) const { return mbIsFull; @@ -261,21 +253,6 @@ bool BitmapCache::BitmapIsUpToDate (const CacheKey& rKey) -void BitmapCache::ReleaseBitmap (const CacheKey& rKey) -{ - ::osl::MutexGuard aGuard (maMutex); - - CacheBitmapContainer::iterator aIterator (mpBitmapContainer->find(rKey)); - if (aIterator != mpBitmapContainer->end()) - { - UpdateCacheSize(aIterator->second, REMOVE); - mpBitmapContainer->erase(aIterator); - } -} - - - - void BitmapCache::InvalidateBitmap (const CacheKey& rKey) { ::osl::MutexGuard aGuard (maMutex); @@ -348,20 +325,6 @@ void BitmapCache::SetBitmap ( -bool BitmapCache::IsPrecious (const CacheKey& rKey) -{ - ::osl::MutexGuard aGuard (maMutex); - - CacheBitmapContainer::iterator aIterator (mpBitmapContainer->find(rKey)); - if (aIterator != mpBitmapContainer->end()) - return aIterator->second.IsPrecious(); - else - return false; -} - - - - void BitmapCache::SetPrecious (const CacheKey& rKey, bool bIsPrecious) { ::osl::MutexGuard aGuard (maMutex); diff --git a/sd/source/ui/slidesorter/cache/SlsBitmapCache.hxx b/sd/source/ui/slidesorter/cache/SlsBitmapCache.hxx index d0f8766cabf5..2c33e042342f 100644 --- a/sd/source/ui/slidesorter/cache/SlsBitmapCache.hxx +++ b/sd/source/ui/slidesorter/cache/SlsBitmapCache.hxx @@ -81,10 +81,6 @@ public: */ void Clear (void); - /** Returns when there is no preview bitmap in the cache. - */ - bool IsEmpty (void) const; - /** Return when the cache is full, i.e. the cache compactor had to be run. */ @@ -108,11 +104,6 @@ public: */ ::boost::shared_ptr GetBitmap (const CacheKey& rKey); - /** Release the reference to the preview bitmap that is associated with - the given key. - */ - void ReleaseBitmap (const CacheKey& rKey); - /** Mark the specified preview bitmap as not being up-to-date anymore. */ void InvalidateBitmap (const CacheKey& rKey); @@ -128,11 +119,6 @@ public: const ::boost::shared_ptr& rpPreview, bool bIsPrecious); - /** Return whether the specified preview bitmap has been marked as - precious. - */ - bool IsPrecious (const CacheKey& rKey); - /** Mark the specified preview bitmap as precious, i.e. that it must not be compressed or otherwise removed from the cache. */ diff --git a/sd/source/ui/slidesorter/cache/SlsGenericPageCache.cxx b/sd/source/ui/slidesorter/cache/SlsGenericPageCache.cxx index 7658d1f3b663..780a429df29e 100644 --- a/sd/source/ui/slidesorter/cache/SlsGenericPageCache.cxx +++ b/sd/source/ui/slidesorter/cache/SlsGenericPageCache.cxx @@ -199,15 +199,6 @@ void GenericPageCache::RequestPreviewBitmap ( -void GenericPageCache::InvalidatePreviewBitmap (CacheKey aKey) -{ - if (mpBitmapCache.get() != NULL) - mpBitmapCache->InvalidateBitmap(mpCacheContext->GetPage(aKey)); -} - - - - void GenericPageCache::ReleasePreviewBitmap (CacheKey aKey) { if (mpBitmapCache.get() != NULL) @@ -294,17 +285,6 @@ void GenericPageCache::SetPreciousFlag (CacheKey aKey, bool bIsPrecious) -bool GenericPageCache::IsEmpty (void) const -{ - if (mpBitmapCache.get() != NULL) - return mpBitmapCache->IsEmpty(); - else - return true; -} - - - - void GenericPageCache::Pause (void) { ProvideCacheAndProcessor(); diff --git a/sd/source/ui/slidesorter/cache/SlsGenericPageCache.hxx b/sd/source/ui/slidesorter/cache/SlsGenericPageCache.hxx index e38745e2844f..89fc657004e8 100644 --- a/sd/source/ui/slidesorter/cache/SlsGenericPageCache.hxx +++ b/sd/source/ui/slidesorter/cache/SlsGenericPageCache.hxx @@ -99,12 +99,6 @@ public: const Size& rSize, bool bMayBeUpToDate = true); - /** Tell the cache to replace the bitmap associated with the given - request data with a new one that reflects recent changes in the - content of the page object. - */ - void InvalidatePreviewBitmap (CacheKey aKey); - /** Call this method when a view-object-contact object is being deleted and does not need (a) its current bitmap in the cache and (b) a requested a new bitmap. @@ -124,10 +118,6 @@ public: */ void SetPreciousFlag (CacheKey aKey, bool bIsPrecious); - /** Return when there is no preview bitmap in the cache. - */ - bool IsEmpty (void) const; - void Pause (void); void Resume (void); diff --git a/sd/source/ui/slidesorter/cache/SlsIdleDetector.cxx b/sd/source/ui/slidesorter/cache/SlsIdleDetector.cxx deleted file mode 100644 index 6df77bf52800..000000000000 --- a/sd/source/ui/slidesorter/cache/SlsIdleDetector.cxx +++ /dev/null @@ -1,66 +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. - * - ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_sd.hxx" - -#include "precompiled_sd.hxx" - -#include "SlsIdleDetector.hxx" - -#include "view/SlideSorterView.hxx" -#include "tools/IdleDetection.hxx" -#include "Window.hxx" - -namespace sd { namespace slidesorter { namespace cache { - -IdleDetector::IdleDetector ( - const ::Window* pWindow, - const bool bIsSuspendPreviewUpdatesDuringFullScreenPresentation) - : mpWindow(pWindow), - mbIsSuspendPreviewUpdatesDuringFullScreenPresentation( - bIsSuspendPreviewUpdatesDuringFullScreenPresentation) -{ -} - - - - -bool IdleDetector::operator() (void) -{ - // Determine whether the system is idle. - sal_Int32 nIdleState (tools::IdleDetection::GetIdleState(mpWindow)); - if (nIdleState == tools::IdleDetection::IDET_IDLE) - return true; - else - return false; -} - - -} } } // end of namespace ::sd::slidesorter::cache - - - diff --git a/sd/source/ui/slidesorter/cache/SlsIdleDetector.hxx b/sd/source/ui/slidesorter/cache/SlsIdleDetector.hxx deleted file mode 100644 index a0ad5422496a..000000000000 --- a/sd/source/ui/slidesorter/cache/SlsIdleDetector.hxx +++ /dev/null @@ -1,51 +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_SLIDESORTER_IDLE_DETECTOR_HXX -#define SD_SLIDESORTER_IDLE_DETECTOR_HXX - -class Window; - -namespace sd { namespace slidesorter { namespace cache { - -class IdleDetector -{ -public: - IdleDetector (const ::Window* pWindow, const bool bIsSuspendPreviewUpdatesDuringFullScreenPresentation); - bool operator() (void); - -private: - const ::Window* mpWindow; - const bool mbIsSuspendPreviewUpdatesDuringFullScreenPresentation; -}; - - - - -} } } // end of namespace ::sd::slidesorter::cache - -#endif diff --git a/sd/source/ui/slidesorter/cache/SlsPageCache.cxx b/sd/source/ui/slidesorter/cache/SlsPageCache.cxx index 29b7cdb687d1..714e1f008329 100644 --- a/sd/source/ui/slidesorter/cache/SlsPageCache.cxx +++ b/sd/source/ui/slidesorter/cache/SlsPageCache.cxx @@ -29,7 +29,6 @@ #include "SlsGenericPageCache.hxx" #include "SlsRequestFactory.hxx" -#include "SlsIdleDetector.hxx" #include "cache/SlsPageCache.hxx" #include "model/SlideSorterModel.hxx" #include @@ -81,25 +80,6 @@ BitmapEx PageCache::GetPreviewBitmap ( -void PageCache::RequestPreviewBitmap ( - CacheKey aKey, - const Size& rSize) -{ - return mpImplementation->RequestPreviewBitmap(aKey, rSize); -} - - - - -void PageCache::InvalidatePreviewBitmap ( - CacheKey aKey) -{ - mpImplementation->InvalidatePreviewBitmap(aKey); -} - - - - void PageCache::ReleasePreviewBitmap ( CacheKey aKey) { diff --git a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx index 86354c823b7e..bec9c7fa369d 100644 --- a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx +++ b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx @@ -30,7 +30,6 @@ #include "SlsQueueProcessor.hxx" #include "SlsCacheConfiguration.hxx" #include "SlsRequestQueue.hxx" -#include "SlsIdleDetector.hxx" namespace sd { namespace slidesorter { namespace cache { diff --git a/sd/source/ui/slidesorter/cache/makefile.mk b/sd/source/ui/slidesorter/cache/makefile.mk index d9766e892992..58862a28645a 100644 --- a/sd/source/ui/slidesorter/cache/makefile.mk +++ b/sd/source/ui/slidesorter/cache/makefile.mk @@ -49,7 +49,6 @@ SLOFILES = \ $(SLO)$/SlsCacheCompactor.obj \ $(SLO)$/SlsCacheConfiguration.obj \ $(SLO)$/SlsGenericPageCache.obj \ - $(SLO)$/SlsIdleDetector.obj \ $(SLO)$/SlsPageCache.obj \ $(SLO)$/SlsPageCacheManager.obj \ $(SLO)$/SlsQueueProcessor.obj \ diff --git a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx index d90f6f0f824f..69c2a02ddc24 100644 --- a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx +++ b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx @@ -210,14 +210,6 @@ SlideSorterController::~SlideSorterController (void) -SlideSorter& SlideSorterController::GetSlideSorter (void) const -{ - return mrSlideSorter; -} - - - - model::SharedPageDescriptor SlideSorterController::GetPageAt ( const Point& aPixelPosition) { @@ -229,23 +221,6 @@ model::SharedPageDescriptor SlideSorterController::GetPageAt ( return pDescriptorAtPoint; } - - - -model::SharedPageDescriptor SlideSorterController::GetFadePageAt ( - const Point& aPixelPosition) -{ - sal_Int32 nHitPageIndex (mrView.GetFadePageIndexAtPoint(aPixelPosition)); - model::SharedPageDescriptor pDescriptorAtPoint; - if (nHitPageIndex >= 0) - pDescriptorAtPoint = mrModel.GetPageDescriptor(nHitPageIndex); - - return pDescriptorAtPoint; -} - - - - PageSelector& SlideSorterController::GetPageSelector (void) { OSL_ASSERT(mpPageSelector.get()!=NULL); @@ -800,50 +775,6 @@ Rectangle SlideSorterController::Rearrange (bool bForce) -void SlideSorterController::SetZoom (long int nZoom) -{ - ::sd::Window* pWindow = mrSlideSorter.GetActiveWindow(); - long int nCurrentZoom ((long int)( - pWindow->GetMapMode().GetScaleX().operator double() * 100)); - - if (nZoom > nCurrentZoom) - { - Size aPageSize (mrView.GetPageBoundingBox( - 0, - view::SlideSorterView::CS_MODEL, - view::SlideSorterView::BBT_SHAPE).GetSize()); - Size aWindowSize (pWindow->PixelToLogic( - pWindow->GetOutputSizePixel())); - - // The zoom factor must not grow by more then the ratio of the - // widths of the output window and the page objects. - long nMaxFactor - = nCurrentZoom * aWindowSize.Width() / aPageSize.Width(); - // Apply rounding, so that a current zoom factor of 1 is still - // increased. - nMaxFactor = (nCurrentZoom * 18 + 5) / 10; - nZoom = Min(nMaxFactor, nZoom); - } - if (nZoom < 1) - nZoom = 1; - - mrView.LockRedraw (TRUE); - mrView.GetLayouter().SetZoom(nZoom/100.0, pWindow); - mrView.Layout(); - GetScrollBarManager().UpdateScrollBars (false); - mrView.GetPreviewCache()->InvalidateCache(); - mrView.RequestRepaint(); - mrView.LockRedraw (FALSE); - - /* - ViewShell::SetZoom (nZoom); - GetViewFrame()->GetBindings().Invalidate (SID_ATTR_ZOOM); - */ -} - - - - FunctionReference SlideSorterController::CreateSelectionFunction (SfxRequest& rRequest) { FunctionReference xFunc( SelectionFunction::Create(mrSlideSorter, rRequest) ); diff --git a/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx b/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx index 5fdee6400959..f5864c3307a1 100644 --- a/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx @@ -253,19 +253,4 @@ void CurrentSlideManager::HandleModelChange (void) } } - - - -SdPage* GetCurrentSdPage (SlideSorter& rSlideSorter) -{ - SharedPageDescriptor pDescriptor ( - rSlideSorter.GetController().GetCurrentSlideManager()->GetCurrentSlide()); - if (pDescriptor.get() == NULL) - return NULL; - else - return pDescriptor->GetPage(); -} - - - } } } // end of namespace ::sd::slidesorter::controller diff --git a/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx b/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx index b50be47a0188..0e8f5e100d1c 100644 --- a/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx +++ b/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx @@ -177,17 +177,6 @@ void PageSelector::DeselectPage (int nPageIndex) -void PageSelector::DeselectPage (const SdPage* pPage) -{ - int nPageIndex = (pPage->GetPageNum()-1) / 2; - SharedPageDescriptor pDescriptor (mrModel.GetPageDescriptor(nPageIndex)); - if (pDescriptor.get()!=NULL && pDescriptor->GetPage()==pPage) - DeselectPage(pDescriptor); -} - - - - void PageSelector::DeselectPage (const SharedPageDescriptor& rpDescriptor) { if (rpDescriptor.get()!=NULL && rpDescriptor->Deselect()) diff --git a/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx b/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx index b928eeb9f4ce..5ee7f6f58b82 100644 --- a/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx @@ -219,26 +219,6 @@ void ScrollBarManager::PlaceFiller (const Rectangle& aArea) -void ScrollBarManager::AdaptWindowSize (const Rectangle& rArea) -{ - Size aPixelContentSize (mpContentWindow->LogicToPixel( - mrSlideSorter.GetView().GetLayouter().GetPageBox ( - mrSlideSorter.GetModel().GetPageCount()).GetSize())); - int nHeightDifference = aPixelContentSize.Height() - rArea.GetHeight(); - ::Window* pParentWindow = mpContentWindow->GetParent(); - Size aNewWindowSize (pParentWindow->GetSizePixel()); - if (nHeightDifference != 0) - { - aNewWindowSize.Height() += nHeightDifference; - pParentWindow->SetPosSizePixel( - pParentWindow->GetPosPixel(), - aNewWindowSize); - } -} - - - - void ScrollBarManager::UpdateScrollBars (bool bResetThumbPosition, bool bUseScrolling) { Rectangle aModelArea (mrSlideSorter.GetView().GetModelArea()); diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionCommand.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionCommand.cxx index d24f8a347646..687019954feb 100644 --- a/sd/source/ui/slidesorter/controller/SlsSelectionCommand.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSelectionCommand.cxx @@ -54,18 +54,6 @@ SelectionCommand::SelectionCommand ( -void SelectionCommand::AddSlides ( - const ::boost::shared_ptr& rpSelection) -{ - PageSelector::PageSelection::iterator iPage = rpSelection->begin(); - PageSelector::PageSelection::iterator iEnd = rpSelection->end(); - for (; iPage!=iEnd; ++iPage) - AddSlide(((*iPage)->GetPageNum()-1)/2); -} - - - - void SelectionCommand::AddSlide (USHORT nPageIndex) { maPagesToSelect.push_back(nPageIndex); @@ -74,14 +62,6 @@ void SelectionCommand::AddSlide (USHORT nPageIndex) -void SelectionCommand::SetCurrentSlide (USHORT nPageIndex) -{ - mnCurrentPageIndex = nPageIndex; -} - - - - void SelectionCommand::operator() (void) { OSL_ASSERT(mpCurrentSlideManager.get()!=NULL); diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionCommand.hxx b/sd/source/ui/slidesorter/controller/SlsSelectionCommand.hxx index 88ce0ea29b75..7a9d0f27369e 100644 --- a/sd/source/ui/slidesorter/controller/SlsSelectionCommand.hxx +++ b/sd/source/ui/slidesorter/controller/SlsSelectionCommand.hxx @@ -64,24 +64,11 @@ public: const ::boost::shared_ptr& rpCurrentSlideManager, const model::SlideSorterModel& rModel); - /** Add the pages in the given list of selected pages to those that will - be selected when this command is executed, i.e. its operator() - method is called. - The first page will be set as current page when the new current page - has not been specified previously. - */ - void AddSlides (const ::boost::shared_ptr& rpSelection); - /** Remember the specified page to be selected when this command is executed. */ void AddSlide (USHORT nPageIndex); - /** Call this method to explicitly set the page that will be made the - current page when this command is executed. - */ - void SetCurrentSlide (USHORT nPageIndex); - /** Execute the command and select the pages added by previous calls to AddPages() and AddPage(). */ diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx index 710e7c2eb02d..c1d742ce7158 100644 --- a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx @@ -47,7 +47,6 @@ #include "view/SlsLayouter.hxx" #include "view/SlsPageObjectViewObjectContact.hxx" #include "framework/FrameworkHelper.hxx" -#include "showview.hxx" #include "ViewShellBase.hxx" #include "DrawController.hxx" #include @@ -136,26 +135,6 @@ private: }; -class SelectionFunction::InsertionIndicatorHandler -{ -public: - InsertionIndicatorHandler (SlideSorter& rSlideSorter); - ~InsertionIndicatorHandler (void); - - /** Show the insertion marker at the given coordinates. - */ - void Start (const Point& rMouseModelPosition); - - void UpdatePosition (const Point& rMouseModelPosition); - - /** Hide the insertion marker. - */ - void End (void); - -private: - SlideSorter& mrSlideSorter; -}; - class SelectionFunction::EventDescriptor { public: @@ -188,8 +167,7 @@ SelectionFunction::SelectionFunction ( mbDragSelection(false), maInsertionMarkerBox(), mbProcessingMouseButtonDown(false), - mpSubstitutionHandler(new SubstitutionHandler(mrSlideSorter)), - mpInsertionIndicatorHandler(new InsertionIndicatorHandler(mrSlideSorter)) + mpSubstitutionHandler(new SubstitutionHandler(mrSlideSorter)) { //af aDelayToScrollTimer.SetTimeout(50); aDragTimer.SetTimeoutHdl( LINK( this, SelectionFunction, DragSlideHdl ) ); @@ -710,20 +688,6 @@ void SelectionFunction::GotoNextPage (int nOffset) -void SelectionFunction::ClearOverlays (void) -{ - view::ViewOverlay& rOverlay (mrSlideSorter.GetView().GetOverlay()); - - rOverlay.GetSubstitutionOverlay().setVisible(false); - rOverlay.GetSubstitutionOverlay().Clear(); - - mpInsertionIndicatorHandler->End(); - rOverlay.GetMouseOverIndicatorOverlay().SetSlideUnderMouse(model::SharedPageDescriptor()); -} - - - - void SelectionFunction::ProcessMouseEvent (sal_uInt32 nEventType, const MouseEvent& rEvent) { // #95491# remember button state for creation of own MouseEvents @@ -1350,55 +1314,4 @@ bool SelectionFunction::SubstitutionHandler::IsSubstitutionInsertionNonTrivial ( return bIsNonTrivial; } - - - -//===== InsertionIndicatorHandler ============================================= - -SelectionFunction::InsertionIndicatorHandler::InsertionIndicatorHandler ( - SlideSorter& rSlideSorter) - : mrSlideSorter(rSlideSorter) -{ -} - - - - -SelectionFunction::InsertionIndicatorHandler::~InsertionIndicatorHandler (void) -{ -} - - - - -void SelectionFunction::InsertionIndicatorHandler::Start (const Point& rMouseModelPosition) -{ - if (mrSlideSorter.GetController().GetProperties()->IsUIReadOnly()) - return; - - view::ViewOverlay& rOverlay (mrSlideSorter.GetView().GetOverlay()); - rOverlay.GetInsertionIndicatorOverlay().SetPosition(rMouseModelPosition); - rOverlay.GetInsertionIndicatorOverlay().setVisible(true); -} - - - - -void SelectionFunction::InsertionIndicatorHandler::UpdatePosition (const Point& rMouseModelPosition) -{ - if (mrSlideSorter.GetController().GetProperties()->IsUIReadOnly()) - return; - - view::ViewOverlay& rOverlay (mrSlideSorter.GetView().GetOverlay()); - rOverlay.GetInsertionIndicatorOverlay().SetPosition(rMouseModelPosition); -} - - - - -void SelectionFunction::InsertionIndicatorHandler::End (void) -{ - mrSlideSorter.GetView().GetOverlay().GetInsertionIndicatorOverlay().setVisible(false); -} - } } } // end of namespace ::sd::slidesorter::controller diff --git a/sd/source/ui/slidesorter/controller/SlsSlideFunction.cxx b/sd/source/ui/slidesorter/controller/SlsSlideFunction.cxx index 1b70cb1e154e..7fe090ad5541 100644 --- a/sd/source/ui/slidesorter/controller/SlsSlideFunction.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSlideFunction.cxx @@ -53,12 +53,6 @@ SlideFunction::SlideFunction ( { } -FunctionReference SlideFunction::Create( SlideSorter& rSlideSorter, SfxRequest& rRequest ) -{ - FunctionReference xFunc( new SlideFunction( rSlideSorter, rRequest ) ); - return xFunc; -} - void SlideFunction::ScrollStart (void) { } diff --git a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx index 126a599c21d3..e07e2d2cccaf 100644 --- a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx @@ -483,68 +483,6 @@ void SlotManager::GetAttrState (SfxItemSet& rSet) } } - - - -void SlotManager::GetCtrlState (SfxItemSet& rSet) -{ - if (rSet.GetItemState(SID_RELOAD) != SFX_ITEM_UNKNOWN) - { - // "Letzte Version" vom SFx en/disablen lassen - ViewShell* pShell = mrSlideSorter.GetViewShell(); - if (pShell != NULL) - { - SfxViewFrame* pSlideViewFrame = pShell->GetViewFrame(); - DBG_ASSERT(pSlideViewFrame!=NULL, - "SlideSorterController::GetCtrlState: ViewFrame not found"); - pSlideViewFrame->GetSlotState (SID_RELOAD, NULL, &rSet); - } - } - - // Output quality. - if (rSet.GetItemState(SID_OUTPUT_QUALITY_COLOR)==SFX_ITEM_AVAILABLE - ||rSet.GetItemState(SID_OUTPUT_QUALITY_GRAYSCALE)==SFX_ITEM_AVAILABLE - ||rSet.GetItemState(SID_OUTPUT_QUALITY_BLACKWHITE)==SFX_ITEM_AVAILABLE - ||rSet.GetItemState(SID_OUTPUT_QUALITY_CONTRAST)==SFX_ITEM_AVAILABLE) - { - ULONG nMode = mrSlideSorter.GetView().GetWindow()->GetDrawMode(); - UINT16 nQuality = 0; - - switch (nMode) - { - case ::sd::ViewShell::OUTPUT_DRAWMODE_COLOR: - nQuality = 0; - break; - case ::sd::ViewShell::OUTPUT_DRAWMODE_GRAYSCALE: - nQuality = 1; - break; - case ::sd::ViewShell::OUTPUT_DRAWMODE_BLACKWHITE: - nQuality = 2; - break; - case ::sd::ViewShell::OUTPUT_DRAWMODE_CONTRAST: - nQuality = 3; - break; - } - - rSet.Put (SfxBoolItem (SID_OUTPUT_QUALITY_COLOR, - (BOOL)(nQuality==0))); - rSet.Put (SfxBoolItem (SID_OUTPUT_QUALITY_GRAYSCALE, - (BOOL)(nQuality==1))); - rSet.Put (SfxBoolItem (SID_OUTPUT_QUALITY_BLACKWHITE, - (BOOL)(nQuality==2))); - rSet.Put (SfxBoolItem (SID_OUTPUT_QUALITY_CONTRAST, - (BOOL)(nQuality==3))); - } - - if (rSet.GetItemState(SID_MAIL_SCROLLBODY_PAGEDOWN) == SFX_ITEM_AVAILABLE) - { - rSet.Put (SfxBoolItem( SID_MAIL_SCROLLBODY_PAGEDOWN, TRUE)); - } -} - - - - void SlotManager::GetMenuState ( SfxItemSet& rSet) { EditMode eEditMode = mrSlideSorter.GetModel().GetEditMode(); @@ -1160,38 +1098,6 @@ void SlotManager::InsertSlide (SfxRequest& rRequest) mrSlideSorter.GetView().LockRedraw(FALSE); } - - - -void SlotManager::AssignTransitionEffect (void) -{ - model::SlideSorterModel& rModel (mrSlideSorter.GetModel()); - - // We have to manually select the pages in the document that are - // selected in the slide sorter. - rModel.SynchronizeDocumentSelection(); - - // #i34011#: Needs review, AF's bugfix is removed here - //rShell.AssignFromSlideChangeWindow(rModel.GetEditMode()); - - // We have to remove the selection of master pages to not confuse the - // model. - if (rModel.GetEditMode() == EM_MASTERPAGE) - { - SdDrawDocument* pDocument = mrSlideSorter.GetModel().GetDocument(); - USHORT nMasterPageCount = pDocument->GetMasterSdPageCount(PK_STANDARD); - for (USHORT nIndex=0; nIndexGetMasterSdPage(nIndex, PK_STANDARD); - if (pPage != NULL) - pPage->SetSelected (FALSE); - } - } -} - - - - void SlotManager::ExecuteCommandAsynchronously (::std::auto_ptr pCommand) { // Ownership of command is (implicitely) transferred to the queue. diff --git a/sd/source/ui/slidesorter/inc/cache/SlsPageCache.hxx b/sd/source/ui/slidesorter/inc/cache/SlsPageCache.hxx index 9a3256a07d86..4a5c2b51ac28 100644 --- a/sd/source/ui/slidesorter/inc/cache/SlsPageCache.hxx +++ b/sd/source/ui/slidesorter/inc/cache/SlsPageCache.hxx @@ -68,18 +68,11 @@ class RequestData; bitmaps and throw.

-

There are three somewhat similar methods for requesting new previews: - a) GetPreviewBitmap() schedules a re-rendering (when necessary) and +

There is another somewhat similar methods for requesting new previews: + GetPreviewBitmap() schedules a re-rendering (when necessary) and returns the preview what is currently available, either as a preview of the preview or, when nothing has changed since the last call, as the final thing. - b) RequestPreviewBitmap() schedules, like GetPreviewBitmap(), a - re-rendering when the currently available preview is not up-to-date. It - does not, however, return anything. Use this if you can wait for the - preview. - c) InvalidatePreviewBitmap() does not schedule a re-rendering, but - remembers that one is necessary when one of the other two methods is - called.

*/ class PageCache @@ -120,24 +113,6 @@ public: CacheKey aKey, const Size& rSize); - /** When the requested preview bitmap does not yet exist or is not - up-to-date then the rendering of one is scheduled. Otherwise this - method does nothing. - */ - void RequestPreviewBitmap ( - CacheKey aKey, - const Size& rSize); - - /** Tell the cache that the bitmap associated with the given request - data is not up-to-date anymore. Unlike the RequestPreviewBitmap() - method this does not trigger the rendering itself. It just - remembers to render it when the preview is requested the next time. - @param rRequestData - It is safe to pass a (barly) living object. It will called only - once to obtain its page object. - */ - void InvalidatePreviewBitmap (CacheKey aKey); - /** Call this method when a view-object-contact object is being deleted and does not need (a) its current bitmap in the cache and (b) a requested new bitmap. diff --git a/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx b/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx index af90b60932b9..667aa768ee8f 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx @@ -105,8 +105,6 @@ public: */ Rectangle Rearrange (bool bForce = false); - SlideSorter& GetSlideSorter (void) const; - /** Return the descriptor of the page that is rendered under the given position. @return @@ -116,14 +114,6 @@ public: */ model::SharedPageDescriptor GetPageAt (const Point& rPixelPosition); - /** Return the descriptor of the page that is associated to the page - visible fade symbol at the given position. - @return - When the given position is not over a visible page fade symbol - then NULL is returned. - */ - model::SharedPageDescriptor GetFadePageAt (const Point& rPixelPosition); - PageSelector& GetPageSelector (void); FocusManager& GetFocusManager (void); controller::Clipboard& GetClipboard (void); @@ -189,14 +179,6 @@ public: */ void UpdateAllPages (void); - /** Set the zoom factor. The given value is clipped against an upper - bound. - @param nZoom - An integer percent value, i.e. nZoom/100 is the actual zoom - factor. - */ - void SetZoom (long int nZoom); - /** This factory method creates a selection function. */ virtual FunctionReference CreateSelectionFunction (SfxRequest& rRequest); diff --git a/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx b/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx index 24420160b8cd..57aaf9293301 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx @@ -91,7 +91,6 @@ public: /** Deselect the descriptor that is associated with the given page. */ void DeselectPage (int nPageIndex); - void DeselectPage (const SdPage* pPage); void DeselectPage (const model::SharedPageDescriptor& rpDescriptor); /** This convenience method returns the same number of pages that diff --git a/sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx b/sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx index 9d4c5a9329e2..c93ed7708650 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx @@ -242,13 +242,6 @@ private: void PlaceHorizontalScrollBar (const Rectangle& aArea); void PlaceVerticalScrollBar (const Rectangle& aArea); void PlaceFiller (const Rectangle& aArea); - - /** Make the height of the content window larger or smaller, so that the - - content size fits exactly in. This is achieved by changing the size - of the parent window and rely on the resulting resize. - */ - void AdaptWindowSize (const Rectangle& rArea); }; } } } // end of namespace ::sd::slidesorter::controller diff --git a/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx b/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx index ef2bcd7b5617..79b8a1ff5d44 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx @@ -99,7 +99,6 @@ protected: private: class SubstitutionHandler; class EventDescriptor; - class InsertionIndicatorHandler; /// Set in MouseButtonDown this flag indicates that a page has been hit. bool mbPageHit; @@ -121,8 +120,6 @@ private: ::std::auto_ptr mpSubstitutionHandler; - ::std::auto_ptr mpInsertionIndicatorHandler; - DECL_LINK( DragSlideHdl, Timer* ); void StartDrag (void); @@ -182,11 +179,6 @@ private: */ void ProcessRectangleSelection (bool bToggleSelection); - /** Hide and clear the insertion indiciator, substitution display and - selection rectangle. - */ - void ClearOverlays (void); - /** Compute a numerical code that describes a mouse event and that can be used for fast look up of the appropriate reaction. */ diff --git a/sd/source/ui/slidesorter/inc/controller/SlsSlideFunction.hxx b/sd/source/ui/slidesorter/inc/controller/SlsSlideFunction.hxx index 843e6e82b45c..5b8c7d9a08b6 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsSlideFunction.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsSlideFunction.hxx @@ -50,8 +50,6 @@ class SlideFunction public: TYPEINFO(); - static FunctionReference Create( SlideSorter& rSlideSorter, SfxRequest& rRequest ); - virtual BOOL MouseMove (const MouseEvent& rMEvt); virtual BOOL MouseButtonUp (const MouseEvent& rMEvt); virtual BOOL MouseButtonDown (const MouseEvent& rMEvt); diff --git a/sd/source/ui/slidesorter/inc/controller/SlsSlotManager.hxx b/sd/source/ui/slidesorter/inc/controller/SlsSlotManager.hxx index d7b7a0e06831..0e58d5d3b411 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsSlotManager.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsSlotManager.hxx @@ -63,7 +63,6 @@ public: void FuTemporary (SfxRequest& rRequest); void FuPermanent (SfxRequest& rRequest); void FuSupport (SfxRequest& rRequest); - void GetCtrlState (SfxItemSet &rSet); void GetMenuState (SfxItemSet &rSet); void GetClipboardState (SfxItemSet &rSet); void GetStatusBarState (SfxItemSet& rSet); @@ -94,8 +93,6 @@ private: */ void InsertSlide (SfxRequest& rRequest); - void AssignTransitionEffect (void); - DECL_LINK(UserEventCallback, void*); }; diff --git a/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx b/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx index 42bc6c2140f7..4ade19087304 100644 --- a/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx +++ b/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx @@ -83,9 +83,6 @@ public: */ bool SetEditMode (EditMode eEditMode); - /** Set the edit mode to that currently used by the controller. - */ - bool SetEditModeFromController (void); EditMode GetEditMode (void) const; PageKind GetPageType (void) const; @@ -147,10 +144,6 @@ public: */ void SynchronizeDocumentSelection (void); - /** Set the selection of the called model to exactly that of the document. - */ - void SynchronizeModelSelection (void); - /** Replace the factory for the creation of the page objects and contacts with the given object. The old factory is destroyed. */ diff --git a/sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx b/sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx index 0854ad5e678a..81877ce7465c 100644 --- a/sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx +++ b/sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx @@ -100,13 +100,6 @@ public: */ css::uno::Reference GetXDrawPage (void) const; - /** Returns the index of the page as it is displayed in the view as page - number. The value may differ from the index returned by the - XDrawPage when there are hidden slides and the XIndexAccess used to - access the model filters them out. - */ - sal_Int32 GetPageIndex (void) const; - /** Return the page shape that is used for visualizing the page. */ view::PageObject* GetPageObject (void); @@ -176,10 +169,6 @@ public: void SetPageNumberAreaModelSize (const Size& rSize); Size GetPageNumberAreaModelSize (void) const; - /** Returns when the slide is the current slide. - */ - bool IsCurrentPage (void) const; - /** Set or revoke the state of this slide being the current slide. */ void SetIsCurrentPage (const bool bIsCurrent); diff --git a/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx b/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx index d5c8dd4bf241..6c16a154ecfd 100644 --- a/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx @@ -134,7 +134,6 @@ public: given position. */ sal_Int32 GetPageIndexAtPoint (const Point& rPosition) const; - sal_Int32 GetFadePageIndexAtPoint (const Point& rPosition) const; view::Layouter& GetLayouter (void); @@ -206,8 +205,6 @@ public: */ void SetSelectionRectangleVisibility (bool bVisible); - ::sdr::contact::ObjectContact& GetObjectContact (void) const; - typedef ::std::pair PageRange; /** Return the range of currently visible page objects including the first and last one in that range. @@ -217,16 +214,6 @@ public: */ PageRange GetVisiblePageRange (void); - /** Return the size of the area where the page numbers are displayed. - @return - The returned size is given in model coordinates. - */ - Size GetPageNumberAreaModelSize (void) const; - - /** Return the size of the border around the original SdrPageObj. - */ - SvBorder GetModelBorder (void) const; - /** Add a shape to the page. Typically used from inside PostModelChange(). */ diff --git a/sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx b/sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx index 246dcbc05ee7..9b1fd996e9c0 100644 --- a/sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx @@ -69,14 +69,6 @@ public: Layouter (void); ~Layouter (void); - /** Set the minimal, the maximal, and the desired width of the page - objects. The three parameters have to fullfill the constraint - nMinimalWidth <= nPreferredWidth <= nMaximalWidth or the call is - ignored. - */ - void SetObjectWidth (sal_Int32 nMinimalWidth, sal_Int32 nMaximalWidth, - sal_Int32 nPreferredWidth); - /** Set the horizontal and vertical borders in pixel coordinates between the enclosing window and page objects. The borders may be painted larger then the given values when the space for the insertion marker @@ -114,13 +106,6 @@ public: void SetPageBorders (sal_Int32 nLeftBorder, sal_Int32 nRightBorder, sal_Int32 nTopBorder, sal_Int32 nBottomBorder); - /** Set the horizontal and vertical gaps between adjacent page objects. - These gaps are only relevant when there is more than one column or - more than one row. Negative values indicate that the respective gap - is not set. - */ - void SetGaps (sal_Int32 nHorizontalGap, sal_Int32 nVerticalGap); - /** Set the interval of valid column counts. When nMinimalColumnCount <= nMaximalColumnCount is not fullfilled then the call is ignored. @param nMinimalColumnCount @@ -160,19 +145,12 @@ public: /** Change the zoom factor. This does not change the general layout (number of columns). */ - void SetZoom (double nZoomFactor, OutputDevice* pDevice); void SetZoom (Fraction nZoomFactor, OutputDevice* pDevice); /** Return the number of columns. */ sal_Int32 GetColumnCount (void) const; - /** Returns whether the column count is fixed () or variable - (). It is fixed if SetColumnCount() was called with the - same value for minimal and maximal column count. - */ - bool IsColumnCountFixed (void) const; - /** Return the scale factor that can be set at the map mode of the output window. */ @@ -289,7 +267,6 @@ public: const DoublePoint&rLayouterPoint) const; typedef ::std::vector BackgroundRectangleList; - const BackgroundRectangleList& GetBackgroundRectangleList (void) const; private: class ScreenAndModelValue {public: diff --git a/sd/source/ui/slidesorter/inc/view/SlsPageObjectViewContact.hxx b/sd/source/ui/slidesorter/inc/view/SlsPageObjectViewContact.hxx index c0083ff92d73..31899d3b3e44 100644 --- a/sd/source/ui/slidesorter/inc/view/SlsPageObjectViewContact.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlsPageObjectViewContact.hxx @@ -69,8 +69,6 @@ public: SdrPageObj& GetPageObject (void) const; - Rectangle GetPageObjectBoundingBox (void) const; - virtual void ActionChanged (void); protected: diff --git a/sd/source/ui/slidesorter/model/SlideSorterModel.cxx b/sd/source/ui/slidesorter/model/SlideSorterModel.cxx index be298856c066..5ba5344f137a 100644 --- a/sd/source/ui/slidesorter/model/SlideSorterModel.cxx +++ b/sd/source/ui/slidesorter/model/SlideSorterModel.cxx @@ -119,30 +119,6 @@ bool SlideSorterModel::SetEditMode (EditMode eEditMode) -bool SlideSorterModel::SetEditModeFromController (void) -{ - bool bIsMasterPageMode = false; - // Get the edit mode from the controller. - try - { - Reference xSet (mrSlideSorter.GetXController(), UNO_QUERY_THROW); - Any aValue (xSet->getPropertyValue( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsMasterPageMode")))); - aValue >>= bIsMasterPageMode; - } - catch (RuntimeException&) - { - // When the property is not supported then the master - // page mode is not supported, too. - bIsMasterPageMode = false; - } - - return SetEditMode(bIsMasterPageMode ? EM_MASTERPAGE : EM_PAGE); -} - - - - EditMode SlideSorterModel::GetEditMode (void) const { return meEditMode; @@ -313,27 +289,6 @@ void SlideSorterModel::SynchronizeDocumentSelection (void) } } - - - -void SlideSorterModel::SynchronizeModelSelection (void) -{ - ::osl::MutexGuard aGuard (maMutex); - - PageEnumeration aAllPages (PageEnumerationProvider::CreateAllPagesEnumeration(*this)); - while (aAllPages.HasMoreElements()) - { - SharedPageDescriptor pDescriptor (aAllPages.GetNextElement()); - if (pDescriptor->GetPage()->IsSelected()) - pDescriptor->Select (); - else - pDescriptor->Deselect (); - } -} - - - - void SlideSorterModel::SetPageObjectFactory( ::std::auto_ptr pPageObjectFactory) { diff --git a/sd/source/ui/slidesorter/model/SlsPageDescriptor.cxx b/sd/source/ui/slidesorter/model/SlsPageDescriptor.cxx index 2010d313c9dd..ffd93cbf0a13 100644 --- a/sd/source/ui/slidesorter/model/SlsPageDescriptor.cxx +++ b/sd/source/ui/slidesorter/model/SlsPageDescriptor.cxx @@ -92,14 +92,6 @@ Reference PageDescriptor::GetXDrawPage (void) const -sal_Int32 PageDescriptor::GetPageIndex (void) const -{ - return mnIndex; -} - - - - view::PageObject* PageDescriptor::GetPageObject (void) { if (mpPageObject==NULL && mpPageObjectFactory!=NULL && mpPage != NULL) @@ -279,14 +271,6 @@ Size PageDescriptor::GetPageNumberAreaModelSize (void) const -bool PageDescriptor::IsCurrentPage (void) const -{ - return mbIsCurrent; -} - - - - void PageDescriptor::SetIsCurrentPage (const bool bIsCurrent) { mbIsCurrent = bIsCurrent; diff --git a/sd/source/ui/slidesorter/shell/SlideSorterService.cxx b/sd/source/ui/slidesorter/shell/SlideSorterService.cxx index db5d948b52fc..787086b4596e 100644 --- a/sd/source/ui/slidesorter/shell/SlideSorterService.cxx +++ b/sd/source/ui/slidesorter/shell/SlideSorterService.cxx @@ -631,18 +631,6 @@ void SlideSorterService::Resize (void) -void SlideSorterService::Rearrange (void) -{ - if (mxParentWindow.is()) - { - awt::Rectangle aWindowBox = mxParentWindow->getPosSize(); - mpSlideSorter->GetController().Rearrange(); - } -} - - - - void SlideSorterService::ThrowIfDisposed (void) throw (::com::sun::star::lang::DisposedException) { diff --git a/sd/source/ui/slidesorter/shell/SlideSorterService.hxx b/sd/source/ui/slidesorter/shell/SlideSorterService.hxx index a502442ab9f2..9af239c64fd1 100644 --- a/sd/source/ui/slidesorter/shell/SlideSorterService.hxx +++ b/sd/source/ui/slidesorter/shell/SlideSorterService.hxx @@ -204,7 +204,6 @@ private: ::boost::scoped_ptr mpPropertyArrayHelper; void Resize (void); - void Rearrange (void); /** This method throws a DisposedException when the object has already been disposed. diff --git a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx index 83475948fab2..86ec4002cd02 100644 --- a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx +++ b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx @@ -327,22 +327,6 @@ SfxUndoManager* SlideSorterViewShell::ImpGetUndoManager (void) const -SfxShell* SlideSorterViewShell::CreateInstance ( - sal_Int32, - SfxShell*, - void* pUserData, - ViewShellBase& rBase) -{ - return new SlideSorterViewShell ( - rBase.GetViewFrame(), - rBase, - static_cast< ::Window*>(pUserData), - NULL); -} - - - - void SlideSorterViewShell::GetFocus (void) { OSL_ASSERT(mpSlideSorter.get()!=NULL); diff --git a/sd/source/ui/slidesorter/view/SlideSorterView.cxx b/sd/source/ui/slidesorter/view/SlideSorterView.cxx index 82aac5b2cd9e..47ce907be637 100644 --- a/sd/source/ui/slidesorter/view/SlideSorterView.cxx +++ b/sd/source/ui/slidesorter/view/SlideSorterView.cxx @@ -171,52 +171,6 @@ sal_Int32 SlideSorterView::GetPageIndexAtPoint (const Point& rPosition) const -sal_Int32 SlideSorterView::GetFadePageIndexAtPoint ( - const Point& rPosition) const -{ - sal_Int32 nIndex (-1); - - ::sd::Window* pWindow = GetWindow(); - if (pWindow != NULL) - { - Point aModelPosition (pWindow->PixelToLogic (rPosition)); - nIndex = mpLayouter->GetIndexAtPoint( - aModelPosition, - true // Include page borders into hit test - ); - - // Clip the page index against the page count. - if (nIndex >= mrModel.GetPageCount()) - nIndex = -1; - - if (nIndex >= 0) - { - // Now test whether the given position is inside the area of the - // fade effect indicator. - view::PageObjectViewObjectContact* pContact - = mrModel.GetPageDescriptor(nIndex)->GetViewObjectContact(); - if (pContact != NULL) - { - if ( ! pContact->GetBoundingBox( - *pWindow, - PageObjectViewObjectContact::FadeEffectIndicatorBoundingBox, - PageObjectViewObjectContact::ModelCoordinateSystem).IsInside ( - aModelPosition)) - { - nIndex = -1; - } - } - else - nIndex = -1; - } - } - - return nIndex; -} - - - - Layouter& SlideSorterView::GetLayouter (void) { return *mpLayouter.get(); @@ -725,14 +679,6 @@ ViewOverlay& SlideSorterView::GetOverlay (void) -::sdr::contact::ObjectContact& SlideSorterView::GetObjectContact (void) const -{ - return GetSdrPageView()->GetPageWindow(0)->GetObjectContact(); -} - - - - SlideSorterView::PageRange SlideSorterView::GetVisiblePageRange (void) { const int nMaxPageIndex (mrModel.GetPageCount() - 1); @@ -821,22 +767,6 @@ void SlideSorterView::UpdatePageBorders (void) -Size SlideSorterView::GetPageNumberAreaModelSize (void) const -{ - return maPageNumberAreaModelSize; -} - - - - -SvBorder SlideSorterView::GetModelBorder (void) const -{ - return maModelBorder; -} - - - - void SlideSorterView::AddSdrObject (SdrObject& rObject) { mpPage->InsertObject(&rObject); diff --git a/sd/source/ui/slidesorter/view/SlsLayouter.cxx b/sd/source/ui/slidesorter/view/SlsLayouter.cxx index 1ba44caa24b0..3767a655c48b 100644 --- a/sd/source/ui/slidesorter/view/SlsLayouter.cxx +++ b/sd/source/ui/slidesorter/view/SlsLayouter.cxx @@ -71,22 +71,6 @@ Layouter::~Layouter (void) } -void Layouter::SetObjectWidth ( - sal_Int32 nMinimalWidth, - sal_Int32 nMaximalWidth, - sal_Int32 nPreferredWidth) -{ - if (nMinimalWidth <= nPreferredWidth && nPreferredWidth <= nMaximalWidth) - { - mnMinimalWidth = nMinimalWidth; - mnPreferredWidth = nMaximalWidth; - mnMaximalWidth = nPreferredWidth; - } -} - - - - void Layouter::SetBorders ( sal_Int32 nLeftBorder, sal_Int32 nRightBorder, @@ -125,20 +109,6 @@ void Layouter::SetPageBorders ( -void Layouter::SetGaps ( - sal_Int32 nHorizontalGap, - sal_Int32 nVerticalGap) -{ - if (nHorizontalGap >= 0) - mnHorizontalGap.mnScreen = nHorizontalGap; - if (nVerticalGap >= 0) - mnVerticalGap.mnScreen = nVerticalGap; -} - - - - - void Layouter::SetColumnCount ( sal_Int32 nMinimalColumnCount, sal_Int32 nMaximalColumnCount) @@ -337,14 +307,6 @@ bool Layouter::RearrangeVertical ( -void Layouter::SetZoom (double nZoomFactor, OutputDevice* pDevice) -{ - SetZoom(Fraction(nZoomFactor), pDevice); -} - - - - void Layouter::SetZoom (Fraction nZoomFactor, OutputDevice* pDevice) { MapMode aMapMode (pDevice->GetMapMode()); @@ -406,14 +368,6 @@ sal_Int32 Layouter::GetColumnCount (void) const -bool Layouter::IsColumnCountFixed (void) const -{ - return mnMinimalColumnCount == mnMaximalColumnCount; -} - - - - Size Layouter::GetPageObjectSize (void) const { return maPageObjectModelSize; @@ -801,13 +755,4 @@ sal_Int32 Layouter::ResolvePositionInGap ( -const Layouter::BackgroundRectangleList& - Layouter::GetBackgroundRectangleList (void) const -{ - return maBackgroundRectangleList; -} - - - - } } } // end of namespace ::sd::slidesorter::namespace diff --git a/sd/source/ui/slidesorter/view/SlsPageObjectViewContact.cxx b/sd/source/ui/slidesorter/view/SlsPageObjectViewContact.cxx index 5ef90ad2830b..303e78eeff61 100644 --- a/sd/source/ui/slidesorter/view/SlsPageObjectViewContact.cxx +++ b/sd/source/ui/slidesorter/view/SlsPageObjectViewContact.cxx @@ -93,21 +93,6 @@ void PageObjectViewContact::ActionChanged (void) ViewContactOfPageObj::ActionChanged(); } -Rectangle PageObjectViewContact::GetPageObjectBoundingBox (void) const -{ - // use model data directly here - OSL_ASSERT(mpDescriptor.get()!=NULL); - Rectangle aRetval(GetPageObject().GetLastBoundRect()); - const SvBorder aPageDescriptorBorder(mpDescriptor->GetModelBorder()); - - aRetval.Left() -= aPageDescriptorBorder.Left(); - aRetval.Top() -= aPageDescriptorBorder.Top(); - aRetval.Right() += aPageDescriptorBorder.Right(); - aRetval.Bottom() += aPageDescriptorBorder.Bottom(); - - return aRetval; -} - SdrPageObj& PageObjectViewContact::GetPageObject (void) const { return ViewContactOfPageObj::GetPageObj(); diff --git a/sd/source/ui/slidesorter/view/SlsPageObjectViewObjectContact.cxx b/sd/source/ui/slidesorter/view/SlsPageObjectViewObjectContact.cxx index 8f259e2a8c0f..92cbfe8f04d2 100644 --- a/sd/source/ui/slidesorter/view/SlsPageObjectViewObjectContact.cxx +++ b/sd/source/ui/slidesorter/view/SlsPageObjectViewObjectContact.cxx @@ -626,7 +626,6 @@ private: // private helpers const BitmapEx& getFadeEffectIconBitmap() const; - const BitmapEx& getCommentsIconBitmap() const; protected: // method which is to be used to implement the local decomposition of a 2D primitive. @@ -684,21 +683,6 @@ const BitmapEx& SdPageObjectFadeNameNumberPrimitive::getFadeEffectIconBitmap() c const sal_Int32 SdPageObjectFadeNameNumberPrimitive::mnCommentsIndicatorOffset(9); BitmapEx* SdPageObjectFadeNameNumberPrimitive::mpCommentsIconBitmap = 0; -const BitmapEx& SdPageObjectFadeNameNumberPrimitive::getCommentsIconBitmap() const -{ - if(mpCommentsIconBitmap == NULL) - { - // prepare CommentsIconBitmap on demand - const sal_uInt16 nIconId(Application::GetSettings().GetStyleSettings().GetHighContrastMode() - ? BMP_COMMENTS_INDICATOR_H - : BMP_COMMENTS_INDICATOR); - const BitmapEx aCommentsIconBitmap(IconCache::Instance().GetIcon(nIconId).GetBitmapEx()); - const_cast< SdPageObjectFadeNameNumberPrimitive* >(this)->mpCommentsIconBitmap = new BitmapEx(aCommentsIconBitmap); - } - - return *mpCommentsIconBitmap; -} - Primitive2DSequence SdPageObjectFadeNameNumberPrimitive::create2DDecomposition(const drawinglayer::geometry::ViewInformation2D& rViewInformation) const { const xub_StrLen nTextLength(getPageName().Len()); diff --git a/sd/source/ui/toolpanel/EmptyWindow.cxx b/sd/source/ui/toolpanel/EmptyWindow.cxx deleted file mode 100644 index 2e964fa4e30b..000000000000 --- a/sd/source/ui/toolpanel/EmptyWindow.cxx +++ /dev/null @@ -1,96 +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. - * - ************************************************************************/ - -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_sd.hxx" - -#include "EmptyWindow.hxx" - -namespace sd { namespace toolpanel { - - -EmptyWindow::EmptyWindow ( - Window* pParentWindow, - Color aBackgroundColor, - const String& rText) - : Window (pParentWindow, WinBits()), - msText (rText) -{ - SetBackground (aBackgroundColor); -} - - - - -EmptyWindow::~EmptyWindow (void) -{ -} - - - - -void EmptyWindow::Paint (const Rectangle& ) -{ - Size aWindowSize (GetOutputSizePixel()); - Point aPosition(aWindowSize.Width()/2,aWindowSize.Height()/2); - - Rectangle aBBox; - aPosition = Point(10,aWindowSize.Height()/2); - if (GetTextBoundRect (aBBox, msText)) - aPosition = Point ( - (aWindowSize.Width()-aBBox.GetWidth())/2, - (aWindowSize.Height()-aBBox.GetHeight())/2); - DrawText (aPosition, msText); - - String sSizeString = String::CreateFromInt32(aWindowSize.Width()); - sSizeString.Append (String::CreateFromAscii(" x ")); - sSizeString.Append (String::CreateFromInt32(aWindowSize.Height())); - if (GetTextBoundRect (aBBox, sSizeString)) - aPosition = Point ( - (aWindowSize.Width()-aBBox.GetWidth())/2, - aPosition.Y() + GetTextHeight() + aBBox.GetHeight()); - DrawText (aPosition, sSizeString); -} - - - - -void EmptyWindow::Resize (void) -{ - Window::Resize(); -} - - - - -void EmptyWindow::GetFocus (void) -{ - GetParent()->GrabFocus(); -} - - -} } // end of namespace ::sd::tpv diff --git a/sd/source/ui/toolpanel/EmptyWindow.hxx b/sd/source/ui/toolpanel/EmptyWindow.hxx deleted file mode 100644 index 4137020874f5..000000000000 --- a/sd/source/ui/toolpanel/EmptyWindow.hxx +++ /dev/null @@ -1,57 +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_EMPTY_WINDOW_HXX -#define SD_EMPTY_WINDOW_HXX - -#include - -namespace sd { namespace toolpanel { - -/** Simply paint a solid background and a centered text. -*/ -class EmptyWindow - : public ::Window -{ -public: - EmptyWindow ( - ::Window* pParentWindow, - Color rBackgroundColor, - const String& rText); - virtual ~EmptyWindow (void); - - virtual void Paint (const Rectangle& rBoundingBox); - virtual void Resize (void); - virtual void GetFocus (void); - -private: - String msText; -}; - -} } // end of namespace ::sd::toolpanel - -#endif diff --git a/sd/source/ui/toolpanel/LayoutMenu.cxx b/sd/source/ui/toolpanel/LayoutMenu.cxx index a2bb1d0cbbac..6e5a73c3aecc 100644 --- a/sd/source/ui/toolpanel/LayoutMenu.cxx +++ b/sd/source/ui/toolpanel/LayoutMenu.cxx @@ -305,14 +305,6 @@ LayoutMenu::~LayoutMenu (void) -String LayoutMenu::GetSelectedLayoutName (void) -{ - return GetItemText (GetSelectItemId()); -} - - - - AutoLayout LayoutMenu::GetSelectedAutoLayout (void) { AutoLayout aResult = AUTOLAYOUT_NONE; diff --git a/sd/source/ui/toolpanel/LayoutMenu.hxx b/sd/source/ui/toolpanel/LayoutMenu.hxx index bd121403c2d3..d2f019b5bc34 100644 --- a/sd/source/ui/toolpanel/LayoutMenu.hxx +++ b/sd/source/ui/toolpanel/LayoutMenu.hxx @@ -99,10 +99,6 @@ public: ViewShellBase& rBase, DrawDocShell& rDocShell); - /** Return the name of the currently selected layout. - */ - String GetSelectedLayoutName (void); - /** Return a numerical value representing the currently selected layout. */ diff --git a/sd/source/ui/toolpanel/ScrollPanel.cxx b/sd/source/ui/toolpanel/ScrollPanel.cxx index cff065777235..13bb9c8e8d35 100644 --- a/sd/source/ui/toolpanel/ScrollPanel.cxx +++ b/sd/source/ui/toolpanel/ScrollPanel.cxx @@ -110,15 +110,6 @@ ScrollPanel::~ScrollPanel (void) -void ScrollPanel::ListHasChanged (void) -{ - mpControlContainer->ListHasChanged (); - RequestResize (); -} - - - - TitledControl* ScrollPanel::AddControl ( ::std::auto_ptr pControl, const String& rTitle, diff --git a/sd/source/ui/toolpanel/SimpleLayoutWrapper.cxx b/sd/source/ui/toolpanel/SimpleLayoutWrapper.cxx deleted file mode 100644 index 0aa2d3f91760..000000000000 --- a/sd/source/ui/toolpanel/SimpleLayoutWrapper.cxx +++ /dev/null @@ -1,98 +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. - * - ************************************************************************/ - -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_sd.hxx" - -#include "SimpleLayoutWrapper.hxx" - -#include - -namespace sd { namespace toolpanel { - -SimpleLayoutWrapper::SimpleLayoutWrapper ( - ::std::auto_ptr< ::Window> pWindow, - int nPreferredWidth, - int nPreferredHeight, - bool bIsResizable) - : mpWindow (pWindow), - mnPreferredWidth(nPreferredWidth), - mnPreferredHeight(nPreferredHeight), - mbIsResizable (bIsResizable) -{ -} - - - - -SimpleLayoutWrapper::~SimpleLayoutWrapper (void) -{ -} - - - - -Size SimpleLayoutWrapper::GetPreferredSize (void) -{ - return Size (mnPreferredWidth, mnPreferredHeight); -} - - - - -sal_Int32 SimpleLayoutWrapper::GetPreferredWidth (sal_Int32) -{ - return mnPreferredWidth; -} - - - - -sal_Int32 SimpleLayoutWrapper::GetPreferredHeight (sal_Int32) -{ - return mnPreferredHeight; -} - - - - -bool SimpleLayoutWrapper::IsResizable (void) -{ - return mbIsResizable; -} - - - - -::Window* SimpleLayoutWrapper::GetWindow (void) -{ - return mpWindow.get(); -} - - -} } // end of namespace ::sd::toolpanel - diff --git a/sd/source/ui/toolpanel/SimpleLayoutWrapper.hxx b/sd/source/ui/toolpanel/SimpleLayoutWrapper.hxx deleted file mode 100644 index a05d9d6ff295..000000000000 --- a/sd/source/ui/toolpanel/SimpleLayoutWrapper.hxx +++ /dev/null @@ -1,70 +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_TASKPANE_SIMPLE_LAYOUT_WRAPPER_HXX -#define SD_TASKPANE_SIMPLE_LAYOUT_WRAPPER_HXX - -#include "taskpane/ILayoutableWindow.hxx" - -#include - -namespace sd { namespace toolpanel { - - -/** Simple wrapper arround a regular VCL window that implements the - methods that return the preferred size of the window. They are - given once to the constructor and are not modified by the wrapper. -*/ -class SimpleLayoutWrapper - : public virtual ILayoutableWindow -{ -public: - SimpleLayoutWrapper ( - ::std::auto_ptr< ::Window> pWindow, - int nPreferredWidth, - int nPreferredHeight, - bool bIsResizable); - virtual ~SimpleLayoutWrapper (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); - - using sd::toolpanel::ILayoutableWindow::GetPreferredWidth; - using sd::toolpanel::ILayoutableWindow::GetPreferredHeight; -private: - ::std::auto_ptr< ::Window> mpWindow; - int mnPreferredWidth; - int mnPreferredHeight; - bool mbIsResizable; -}; - -} } // end of namespace ::sd::toolpanel - -#endif diff --git a/sd/source/ui/toolpanel/SubToolPanel.cxx b/sd/source/ui/toolpanel/SubToolPanel.cxx index 31c29f4f1c08..06b63ae2da85 100644 --- a/sd/source/ui/toolpanel/SubToolPanel.cxx +++ b/sd/source/ui/toolpanel/SubToolPanel.cxx @@ -86,64 +86,6 @@ SubToolPanel::~SubToolPanel (void) -void SubToolPanel::ListHasChanged (void) -{ - mpControlContainer->ListHasChanged (); - RequestResize (); -} - - - - -void SubToolPanel::AddControl ( - ::std::auto_ptr pControl, - const String& rTitle, - ULONG nHelpId) -{ - pControl->GetWindow()->AddEventListener ( - LINK(this,SubToolPanel,WindowEventListener)); - - // We are interested only in the title. The control itself is - // managed by the content object. - TitledControl* pTitledControl = new TitledControl( - this, - pControl, - rTitle, - TitledControlStandardClickHandler(GetControlContainer(), ControlContainer::ES_TOGGLE), - TitleBar::TBT_SUB_CONTROL_HEADLINE); - pTitledControl->GetWindow()->SetParent(this); - pTitledControl->GetWindow()->SetHelpId(nHelpId); - ::std::auto_ptr pChild (pTitledControl); - - // Add a down link only for the first control so that when - // entering the sub tool panel the focus is set to the first control. - if (mpControlContainer->GetControlCount() == 0) - FocusManager::Instance().RegisterDownLink(GetParent(), pTitledControl->GetWindow()); - FocusManager::Instance().RegisterUpLink(pTitledControl->GetWindow(), GetParent()); - - mpControlContainer->AddControl (pChild); -} - - - - -void SubToolPanel::AddControl (::std::auto_ptr pControl) -{ - pControl->GetWindow()->AddEventListener ( - LINK(this,SubToolPanel,WindowEventListener)); - - // Add a down link only for the first control so that when - // entering the sub tool panel the focus is set to the first control. - if (mpControlContainer->GetControlCount() == 0) - FocusManager::Instance().RegisterDownLink(GetParent(), pControl->GetWindow()); - FocusManager::Instance().RegisterUpLink(pControl->GetWindow(), GetParent()); - - mpControlContainer->AddControl (pControl); -} - - - - void SubToolPanel::Paint (const Rectangle& rRect) { if (mbIsRearrangePending) diff --git a/sd/source/ui/toolpanel/TaskPaneShellManager.cxx b/sd/source/ui/toolpanel/TaskPaneShellManager.cxx index 5a4875340840..b1556c53d3d2 100644 --- a/sd/source/ui/toolpanel/TaskPaneShellManager.cxx +++ b/sd/source/ui/toolpanel/TaskPaneShellManager.cxx @@ -76,19 +76,6 @@ void TaskPaneShellManager::ReleaseShell (SfxShell* ) // Nothing to do. } -// hack for annotation panel, better fix? -void TaskPaneShellManager_AddSubShell ( TaskPaneShellManager* pManager, sal_Int32 nId, SfxShell* pShell, ::Window* pWindow ) -{ - if( pManager != NULL ) - pManager->AddSubShell( (ShellId)nId, pShell, pWindow ); -} - -void TaskPaneShellManager_RemoveSubShell ( TaskPaneShellManager* pManager, const SfxShell* pShell) -{ - if( pManager != NULL ) - pManager->RemoveSubShell( pShell ); -} - void TaskPaneShellManager::AddSubShell ( ShellId nId, SfxShell* pShell, diff --git a/sd/source/ui/toolpanel/TaskPaneTreeNode.cxx b/sd/source/ui/toolpanel/TaskPaneTreeNode.cxx index 152f576bd5bc..4e0daacb74b1 100644 --- a/sd/source/ui/toolpanel/TaskPaneTreeNode.cxx +++ b/sd/source/ui/toolpanel/TaskPaneTreeNode.cxx @@ -55,22 +55,6 @@ TreeNode::~TreeNode (void) -bool TreeNode::IsLeaf (void) -{ - return (mpControlContainer.get()==NULL); -} - - - - -bool TreeNode::IsRoot (void) -{ - return (mpParent==NULL); -} - - - - void TreeNode::SetParentNode (TreeNode* pNewParent) { mpParent = pNewParent; @@ -288,18 +272,6 @@ void TreeNode::AddStateChangeListener (const Link& rListener) -void TreeNode::RemoveStateChangeListener (const Link& rListener) -{ - maStateChangeListeners.erase ( - ::std::find ( - maStateChangeListeners.begin(), - maStateChangeListeners.end(), - rListener)); -} - - - - void TreeNode::FireStateChangeEvent ( TreeNodeStateChangeEventId eEventId, TreeNode* pChild) const diff --git a/sd/source/ui/toolpanel/TaskPaneViewShell.cxx b/sd/source/ui/toolpanel/TaskPaneViewShell.cxx index d80beba7cd10..b2f91d8aa0ba 100644 --- a/sd/source/ui/toolpanel/TaskPaneViewShell.cxx +++ b/sd/source/ui/toolpanel/TaskPaneViewShell.cxx @@ -46,8 +46,6 @@ #include "controls/TableDesignPanel.hxx" #include "controls/CustomAnimationPanel.hxx" #include "controls/SlideTransitionPanel.hxx" -#include "controls/AnimationSchemesPanel.hxx" -#include "TitleToolBox.hxx" #include "taskpane/ControlContainer.hxx" #include "FrameView.hxx" #include "Window.hxx" @@ -75,6 +73,7 @@ #include #include #include +#include #include "sdtreelb.hxx" #include "DrawViewShell.hxx" #include "drawdoc.hxx" @@ -135,13 +134,6 @@ public: */ void AddPanel (sal_uInt32 nInternalId, PanelId nPublicId); - /** Return the public id for the given internal one. - @return - When the given public id is not known then PID_UNKNOWN is - returned. - */ - PanelId GetPublicId (sal_uInt32 nInternalId) const; - /** Return the internal id for the given public one. @return When the given public id is not known then mnInvalidId is @@ -622,21 +614,6 @@ SdPage* TaskPaneViewShell::getCurrentPage(void) const -void TaskPaneViewShell::Execute (SfxRequest& ) -{ -} - - - - -void TaskPaneViewShell::GetState (SfxItemSet& rItemSet) -{ - (void)rItemSet; -} - - - - TaskPaneShellManager& TaskPaneViewShell::GetSubShellManager (void) const { return *mpSubShellManager.get(); @@ -675,21 +652,6 @@ void TaskPaneViewShell::ShowPanel (const PanelId nPublicId) -void TaskPaneViewShell::HidePanel (const PanelId nPublicId) -{ - Initialize(); - sal_uInt32 nId (mpImpl->GetInternalId(nPublicId)); - if (nId != Implementation::mnInvalidId) - { - mpTaskPane->GetControlContainer().SetVisibilityState ( - nId, - ControlContainer::VS_HIDE); - } -} - - - - void TaskPaneViewShell::ExpandPanel (const PanelId nPublicId) { Initialize(); @@ -809,19 +771,6 @@ void TaskPaneViewShell::Implementation::AddPanel ( -TaskPaneViewShell::PanelId - TaskPaneViewShell::Implementation::GetPublicId ( - sal_uInt32 nInternalId) const -{ - if (nInternalId < maIndexMap.size()) - return maIndexMap[nInternalId]; - else - return PID_UNKNOWN; -} - - - - sal_uInt32 TaskPaneViewShell::Implementation::GetInternalId ( TaskPaneViewShell::PanelId nPublicId) const @@ -840,27 +789,6 @@ sal_uInt32 -//===== PanelActivation ======================================================= - -PanelActivation::PanelActivation (ViewShellBase& rBase, TaskPaneViewShell::PanelId nPanelId) - : mrBase(rBase), - mnPanelId(nPanelId) -{ -} - -void PanelActivation::operator() (bool) -{ - toolpanel::TaskPaneViewShell* pTaskPane - = dynamic_cast( - framework::FrameworkHelper::Instance(mrBase) - ->GetViewShell(framework::FrameworkHelper::msRightPaneURL).get()); - if (pTaskPane != NULL) - pTaskPane->ShowPanel(mnPanelId); -} - - - - //===== ResourceActivationClickHandler ======================================== ResourceActivationClickHandler::ResourceActivationClickHandler ( diff --git a/sd/source/ui/toolpanel/TestMenu.cxx b/sd/source/ui/toolpanel/TestMenu.cxx index 7bfb6adebe8d..a7396cf36999 100644 --- a/sd/source/ui/toolpanel/TestMenu.cxx +++ b/sd/source/ui/toolpanel/TestMenu.cxx @@ -37,6 +37,7 @@ namespace sd { namespace toolpanel { +#ifdef SHOW_COLOR_MENU /** This factory class is used to create instances of ColorMenu. It can be extended so that its constructor stores arguments that later are passed to new ColorMenu objects. @@ -82,16 +83,12 @@ ColorMenu::~ColorMenu (void) } - - ::std::auto_ptr ColorMenu::CreateControlFactory (void) { return ::std::auto_ptr(new ColorMenuFactory()); } - - /** The preferred size depends on the preferred number of columns, the number of items, and the size of the items. */ @@ -316,5 +313,6 @@ void ColorMenu::Fill (void) maSet.InsertItem (++i, rSettings.GetFontColor()); maSet.SetItemText (i, String::CreateFromAscii("FontColor")); } +#endif } } // end of namespace ::sd::toolpanel diff --git a/sd/source/ui/toolpanel/TestMenu.hxx b/sd/source/ui/toolpanel/TestMenu.hxx index 37ac6542970d..d1df4c9f4f5a 100644 --- a/sd/source/ui/toolpanel/TestMenu.hxx +++ b/sd/source/ui/toolpanel/TestMenu.hxx @@ -39,6 +39,8 @@ namespace sd { namespace toolpanel { class ControlFactory; +#ifdef SHOW_COLOR_MENU + /** This demo menu shows the colors that are available from the StyleSettings. */ @@ -75,6 +77,7 @@ private: int CalculateRowCount (const Size& rItemSize, int nColumnCount); void Fill (void); }; +#endif } } // end of namespace ::sd::toolpanel diff --git a/sd/source/ui/toolpanel/TestPanel.cxx b/sd/source/ui/toolpanel/TestPanel.cxx index e2786e23a0c5..2b05769e0db7 100644 --- a/sd/source/ui/toolpanel/TestPanel.cxx +++ b/sd/source/ui/toolpanel/TestPanel.cxx @@ -37,6 +37,7 @@ namespace sd { namespace toolpanel { +#ifdef SHOW_TEST_PANEL /** This factory class is used to create instances of TestPanel. It can be extended so that its constructor stores arguments that later are passed to new TestPanel objects. @@ -163,13 +164,11 @@ TestPanel::~TestPanel (void) { } - - - std::auto_ptr TestPanel::CreateControlFactory (void) { return std::auto_ptr(new TestPanelFactory()); } +#endif } } // end of namespace ::sd::toolpanel diff --git a/sd/source/ui/toolpanel/TestPanel.hxx b/sd/source/ui/toolpanel/TestPanel.hxx index f883cc08c1e1..77b075df2660 100644 --- a/sd/source/ui/toolpanel/TestPanel.hxx +++ b/sd/source/ui/toolpanel/TestPanel.hxx @@ -36,6 +36,8 @@ namespace sd { namespace toolpanel { class ControlFactory; class TreeNode; +#ifdef SHOW_TEST_PANEL + /** This panel demonstrates how to create a panel for the task pane. */ class TestPanel @@ -48,6 +50,8 @@ public: static std::auto_ptr CreateControlFactory (void); }; +#endif + } } // end of namespace ::sd::toolpanel #endif diff --git a/sd/source/ui/toolpanel/TitleToolBox.cxx b/sd/source/ui/toolpanel/TitleToolBox.cxx deleted file mode 100644 index 57cbac3fe132..000000000000 --- a/sd/source/ui/toolpanel/TitleToolBox.cxx +++ /dev/null @@ -1,116 +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. - * - ************************************************************************/ - -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_sd.hxx" - -#include "TitleToolBox.hxx" - -#include "res_bmp.hrc" -#include -#include -#include "sdresid.hxx" -#include - -namespace sd { namespace toolpanel { - - -TitleToolBox::TitleToolBox (::Window* pParent, WinBits nStyle ) - : ToolBox( pParent, nStyle ) -{ - lastSize = -1; - - Bitmap aBitmap (SdResId (BMP_CLOSE_DOC)); - Bitmap aBitmapHC (SdResId (BMP_CLOSE_DOC_H)); - Bitmap aTriangleRight (SdResId (BMP_TRIANGLE_RIGHT)); - Bitmap aTriangleDown (SdResId (BMP_TRIANGLE_DOWN)); - - maImage = Image (aBitmap, Color (COL_LIGHTMAGENTA)); - maImageHC = Image (aBitmapHC, Color (BMP_COLOR_HIGHCONTRAST)); - maTriangleRight = Image (aTriangleRight, Color (COL_LIGHTMAGENTA)); - maTriangleDown = Image (aTriangleDown, Color (COL_LIGHTMAGENTA)); - - SetOutStyle (TOOLBOX_STYLE_FLAT); - SetBackground (Wallpaper ( - GetSettings().GetStyleSettings().GetDialogColor())); -} - - - - -void TitleToolBox::AddItem (ToolBoxId aId) -{ - switch (aId) - { - case TBID_PANEL_MENU: - InsertItem (TBID_PANEL_MENU, - String::CreateFromAscii ("Panel"), - TIB_DROPDOWN); - break; - - case TBID_DOCUMENT_CLOSE: - InsertItem (TBID_DOCUMENT_CLOSE, - GetSettings().GetStyleSettings().GetHighContrastMode() - ? maImageHC : maImage, 0 ); - break; - - case TBID_TRIANGLE_RIGHT: - InsertItem (TBID_TRIANGLE_RIGHT, - maTriangleRight, 0); - break; - - case TBID_TRIANGLE_DOWN: - InsertItem (TBID_TRIANGLE_DOWN, - maTriangleDown, 0); - break; - - case TBID_TEST: - InsertItem (TBID_TEST, - String::CreateFromAscii ("Test"), - TIB_DROPDOWN); - break; - } -} - - - - -void TitleToolBox::DataChanged (const DataChangedEvent& rDCEvt) -{ - Window::DataChanged (rDCEvt); - - if (rDCEvt.GetFlags() & SETTINGS_STYLE) - { - SetBackground ( - Wallpaper (GetSettings().GetStyleSettings().GetDialogColor())); - } -} - - - - -} } // end of namespace ::sd::toolbox diff --git a/sd/source/ui/toolpanel/TitleToolBox.hxx b/sd/source/ui/toolpanel/TitleToolBox.hxx deleted file mode 100644 index 9433706579df..000000000000 --- a/sd/source/ui/toolpanel/TitleToolBox.hxx +++ /dev/null @@ -1,70 +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_TOOLBOX_TITLETOOLBOX_HXX -#define SD_TOOLBOX_TITLETOOLBOX_HXX - -#include - -class PushButton; - -namespace sd { namespace toolpanel { - -/** Copied from vcl/menu.cxx -// To get the transparent mouse-over look, the TitleToolBox is actually a toolbox -// overload DataChange to handle style changes correctly -*/ -class TitleToolBox - : public ToolBox -{ -public: - enum ToolBoxId { - TBID_DOCUMENT_CLOSE = 1, - TBID_PANEL_MENU = 2, - TBID_TRIANGLE_RIGHT = 3, - TBID_TRIANGLE_DOWN = 4, - TBID_TEST - }; - - TitleToolBox (::Window* pParent, WinBits nStyle = 0); - - void AddItem (ToolBoxId aId); - - void DataChanged (const DataChangedEvent& rDCEvt); - -private: - Image maImage; - Image maImageHC; - Image maTriangleRight; - Image maTriangleDown; - - long lastSize; -}; - -} } // end of namespace ::sd::toolbox - -#endif diff --git a/sd/source/ui/toolpanel/TitledControl.cxx b/sd/source/ui/toolpanel/TitledControl.cxx index 7930bb4cd7f1..eb84e4f72373 100644 --- a/sd/source/ui/toolpanel/TitledControl.cxx +++ b/sd/source/ui/toolpanel/TitledControl.cxx @@ -359,22 +359,6 @@ void TitledControl::SetEnabledState(bool bFlag) -void TitledControl::SetUserData (void* pUserData) -{ - mpUserData = pUserData; -} - - - - -void* TitledControl::GetUserData (void) const -{ - return mpUserData; -} - - - - bool TitledControl::IsShowing (void) const { return mbVisible; diff --git a/sd/source/ui/toolpanel/ToolPanel.cxx b/sd/source/ui/toolpanel/ToolPanel.cxx index 89ab9397d4ee..e6621b1f544d 100644 --- a/sd/source/ui/toolpanel/ToolPanel.cxx +++ b/sd/source/ui/toolpanel/ToolPanel.cxx @@ -125,15 +125,6 @@ sal_uInt32 ToolPanel::AddControl ( -void ToolPanel::ListHasChanged (void) -{ - mpControlContainer->ListHasChanged (); - Rearrange (); -} - - - - void ToolPanel::Resize (void) { Control::Resize(); diff --git a/sd/source/ui/toolpanel/controls/AnimationSchemesPanel.cxx b/sd/source/ui/toolpanel/controls/AnimationSchemesPanel.cxx index c4fc41e97744..730fc74795f2 100644 --- a/sd/source/ui/toolpanel/controls/AnimationSchemesPanel.cxx +++ b/sd/source/ui/toolpanel/controls/AnimationSchemesPanel.cxx @@ -24,7 +24,93 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ +/************************************************************************* + * + * 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: AnimationSchemesPanel.cxx,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. + * + ************************************************************************/ + +// MARKER(update_precomp.py): autogen include statement, do not remove +#include "precompiled_sd.hxx" +#include "AnimationSchemesPanel.hxx" + +#include "strings.hrc" +#include "sdresid.hxx" +#include + +namespace sd +{ + + class ViewShellBase; + extern ::Window * createAnimationSchemesPanel( ::Window* pParent, ViewShellBase& rBase ); + +namespace toolpanel { namespace controls { + +AnimationSchemesPanel::AnimationSchemesPanel(TreeNode* pParent, ViewShellBase& rBase) + : SubToolPanel (pParent), + maPreferredSize( 100, 200 ) +{ + mpWrappedControl = createAnimationSchemesPanel( pParent->GetWindow(), rBase ); + mpWrappedControl->Show(); +} + +AnimationSchemesPanel::~AnimationSchemesPanel() +{ + delete mpWrappedControl; +} + +Size AnimationSchemesPanel::GetPreferredSize() +{ + return maPreferredSize; +} +sal_Int32 AnimationSchemesPanel::GetPreferredWidth(sal_Int32 ) +{ + return maPreferredSize.Width(); +} +sal_Int32 AnimationSchemesPanel::GetPreferredHeight(sal_Int32 ) +{ + return maPreferredSize.Height(); +} +::Window* AnimationSchemesPanel::GetWindow() +{ + return mpWrappedControl; +} +bool AnimationSchemesPanel::IsResizable() +{ + return true; +} +bool AnimationSchemesPanel::IsExpandable() const +{ + return true; +} + + +} } } // end of namespace ::sd::toolpanel::controls // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sd.hxx" #include "AnimationSchemesPanel.hxx" diff --git a/sd/source/ui/toolpanel/controls/AnimationSchemesPanel.hxx b/sd/source/ui/toolpanel/controls/AnimationSchemesPanel.hxx index 4cee546dae0d..dd3388fb0342 100644 --- a/sd/source/ui/toolpanel/controls/AnimationSchemesPanel.hxx +++ b/sd/source/ui/toolpanel/controls/AnimationSchemesPanel.hxx @@ -24,6 +24,35 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ +/************************************************************************* + * + * 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: AnimationSchemesPanel.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_TASKPANE_CONTROLS_ANIMATION_SCHEMES_PANEL_HXX #define SD_TASKPANE_CONTROLS_ANIMATION_SCHEMES_PANEL_HXX @@ -66,3 +95,44 @@ private: } } } // end of namespace ::sd::toolpanel::controls #endif +#ifndef SD_TASKPANE_CONTROLS_ANIMATION_SCHEMES_PANEL_HXX +#define SD_TASKPANE_CONTROLS_ANIMATION_SCHEMES_PANEL_HXX + +#include "taskpane/SubToolPanel.hxx" + +namespace sd { +class ViewShellBase; +} + +namespace sd { namespace toolpanel { +class TreeNode; +} } + +namespace sd { namespace toolpanel { namespace controls { + +class AnimationSchemesPanel + : public SubToolPanel +{ +public: + AnimationSchemesPanel ( + TreeNode* pParent, + ViewShellBase& rBase); + virtual ~AnimationSchemesPanel (void); + + virtual Size GetPreferredSize (void); + virtual sal_Int32 GetPreferredWidth (sal_Int32 nHeigh); + virtual sal_Int32 GetPreferredHeight (sal_Int32 nWidth); + virtual ::Window* GetWindow (void); + virtual bool IsResizable (void); + virtual bool IsExpandable (void) const; + + using Window::GetWindow; + +private: + Size maPreferredSize; + ::Window* mpWrappedControl; +}; + +} } } // end of namespace ::sd::toolpanel::controls + +#endif diff --git a/sd/source/ui/toolpanel/controls/MasterPageContainer.cxx b/sd/source/ui/toolpanel/controls/MasterPageContainer.cxx index 444ecd6dacb4..80a094ec1a66 100644 --- a/sd/source/ui/toolpanel/controls/MasterPageContainer.cxx +++ b/sd/source/ui/toolpanel/controls/MasterPageContainer.cxx @@ -73,24 +73,6 @@ namespace { typedef ::std::vector MasterPageContainerType; - -class PreviewCreationRequest -{ -public: - PreviewCreationRequest (MasterPageContainer::Token aToken, int nPriority); - MasterPageContainer::Token maToken; - int mnPriority; - class Compare {public: - bool operator() (const PreviewCreationRequest& r1,const PreviewCreationRequest& r2); - }; - class CompareToken {public: - MasterPageContainer::Token maToken; - CompareToken(MasterPageContainer::Token aToken); - bool operator() (const PreviewCreationRequest& rRequest); - }; -}; - - } // end of anonymous namespace @@ -423,28 +405,6 @@ MasterPageContainer::Token MasterPageContainer::GetTokenForURL ( -MasterPageContainer::Token MasterPageContainer::GetTokenForPageName ( - const String& sPageName) -{ - const ::osl::MutexGuard aGuard (mpImpl->maMutex); - - Token aResult (NIL_TOKEN); - if (sPageName.Len() > 0) - { - MasterPageContainerType::iterator iEntry ( - ::std::find_if ( - mpImpl->maContainer.begin(), - mpImpl->maContainer.end(), - MasterPageDescriptor::PageNameComparator(sPageName))); - if (iEntry != mpImpl->maContainer.end()) - aResult = (*iEntry)->maToken; - } - return aResult; -} - - - - MasterPageContainer::Token MasterPageContainer::GetTokenForStyleName (const String& sStyleName) { const ::osl::MutexGuard aGuard (mpImpl->maMutex); @@ -589,46 +549,6 @@ sal_Int32 MasterPageContainer::GetTemplateIndexForToken (Token aToken) -void MasterPageContainer::SetPreviewProviderForToken ( - Token aToken, - const ::boost::shared_ptr& rpPreviewProvider) -{ - const ::osl::MutexGuard aGuard (mpImpl->maMutex); - - SharedMasterPageDescriptor pDescriptor = mpImpl->GetDescriptor(aToken); - if (pDescriptor.get()!=NULL) - { - pDescriptor->mpPreviewProvider = rpPreviewProvider; - mpImpl->InvalidatePreview(aToken); - } -} - - - - -SdPage* MasterPageContainer::GetSlideForToken ( - MasterPageContainer::Token aToken, - bool bLoad) -{ - const ::osl::MutexGuard aGuard (mpImpl->maMutex); - - SdPage* pSlide = NULL; - SharedMasterPageDescriptor pDescriptor = mpImpl->GetDescriptor(aToken); - if (pDescriptor.get() != NULL) - { - pSlide = pDescriptor->mpSlide; - if (pSlide==NULL && bLoad) - { - GetPageObjectForToken(aToken, bLoad); - pSlide = pDescriptor->mpSlide; - } - } - return pSlide; -} - - - - SharedMasterPageDescriptor MasterPageContainer::GetDescriptorForToken ( MasterPageContainer::Token aToken) { @@ -639,19 +559,6 @@ SharedMasterPageDescriptor MasterPageContainer::GetDescriptorForToken ( - -bool MasterPageContainer::UpdateDescriptor ( - const SharedMasterPageDescriptor& rpDescriptor, - bool bForcePageObject, - bool bForcePreview, - bool bSendEvents) -{ - return mpImpl->UpdateDescriptor(rpDescriptor, bForcePageObject, bForcePreview, bSendEvents); -} - - - - void MasterPageContainer::InvalidatePreview (MasterPageContainer::Token aToken) { mpImpl->InvalidatePreview(aToken); @@ -1311,58 +1218,3 @@ void MasterPageContainer::Implementation::FillingDone (void) } } } // end of namespace ::sd::toolpanel::controls - - - - -namespace { - -//===== PreviewCreationRequest ================================================ - -PreviewCreationRequest::PreviewCreationRequest ( - MasterPageContainer::Token aToken, - int nPriority) - : maToken(aToken), - mnPriority(nPriority) -{ -} - - - - -bool PreviewCreationRequest::Compare::operator() ( - const PreviewCreationRequest& aRequest1, - const PreviewCreationRequest& aRequest2) -{ - if (aRequest1.mnPriority != aRequest2.mnPriority) - { - // Prefer requests with higher priority. - return aRequest1.mnPriority > aRequest2.mnPriority; - } - else - { - // Prefer tokens that have been earlier created (those with lower - // value). - return aRequest1.maToken < aRequest2.maToken; - } -} - - - - -PreviewCreationRequest::CompareToken::CompareToken (MasterPageContainer::Token aToken) - : maToken(aToken) -{ -} - - - - -bool PreviewCreationRequest::CompareToken::operator() (const PreviewCreationRequest& aRequest) -{ - return maToken==aRequest.maToken; -} - - - -} // end of anonymous namespace diff --git a/sd/source/ui/toolpanel/controls/MasterPageContainer.hxx b/sd/source/ui/toolpanel/controls/MasterPageContainer.hxx index d922c089ffb4..60f760f63e34 100644 --- a/sd/source/ui/toolpanel/controls/MasterPageContainer.hxx +++ b/sd/source/ui/toolpanel/controls/MasterPageContainer.hxx @@ -143,26 +143,16 @@ public: Token GetTokenForIndex (int nIndex); Token GetTokenForURL (const String& sURL); - Token GetTokenForPageName (const String& sPageName); Token GetTokenForStyleName (const String& sStyleName); Token GetTokenForPageObject (const SdPage* pPage); String GetURLForToken (Token aToken); String GetPageNameForToken (Token aToken); String GetStyleNameForToken (Token aToken); - SdPage* GetSlideForToken (Token aToken, bool bLoad=true); SdPage* GetPageObjectForToken (Token aToken, bool bLoad=true); Origin GetOriginForToken (Token aToken); sal_Int32 GetTemplateIndexForToken (Token aToken); ::boost::shared_ptr GetDescriptorForToken (Token aToken); - bool UpdateDescriptor ( - const ::boost::shared_ptr& rpDescriptor, - bool bForcePageObject, - bool bForcePreview, - bool bSendEvents); - - void SetPreviewProviderForToken (Token aToken, - const ::boost::shared_ptr& rpPreviewProvider); void InvalidatePreview (Token aToken); diff --git a/sd/source/ui/toolpanel/controls/MasterPageContainerProviders.cxx b/sd/source/ui/toolpanel/controls/MasterPageContainerProviders.cxx index 6b9ff09bbed3..e45fed2c9c1b 100644 --- a/sd/source/ui/toolpanel/controls/MasterPageContainerProviders.cxx +++ b/sd/source/ui/toolpanel/controls/MasterPageContainerProviders.cxx @@ -386,46 +386,6 @@ bool DefaultPageObjectProvider::operator== (const PageObjectProvider& rProvider) -//===== DefaultPagePreviewProvider ============================================ - -DefaultPagePreviewProvider::DefaultPagePreviewProvider (void) -{ -} - - - -Image DefaultPagePreviewProvider::operator() ( - int nWidth, - SdPage* pPage, - ::sd::PreviewRenderer& rRenderer) -{ - // Unused parameters. - (void)nWidth; - (void)pPage; - (void)rRenderer; - - return Image(); -} - - - - -int DefaultPagePreviewProvider::GetCostIndex (void) -{ - return 0; -} - - - - -bool DefaultPagePreviewProvider::NeedsPageObject (void) -{ - return false; -} - - - - //===== ExistingPageProvider ================================================== ExistingPageProvider::ExistingPageProvider (SdPage* pPage) diff --git a/sd/source/ui/toolpanel/controls/MasterPageContainerProviders.hxx b/sd/source/ui/toolpanel/controls/MasterPageContainerProviders.hxx index 7cde148b3e3d..071b23cdbb16 100644 --- a/sd/source/ui/toolpanel/controls/MasterPageContainerProviders.hxx +++ b/sd/source/ui/toolpanel/controls/MasterPageContainerProviders.hxx @@ -170,21 +170,6 @@ public: - -/** Used temporarily to avoid the (expensive) creation of the default page - too early. -*/ -class DefaultPagePreviewProvider : public PreviewProvider -{ -public: - DefaultPagePreviewProvider (void); - virtual Image operator() (int nWidth, SdPage* pPage, ::sd::PreviewRenderer& rRenderer); - virtual int GetCostIndex (void); - virtual bool NeedsPageObject (void); -}; - - - /** This implementation of the PageObjectProvider simply returns an already existing master page object. */ diff --git a/sd/source/ui/toolpanel/controls/MasterPageDescriptor.cxx b/sd/source/ui/toolpanel/controls/MasterPageDescriptor.cxx index 49ae6dff264d..6871883d65f5 100644 --- a/sd/source/ui/toolpanel/controls/MasterPageDescriptor.cxx +++ b/sd/source/ui/toolpanel/controls/MasterPageDescriptor.cxx @@ -337,28 +337,6 @@ bool MasterPageDescriptor::URLComparator::operator() ( -//===== PageNameComparator ==================================================== - -MasterPageDescriptor::PageNameComparator::PageNameComparator (const ::rtl::OUString& sPageName) - : msPageName(sPageName) -{ -} - - - - -bool MasterPageDescriptor::PageNameComparator::operator() ( - const SharedMasterPageDescriptor& rDescriptor) -{ - if (rDescriptor.get() == NULL) - return false; - else - return rDescriptor->msPageName.equals(msPageName); -} - - - - // ===== StyleNameComparator ================================================== MasterPageDescriptor::StyleNameComparator::StyleNameComparator (const ::rtl::OUString& sStyleName) diff --git a/sd/source/ui/toolpanel/controls/MasterPageDescriptor.hxx b/sd/source/ui/toolpanel/controls/MasterPageDescriptor.hxx index 1eea46bd1802..0303989e3379 100644 --- a/sd/source/ui/toolpanel/controls/MasterPageDescriptor.hxx +++ b/sd/source/ui/toolpanel/controls/MasterPageDescriptor.hxx @@ -214,11 +214,6 @@ public: URLComparator (const ::rtl::OUString& sURL); bool operator() (const SharedMasterPageDescriptor& rDescriptor); }; - class PageNameComparator { public: - ::rtl::OUString msPageName; - PageNameComparator (const ::rtl::OUString& sPageName); - bool operator() (const SharedMasterPageDescriptor& rDescriptor); - }; class StyleNameComparator { public: ::rtl::OUString msStyleName; StyleNameComparator (const ::rtl::OUString& sStyleName); diff --git a/sd/source/ui/toolpanel/controls/MasterPageObserver.cxx b/sd/source/ui/toolpanel/controls/MasterPageObserver.cxx index 0f485174009d..2ba0cc678403 100644 --- a/sd/source/ui/toolpanel/controls/MasterPageObserver.cxx +++ b/sd/source/ui/toolpanel/controls/MasterPageObserver.cxx @@ -187,15 +187,6 @@ MasterPageObserver::~MasterPageObserver (void) -MasterPageObserver::MasterPageNameSet MasterPageObserver::GetMasterPageNames ( - SdDrawDocument& rDocument) -{ - return mpImpl->GetMasterPageNames (rDocument); -} - - - - //===== MasterPageObserver::Implementation ==================================== void MasterPageObserver::Implementation::RegisterDocument ( diff --git a/sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx b/sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx index 4571d4278140..b321dbf8dd14 100644 --- a/sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx +++ b/sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx @@ -41,7 +41,6 @@ #include "app.hrc" #include "res_bmp.hrc" #include "strings.hrc" -#include "showview.hxx" #include "DrawViewShell.hxx" #include "DrawController.hxx" #include "SlideSorterViewShell.hxx" @@ -699,21 +698,6 @@ void MasterPagesSelector::RemoveTokenToIndexEntry ( -void MasterPagesSelector::InvalidatePreview (MasterPageContainer::Token aToken) -{ - const ::osl::MutexGuard aGuard (maMutex); - - int nIndex (GetIndexForToken(aToken)); - if (nIndex > 0) - { - mpContainer->InvalidatePreview(aToken); - mpContainer->RequestPreview(aToken); - } -} - - - - void MasterPagesSelector::InvalidatePreview (const SdPage* pPage) { const ::osl::MutexGuard aGuard (maMutex); @@ -734,20 +718,6 @@ void MasterPagesSelector::InvalidatePreview (const SdPage* pPage) } } - - - -void MasterPagesSelector::InvalidateAllPreviews (void) -{ - const ::osl::MutexGuard aGuard (maMutex); - - for (USHORT nIndex=1; nIndex<=mpPageSet->GetItemCount(); nIndex++) - InvalidatePreview(nIndex); -} - - - - void MasterPagesSelector::UpdateAllPreviews (void) { const ::osl::MutexGuard aGuard (maMutex); diff --git a/sd/source/ui/toolpanel/controls/MasterPagesSelector.hxx b/sd/source/ui/toolpanel/controls/MasterPagesSelector.hxx index a480729aa9c8..a2df51f2bd4b 100644 --- a/sd/source/ui/toolpanel/controls/MasterPagesSelector.hxx +++ b/sd/source/ui/toolpanel/controls/MasterPagesSelector.hxx @@ -131,14 +131,8 @@ public: Index into the value set control that is used for displaying the previews. */ - void InvalidatePreview (MasterPageContainer::Token aToken); void InvalidatePreview (const SdPage* pPage); - /** Mark all previews as no being up-to-date anymore. This method is - typically called when the size of the previews has changed. - */ - void InvalidateAllPreviews (void); - void UpdateAllPreviews (void); protected: diff --git a/sd/source/ui/toolpanel/controls/makefile.mk b/sd/source/ui/toolpanel/controls/makefile.mk index 33871a415a7e..b2218e55008c 100644 --- a/sd/source/ui/toolpanel/controls/makefile.mk +++ b/sd/source/ui/toolpanel/controls/makefile.mk @@ -59,8 +59,7 @@ SLOFILES = \ $(SLO)$/RecentMasterPagesSelector.obj \ $(SLO)$/CustomAnimationPanel.obj \ $(SLO)$/SlideTransitionPanel.obj \ - $(SLO)$/TableDesignPanel.obj \ - $(SLO)$/AnimationSchemesPanel.obj + $(SLO)$/TableDesignPanel.obj # --- Tagets ------------------------------------------------------- diff --git a/sd/source/ui/toolpanel/makefile.mk b/sd/source/ui/toolpanel/makefile.mk index 08a966fe4061..e59e37ff9e03 100644 --- a/sd/source/ui/toolpanel/makefile.mk +++ b/sd/source/ui/toolpanel/makefile.mk @@ -45,10 +45,8 @@ PRJINC=..$/slidesorter SLOFILES = \ $(SLO)$/ControlContainer.obj \ $(SLO)$/ScrollPanel.obj \ - $(SLO)$/SimpleLayoutWrapper.obj \ $(SLO)$/SubToolPanel.obj \ $(SLO)$/TitleBar.obj \ - $(SLO)$/TitleToolBox.obj \ $(SLO)$/TitledControl.obj \ $(SLO)$/ToolPanel.obj \ $(SLO)$/TaskPaneControlFactory.obj \ @@ -57,7 +55,6 @@ SLOFILES = \ $(SLO)$/TaskPaneTreeNode.obj \ $(SLO)$/TaskPaneViewShell.obj \ \ - $(SLO)$/EmptyWindow.obj \ $(SLO)$/LayoutMenu.obj \ $(SLO)$/TestMenu.obj \ $(SLO)$/TestPanel.obj \ diff --git a/sd/source/ui/tools/PropertySet.cxx b/sd/source/ui/tools/PropertySet.cxx index 010571b10927..9cf24dccd508 100644 --- a/sd/source/ui/tools/PropertySet.cxx +++ b/sd/source/ui/tools/PropertySet.cxx @@ -58,22 +58,6 @@ void SAL_CALL PropertySet::disposing (void) { } - - - -beans::UnknownPropertyException PropertySet::CreateUnknownPropertyException ( - const rtl::OUString& rsPropertyName) -{ - return beans::UnknownPropertyException( - OUString::createFromAscii("property ") - + rsPropertyName - + OUString::createFromAscii(" is not known"), - static_cast(this)); -} - - - - //----- XPropertySet ---------------------------------------------------------- Reference SAL_CALL PropertySet::getPropertySetInfo (void) diff --git a/sd/source/ui/tools/SdGlobalResourceContainer.cxx b/sd/source/ui/tools/SdGlobalResourceContainer.cxx index 878ef16a52f4..4ed95bbf5b99 100644 --- a/sd/source/ui/tools/SdGlobalResourceContainer.cxx +++ b/sd/source/ui/tools/SdGlobalResourceContainer.cxx @@ -152,31 +152,6 @@ void SdGlobalResourceContainer::AddResource (const Reference& rxReso - -::std::auto_ptr SdGlobalResourceContainer::ReleaseResource ( - SdGlobalResource* pResource) -{ - ::std::auto_ptr pResult (NULL); - - ::osl::MutexGuard aGuard (mpImpl->maMutex); - - Implementation::ResourceList::iterator iResource; - iResource = ::std::find ( - mpImpl->maResources.begin(), - mpImpl->maResources.end(), - pResource); - if (iResource != mpImpl->maResources.end()) - { - pResult.reset (*iResource); - mpImpl->maResources.erase(iResource); - } - - return pResult; -} - - - - SdGlobalResourceContainer::SdGlobalResourceContainer (void) : mpImpl (new SdGlobalResourceContainer::Implementation()) { diff --git a/sd/source/ui/tools/SlotStateListener.cxx b/sd/source/ui/tools/SlotStateListener.cxx index e8e2ffb24f2b..b3175b7fdb4a 100644 --- a/sd/source/ui/tools/SlotStateListener.cxx +++ b/sd/source/ui/tools/SlotStateListener.cxx @@ -45,16 +45,6 @@ using namespace ::rtl; namespace sd { namespace tools { -SlotStateListener::SlotStateListener (void) - : SlotStateListenerInterfaceBase(maMutex), - maCallback(), - mxDispatchProviderWeak(NULL) -{ -} - - - - SlotStateListener::SlotStateListener ( Link& rCallback, const uno::Reference& rxDispatchProvider, @@ -125,14 +115,6 @@ void SlotStateListener::ObserveSlot (const ::rtl::OUString& rSlotName) -bool SlotStateListener::IsValid (void) const -{ - return maRegisteredURLList.size() > 0; -} - - - - void SlotStateListener::disposing (void) { ReleaseListeners(); diff --git a/sd/source/ui/unoidl/DrawController.cxx b/sd/source/ui/unoidl/DrawController.cxx index acd57f18d85c..0b2bced0ae65 100644 --- a/sd/source/ui/unoidl/DrawController.cxx +++ b/sd/source/ui/unoidl/DrawController.cxx @@ -368,18 +368,6 @@ void SAL_CALL -::awt::Rectangle DrawController::GetVisArea (void) const -{ - return awt::Rectangle( - maLastVisArea.Left(), - maLastVisArea.Top(), - maLastVisArea.GetWidth(), - maLastVisArea.GetHeight()); -} - - - - // XDrawView void SAL_CALL DrawController::setCurrentPage( const Reference< drawing::XDrawPage >& xPage ) diff --git a/sd/source/ui/unoidl/SdUnoPresView.cxx b/sd/source/ui/unoidl/SdUnoPresView.cxx deleted file mode 100644 index dcd5001ace38..000000000000 --- a/sd/source/ui/unoidl/SdUnoPresView.cxx +++ /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. - * - ************************************************************************/ - -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_sd.hxx" - -#include "SdUnoPresView.hxx" - - -namespace sd { - - -SdUnoPresView::SdUnoPresView ( - DrawController& rController, - DrawViewShell& rViewShell, - View& rView) throw() - : SdUnoDrawView (rController, rViewShell, rView) -{ -} - - - - -SdUnoPresView::~SdUnoPresView (void) throw() -{ -} - - - -} // end of namespace sd diff --git a/sd/source/ui/unoidl/makefile.mk b/sd/source/ui/unoidl/makefile.mk index b3e71df86740..cf4910b29186 100644 --- a/sd/source/ui/unoidl/makefile.mk +++ b/sd/source/ui/unoidl/makefile.mk @@ -50,7 +50,6 @@ NOOPTFILES= $(SLO)$/unowcntr.obj SLO1FILES = \ $(SLO)$/DrawController.obj \ - $(SLO)$/SdUnoPresView.obj\ $(SLO)$/SdUnoSlideView.obj\ $(SLO)$/SdUnoOutlineView.obj\ $(SLO)$/SdUnoDrawView.obj \ @@ -66,7 +65,6 @@ SLO1FILES = \ $(SLO)$/unowcntr.obj \ $(SLO)$/unokywds.obj \ $(SLO)$/unopback.obj \ - $(SLO)$/unovwcrs.obj \ $(SLO)$/unodoc.obj \ $(SLO)$/unomodule.obj \ $(SLO)$/randomnode.obj diff --git a/sd/source/ui/unoidl/unocpres.cxx b/sd/source/ui/unoidl/unocpres.cxx index b8f48a6928aa..1935c424ec03 100644 --- a/sd/source/ui/unoidl/unocpres.cxx +++ b/sd/source/ui/unoidl/unocpres.cxx @@ -493,24 +493,3 @@ SdCustomShow * SdXCustomPresentationAccess::getSdCustomShow( const OUString& Nam } return NULL; } - -sal_Int32 SdXCustomPresentationAccess::getSdCustomShowIdx( const OUString& Name ) const throw() -{ - sal_Int32 nIdx = 0; - - List* pList = GetCustomShowList(); - const sal_Int32 nCount = pList?pList->Count():0; - - const String aName( Name ); - - while( nIdx < nCount ) - { - SdCustomShow* pShow = (SdCustomShow*)pList->GetObject(nIdx); - if( pShow->GetName() == aName ) - return nIdx; - nIdx++; - } - return -1; -} - - diff --git a/sd/source/ui/unoidl/unocpres.hxx b/sd/source/ui/unoidl/unocpres.hxx index 1267b3a58b0a..615d5ba7007c 100644 --- a/sd/source/ui/unoidl/unocpres.hxx +++ b/sd/source/ui/unoidl/unocpres.hxx @@ -124,7 +124,6 @@ private: // intern inline List* GetCustomShowList() const throw(); - sal_Int32 getSdCustomShowIdx( const ::rtl::OUString& Name ) const throw(); SdCustomShow * getSdCustomShow( const ::rtl::OUString& Name ) const throw(); public: diff --git a/sd/source/ui/unoidl/unoobj.cxx b/sd/source/ui/unoidl/unoobj.cxx index 54c3f88a6916..fdda65a3d970 100644 --- a/sd/source/ui/unoidl/unoobj.cxx +++ b/sd/source/ui/unoidl/unoobj.cxx @@ -311,14 +311,6 @@ typedef SORT* PSORT; extern "C" int __LOADONCALLAPI SortFunc( const void* p1, const void* p2 ); -SdXShape::SdXShape() throw() -: mpPropSet(lcl_GetEmpty_SdXShapePropertySet_Impl()), - mpMap(lcl_GetEmpty_SdXShapePropertyMap_Impl()), - mpModel(NULL), - mpImplementationId(NULL) -{ -} - SdXShape::SdXShape( SvxShape* pShape, SdXImpressDocument* pModel) throw() : mpShape( pShape ), mpPropSet( pModel? diff --git a/sd/source/ui/unoidl/unoobj.hxx b/sd/source/ui/unoidl/unoobj.hxx index 3e7c3fab7d3c..0e472f41ff16 100644 --- a/sd/source/ui/unoidl/unoobj.hxx +++ b/sd/source/ui/unoidl/unoobj.hxx @@ -75,7 +75,6 @@ private: com::sun::star::uno::Sequence< sal_Int8 >* mpImplementationId; public: - SdXShape() throw(); SdXShape(SvxShape* pShape, SdXImpressDocument* pModel) throw(); virtual ~SdXShape() throw(); diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx index 69d961d7237a..4e012422e471 100644 --- a/sd/source/ui/unoidl/unopage.cxx +++ b/sd/source/ui/unoidl/unopage.cxx @@ -345,7 +345,34 @@ const SvxItemPropertySet* ImplGetMasterPagePropertySet( PageKind ePageKind ) return pRet; } -UNO3_GETIMPLEMENTATION2_IMPL( SdGenericDrawPage, SvxFmDrawPage ); +const ::com::sun::star::uno::Sequence< sal_Int8 > & SdGenericDrawPage::getUnoTunnelId() throw() +{ + static ::com::sun::star::uno::Sequence< sal_Int8 > * pSeq = 0; + if( !pSeq ) + { + ::osl::Guard< ::osl::Mutex > aGuard( ::osl::Mutex::getGlobalMutex() ); + if( !pSeq ) + { + static ::com::sun::star::uno::Sequence< sal_Int8 > aSeq( 16 ); + rtl_createUuid( (sal_uInt8*)aSeq.getArray(), 0, sal_True ); + pSeq = &aSeq; + } + } + return *pSeq; +} + +sal_Int64 SAL_CALL SdGenericDrawPage::getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw(::com::sun::star::uno::RuntimeException) +{ + if( rId.getLength() == 16 && 0 == rtl_compareMemory( getUnoTunnelId().getConstArray(), + rId.getConstArray(), 16 ) ) + { + return sal::static_int_cast(reinterpret_cast(this)); + } + else + { + return SvxFmDrawPage::getSomething( rId ); + } +} /*********************************************************************** * * diff --git a/sd/source/ui/unoidl/unopage.hxx b/sd/source/ui/unoidl/unopage.hxx index 52e5cc061f7d..5d525b0f0f04 100644 --- a/sd/source/ui/unoidl/unopage.hxx +++ b/sd/source/ui/unoidl/unopage.hxx @@ -113,7 +113,8 @@ public: SdPage* GetPage() const { return (SdPage*)SvxDrawPage::mpPage; } SdXImpressDocument* GetModel() const; - UNO3_GETIMPLEMENTATION_DECL( SdGenericDrawPage ) + static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId() throw(); + virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException); // this is called whenever a SdrObject must be created for a empty api shape wrapper virtual SdrObject *_CreateSdrObject( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape ) throw(); diff --git a/sd/source/ui/unoidl/unosrch.cxx b/sd/source/ui/unoidl/unosrch.cxx index a1cd11861d3a..56133e03a375 100644 --- a/sd/source/ui/unoidl/unosrch.cxx +++ b/sd/source/ui/unoidl/unosrch.cxx @@ -105,11 +105,6 @@ SdUnoSearchReplaceShape::SdUnoSearchReplaceShape( drawing::XDrawPage* pPage ) th mpPage = pPage; } -SdUnoSearchReplaceShape::SdUnoSearchReplaceShape( drawing::XShape* pShape ) throw() -{ - mpShape = pShape; -} - SdUnoSearchReplaceShape::~SdUnoSearchReplaceShape() throw() { } diff --git a/sd/source/ui/unoidl/unovwcrs.cxx b/sd/source/ui/unoidl/unovwcrs.cxx deleted file mode 100644 index 8b72cbe1fd96..000000000000 --- a/sd/source/ui/unoidl/unovwcrs.cxx +++ /dev/null @@ -1,209 +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. - * - ************************************************************************/ - -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_sd.hxx" -#include -#include -#include -#include -#include "View.hxx" -#ifndef SVX_LIGHT -#ifndef SD_DRAW_DOC_SHELL_HXX -#include "DrawDocShell.hxx" -#endif -#endif -#include "ViewShell.hxx" -#include "slideshow.hxx" - -#include -#include - -using namespace ::vos; -using namespace ::rtl; -using namespace ::com::sun::star; - -class SdXTextViewCursor - : public ::cppu::WeakImplHelper2< - text::XTextViewCursor, - view::XScreenCursor > -{ -public: - SdXTextViewCursor(::sd::View* pVw) throw(); - virtual ~SdXTextViewCursor() throw(); - - //XTextViewCursor - virtual sal_Bool SAL_CALL isVisible(void) throw( uno::RuntimeException ); - virtual void SAL_CALL setVisible(sal_Bool bVisible) throw( uno::RuntimeException ); - virtual awt::Point SAL_CALL getPosition(void) throw( uno::RuntimeException ); - - //XTextCursor - virtual void SAL_CALL collapseToStart(void) throw( uno::RuntimeException ); - virtual void SAL_CALL collapseToEnd(void) throw( uno::RuntimeException ); - virtual sal_Bool SAL_CALL isCollapsed(void) throw( uno::RuntimeException ); - virtual sal_Bool SAL_CALL goLeft(sal_Int16 nCount, sal_Bool Expand) throw( uno::RuntimeException ); - virtual sal_Bool SAL_CALL goRight(sal_Int16 nCount, sal_Bool Expand) throw( uno::RuntimeException ); - virtual void SAL_CALL gotoStart(sal_Bool Expand) throw( uno::RuntimeException ); - virtual void SAL_CALL gotoEnd(sal_Bool Expand) throw( uno::RuntimeException ); - virtual void SAL_CALL gotoRange(const uno::Reference< text::XTextRange > & rRange, sal_Bool bExpand ) throw (::com::sun::star::uno::RuntimeException); - - //XTextRange - virtual uno::Reference< text::XText > SAL_CALL getText(void) throw( uno::RuntimeException ); - virtual uno::Reference< text::XTextRange > SAL_CALL getStart(void) throw( uno::RuntimeException ); - virtual uno::Reference< text::XTextRange > SAL_CALL getEnd(void) throw( uno::RuntimeException ); - virtual OUString SAL_CALL getString(void) throw( uno::RuntimeException ); - virtual void SAL_CALL setString(const OUString& aString) throw( uno::RuntimeException ); - - //XScreenCursor - virtual sal_Bool SAL_CALL screenDown(void) throw( uno::RuntimeException ); - virtual sal_Bool SAL_CALL screenUp(void) throw( uno::RuntimeException ); - - void Invalidate() { mpView = 0; } - -private: - ::sd::View* mpView; -}; - - -text::XTextViewCursor* CreateSdXTextViewCursor(::sd::View* mpView ) -{ - return new SdXTextViewCursor( mpView ); -} - -SdXTextViewCursor::SdXTextViewCursor(::sd::View* pSdView ) throw() - : mpView(pSdView) -{ - -} - -SdXTextViewCursor::~SdXTextViewCursor() throw() -{ -} - -sal_Bool SdXTextViewCursor::isVisible(void) throw( uno::RuntimeException ) -{ - DBG_WARNING("not implemented"); - return sal_True; -} - -void SdXTextViewCursor::setVisible(sal_Bool ) throw( uno::RuntimeException ) -{ - DBG_WARNING("not implemented"); -} - -awt::Point SdXTextViewCursor::getPosition(void) throw( uno::RuntimeException ) -{ - DBG_WARNING("not implemented"); - return awt::Point(); -} - -void SdXTextViewCursor::collapseToStart(void) throw( uno::RuntimeException ) -{ - DBG_WARNING("not implemented"); -} - -void SdXTextViewCursor::collapseToEnd(void) throw( uno::RuntimeException ) -{ - DBG_WARNING("not implemented"); -} - -sal_Bool SdXTextViewCursor::isCollapsed(void) throw( uno::RuntimeException ) -{ - DBG_WARNING("not implemented"); - return sal_True; - -} - -sal_Bool SdXTextViewCursor::goLeft(sal_Int16 , sal_Bool ) throw( uno::RuntimeException ) -{ - DBG_WARNING("not implemented"); - return sal_False; -} - -sal_Bool SdXTextViewCursor::goRight(sal_Int16, sal_Bool ) throw( uno::RuntimeException ) -{ - DBG_WARNING("not implemented"); - return sal_False; -} - -void SdXTextViewCursor::gotoRange(const uno::Reference< text::XTextRange > &, sal_Bool ) throw (::com::sun::star::uno::RuntimeException) -{ - DBG_WARNING("not implemented"); -} - -void SdXTextViewCursor::gotoStart(sal_Bool ) throw( uno::RuntimeException ) -{ - DBG_WARNING("not implemented"); -} - -void SdXTextViewCursor::gotoEnd(sal_Bool ) throw( uno::RuntimeException ) -{ - DBG_WARNING("not implemented"); -} - -sal_Bool SdXTextViewCursor::screenDown(void) throw( uno::RuntimeException ) -{ - OGuard aGuard(Application::GetSolarMutex()); - return sal_False; -} - -sal_Bool SdXTextViewCursor::screenUp(void) throw( uno::RuntimeException ) -{ - OGuard aGuard(Application::GetSolarMutex()); - return sal_False; -} - -uno::Reference< text::XText > SdXTextViewCursor::getText(void) throw( uno::RuntimeException ) -{ - DBG_WARNING("not implemented"); - return uno::Reference< text::XText > (); -} - -uno::Reference< text::XTextRange > SdXTextViewCursor::getStart(void) throw( uno::RuntimeException ) -{ - DBG_WARNING("not implemented"); - return uno::Reference< text::XTextRange > (); -} - -uno::Reference< text::XTextRange > SdXTextViewCursor::getEnd(void) throw( uno::RuntimeException ) -{ - DBG_WARNING("not implemented"); - return uno::Reference< text::XTextRange > (); -} - -OUString SdXTextViewCursor::getString(void) throw( uno::RuntimeException ) -{ - DBG_WARNING("not implemented"); - return OUString(); -} - -void SdXTextViewCursor::setString(const OUString& ) throw( uno::RuntimeException ) -{ - DBG_WARNING("not implemented"); -} - - diff --git a/sd/source/ui/unoidl/unowcntr.cxx b/sd/source/ui/unoidl/unowcntr.cxx index fbb9991981f9..e29ee1e1516e 100644 --- a/sd/source/ui/unoidl/unowcntr.cxx +++ b/sd/source/ui/unoidl/unowcntr.cxx @@ -77,31 +77,6 @@ void SvUnoWeakContainer::insert( uno::WeakReference< uno::XInterface > xRef ) th mpList->Insert( new uno::WeakReference< uno::XInterface >( xRef ) ); } -/** removes the given ref from this container */ -void SvUnoWeakContainer::remove( uno::WeakReference< uno::XInterface > xRef ) throw() -{ - uno::WeakReference< uno::XInterface >* pRef = mpList->First(); - while( pRef ) - { - uno::Reference< uno::XInterface > xTestRef( *pRef ); - if(!xTestRef.is()) - { - delete mpList->Remove(); - pRef = mpList->GetCurObject(); - } - else - { - if( *pRef == xRef ) - { - delete mpList->Remove(); - break; - } - - pRef = mpList->Next(); - } - } -} - /** searches the container for a ref that returns true on the given search function */ diff --git a/sd/source/ui/unoidl/unowcntr.hxx b/sd/source/ui/unoidl/unowcntr.hxx index 86d68f3c4d22..a35c27cfd583 100644 --- a/sd/source/ui/unoidl/unowcntr.hxx +++ b/sd/source/ui/unoidl/unowcntr.hxx @@ -46,9 +46,6 @@ public: /** inserts the given ref into this container */ void insert( ::com::sun::star::uno::WeakReference< ::com::sun::star::uno::XInterface > xRef ) throw(); - /** removes the given ref from this container */ - void remove( ::com::sun::star::uno::WeakReference< ::com::sun::star::uno::XInterface > xRef ) throw(); - /** searches the container for a ref that returns true on the given search function */ diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx index 5314f6dbe768..ed3777d49082 100644 --- a/sd/source/ui/view/Outliner.cxx +++ b/sd/source/ui/view/Outliner.cxx @@ -318,11 +318,6 @@ void Outliner::StartSpelling (void) mpSearchItem = NULL; } -/** Proxy for method from base class to avoid compiler warning */ -void Outliner::StartSpelling(EditView& rView, unsigned char c) -{ - SdrOutliner::StartSpelling( rView, c ); -} /** Free all resources acquired during the search/spell check. After a spell check the start position is restored here. @@ -425,23 +420,6 @@ BOOL Outliner::SpellNextDocument (void) } -void Outliner::HandleOutsideChange (ChangeHint eHint) -{ - switch (eHint) - { - case CH_VIEW_SHELL_INVALID: - EndSpelling(); - mbPrepareSpellingPending = true; - mbViewShellValid = false; - break; - - case CH_VIEW_SHELL_VALID: - mbViewShellValid = true; - break; - } -} - - /************************************************************************* |* @@ -1076,23 +1054,6 @@ void Outliner::EndOfSearch (void) } } - - - -void Outliner::InitPage (USHORT nPageIndex) -{ - (void)nPageIndex; - - ::sd::outliner::IteratorPosition aPosition (*maObjectIterator); - if (aPosition.meEditMode == EM_PAGE) - mnPageCount = mpDrawDocument->GetSdPageCount(aPosition.mePageKind); - else - mnPageCount = mpDrawDocument->GetMasterSdPageCount(aPosition.mePageKind); -} - - - - void Outliner::ShowEndOfSearchDialog (void) { String aString; @@ -1475,36 +1436,6 @@ bool Outliner::HandleFailedSearch (void) } -#if ENABLE_LAYOUT -#define SvxSearchDialog Window -#endif - -/** See task #95227# for discussion about correct parent for dialogs/info boxes. -*/ -::Window* Outliner::GetParentForDialog (void) -{ - ::Window* pParent = NULL; - - if (meMode == SEARCH) - pParent = static_cast( - SfxViewFrame::Current()->GetChildWindow( - SvxSearchDialogWrapper::GetChildWindowId())->GetWindow()); - - if (pParent == NULL) - pParent = mpViewShell->GetActiveWindow(); - - if (pParent == NULL) - pParent = Application::GetDefDialogParent(); - //1.30->1.31 of sdoutl.cxx pParent = Application::GetDefModalDialogParent(); - - return pParent; -} - -#if ENABLE_LAYOUT -#undef SvxSearchDialog -#endif - - SdrObject* Outliner::SetObject ( const ::sd::outliner::IteratorPosition& rPosition) { diff --git a/sd/source/ui/view/OutlinerIterator.cxx b/sd/source/ui/view/OutlinerIterator.cxx index 81f9a50d256d..226d767c6c91 100644 --- a/sd/source/ui/view/OutlinerIterator.cxx +++ b/sd/source/ui/view/OutlinerIterator.cxx @@ -67,15 +67,6 @@ IteratorPosition::IteratorPosition (const IteratorPosition& aPosition) { } -IteratorPosition::IteratorPosition (SdrObject* pObject, sal_Int32 nText, sal_Int32 nPageIndex, PageKind ePageKind, EditMode eEditMode) -: mxObject(pObject) -, mnText(nText) -, mnPageIndex(nPageIndex) -, mePageKind(ePageKind) -, meEditMode(eEditMode) -{ -} - IteratorPosition::~IteratorPosition (void) { } @@ -119,11 +110,6 @@ Iterator::Iterator (IteratorImplBase* pObject) mpIterator = pObject; } -Iterator::Iterator (const IteratorImplBase& rObject) -{ - mpIterator = rObject.Clone(); -} - Iterator::~Iterator (void) { delete mpIterator; @@ -266,28 +252,6 @@ Iterator OutlinerContainer::CreateSelectionIterator ( rObjectList, nObjectIndex, pDocument, rpViewShell, bDirectionIsForward)); } -Iterator OutlinerContainer::CreateViewIterator ( - SdDrawDocument* pDocument, - const ::boost::shared_ptr& rpViewShell, - bool bDirectionIsForward, - IteratorLocation aLocation) -{ - OSL_ASSERT(rpViewShell.get()); - - const ::boost::shared_ptr pDrawViewShell( - ::boost::dynamic_pointer_cast(rpViewShell)); - sal_Int32 nPageIndex = GetPageIndex ( - pDocument, - rpViewShell, - pDrawViewShell.get() ? pDrawViewShell->GetPageKind() : PK_STANDARD, - pDrawViewShell.get() ? pDrawViewShell->GetEditMode() : EM_PAGE, - bDirectionIsForward, - aLocation); - - return Iterator (new ViewIteratorImpl ( - nPageIndex, pDocument, rpViewShell, bDirectionIsForward)); -} - Iterator OutlinerContainer::CreateDocumentIterator ( SdDrawDocument* pDocument, const ::boost::shared_ptr& rpViewShell, diff --git a/sd/source/ui/view/ToolBarManager.cxx b/sd/source/ui/view/ToolBarManager.cxx index 4919a9fe2bbb..ce3064392d40 100644 --- a/sd/source/ui/view/ToolBarManager.cxx +++ b/sd/source/ui/view/ToolBarManager.cxx @@ -119,10 +119,9 @@ private: /** Manage tool bars that are implemented as sub shells of a view shell. The typical procedure of updating the sub shells of a view shell is to rebuild a list of sub shells that the caller would like to have active. - The methods ClearGroup(), AddShellId(), and RemoveShellId() allow the - caller to do that. A final call to UpdateShells() activates the - requested shells that are not active and deactivates the active shells - that are not requested. + The methods ClearGroup() and AddShellId() allow the caller to do that. A + final call to UpdateShells() activates the requested shells that are not + active and deactivates the active shells that are not requested . This is done by maintaining two lists. One (the current list) reflects the current state. The other (the requested list) contains the @@ -157,18 +156,6 @@ public: */ void AddShellId (sd::ToolBarManager::ToolBarGroup eGroup, sd::ShellId nId); - /** Remove a shell. This is done only when the specified shell is a - member of the specified group. If it has been requested for another - group or if it has not been requested then this call is ignored. - @param eGroup - The group from which to remove the shell. - @param nId - The id of the shell to remove. - @return - Returns whether the shell is removed. - */ - bool RemoveShellId (sd::ToolBarManager::ToolBarGroup eGroup, sd::ShellId nId); - /** Releasing all shells means that the given ToolBarRules object is informed that every shell mananged by the called ToolBarShellList is about to be removed and that the associated framework tool bars can @@ -296,7 +283,6 @@ public: void AddToolBar (ToolBarGroup eGroup, const ::rtl::OUString& rsToolBarName); void AddToolBarShell (ToolBarGroup eGroup, ShellId nToolBarId); void RemoveToolBar (ToolBarGroup eGroup, const ::rtl::OUString& rsToolBarName); - void RemoveToolBarShell (ToolBarGroup eGroup, ShellId nToolBarId); /** Release all tool bar shells and the associated framework tool bars. Typically called when the main view shell is being replaced by @@ -332,7 +318,6 @@ public: }; void LockViewShellManager (void); - bool IsUpdateLocked (void) const; void LockUpdate (void); void UnlockUpdate (void); @@ -430,15 +415,6 @@ void ToolBarManager::Shutdown (void) -void ToolBarManager::SetValid (bool bValid) -{ - if (mpImpl.get() != NULL) - mpImpl->SetValid(bValid); -} - - - - void ToolBarManager::ResetToolBars (ToolBarGroup eGroup) { if (mpImpl.get() != NULL) @@ -505,20 +481,6 @@ void ToolBarManager::RemoveToolBar ( -void ToolBarManager::RemoveToolBarShell ( - ToolBarGroup eGroup, - ShellId nToolBarId) -{ - if (mpImpl.get() != NULL) - { - UpdateLock aLock (shared_from_this()); - mpImpl->RemoveToolBarShell(eGroup,nToolBarId); - } -} - - - - void ToolBarManager::SetToolBar ( ToolBarGroup eGroup, const ::rtl::OUString& rsToolBarName) @@ -576,17 +538,6 @@ void ToolBarManager::LockViewShellManager (void) -bool ToolBarManager::IsUpdateLocked (void) const -{ - if (mpImpl.get() != NULL) - return mpImpl->IsUpdateLocked(); - else - return false; -} - - - - void ToolBarManager::LockUpdate (void) { if (mpImpl.get()!=NULL) @@ -819,21 +770,6 @@ void ToolBarManager::Implementation::AddToolBarShell ( -void ToolBarManager::Implementation::RemoveToolBarShell ( - ToolBarGroup eGroup, - ShellId nToolBarId) -{ - ViewShell* pMainViewShell = mrBase.GetMainViewShell().get(); - if (pMainViewShell != NULL) - { - GetToolBarRules().SubShellRemoved(eGroup, nToolBarId); - maToolBarShellList.RemoveShellId(eGroup,nToolBarId); - } -} - - - - void ToolBarManager::Implementation::ReleaseAllToolBarShells (void) { maToolBarShellList.ReleaseAllShells(GetToolBarRules()); @@ -946,14 +882,6 @@ void ToolBarManager::Implementation::LockViewShellManager (void) -bool ToolBarManager::Implementation::IsUpdateLocked (void) const -{ - return mnLockCount; -} - - - - void ToolBarManager::Implementation::LockUpdate (void) { #ifdef VERBOSE @@ -1705,26 +1633,6 @@ void ToolBarShellList::AddShellId (sd::ToolBarManager::ToolBarGroup eGroup, sd:: -bool ToolBarShellList::RemoveShellId (sd::ToolBarManager::ToolBarGroup eGroup, sd::ShellId nId) -{ - bool bRemoved (false); - - GroupedShellList::iterator iDescriptor (maNewList.find(ShellDescriptor(nId,eGroup))); - if (iDescriptor != maNewList.end()) - { - if (iDescriptor->meGroup == eGroup) - { - maNewList.erase(iDescriptor); - bRemoved = true; - } - } - - return bRemoved; -} - - - - void ToolBarShellList::ReleaseAllShells (ToolBarRules& rRules) { // Release the currently active tool bars. diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx index 6640d2455c20..813302136932 100644 --- a/sd/source/ui/view/ViewShellBase.cxx +++ b/sd/source/ui/view/ViewShellBase.cxx @@ -163,8 +163,6 @@ public: ::boost::shared_ptr mpFormShellManager; - ::boost::shared_ptr mpCustomHandleManager; - Implementation (ViewShellBase& rBase); ~Implementation (void); @@ -460,13 +458,6 @@ ViewShellBase* ViewShellBase::GetViewShellBase (SfxViewFrame* pViewFrame) -void ViewShellBase::GetMenuState (SfxItemSet& ) -{ -} - - - - DrawDocShell* ViewShellBase::GetDocShell (void) const { return mpDocShell; @@ -712,21 +703,6 @@ ErrCode ViewShellBase::DoPrint ( -USHORT ViewShellBase::SetPrinterOptDlg ( - SfxPrinter* pNewPrinter, - USHORT nDiffFlags, - BOOL bShowDialog) -{ - (void)pNewPrinter; - (void)nDiffFlags; - (void)bShowDialog; - return 0; - // return mpImpl->mpPrintManager->SetPrinterOptDlg ( pNewPrinter, nDiffFlags, bShowDialog); -} - - - - void ViewShellBase::PreparePrint (PrintDialog* pPrintDialog) { SfxViewShell::PreparePrint (pPrintDialog); @@ -1247,16 +1223,6 @@ void ViewShellBase::SetViewTabBar (const ::rtl::Reference& rViewTabB -CustomHandleManager& ViewShellBase::getCustomHandleManager() const -{ - OSL_ASSERT(mpImpl.get()!=NULL); - - if( !mpImpl->mpCustomHandleManager.get() ) - mpImpl->mpCustomHandleManager.reset( new ::sd::CustomHandleManager(*const_cast< ViewShellBase* >(this)) ); - - return *mpImpl->mpCustomHandleManager.get(); -} - ::rtl::OUString ViewShellBase::RetrieveLabelFromCommand( const ::rtl::OUString& aCmdURL ) const { ::rtl::OUString aLabel; @@ -1813,34 +1779,4 @@ void FocusForwardingWindow::Command (const CommandEvent& rEvent) } // end of anonymouse namespace -// ==================================================================== - -CustomHandleManager::CustomHandleManager( ViewShellBase& rViewShellBase ) -: mrViewShellBase( rViewShellBase ) -{ -} - -CustomHandleManager::~CustomHandleManager() -{ - DBG_ASSERT( maSupplier.empty(), "sd::CustomHandleManager::~CustomHandleManager(), still suppliers attached!" ); -} - -void CustomHandleManager::registerSupplier( ICustomhandleSupplier* pSupplier ) -{ - maSupplier.insert( pSupplier ); -} - -void CustomHandleManager::unRegisterSupplier( ICustomhandleSupplier* pSupplier ) -{ - maSupplier.erase( pSupplier ); -} - -void CustomHandleManager::addCustomHandler( SdrView& rSourceView, ViewShell::ShellType eShellType, SdrHdlList& rHandlerList ) -{ - for( std::set< ICustomhandleSupplier* >::iterator aIter( maSupplier.begin() ); aIter != maSupplier.end(); aIter++ ) - { - (*aIter)->addCustomHandler( rSourceView, eShellType, rHandlerList ); - } -} - } // end of namespace sd diff --git a/sd/source/ui/view/ViewShellImplementation.cxx b/sd/source/ui/view/ViewShellImplementation.cxx index 8193ae3004d2..463a05b530aa 100644 --- a/sd/source/ui/view/ViewShellImplementation.cxx +++ b/sd/source/ui/view/ViewShellImplementation.cxx @@ -69,48 +69,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; using ::sd::framework::FrameworkHelper; -namespace { - -class ImpUndoDeleteWarning : public ModalDialog -{ -private: - FixedImage maImage; - FixedText maWarningFT; - CheckBox maDisableCB; - OKButton maYesBtn; - CancelButton maNoBtn; - -public: - ImpUndoDeleteWarning(Window* pParent); - BOOL IsWarningDisabled() const { return maDisableCB.IsChecked(); } -}; - -ImpUndoDeleteWarning::ImpUndoDeleteWarning(Window* pParent) -: ModalDialog(pParent, SdResId(RID_UNDO_DELETE_WARNING)), - maImage(this, SdResId(IMG_UNDO_DELETE_WARNING)), - maWarningFT(this, SdResId(FT_UNDO_DELETE_WARNING)), - maDisableCB(this, SdResId(CB_UNDO_DELETE_DISABLE)), - maYesBtn(this, SdResId(BTN_UNDO_DELETE_YES)), - maNoBtn(this, SdResId(BTN_UNDO_DELETE_NO)) -{ - FreeResource(); - - SetHelpId( HID_SD_UNDODELETEWARNING_DLG ); - maDisableCB.SetHelpId( HID_SD_UNDODELETEWARNING_CBX ); - - maYesBtn.SetText(Button::GetStandardText(BUTTON_YES)); - maNoBtn.SetText(Button::GetStandardText(BUTTON_NO)); - maImage.SetImage(WarningBox::GetStandardImage()); - - // #93721# Set focus to YES-Button - maYesBtn.GrabFocus(); -} - -} // end of anonymous namespace - - - - namespace sd { ViewShell::Implementation::Implementation (ViewShell& rViewShell) diff --git a/sd/source/ui/view/ViewShellManager.cxx b/sd/source/ui/view/ViewShellManager.cxx index 3ea4ef7a96f3..681536f34160 100755 --- a/sd/source/ui/view/ViewShellManager.cxx +++ b/sd/source/ui/view/ViewShellManager.cxx @@ -124,10 +124,6 @@ public: void RemoveShellFactory ( const SfxShell* pViewShell, const SharedShellFactory& rpFactory); - ViewShell* ActivateViewShell ( - ShellId nId, - ::Window* pParentWindow, - FrameView* pFrameView); void ActivateViewShell ( ViewShell* pViewShell); void DeactivateViewShell (const ViewShell& rShell); @@ -137,13 +133,10 @@ public: void SetFormShell (const ViewShell* pViewShell, FmFormShell* pFormShell, bool bAbove); void ActivateSubShell (const SfxShell& rParentShell, ShellId nId); void DeactivateSubShell (const SfxShell& rParentShell, ShellId nId); - void DeactivateAllSubShells (const SfxShell& rViewShell); void MoveSubShellToTop (const SfxShell& rParentShell, ShellId nId); void MoveToTop (const SfxShell& rParentShell); SfxShell* GetShell (ShellId nId) const; SfxShell* GetTopShell (void) const; - ShellId GetShellId (const SfxShell* pShell) const; - void ReplaceUndoManager (SfxUndoManager* pManager, SfxUndoManager* pReplacement); void Shutdown (void); void InvalidateAllSubShells (const SfxShell* pParentShell); @@ -235,7 +228,6 @@ private: DECL_LINK(WindowEventHandler, VclWindowEvent*); - void DumpActiveShell (const ActiveShellList& rList); void DumpShellStack (const ShellStack& rStack); void DumpSfxShellStack (void); @@ -246,10 +238,6 @@ private: */ void Deactivate (SfxShell* pShell); - ShellDescriptor CreateViewShell ( - ShellId nShellId, - ::Window* pParentWindow, - FrameView* pFrameView); ShellDescriptor CreateSubShell ( SfxShell* pShell, ShellId nShellId, @@ -304,20 +292,6 @@ void ViewShellManager::RemoveSubShellFactory ( -ViewShell* ViewShellManager::ActivateViewShell ( - ShellId nShellId, - ::Window* pParentWindow, - FrameView* pFrameView) -{ - if (mbValid) - return mpImpl->ActivateViewShell(nShellId,pParentWindow,pFrameView); - else - return NULL; -} - - - - void ViewShellManager::ActivateViewShell (ViewShell* pViewShell) { if (mbValid) @@ -377,15 +351,6 @@ void ViewShellManager::DeactivateSubShell (const ViewShell& rViewShell, ShellId -void ViewShellManager::DeactivateAllSubShells (const ViewShell& rViewShell) -{ - if (mbValid) - mpImpl->DeactivateAllSubShells(rViewShell); -} - - - - void ViewShellManager::InvalidateAllSubShells (ViewShell* pViewShell) { if (mbValid) @@ -413,15 +378,6 @@ void ViewShellManager::DeactivateShell (const SfxShell* pShell) -void ViewShellManager::InvalidateShellStack (const SfxShell* pShell) -{ - if (mbValid) - mpImpl->TakeShellsFromStack(pShell); -} - - - - void ViewShellManager::MoveToTop (const ViewShell& rParentShell) { if (mbValid) @@ -453,26 +409,6 @@ SfxShell* ViewShellManager::GetTopShell (void) const -ShellId ViewShellManager::GetShellId (const SfxShell* pShell) const -{ - if (mbValid) - return mpImpl->GetShellId(pShell); - else - return snInvalidShellId; -} - - - - -void ViewShellManager::ReplaceUndoManager (SfxUndoManager* pManager, SfxUndoManager* pReplacement) -{ - if (mbValid) - mpImpl->ReplaceUndoManager(pManager,pReplacement); -} - - - - void ViewShellManager::Shutdown (void) { if (mbValid) @@ -572,24 +508,6 @@ void ViewShellManager::Implementation::RemoveShellFactory ( -ViewShell* ViewShellManager::Implementation::ActivateViewShell ( - ShellId nShellId, - ::Window* pParentWindow, - FrameView* pFrameView) -{ - ::osl::MutexGuard aGuard (maMutex); - - // Create a new shell or recycle on in the cache. - ShellDescriptor aDescriptor (CreateViewShell(nShellId, pParentWindow, pFrameView)); - - ActivateShell(aDescriptor); - - return dynamic_cast(aDescriptor.mpShell); -} - - - - void ViewShellManager::Implementation::ActivateViewShell (ViewShell* pViewShell) { ::osl::MutexGuard aGuard (maMutex); @@ -953,66 +871,6 @@ SfxShell* ViewShellManager::Implementation::GetTopShell (void) const -ShellId ViewShellManager::Implementation::GetShellId (const SfxShell* pShell) const -{ - ::osl::MutexGuard aGuard (maMutex); - - ShellId nId = snInvalidShellId; - - // First search the active view shells. - const ViewShell* pViewShell = dynamic_cast(pShell); - if (pShell != NULL) - { - ActiveShellList::const_iterator iShell ( - ::std::find_if ( - maActiveViewShells.begin(), - maActiveViewShells.end(), - IsShell(pViewShell))); - if (iShell != maActiveViewShells.end()) - nId = iShell->mnId; - } - if (nId == snInvalidShellId) - { - // Now search the active sub shells of every active view shell. - SubShellList::const_iterator iList; - for (iList=maActiveSubShells.begin(); iList!=maActiveSubShells.end(); ++iList) - { - const SubShellSubList& rList (iList->second); - SubShellSubList::const_iterator iSubShell( - ::std::find_if(rList.begin(),rList.end(), IsShell(pShell))); - if (iSubShell != rList.end()) - { - nId = iSubShell->mnId; - break; - } - } - } - - return nId; -} - - - - -void ViewShellManager::Implementation::ReplaceUndoManager ( - SfxUndoManager* pManager, - SfxUndoManager* pReplacement) -{ - for (USHORT i=0; ;++i) - { - SfxShell* pShell = mrBase.GetSubShell(i); - if (pShell == NULL) - break; - if (pShell->GetUndoManager() == pManager) - pShell->SetUndoManager(pReplacement); - } -} - - - - - - void ViewShellManager::Implementation::LockUpdate (void) { mnUpdateLockCount++; @@ -1333,44 +1191,6 @@ IMPL_LINK(ViewShellManager::Implementation, WindowEventHandler, VclWindowEvent*, -ShellDescriptor ViewShellManager::Implementation::CreateViewShell ( - ShellId nShellId, - ::Window* pParentWindow, - FrameView* pFrameView) -{ - ShellDescriptor aResult; - - if (pParentWindow != NULL) - { - ShellDescriptor aDescriptor ( - CreateSubShell(NULL,nShellId,pParentWindow,pFrameView)); - aResult.mpShell = dynamic_cast(aDescriptor.mpShell); - aResult.mpFactory = aDescriptor.mpFactory; - aResult.mnId = aDescriptor.mnId; - - // Register as window listener so that the shells of the current - // window can be moved to the top of the shell stack. - if (aResult.mpShell != NULL) - { - ::Window* pWindow = aResult.GetWindow(); - if (pWindow != NULL) - pWindow->AddEventListener( - LINK(this, ViewShellManager::Implementation, WindowEventHandler)); - else - { - DBG_ASSERT (false, - "ViewShellManager::ActivateViewShell: " - "new view shell has no active window"); - } - } - } - - return aResult; -} - - - - ShellDescriptor ViewShellManager::Implementation::CreateSubShell ( SfxShell* pParentShell, ShellId nShellId, @@ -1499,15 +1319,6 @@ void ViewShellManager::Implementation::Shutdown (void) -void ViewShellManager::Implementation::DumpActiveShell (const ActiveShellList& rList) -{ - for (ActiveShellList::const_iterator aI=rList.begin(); aI!=rList.end(); ++aI) - OSL_TRACE (" %d %p\r", aI->mnId, aI->mpShell); -} - - - - void ViewShellManager::Implementation::DumpShellStack (const ShellStack& rStack) { ShellStack::const_reverse_iterator iEntry; @@ -1580,24 +1391,6 @@ void ViewShellManager::Implementation::SetFormShell ( -void ViewShellManager::Implementation::DeactivateAllSubShells ( - const SfxShell& rViewShell) -{ - ::osl::MutexGuard aGuard (maMutex); - - SubShellList::iterator iList (maActiveSubShells.find(&rViewShell)); - if (iList != maActiveSubShells.end()) - { - SubShellSubList& rList (iList->second); - UpdateLock aLock (*this); - while ( ! rList.empty()) - DeactivateSubShell(rViewShell, rList.front().mnId); - } -} - - - - namespace { ShellDescriptor::ShellDescriptor (void) diff --git a/sd/source/ui/view/bmcache.cxx b/sd/source/ui/view/bmcache.cxx index d8781733c520..c7f313037ff8 100644 --- a/sd/source/ui/view/bmcache.cxx +++ b/sd/source/ui/view/bmcache.cxx @@ -58,115 +58,6 @@ BitmapCache::~BitmapCache() } } -/************************************************************************* -|* -|* Cache-Eintrag einfuegen -|* -\************************************************************************/ - -void BitmapCache::Add(const SdPage* pPage, const Bitmap& rBmp, long nZoom) -{ - BitmapCacheEntry* pEntry = NULL; - ULONG nSizeOfBitmap = rBmp.GetSizeBytes(); - - if( nSizeOfBitmap < nMaxSize ) - { - while (nCurSize + nSizeOfBitmap > nMaxSize) - { - if( aEntries.Count() ) - { - pEntry = (BitmapCacheEntry*) aEntries.Remove(aEntries.Count() - 1); - - if( pEntry && pEntry->pGraphicObject ) - { - nCurSize -= pEntry->nSizeBytes; - delete pEntry->pGraphicObject; - } - - delete pEntry; - } - else - break; - } - - pEntry = new BitmapCacheEntry; - pEntry->pPage = pPage; - pEntry->pGraphicObject = new GraphicObject( rBmp ); - pEntry->nSizeBytes = nSizeOfBitmap; - pEntry->nZoom = nZoom; - - aEntries.Insert( pEntry, (ULONG) 0 ); - nCurSize += nSizeOfBitmap; - } -} - -/************************************************************************* -|* -|* Cache-Eintrag suchen, Bitmap-Zeiger zurueckgeben (NULL, wenn Bitmap nicht -|* im Cache) -|* - auf rZoomPercent wird der Zoomfaktor der Bitmap geschrieben -|* - abs(nZoomTolerance) gibt die maximal erlaubte Abweichung des -|* Zoomfaktors an; ist die Toleranz negativ, so sucht der Cache den -|* "best fit", sonst den "first fit", -|* - es werden nur Bitmaps mit Zoomfaktoren kleiner oder gleich rZoomPercent -|* beruecksichtigt, um ein Verkleinern der Bitmap beim Zeichnen zu vermeiden -|* -\************************************************************************/ - -const GraphicObject* BitmapCache::Get( const SdPage* pPage, long& rZoomPercent, long nZoomTolerancePercent) -{ - BitmapCacheEntry* pEntry = NULL; - GraphicObject* pGraphicObject = NULL; - - if( nZoomTolerancePercent < 0 ) - { - // "best fit"-Suche - long nTolerance = -nZoomTolerancePercent; - BitmapCacheEntry* pBest = NULL; - long nBest = LONG_MAX; - long nTest = 0L; - - for( ULONG nPos = 0; nPos < aEntries.Count(); nPos++ ) - { - pEntry = (BitmapCacheEntry*) aEntries.GetObject( nPos ); - - if( pEntry->pPage == pPage ) - { - nTest = rZoomPercent - pEntry->nZoom; - - if( nTest >= 0 && nTest < nBest && nTest <= nTolerance ) - pBest = pEntry; - } - } - - pEntry = pBest; - } - else - { - // "first fit"-suche - for( ULONG nPos = 0; nPos < aEntries.Count(); nPos++ ) - { - pEntry = (BitmapCacheEntry*)aEntries.GetObject( nPos ); - - if (pEntry->pPage == pPage && Abs( pEntry->nZoom - rZoomPercent ) <= nZoomTolerancePercent ) - break; - else - pEntry = NULL; - } - } - - // was passendes gefunden? - if( pEntry ) - { - pGraphicObject = pEntry->pGraphicObject; - aEntries.Remove( pEntry ); - aEntries.Insert( pEntry, (ULONG) 0 ); - rZoomPercent = pEntry->nZoom; - } - - return pGraphicObject; -} - void BitmapCache::Remove( const SdPage* pPage ) { for( ULONG nPos = 0; nPos < aEntries.Count(); ) diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx index 4b9aecb02ac5..302bdab6f115 100644 --- a/sd/source/ui/view/drviews1.cxx +++ b/sd/source/ui/view/drviews1.cxx @@ -92,7 +92,6 @@ #include "slideshow.hxx" #include "optsitem.hxx" #include "fusearch.hxx" -#include "fuspell.hxx" #include "Outliner.hxx" #include "AnimationChildWindow.hxx" #include "SdUnoDrawView.hxx" diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx index aa1a0f53c15a..9669a33bd402 100644 --- a/sd/source/ui/view/drviews2.cxx +++ b/sd/source/ui/view/drviews2.cxx @@ -103,48 +103,6 @@ using namespace ::com::sun::star::uno; namespace sd { -/************************************************************************* -|* -|* modal dialog for #90356# -|* -\************************************************************************/ - -class ImpUndoDeleteWarning : public ModalDialog -{ -private: - FixedImage maImage; - FixedText maWarningFT; - CheckBox maDisableCB; - OKButton maYesBtn; - CancelButton maNoBtn; - -public: - ImpUndoDeleteWarning(Window* pParent); - BOOL IsWarningDisabled() const { return maDisableCB.IsChecked(); } -}; - -ImpUndoDeleteWarning::ImpUndoDeleteWarning(Window* pParent) -: ModalDialog(pParent, SdResId(RID_UNDO_DELETE_WARNING)), - maImage(this, SdResId(IMG_UNDO_DELETE_WARNING)), - maWarningFT(this, SdResId(FT_UNDO_DELETE_WARNING)), - maDisableCB(this, SdResId(CB_UNDO_DELETE_DISABLE)), - maYesBtn(this, SdResId(BTN_UNDO_DELETE_YES)), - maNoBtn(this, SdResId(BTN_UNDO_DELETE_NO)) -{ - FreeResource(); - - SetHelpId( HID_SD_UNDODELETEWARNING_DLG ); - maDisableCB.SetHelpId( HID_SD_UNDODELETEWARNING_CBX ); - - maYesBtn.SetText(Button::GetStandardText(BUTTON_YES)); - maNoBtn.SetText(Button::GetStandardText(BUTTON_NO)); - maImage.SetImage(WarningBox::GetStandardImage()); - - // #93721# Set focus to YES-Button - maYesBtn.GrabFocus(); -} - - /************************************************************************* |* |* SfxRequests fuer temporaere Funktionen diff --git a/sd/source/ui/view/drviews6.cxx b/sd/source/ui/view/drviews6.cxx index 4dd3c61556e1..3ca5644d040b 100644 --- a/sd/source/ui/view/drviews6.cxx +++ b/sd/source/ui/view/drviews6.cxx @@ -191,32 +191,6 @@ void DrawViewShell::GetFormTextState(SfxItemSet& rSet) } } -/************************************************************************* -|* -|* SfxRequests fuer Objektpalette bearbeiten -|* -\************************************************************************/ - -void DrawViewShell::ExecObjPalette( SfxRequest& ) -{ - // Diese Methode muss erhalten bleiben, bis - // der/die Slots entfernt wurden; - // ==> Voll-Update -} - -/************************************************************************* -|* -|* Statuswerte fuer Objektpalette zurueckgeben -|* -\************************************************************************/ - -void DrawViewShell::GetObjPaletteState(SfxItemSet& ) -{ - // Diese Methode muss erhalten bleiben, bis - // der/die Slots entfernt wurden; - // ==> Voll-Update -} - /************************************************************************* |* |* SfxRequests fuer Animator bearbeiten diff --git a/sd/source/ui/view/drviewsa.cxx b/sd/source/ui/view/drviewsa.cxx index 4d30831f4e2a..882e3040d134 100644 --- a/sd/source/ui/view/drviewsa.cxx +++ b/sd/source/ui/view/drviewsa.cxx @@ -148,21 +148,6 @@ DrawViewShell::DrawViewShell( SfxViewFrame* pFrame, ViewShellBase& rViewShellBas Construct(GetDocSh(), ePageKind); } -/************************************************************************* -|* -|* Copy-Konstruktor -|* -\************************************************************************/ - -DrawViewShell::DrawViewShell( SfxViewFrame* pFrame, ::Window* pParentWindow, const DrawViewShell& rShell ) -: ViewShell(pFrame, pParentWindow, rShell) -, maTabControl(this, pParentWindow) -, mbIsInSwitchPage(false) -{ - mpFrameView = new FrameView(GetDoc()); - Construct (GetDocSh(), PK_STANDARD); -} - /************************************************************************* |* |* Destruktor diff --git a/sd/source/ui/view/grviewsh.cxx b/sd/source/ui/view/grviewsh.cxx index 1c22348f8b87..646a437c42bf 100644 --- a/sd/source/ui/view/grviewsh.cxx +++ b/sd/source/ui/view/grviewsh.cxx @@ -61,24 +61,6 @@ GraphicViewShell::GraphicViewShell ( ConstructGraphicViewShell(); } -/************************************************************************* -|* -|* Copy-Konstruktor -|* -\************************************************************************/ - -GraphicViewShell::GraphicViewShell ( - SfxViewFrame* pFrame, - ::Window* pParentWindow, - const DrawViewShell& rShell) - : DrawViewShell (pFrame, pParentWindow, rShell) -{ - ConstructGraphicViewShell(); -} - - - - GraphicViewShell::~GraphicViewShell (void) { } diff --git a/sd/source/ui/view/makefile.mk b/sd/source/ui/view/makefile.mk index 3b3bca4ff3d5..4acd747adc65 100644 --- a/sd/source/ui/view/makefile.mk +++ b/sd/source/ui/view/makefile.mk @@ -84,7 +84,6 @@ SLOFILES = \ $(SLO)$/presvish.obj \ $(SLO)$/outlview.obj \ $(SLO)$/tabcontr.obj \ - $(SLO)$/showview.obj \ $(SLO)$/bmcache.obj \ $(SLO)$/drbezob.obj \ $(SLO)$/drtxtob.obj \ diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx index 1467e6c24bd0..aa11707cdb32 100644 --- a/sd/source/ui/view/outlnvsh.cxx +++ b/sd/source/ui/view/outlnvsh.cxx @@ -235,31 +235,6 @@ OutlineViewShell::OutlineViewShell ( Construct(GetDocSh()); } - -/************************************************************************* -|* -|* Copy-Konstruktor -|* -\************************************************************************/ - -OutlineViewShell::OutlineViewShell ( - SfxViewFrame* pFrame, - ::Window* pParentWindow, - const OutlineViewShell& rShell) - : ViewShell (pFrame, pParentWindow, rShell), - pOlView(NULL), - pLastPage( NULL ), - pClipEvtLstnr(NULL), - bPastePossible(FALSE), - mbInitialized(false) - -{ - mpFrameView = new FrameView(GetDoc()); - mpFrameView->Connect(); - - Construct(GetDocSh()); -} - /************************************************************************* |* |* Destruktor diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx index 30daec8b636e..dfad4b34c6f2 100644 --- a/sd/source/ui/view/outlview.cxx +++ b/sd/source/ui/view/outlview.cxx @@ -2040,6 +2040,7 @@ IMPL_LINK(OutlineView, PaintingFirstLineHdl, PaintFirstLineInfo*, pInfo) return 0; } +#if 0 sal_Int32 OutlineView::GetPageNumberWidthPixel() { Window* pActWin = mpOutlineViewShell->GetActiveWindow(); @@ -2062,6 +2063,7 @@ sal_Int32 OutlineView::GetPageNumberWidthPixel() } return mnPageNumberWidthPixel; } +#endif // -------------------------------------------------------------------- diff --git a/sd/source/ui/view/sdview.cxx b/sd/source/ui/view/sdview.cxx index 813c6caba95a..3aed9c6c0d9c 100644 --- a/sd/source/ui/view/sdview.cxx +++ b/sd/source/ui/view/sdview.cxx @@ -969,89 +969,6 @@ void View::SetMarkedOriginalSize() delete pUndoGroup; } -/** create a virtual device and paints the slide contents into it. - The caller must delete the returned device */ -VirtualDevice* View::CreatePageVDev(USHORT nSdPage, PageKind ePageKind, ULONG nWidthPixel) -{ - ViewShell* pViewShell = mpDocSh->GetViewShell(); - OutputDevice* pRefDevice = 0; - if( pViewShell ) - pRefDevice = pViewShell->GetActiveWindow(); - - if( !pRefDevice ) - pRefDevice = Application::GetDefaultDevice(); - - DBG_ASSERT( pRefDevice, "sd::View::CreatePageVDev(), I need a reference device to work properly!" ); - - VirtualDevice* pVDev; - if( pRefDevice ) - pVDev = new VirtualDevice( *pRefDevice ); - else - pVDev = new VirtualDevice(); - - MapMode aMM( MAP_100TH_MM ); - - SdPage* pPage = mpDoc->GetSdPage(nSdPage, ePageKind); - DBG_ASSERT(pPage, "sd::View::CreatePageVDev(), slide not found!"); - - if( pPage ) - { - Size aPageSize(pPage->GetSize()); - aPageSize.Width() -= pPage->GetLftBorder(); - aPageSize.Width() -= pPage->GetRgtBorder(); - aPageSize.Height() -= pPage->GetUppBorder(); - aPageSize.Height() -= pPage->GetLwrBorder(); - - // use scaling? - if( nWidthPixel ) - { - const Fraction aFrac( (long) nWidthPixel, pVDev->LogicToPixel( aPageSize, aMM ).Width() ); - - aMM.SetScaleX( aFrac ); - aMM.SetScaleY( aFrac ); - } - - pVDev->SetMapMode( aMM ); - if( pVDev->SetOutputSize(aPageSize) ) - { - std::auto_ptr< SdrView > pView( new SdrView(mpDoc, pVDev) ); - pView->SetPageVisible( FALSE ); - pView->SetBordVisible( FALSE ); - pView->SetGridVisible( FALSE ); - pView->SetHlplVisible( FALSE ); - pView->SetGlueVisible( FALSE ); - pView->ShowSdrPage(pPage); // WAITING FOR SJ , Point(-pPage->GetLftBorder(), -pPage->GetUppBorder())); - SdrPageView* pPageView = pView->GetSdrPageView(); - if( pViewShell ) - { - FrameView* pFrameView = pViewShell->GetFrameView(); - if( pFrameView ) - { - pPageView->SetVisibleLayers( pFrameView->GetVisibleLayers() ); - pPageView->SetLockedLayers( pFrameView->GetLockedLayers() ); - pPageView->SetPrintableLayers( pFrameView->GetPrintableLayers() ); - } - } - - // SJ: i40609, the vdev mapmode seems to be dangled after CompleteRedraw, - // so we are pushing here, because the mapmode is used afterwards - pVDev->Push(); - - Point aPoint( 0, 0 ); - Region aRegion (Rectangle( aPoint, aPageSize ) ); - pView->CompleteRedraw(pVDev, aRegion); - pVDev->Pop(); - } - else - { - DBG_ERROR("sd::View::CreatePageVDev(), virt. device creation failed!"); - } - } - return pVDev; -} - - - /************************************************************************* |* |* OLE-Obj am Client connecten diff --git a/sd/source/ui/view/sdview4.cxx b/sd/source/ui/view/sdview4.cxx index 44e5127bfb25..1767217ebea3 100644 --- a/sd/source/ui/view/sdview4.cxx +++ b/sd/source/ui/view/sdview4.cxx @@ -599,11 +599,6 @@ void View::LockRedraw(BOOL bLock) -bool View::IsRedrawLocked (void) const -{ - return mnLockRedrawSmph>0; -} - /************************************************************************* |* |* StyleSheet aus der Sleketion besorgen diff --git a/sd/source/ui/view/sdwindow.cxx b/sd/source/ui/view/sdwindow.cxx index 7cae5d452a1b..268d77fa8fd8 100644 --- a/sd/source/ui/view/sdwindow.cxx +++ b/sd/source/ui/view/sdwindow.cxx @@ -147,35 +147,6 @@ void Window::SetViewShell (ViewShell* pViewSh) } } - - - -/************************************************************************* -|* -|* Die Haelfte des Sichtbaren Bereich eines anderen Fensters darstellen -|* -\************************************************************************/ - -void Window::ShareViewArea(Window* pOtherWin) -{ - mpShareWin = pOtherWin; - maViewOrigin = pOtherWin->maViewOrigin; - maViewSize = pOtherWin->maViewSize; - mnMinZoom = pOtherWin->mnMinZoom; - mnMaxZoom = pOtherWin->mnMaxZoom; - mbCenterAllowed = pOtherWin->mbCenterAllowed; - - long nZoom = pOtherWin->GetZoom(); - MapMode aMap(GetMapMode()); - aMap.SetScaleX(Fraction(nZoom, 100)); - aMap.SetScaleY(Fraction(nZoom, 100)); - aMap.SetOrigin(pOtherWin->GetMapMode().GetOrigin()); - SetMapMode(aMap); -} - - - - void Window::CalcMinZoom() { // Are we entitled to change the minimal zoom factor? diff --git a/sd/source/ui/view/showview.cxx b/sd/source/ui/view/showview.cxx deleted file mode 100644 index a60195eac1b8..000000000000 --- a/sd/source/ui/view/showview.cxx +++ /dev/null @@ -1,170 +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. - * - ************************************************************************/ - -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_sd.hxx" - -#include "showview.hxx" -#include -#include - - -#include "drawdoc.hxx" -#include "sdpage.hxx" -#include "ViewShell.hxx" -#include "FrameView.hxx" - -namespace sd { - -#ifndef SO2_DECL_SVINPLACEOBJECT_DEFINED -#define SO2_DECL_SVINPLACEOBJECT_DEFINED -SO2_DECL_REF(SvInPlaceObject) -#endif -#ifndef SO2_DECL_SVINPLACECLIENT_DEFINED -#define SO2_DECL_SVINPLACECLIENT_DEFINED -SO2_DECL_REF(SvInPlaceClient) -#endif - -/************************************************************************* -|* -|* der Konstruktor setzt den MapMode und arrangiert die einzelnen Seiten -|* -\************************************************************************/ - -ShowView::ShowView ( - SdDrawDocument* pDoc, - OutputDevice* pOut, - ViewShell* pViewShell, - ::Window* pWin) - : FmFormView(pDoc, pOut), - pDrDoc(pDoc), - mpViewSh(pViewShell), - pWindowForPlugIns(pWin), - nAllowInvalidateSmph(0), - bAllowMasterPageCaching(TRUE) -{ - // #i73602# Use default from the configuration - SetBufferedOverlayAllowed(getOptionsDrawinglayer().IsOverlayBuffer_DrawImpress()); - - // #i74769#, #i75172# Use default from the configuration - SetBufferedOutputAllowed(getOptionsDrawinglayer().IsPaintBuffer_DrawImpress()); - - EnableExtendedKeyInputDispatcher(FALSE); - EnableExtendedMouseEventDispatcher(FALSE); - EnableExtendedCommandEventDispatcher(FALSE); -} - -/************************************************************************* -|* -|* Destruktor -|* -\************************************************************************/ - -ShowView::~ShowView() -{ -} - -/************************************************************************* -|* -|* Zaehler fuer Invalidierungserlaubnis hoch- oder runter zaehlen -|* -\************************************************************************/ - -void ShowView::SetAllowInvalidate(BOOL bFlag) -{ - if (!bFlag) - { - nAllowInvalidateSmph++; - } - else if (nAllowInvalidateSmph > 0) - { - nAllowInvalidateSmph--; - } -} - -/************************************************************************* -|* -|* ermittelt, ob invalidiert werden darf -|* -\************************************************************************/ - -BOOL ShowView::IsInvalidateAllowed() const -{ - return (nAllowInvalidateSmph == 0); -} - -/************************************************************************* -|* -|* Invalidate abfangen -|* -\************************************************************************/ - -void ShowView::InvalidateOneWin (::Window& rWin) -{ - if (IsInvalidateAllowed()) - { - FmFormView::InvalidateOneWin(rWin); - } -} - -/************************************************************************* -|* -|* Invalidate abfangen -|* -\************************************************************************/ - -void ShowView::InvalidateOneWin (::Window& rWin, const Rectangle& rRect) -{ - if (IsInvalidateAllowed()) - { - FmFormView::InvalidateOneWin(rWin, rRect); - } -} - -/************************************************************************* -|* -|* Paint-Methode: das Ereignis wird an die View weitergeleitet -|* -\************************************************************************/ - -void ShowView::CompleteRedraw(OutputDevice* pOutDev, const Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector /*=0L*/) -{ - FmFormView::CompleteRedraw(pOutDev, rReg, pRedirector); -} - -/************************************************************************* -|* -|* DoConnect -|* -\************************************************************************/ - -void ShowView::DoConnect(SdrOle2Obj* ) -{ - // connected wird jetzt in FuSlideShow::ShowPlugIns() -} - -} // end of namespace sd diff --git a/sd/source/ui/view/viewshe2.cxx b/sd/source/ui/view/viewshe2.cxx index 5a3426a42533..616516782be3 100644 --- a/sd/source/ui/view/viewshe2.cxx +++ b/sd/source/ui/view/viewshe2.cxx @@ -526,34 +526,6 @@ void ViewShell::DrawMarkRect(const Rectangle& rRect) const } } - -/************************************************************************* -|* -|* Auf allen Split-Windows ein Rechteck zeichnen. Fuer den Rahmen wird der -|* uebergebene Pen, zum Fuellen die uebergebene Brush benutzt. -|* -\************************************************************************/ - -void ViewShell::DrawFilledRect( const Rectangle& rRect, const Color& rLColor, - const Color& rFColor ) const -{ - if (mpContentWindow.get() != NULL) - { - const Color& rOldLineColor = mpContentWindow->GetLineColor(); - const Color& rOldFillColor = mpContentWindow->GetFillColor(); - - mpContentWindow->SetLineColor( rLColor ); - mpContentWindow->SetFillColor( rFColor ); - - mpContentWindow->DrawRect(rRect); - - mpContentWindow->SetLineColor( rOldLineColor ); - mpContentWindow->SetFillColor( rOldFillColor ); - } -} - - - /************************************************************************* |* |* Groesse und Raender aller Seiten setzen @@ -849,18 +821,6 @@ void ViewShell::WriteFrameViewData() { } -/************************************************************************* -|* -|* Auf allen Split-Windows ein Update erzwingen. -|* -\************************************************************************/ - -void ViewShell::UpdateWindows() -{ - if (mpContentWindow.get() != NULL) - mpContentWindow->Update(); -} - /************************************************************************* |* |* OLE-Object aktivieren diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx index 578026018b9f..c1f4bc070bcf 100644 --- a/sd/source/ui/view/viewshel.cxx +++ b/sd/source/ui/view/viewshel.cxx @@ -173,14 +173,6 @@ ViewShell::ViewShell( SfxViewFrame*, ::Window* pParentWindow, ViewShellBase& rVi construct(); } -ViewShell::ViewShell( SfxViewFrame*, ::Window* pParentWindow, const ViewShell& rShell) -: SfxShell(rShell.GetViewShell()) -, mbCenterAllowed(rShell.mbCenterAllowed) -, mpParentWindow(pParentWindow) -{ - construct(); -} - ViewShell::~ViewShell() { // Keep the content window from accessing in its destructor the diff --git a/sd/source/ui/view/zoomlist.cxx b/sd/source/ui/view/zoomlist.cxx index 6f4d56b6f0a3..9ae178e3d7a6 100644 --- a/sd/source/ui/view/zoomlist.cxx +++ b/sd/source/ui/view/zoomlist.cxx @@ -112,19 +112,6 @@ void ZoomList::InsertZoomRect(const Rectangle& rRect) rBindings.Invalidate( SID_ZOOM_PREV ); } - -/************************************************************************* -|* -|* Aktuelles ZoomRect herausgeben -|* -\************************************************************************/ - -Rectangle ZoomList::GetCurrentZoomRect() const -{ - Rectangle aRect(*(Rectangle*) GetObject(mnCurPos)); - return (aRect); -} - /************************************************************************* |* |* Naechstes ZoomRect herausgeben -- cgit From dd1c2c40badabc44efc54f59e10797ada5e72ca3 Mon Sep 17 00:00:00 2001 From: Christian Lippka Date: Thu, 6 May 2010 14:26:00 +0200 Subject: #i108541# keep non empty pres obj as pres obj even if they are not part of the current layout --- sd/source/core/sdpage.cxx | 2 ++ 1 file changed, 2 insertions(+) (limited to 'sd') diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx index c0485ec7ba86..248a844a768d 100755 --- a/sd/source/core/sdpage.cxx +++ b/sd/source/core/sdpage.cxx @@ -1609,6 +1609,7 @@ void SdPage::SetAutoLayout(AutoLayout eLayout, BOOL bInit, BOOL bCreate ) if( !bUndo ) SdrObject::Free( pObj ); } +/* #i108541# keep non empty pres obj as pres obj even if they are not part of the current layout else { if( bUndo ) @@ -1620,6 +1621,7 @@ void SdPage::SetAutoLayout(AutoLayout eLayout, BOOL bInit, BOOL bCreate ) maPresentationShapeList.removeShape( *pObj ); pObj->SetUserCall(0); } +*/ } pObj = pNext; } -- 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/dlg/PaneChildWindows.cxx | 27 ++++++++++++++++++++++++ sd/source/ui/inc/PaneChildWindows.hxx | 7 +++++- sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx | 5 +++++ sd/source/ui/toolpanel/ToolPanelViewShell.cxx | 8 +++++++ 4 files changed, 46 insertions(+), 1 deletion(-) (limited to 'sd') diff --git a/sd/source/ui/dlg/PaneChildWindows.cxx b/sd/source/ui/dlg/PaneChildWindows.cxx index 26ad4436b7c1..6a6d515822f8 100755 --- a/sd/source/ui/dlg/PaneChildWindows.cxx +++ b/sd/source/ui/dlg/PaneChildWindows.cxx @@ -32,6 +32,7 @@ #include "PaneDockingWindow.hxx" #include "ViewShellBase.hxx" #include "framework/FrameworkHelper.hxx" +#include "taskpane/ToolPanelViewShell.hxx" #include "app.hrc" #include "strings.hrc" #include "sdresid.hxx" @@ -40,6 +41,7 @@ #include #include #include +#include namespace sd { @@ -148,4 +150,29 @@ ToolPanelChildWindow::ToolPanelChildWindow( ::Window* i_pParentWindow, USHORT i_ { } +//---------------------------------------------------------------------------------------------------------------------- +void ToolPanelChildWindow::ActivateToolPanel( const ::rtl::OUString& i_rPanelURL ) +{ + SfxDockingWindow* pDockingWindow = dynamic_cast< SfxDockingWindow* >( GetWindow() ); + ViewShellBase* pViewShellBase = ViewShellBase::GetViewShellBase( pDockingWindow->GetBindings().GetDispatcher()->GetFrame() ); + ENSURE_OR_RETURN_VOID( pViewShellBase != NULL, "ToolPanelChildWindow::ActivateToolPanel: no view shell access!" ); + + const ::boost::shared_ptr< framework::FrameworkHelper > pFrameworkHelper( framework::FrameworkHelper::Instance( *pViewShellBase ) ); + + if ( i_rPanelURL.indexOf( framework::FrameworkHelper::msTaskPanelURLPrefix ) == 0 ) + { + // it's one of our standard panels known to the drawing framework + pFrameworkHelper->RequestTaskPanel( i_rPanelURL ); + } + else + { + // TODO: it would be nice if the drawing framework were able to handle non-standard panels, installed by + // extensions, too. As long as this is not the case, we need to take the direct way ... + ::boost::shared_ptr< ViewShell > pViewShell = pFrameworkHelper->GetViewShell( framework::FrameworkHelper::msRightPaneURL ); + toolpanel::ToolPanelViewShell* pToolPanelViewShell = dynamic_cast< toolpanel::ToolPanelViewShell* >( pViewShell.get() ); + ENSURE_OR_RETURN_VOID( pToolPanelViewShell != NULL, "ToolPanelChildWindow::ActivateToolPanel: no tool panel view shell access!" ); + pToolPanelViewShell->ActivatePanel( i_rPanelURL ); + } +} + } // end of namespace ::sd 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 ); diff --git a/sd/source/ui/toolpanel/ToolPanelViewShell.cxx b/sd/source/ui/toolpanel/ToolPanelViewShell.cxx index b0539b14f41a..c62faf29ca50 100755 --- a/sd/source/ui/toolpanel/ToolPanelViewShell.cxx +++ b/sd/source/ui/toolpanel/ToolPanelViewShell.cxx @@ -732,6 +732,14 @@ Reference< XUIElement > ToolPanelViewShell::CreatePanelUIElement( const Referenc return xUIElement; } +// --------------------------------------------------------------------------------------------------------------------- +void ToolPanelViewShell::ActivatePanel( const ::rtl::OUString& i_rPanelResourceURL ) +{ + OSL_ENSURE( i_rPanelResourceURL.indexOf( FrameworkHelper::msTaskPanelURLPrefix ) < 0, + "ToolPanelViewShell::ActivatePanel: for drawing-framework-controller panels, please use FrameworkHelper::RequestTaskPanel!" ); + mpImpl->ActivatePanelByResource( i_rPanelResourceURL ); +} + // --------------------------------------------------------------------------------------------------------------------- void ToolPanelViewShell::DeactivatePanel( const ::rtl::OUString& i_rPanelResourceURL ) { -- cgit From c4004bb3c81beeb717e0dd4e942d674c1d075812 Mon Sep 17 00:00:00 2001 From: "Thomas Lange [tl]" Date: Fri, 7 May 2010 10:40:12 +0200 Subject: cws tl78: fixing windows specific build problems after merging with DEV300_m77 --- sd/source/filter/grf/sdgrffilter.cxx | 0 sd/source/ui/unoidl/sddetect.cxx | 0 2 files changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 sd/source/filter/grf/sdgrffilter.cxx mode change 100644 => 100755 sd/source/ui/unoidl/sddetect.cxx (limited to 'sd') diff --git a/sd/source/filter/grf/sdgrffilter.cxx b/sd/source/filter/grf/sdgrffilter.cxx old mode 100644 new mode 100755 diff --git a/sd/source/ui/unoidl/sddetect.cxx b/sd/source/ui/unoidl/sddetect.cxx old mode 100644 new mode 100755 -- cgit From ef650c5d2f7f870ad2cd8965f6f6ab9900b68704 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Tue, 18 May 2010 17:08:55 +0200 Subject: CWS mba33issues01: #i99402#: typo RapairPackage --- sd/source/ui/unoidl/sddetect.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sd') diff --git a/sd/source/ui/unoidl/sddetect.cxx b/sd/source/ui/unoidl/sddetect.cxx index 90767a332609..9f268dec0cfa 100644 --- a/sd/source/ui/unoidl/sddetect.cxx +++ b/sd/source/ui/unoidl/sddetect.cxx @@ -167,7 +167,7 @@ SdFilterDetect::~SdFilterDetect() } else if( lDescriptor[nProperty].Name == OUString(RTL_CONSTASCII_USTRINGPARAM("InteractionHandler")) ) lDescriptor[nProperty].Value >>= xInteraction; - else if( lDescriptor[nProperty].Name == OUString(RTL_CONSTASCII_USTRINGPARAM("RapairPackage")) ) + else if( lDescriptor[nProperty].Name == OUString(RTL_CONSTASCII_USTRINGPARAM("RepairPackage")) ) lDescriptor[nProperty].Value >>= bRepairPackage; else if( lDescriptor[nProperty].Name == OUString(RTL_CONSTASCII_USTRINGPARAM("DocumentTitle")) ) nIndexOfDocumentTitle = nProperty; -- cgit From 38c1d35d15a0adc980c2355ff97ce327645cd954 Mon Sep 17 00:00:00 2001 From: sj Date: Tue, 18 May 2010 17:19:53 +0200 Subject: sdk321: #i111521# ppt export, fixed problem with graphical bullets --- sd/source/filter/eppt/epptso.cxx | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'sd') diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx index f07245d1ff31..c9d083db86d9 100644 --- a/sd/source/filter/eppt/epptso.cxx +++ b/sd/source/filter/eppt/epptso.cxx @@ -5358,6 +5358,12 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a pClientTextBox->Write( pOut->GetData(), pOut->Tell() ); delete pOut, aTextRule.pOut = NULL; } + if ( aExtBu.Tell() ) + { + if ( !pClientData ) + pClientData = new SvMemoryStream( 0x200, 0x200 ); + ImplProgTagContainer( pClientData, &aExtBu ); + } } } } -- cgit From afe714cb4a899f6e264a5f60cf421c2396684999 Mon Sep 17 00:00:00 2001 From: "Frank Schoenheit [fs]" Date: Wed, 19 May 2010 12:08:26 +0200 Subject: slidecopy: fixed key navigation within titled controls --- sd/source/ui/toolpanel/TitledControl.cxx | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'sd') diff --git a/sd/source/ui/toolpanel/TitledControl.cxx b/sd/source/ui/toolpanel/TitledControl.cxx index 110e4097f684..4843102feb48 100644 --- a/sd/source/ui/toolpanel/TitledControl.cxx +++ b/sd/source/ui/toolpanel/TitledControl.cxx @@ -54,16 +54,13 @@ TitledControl::TitledControl ( mpUserData(NULL), mpClickHandler(new ClickHandler(rClickHandler)) { - if (pControl.get() != NULL) - { - mpControlContainer->AddControl (::std::auto_ptr ( - new TitleBar (this, rTitle, eType, pControl->IsExpandable()))); - pControl->SetParentNode (this); - } + mpControlContainer->AddControl (::std::auto_ptr ( + new TitleBar (this, rTitle, eType, pControl->IsExpandable()))); + pControl->SetParentNode (this); mpControlContainer->AddControl (pControl); - FocusManager::Instance().RegisterDownLink(this, GetControl()->GetWindow()); - FocusManager::Instance().RegisterUpLink(GetControl()->GetWindow(), this); + FocusManager::Instance().RegisterDownLink( GetTitleBar()->GetWindow(), GetControl()->GetWindow() ); + FocusManager::Instance().RegisterUpLink( GetControl()->GetWindow(), GetTitleBar()->GetWindow() ); SetBackground (Wallpaper()); -- cgit From 6a538f36e80f7fffde074aa2f521434a7a35e8eb Mon Sep 17 00:00:00 2001 From: Carsten Driesner Date: Wed, 19 May 2010 16:56:19 +0200 Subject: findbar01: #i111672# Fix crash on searching next/previous on single text object --- sd/source/ui/view/Outliner.cxx | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) (limited to 'sd') diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx index 5314f6dbe768..b757ca3ede27 100644 --- a/sd/source/ui/view/Outliner.cxx +++ b/sd/source/ui/view/Outliner.cxx @@ -566,7 +566,8 @@ bool Outliner::StartSearchAndReplace (const SvxSearchItem* pSearchItem) void Outliner::Initialize (bool bDirectionIsForward) { - bool bOldDirectionIsForward = mbDirectionIsForward; + const bool bIsAtEnd (maObjectIterator == ::sd::outliner::OutlinerContainer(this).end()); + const bool bOldDirectionIsForward = mbDirectionIsForward; mbDirectionIsForward = bDirectionIsForward; if (maObjectIterator == ::sd::outliner::Iterator()) @@ -601,10 +602,19 @@ void Outliner::Initialize (bool bDirectionIsForward) { // Requested iteration direction has changed. Turn arround the iterator. maObjectIterator.Reverse(); - // The iterator has pointed to the object one ahead/before the current - // one. Now move it to the one before/ahead the current one. - ++maObjectIterator; - ++maObjectIterator; + if (bIsAtEnd) + { + // The iterator has pointed to end(), which after the search + // direction is reversed, becomes begin(). + maObjectIterator = ::sd::outliner::OutlinerContainer(this).begin(); + } + else + { + // The iterator has pointed to the object one ahead/before the current + // one. Now move it to the one before/ahead the current one. + ++maObjectIterator; + ++maObjectIterator; + } mbMatchMayExist = true; } -- cgit From f383c9a98f285dbe51bcd5990aa7b3c9ba962659 Mon Sep 17 00:00:00 2001 From: Christian Lippka Date: Wed, 26 May 2010 15:47:54 +0200 Subject: #i111538# fix high contrast rendering for annotations in impress --- sd/source/ui/annotations/annotationwindow.cxx | 104 ++++++++++++++------------ 1 file changed, 55 insertions(+), 49 deletions(-) (limited to 'sd') diff --git a/sd/source/ui/annotations/annotationwindow.cxx b/sd/source/ui/annotations/annotationwindow.cxx index 3ba99307fd41..a4642bb68096 100644 --- a/sd/source/ui/annotations/annotationwindow.cxx +++ b/sd/source/ui/annotations/annotationwindow.cxx @@ -136,14 +136,25 @@ AnnotationTextWindow::~AnnotationTextWindow() void AnnotationTextWindow::Paint( const Rectangle& rRect) { - if ( !Application::GetSettings().GetStyleSettings().GetHighContrastMode() ) + const bool bHighContrast = Application::GetSettings().GetStyleSettings().GetHighContrastMode(); + if ( !bHighContrast ) { DrawGradient(Rectangle(Point(0,0),PixelToLogic(GetSizePixel())), Gradient(GRADIENT_LINEAR,mpAnnotationWindow->maColorLight,mpAnnotationWindow->maColor)); } if( mpOutlinerView ) + { + Color aBackgroundColor( mpAnnotationWindow->maColor ); + if( bHighContrast ) + { + aBackgroundColor = GetSettings().GetStyleSettings().GetWindowColor(); + } + + mpOutlinerView->SetBackgroundColor( aBackgroundColor ); + mpOutlinerView->Paint( rRect ); + } } void AnnotationTextWindow::KeyInput( const KeyEvent& rKeyEvt ) @@ -609,16 +620,34 @@ void AnnotationWindow::SetColor() { sal_uInt16 nAuthorIdx = mpDoc->GetAnnotationAuthorIndex( mxAnnotation->getAuthor() ); - maColor = mrManager.GetColor( nAuthorIdx ); - maColorDark = mrManager.GetColorDark( nAuthorIdx ); - maColorLight = mrManager.GetColorLight( nAuthorIdx ); + const bool bHighContrast = Application::GetSettings().GetStyleSettings().GetHighContrastMode(); + if( bHighContrast ) + { + StyleSettings aStyleSettings = GetSettings().GetStyleSettings(); + + maColor = aStyleSettings.GetWindowColor(); + maColorDark = maColor; + maColorLight = aStyleSettings.GetWindowTextColor(); + } + else + { + maColor = mrManager.GetColor( nAuthorIdx ); + maColorDark = mrManager.GetColorDark( nAuthorIdx ); + maColorLight = mrManager.GetColorLight( nAuthorIdx ); + } mpOutlinerView->SetBackgroundColor(maColor); + Engine()->SetBackgroundColor(maColor); + + { + SvtAccessibilityOptions aOptions; + Engine()->ForceAutoColor( bHighContrast || aOptions.GetIsAutomaticFontColor() ); + } mpMeta->SetControlBackground(maColor); AllSettings aSettings = mpMeta->GetSettings(); StyleSettings aStyleSettings = aSettings.GetStyleSettings(); - aStyleSettings.SetFieldTextColor(maColorDark); + aStyleSettings.SetFieldTextColor( bHighContrast ? maColorLight : maColorDark); aSettings.SetStyleSettings(aStyleSettings); mpMeta->SetSettings(aSettings); @@ -635,59 +664,35 @@ void AnnotationWindow::SetColor() void AnnotationWindow::Deactivate() { Reference< XAnnotation > xAnnotation( mxAnnotation ); -/* - // check if text is empty - Paragraph* p1stPara=Engine()->GetParagraph( 0 ); - ULONG nParaAnz=Engine()->GetParagraphCount(); - if(p1stPara==NULL) - nParaAnz=0; - if(nParaAnz==1) + // write changed text back to annotation + if ( Engine()->IsModified() ) { - // if it is only one paragraph, check if that paragraph is empty - XubString aStr(Engine()->GetText(p1stPara)); - - if(!aStr.Len()) - nParaAnz = 0; - } + TextApiObject* pTextApi = getTextApiObject( xAnnotation ); - if( nParaAnz == 0 ) - { - // text is empty, delete postit - DeleteAnnotation( xAnnotation ); - } - else -*/ - { - // write changed text back to annotation - if ( Engine()->IsModified() ) + if( pTextApi ) { - TextApiObject* pTextApi = getTextApiObject( xAnnotation ); - - if( pTextApi ) + OutlinerParaObject* pOPO = Engine()->CreateParaObject(); + if( pOPO ) { - OutlinerParaObject* pOPO = Engine()->CreateParaObject(); - if( pOPO ) - { - if( mpDoc->IsUndoEnabled() ) - mpDoc->BegUndo( String( SdResId( STR_ANNOTATION_UNDO_EDIT ) ) ); - - pTextApi->SetText( *pOPO ); - delete pOPO; + if( mpDoc->IsUndoEnabled() ) + mpDoc->BegUndo( String( SdResId( STR_ANNOTATION_UNDO_EDIT ) ) ); - // set current time to changed annotation - xAnnotation->setDateTime( getCurrentDateTime() ); + pTextApi->SetText( *pOPO ); + delete pOPO; - if( mpDoc->IsUndoEnabled() ) - mpDoc->EndUndo(); + // set current time to changed annotation + xAnnotation->setDateTime( getCurrentDateTime() ); - DocView()->GetDocSh()->SetModified(sal_True); - } + if( mpDoc->IsUndoEnabled() ) + mpDoc->EndUndo(); + DocView()->GetDocSh()->SetModified(sal_True); } + } - Engine()->ClearModifyFlag(); } + Engine()->ClearModifyFlag(); Engine()->GetUndoManager().Clear(); } @@ -698,15 +703,16 @@ void AnnotationWindow::Paint( const Rectangle& rRect) if(mpMeta->IsVisible() && !mbReadonly) { + const bool bHighContrast = Application::GetSettings().GetStyleSettings().GetHighContrastMode(); //draw left over space - if ( Application::GetSettings().GetStyleSettings().GetHighContrastMode() ) + if ( bHighContrast ) SetFillColor(COL_BLACK); else SetFillColor(maColor); SetLineColor(); DrawRect(PixelToLogic(Rectangle(Point(mpMeta->GetPosPixel().X()+mpMeta->GetSizePixel().Width(),mpMeta->GetPosPixel().Y()),Size(METABUTTON_AREA_WIDTH,mpMeta->GetSizePixel().Height())))); - if ( Application::GetSettings().GetStyleSettings().GetHighContrastMode()) + if ( bHighContrast ) { //draw rect around button SetFillColor(COL_BLACK); @@ -728,7 +734,7 @@ void AnnotationWindow::Paint( const Rectangle& rRect) DrawRect(maRectMetaButton); //draw arrow - if ( Application::GetSettings().GetStyleSettings().GetHighContrastMode() ) + if( bHighContrast ) SetFillColor(COL_WHITE); else SetFillColor(COL_BLACK); -- cgit From 5d08b0417da503650e5cf2f301cf579cc84452fe Mon Sep 17 00:00:00 2001 From: Wu Yan Date: Thu, 27 May 2010 17:22:17 +0800 Subject: findbar01: #i111848#, #i111852# change title of findbar and show/hide the findbar according to specification --- sd/uiconfig/sdraw/toolbar/findbar.xml | 4 ++-- sd/uiconfig/simpress/toolbar/findbar.xml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'sd') diff --git a/sd/uiconfig/sdraw/toolbar/findbar.xml b/sd/uiconfig/sdraw/toolbar/findbar.xml index a19743198c7d..9ef9d8a1a78f 100644 --- a/sd/uiconfig/sdraw/toolbar/findbar.xml +++ b/sd/uiconfig/sdraw/toolbar/findbar.xml @@ -2,7 +2,7 @@ - + - + diff --git a/sd/uiconfig/simpress/toolbar/findbar.xml b/sd/uiconfig/simpress/toolbar/findbar.xml index a19743198c7d..9ef9d8a1a78f 100644 --- a/sd/uiconfig/simpress/toolbar/findbar.xml +++ b/sd/uiconfig/simpress/toolbar/findbar.xml @@ -2,7 +2,7 @@ - + - + -- cgit From 73637454a30efca9e4f515da64975037def535fd Mon Sep 17 00:00:00 2001 From: Christian Lippka Date: Mon, 31 May 2010 13:10:15 +0200 Subject: #i111928# do not crash when there are fields in an annotation --- sd/source/ui/app/sdmod2.cxx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'sd') diff --git a/sd/source/ui/app/sdmod2.cxx b/sd/source/ui/app/sdmod2.cxx index 9aa36ddd3f82..58aba6823d3a 100644 --- a/sd/source/ui/app/sdmod2.cxx +++ b/sd/source/ui/app/sdmod2.cxx @@ -171,9 +171,10 @@ IMPL_LINK(SdModule, CalcFieldValueHdl, EditFieldInfo*, pInfo) ::sd::DrawDocShell* pDocShell = NULL; SdDrawDocument* pDoc = 0; - if( pInfo->GetOutliner() ) + SdrOutliner* pSdrOutliner = dynamic_cast< SdrOutliner* >( pInfo->GetOutliner() ); + if( pSdrOutliner ) { - const SdrTextObj* pTextObj = static_cast< SdrOutliner* >( pInfo->GetOutliner() )->GetTextObj(); + const SdrTextObj* pTextObj = pSdrOutliner->GetTextObj(); if( pTextObj ) pDoc = dynamic_cast< SdDrawDocument* >( pTextObj->GetModel() ); -- cgit From 507a99439f846e5381b583b30898afd3415b2cc1 Mon Sep 17 00:00:00 2001 From: tono Date: Mon, 31 May 2010 21:51:32 +0900 Subject: i#111956: MinGW port fix: dependency to shared library --- sd/util/makefile.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sd') diff --git a/sd/util/makefile.mk b/sd/util/makefile.mk index bfe4d1fd1b40..a9be975d5b0a 100644 --- a/sd/util/makefile.mk +++ b/sd/util/makefile.mk @@ -229,7 +229,7 @@ SHL4OBJS += $(SLO)$/pchname.obj \ .ENDIF # "$(GUI)$(COM)" == "WNTMSC" # $(ISDLIB) is build in SHL1TARGET -.IF "$(GUI)" == "UNX" +.IF ("$(GUI)"=="UNX" || "$(COM)"=="GCC") && "$(GUI)"!="OS2" SHL4DEPN=$(SHL1TARGETN) SHL5DEPN=$(SHL1TARGETN) .ELSE -- cgit From f165b2dae6e9133481da351586a4d5f14839fa4d Mon Sep 17 00:00:00 2001 From: Mikhail Voytenko Date: Thu, 3 Jun 2010 00:10:45 +0200 Subject: tl78: #i110383# password to modify support for binary types only --- sd/source/ui/unoidl/UnoDocumentSettings.cxx | 28 +--------------------------- 1 file changed, 1 insertion(+), 27 deletions(-) (limited to 'sd') diff --git a/sd/source/ui/unoidl/UnoDocumentSettings.cxx b/sd/source/ui/unoidl/UnoDocumentSettings.cxx index aa41dfc54bb0..ed47e57b2130 100644 --- a/sd/source/ui/unoidl/UnoDocumentSettings.cxx +++ b/sd/source/ui/unoidl/UnoDocumentSettings.cxx @@ -152,7 +152,7 @@ enum SdDocumentSettingsPropertyHandles // --> PB 2004-08-23 #i33095# ,HANDLE_LOAD_READONLY, HANDLE_SAVE_VERSION // <-- - ,HANDLE_SLIDESPERHANDOUT, HANDLE_HANDOUTHORIZONTAL, HANDLE_MODIFYPASSWORDHASH + ,HANDLE_SLIDESPERHANDOUT, HANDLE_HANDOUTHORIZONTAL }; #define MID_PRINTER 1 @@ -216,7 +216,6 @@ enum SdDocumentSettingsPropertyHandles { MAP_LEN("LoadReadonly"), HANDLE_LOAD_READONLY, &::getBooleanCppuType(), 0, 0 }, { MAP_LEN("SaveVersionOnClose"), HANDLE_SAVE_VERSION, &::getBooleanCppuType(), 0, 0 }, // <-- - { MAP_LEN("ModifyPasswordHash"), HANDLE_MODIFYPASSWORDHASH, &getCppuType((sal_Int32*)0), 0, 0 }, { NULL, 0, 0, NULL, 0, 0 } }; @@ -864,25 +863,6 @@ void DocumentSettings::_setPropertyValues( const PropertyMapEntry** ppEntries, c } break; - case HANDLE_MODIFYPASSWORDHASH: - { - sal_Int32 nHash = 0; - if ( ( *pValues >>= nHash ) && nHash >= 0 && nHash <= SAL_MAX_UINT16 ) - { - bChanged = ( pDocSh->GetModifyPasswordHash() != nHash ); - if ( bChanged ) - { - if ( !pDocSh->SetModifyPasswordHash( static_cast< sal_uInt16 >( nHash ) ) ) - throw beans::PropertyVetoException( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "The hash is not allowed to be changed now!" ) ), - uno::Reference< uno::XInterface >() ); - } - - bOk = sal_True; - } - } - break; - default: throw UnknownPropertyException(); } @@ -1142,12 +1122,6 @@ void DocumentSettings::_getPropertyValues( const PropertyMapEntry** ppEntries, A } break; - case HANDLE_MODIFYPASSWORDHASH: - { - *pValue <<= static_cast< sal_Int32 >( pDocSh->GetModifyPasswordHash() ); - } - break; - default: throw UnknownPropertyException(); } -- cgit From a388c0c2cc2e4ba42b73443dc7186451f71fcc33 Mon Sep 17 00:00:00 2001 From: Mikhail Voytenko Date: Thu, 3 Jun 2010 16:40:59 +0200 Subject: fwk139: #i10000# avoid warnings on solaris --- sd/source/ui/app/makefile.mk | 3 +++ 1 file changed, 3 insertions(+) (limited to 'sd') diff --git a/sd/source/ui/app/makefile.mk b/sd/source/ui/app/makefile.mk index d64d9b672f7e..b0ac26018877 100644 --- a/sd/source/ui/app/makefile.mk +++ b/sd/source/ui/app/makefile.mk @@ -73,8 +73,11 @@ SLOFILES = \ $(SLO)$/tmplctrl.obj EXCEPTIONSFILES= \ + $(SLO)$/sddll1.obj \ + $(SLO)$/sddll2.obj \ $(SLO)$/sdxfer.obj \ $(SLO)$/sdmod1.obj \ + $(SLO)$/tbxww.obj \ $(SLO)$/tmplctrl.obj .IF "$(GUI)" == "WNT" -- cgit From 5b44f74fbe7b2dd431e49aa29b92d775da3d86cb Mon Sep 17 00:00:00 2001 From: Christian Lippka Date: Fri, 4 Jun 2010 14:14:06 +0200 Subject: #i94055# enable default printing for handout mode (using the layout set at the handout master page --- sd/source/core/sdpage.cxx | 239 ++++++++++++----------- sd/source/ui/dlg/makefile.mk | 12 +- sd/source/ui/dlg/printdialog.cxx | 342 --------------------------------- sd/source/ui/dlg/printdialog.hrc | 38 ---- sd/source/ui/dlg/printdialog.src | 130 ------------- sd/source/ui/dlg/printdlg.cxx | 88 --------- sd/source/ui/dlg/printdlg.src | 130 ------------- sd/source/ui/inc/printdialog.hxx | 61 ------ sd/source/ui/inc/printdlg.hrc | 36 ---- sd/source/ui/inc/printdlg.hxx | 70 ------- sd/source/ui/view/DocumentRenderer.cxx | 8 +- sd/source/ui/view/DocumentRenderer.src | 1 + 12 files changed, 136 insertions(+), 1019 deletions(-) delete mode 100644 sd/source/ui/dlg/printdialog.cxx delete mode 100644 sd/source/ui/dlg/printdialog.hrc delete mode 100644 sd/source/ui/dlg/printdialog.src delete mode 100644 sd/source/ui/dlg/printdlg.cxx delete mode 100644 sd/source/ui/dlg/printdlg.src delete mode 100644 sd/source/ui/inc/printdialog.hxx delete mode 100644 sd/source/ui/inc/printdlg.hrc delete mode 100644 sd/source/ui/inc/printdlg.hxx (limited to 'sd') diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx index 950d98a487e9..c82c89b7a604 100644 --- a/sd/source/core/sdpage.cxx +++ b/sd/source/core/sdpage.cxx @@ -60,6 +60,7 @@ #include #include #include +#include #include @@ -316,7 +317,7 @@ SdrObject* SdPage::CreatePresObj(PresObjKind eObjKind, BOOL bVertical, const Rec // #i105146# We want no content to be displayed for PK_HANDOUT, // so just never set a page as content pSdrObj = new SdrPageObj(0); - pSdrObj->SetResizeProtect(TRUE); +// pSdrObj->SetResizeProtect(TRUE); } break; @@ -2868,146 +2869,160 @@ void SdPage::CalculateHandoutAreas( SdDrawDocument& rModel, AutoLayout eLayout, { SdPage& rHandoutMaster = *rModel.GetMasterSdPage( 0, PK_HANDOUT ); - Size aArea = rHandoutMaster.GetSize(); - - const long nGapW = 1000; // gap is 1cm - const long nGapH = 1000; + if( eLayout == AUTOLAYOUT_NONE ) + { + // use layout from handout master + SdrObjListIter aShapeIter (rHandoutMaster); + while (aShapeIter.IsMore()) + { + SdrPageObj* pPageObj = dynamic_cast(aShapeIter.Next()); + if (pPageObj) + rAreas.push_back( pPageObj->GetCurrentBoundRect() ); + } + } + else + { + Size aArea = rHandoutMaster.GetSize(); - long nLeftBorder = rHandoutMaster.GetLftBorder(); - long nRightBorder = rHandoutMaster.GetRgtBorder(); - long nTopBorder = rHandoutMaster.GetUppBorder(); - long nBottomBorder = rHandoutMaster.GetLwrBorder(); + const long nGapW = 1000; // gap is 1cm + const long nGapH = 1000; - const long nHeaderFooterHeight = static_cast< long >( (aArea.Height() - nTopBorder - nLeftBorder) * 0.05 ); + long nLeftBorder = rHandoutMaster.GetLftBorder(); + long nRightBorder = rHandoutMaster.GetRgtBorder(); + long nTopBorder = rHandoutMaster.GetUppBorder(); + long nBottomBorder = rHandoutMaster.GetLwrBorder(); - nTopBorder += nHeaderFooterHeight; - nBottomBorder += nHeaderFooterHeight; + const long nHeaderFooterHeight = static_cast< long >( (aArea.Height() - nTopBorder - nLeftBorder) * 0.05 ); - long nX = nGapW + nLeftBorder; - long nY = nGapH + nTopBorder; + nTopBorder += nHeaderFooterHeight; + nBottomBorder += nHeaderFooterHeight; - aArea.Width() -= nGapW * 2 + nLeftBorder + nRightBorder; - aArea.Height() -= nGapH * 2 + nTopBorder + nBottomBorder; + long nX = nGapW + nLeftBorder; + long nY = nGapH + nTopBorder; - const bool bLandscape = aArea.Width() > aArea.Height(); + aArea.Width() -= nGapW * 2 + nLeftBorder + nRightBorder; + aArea.Height() -= nGapH * 2 + nTopBorder + nBottomBorder; - static sal_uInt16 aOffsets[5][9] = - { - { 0, 1, 2, 3, 4, 5, 6, 7, 8 }, // AUTOLAYOUT_HANDOUT9, Portrait, Horizontal order - { 0, 2, 4, 1, 3, 5, 0, 0, 0 }, // AUTOLAYOUT_HANDOUT3, Landscape, Vertical - { 0, 2, 1, 3, 0, 0, 0, 0, 0 }, // AUTOLAYOUT_HANDOUT4, Landscape, Vertical - { 0, 3, 1, 4, 2, 5, 0, 0, 0 }, // AUTOLAYOUT_HANDOUT4, Portrait, Vertical - { 0, 3, 6, 1, 4, 7, 2, 5, 8 }, // AUTOLAYOUT_HANDOUT9, Landscape, Vertical - }; + const bool bLandscape = aArea.Width() > aArea.Height(); - sal_uInt16* pOffsets = aOffsets[0]; - USHORT nColCnt = 0, nRowCnt = 0; - switch ( eLayout ) - { - case AUTOLAYOUT_HANDOUT1: - nColCnt = 1; nRowCnt = 1; - break; + static sal_uInt16 aOffsets[5][9] = + { + { 0, 1, 2, 3, 4, 5, 6, 7, 8 }, // AUTOLAYOUT_HANDOUT9, Portrait, Horizontal order + { 0, 2, 4, 1, 3, 5, 0, 0, 0 }, // AUTOLAYOUT_HANDOUT3, Landscape, Vertical + { 0, 2, 1, 3, 0, 0, 0, 0, 0 }, // AUTOLAYOUT_HANDOUT4, Landscape, Vertical + { 0, 3, 1, 4, 2, 5, 0, 0, 0 }, // AUTOLAYOUT_HANDOUT4, Portrait, Vertical + { 0, 3, 6, 1, 4, 7, 2, 5, 8 }, // AUTOLAYOUT_HANDOUT9, Landscape, Vertical + }; - case AUTOLAYOUT_HANDOUT2: - if( bLandscape ) - { - nColCnt = 2; nRowCnt = 1; - } - else - { - nColCnt = 1; nRowCnt = 2; - } - break; + sal_uInt16* pOffsets = aOffsets[0]; + USHORT nColCnt = 0, nRowCnt = 0; + switch ( eLayout ) + { + case AUTOLAYOUT_HANDOUT1: + nColCnt = 1; nRowCnt = 1; + break; - case AUTOLAYOUT_HANDOUT3: - if( bLandscape ) - { - nColCnt = 3; nRowCnt = 2; - } - else - { - nColCnt = 2; nRowCnt = 3; - } - pOffsets = aOffsets[ bLandscape ? 1 : 0 ]; - break; + case AUTOLAYOUT_HANDOUT2: + if( bLandscape ) + { + nColCnt = 2; nRowCnt = 1; + } + else + { + nColCnt = 1; nRowCnt = 2; + } + break; - case AUTOLAYOUT_HANDOUT4: - nColCnt = 2; nRowCnt = 2; - pOffsets = aOffsets[ bHorizontal ? 0 : 2 ]; - break; + case AUTOLAYOUT_HANDOUT3: + if( bLandscape ) + { + nColCnt = 3; nRowCnt = 2; + } + else + { + nColCnt = 2; nRowCnt = 3; + } + pOffsets = aOffsets[ bLandscape ? 1 : 0 ]; + break; - case AUTOLAYOUT_HANDOUT6: - if( bLandscape ) - { - nColCnt = 3; nRowCnt = 2; - } - else - { - nColCnt = 2; nRowCnt = 3; - } - if( !bHorizontal ) - pOffsets = aOffsets[ bLandscape ? 1 : 3 ]; - break; + case AUTOLAYOUT_HANDOUT4: + nColCnt = 2; nRowCnt = 2; + pOffsets = aOffsets[ bHorizontal ? 0 : 2 ]; + break; - default: - case AUTOLAYOUT_HANDOUT9: - nColCnt = 3; nRowCnt = 3; + case AUTOLAYOUT_HANDOUT6: + if( bLandscape ) + { + nColCnt = 3; nRowCnt = 2; + } + else + { + nColCnt = 2; nRowCnt = 3; + } + if( !bHorizontal ) + pOffsets = aOffsets[ bLandscape ? 1 : 3 ]; + break; - if( !bHorizontal ) - pOffsets = aOffsets[4]; - break; - } + default: + case AUTOLAYOUT_HANDOUT9: + nColCnt = 3; nRowCnt = 3; - rAreas.resize( nColCnt * nRowCnt ); + if( !bHorizontal ) + pOffsets = aOffsets[4]; + break; + } - Size aPartArea, aSize; - aPartArea.Width() = ((aArea.Width() - ((nColCnt-1) * nGapW) ) / nColCnt); - aPartArea.Height() = ((aArea.Height() - ((nRowCnt-1) * nGapH) ) / nRowCnt); + rAreas.resize( nColCnt * nRowCnt ); - SdrPage* pFirstPage = rModel.GetMasterSdPage(0, PK_STANDARD); - if ( pFirstPage ) - { - // scale actual size into handout rect - double fScale = (double)aPartArea.Width() / (double)pFirstPage->GetWdt(); + Size aPartArea, aSize; + aPartArea.Width() = ((aArea.Width() - ((nColCnt-1) * nGapW) ) / nColCnt); + aPartArea.Height() = ((aArea.Height() - ((nRowCnt-1) * nGapH) ) / nRowCnt); - aSize.Height() = (long)(fScale * pFirstPage->GetHgt() ); - if( aSize.Height() > aPartArea.Height() ) + SdrPage* pFirstPage = rModel.GetMasterSdPage(0, PK_STANDARD); + if ( pFirstPage ) { - fScale = (double)aPartArea.Height() / (double)pFirstPage->GetHgt(); - aSize.Height() = aPartArea.Height(); - aSize.Width() = (long)(fScale * pFirstPage->GetWdt()); + // scale actual size into handout rect + double fScale = (double)aPartArea.Width() / (double)pFirstPage->GetWdt(); + + aSize.Height() = (long)(fScale * pFirstPage->GetHgt() ); + if( aSize.Height() > aPartArea.Height() ) + { + fScale = (double)aPartArea.Height() / (double)pFirstPage->GetHgt(); + aSize.Height() = aPartArea.Height(); + aSize.Width() = (long)(fScale * pFirstPage->GetWdt()); + } + else + { + aSize.Width() = aPartArea.Width(); + } + + nX += (aPartArea.Width() - aSize.Width()) / 2; + nY += (aPartArea.Height()- aSize.Height())/ 2; } else { - aSize.Width() = aPartArea.Width(); + aSize = aPartArea; } - nX += (aPartArea.Width() - aSize.Width()) / 2; - nY += (aPartArea.Height()- aSize.Height())/ 2; - } - else - { - aSize = aPartArea; - } + Point aPos( nX, nY ); - Point aPos( nX, nY ); + const bool bRTL = rModel.GetDefaultWritingMode() == ::com::sun::star::text::WritingMode_RL_TB; - const bool bRTL = rModel.GetDefaultWritingMode() == ::com::sun::star::text::WritingMode_RL_TB; + const long nOffsetX = (aPartArea.Width() + nGapW) * (bRTL ? -1 : 1); + const long nOffsetY = aPartArea.Height() + nGapH; + const long nStartX = bRTL ? nOffsetX*(1 - nColCnt) - nX : nX; - const long nOffsetX = (aPartArea.Width() + nGapW) * (bRTL ? -1 : 1); - const long nOffsetY = aPartArea.Height() + nGapH; - const long nStartX = bRTL ? nOffsetX*(1 - nColCnt) - nX : nX; - - for(sal_uInt16 nRow = 0; nRow < nRowCnt; nRow++) - { - aPos.X() = nStartX; - for(sal_uInt16 nCol = 0; nCol < nColCnt; nCol++) + for(sal_uInt16 nRow = 0; nRow < nRowCnt; nRow++) { - rAreas[*pOffsets++] = Rectangle(aPos, aSize); - aPos.X() += nOffsetX; - } + aPos.X() = nStartX; + for(sal_uInt16 nCol = 0; nCol < nColCnt; nCol++) + { + rAreas[*pOffsets++] = Rectangle(aPos, aSize); + aPos.X() += nOffsetX; + } - aPos.Y() += nOffsetY; + aPos.Y() += nOffsetY; + } } } diff --git a/sd/source/ui/dlg/makefile.mk b/sd/source/ui/dlg/makefile.mk index 6bc5a89a08ed..84e5781873f2 100644 --- a/sd/source/ui/dlg/makefile.mk +++ b/sd/source/ui/dlg/makefile.mk @@ -63,7 +63,6 @@ SRC1FILES =\ navigatr.src\ sdpreslt.src\ morphdlg.src\ - printdlg.src\ dlgfield.src\ custsdlg.src\ brkdlg.src\ @@ -71,8 +70,7 @@ SRC1FILES =\ dlgolbul.src \ LayerDialog.src \ PaneDockingWindow.src \ - layeroptionsdlg.src \ - printdialog.src + layeroptionsdlg.src SLOFILES = \ @@ -103,7 +101,6 @@ SLOFILES = \ $(SLO)$/navigatr.obj \ $(SLO)$/sdpreslt.obj \ $(SLO)$/morphdlg.obj \ - $(SLO)$/printdlg.obj \ $(SLO)$/dlgfield.obj \ $(SLO)$/custsdlg.obj \ $(SLO)$/brkdlg.obj \ @@ -121,8 +118,7 @@ SLOFILES = \ $(SLO)$/sdabstdlg.obj \ $(SLO)$/PaneChildWindows.obj \ $(SLO)$/PaneDockingWindow.obj \ - $(SLO)$/PaneShells.obj \ - $(SLO)$/printdialog.obj + $(SLO)$/PaneShells.obj LIB1TARGET= $(SLB)$/$(TARGET).lib @@ -148,8 +144,7 @@ LIB1OBJFILES= \ $(SLO)$/sdabstdlg.obj \ $(SLO)$/PaneChildWindows.obj \ $(SLO)$/PaneDockingWindow.obj \ - $(SLO)$/PaneShells.obj \ - $(SLO)$/printdialog.obj + $(SLO)$/PaneShells.obj LIB2TARGET= $(SLB)$/sdui.lib @@ -174,7 +169,6 @@ LIB2OBJFILES= \ $(SLO)$/dlgolbul.obj \ $(SLO)$/paragr.obj \ $(SLO)$/present.obj \ - $(SLO)$/printdlg.obj \ $(SLO)$/prltempl.obj \ $(SLO)$/sdpreslt.obj \ $(SLO)$/tabtempl.obj \ diff --git a/sd/source/ui/dlg/printdialog.cxx b/sd/source/ui/dlg/printdialog.cxx deleted file mode 100644 index 3e02a18c2af7..000000000000 --- a/sd/source/ui/dlg/printdialog.cxx +++ /dev/null @@ -1,342 +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. - * - ************************************************************************/ - -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_sd.hxx" - -#include - -#include "sdresid.hxx" -#include "printdialog.hxx" -#include "printdialog.hrc" -#include "optsitem.hxx" -#include "res_bmp.hrc" - -class SdPrintDialogImpl : public ModalDialog -{ -public: - SdPrintDialogImpl() - : ModalDialog( 0, SdResId( DLG_PRINTDIALOG ) ) - { - } - - virtual ~SdPrintDialogImpl() - { - FreeResource(); - } -}; - -/** - aOptions.GetOptionsPrint().SetDraw( aCbxDraw.IsChecked() ); - aOptions.GetOptionsPrint().SetNotes( aCbxNotes.IsChecked() ); - aOptions.GetOptionsPrint().SetHandout( aCbxHandout.IsChecked() ); - aOptions.GetOptionsPrint().SetOutline( aCbxOutline.IsChecked() ); - - aCbxDraw.Check( pPrintOpts->GetOptionsPrint().IsDraw() ); - aCbxNotes.Check( pPrintOpts->GetOptionsPrint().IsNotes() ); - aCbxHandout.Check( pPrintOpts->GetOptionsPrint().IsHandout() ); - aCbxOutline.Check( pPrintOpts->GetOptionsPrint().IsOutline() ); - - only for impress!! -*/ - -SdPrintDialog* SdPrintDialog::Create( Window* pWindow, bool bImpress ) -{ - return new SdPrintDialog( pWindow, bImpress ); -} - -SdPrintDialog::SdPrintDialog( Window* pWindow, bool bImpress ) -: PrintDialog( pWindow, false ) -, mbImpress( bImpress ) -{ - if( bImpress ) - { - mpControls.resize( PRINTDLG_CONTROLCOUNT ); - - boost::scoped_ptr< SdPrintDialogImpl > aImplDlg( new SdPrintDialogImpl() ); - - USHORT nChildCount = GetChildCount(); - - mpControls[FL_PRINTCONTENT-1].reset( new FixedLine( this, SdResId( FL_PRINTCONTENT ) ) ); - mpControls[FT_CONTENT-1].reset( new FixedText( this, SdResId( FT_CONTENT ) ) ); - mpControls[CB_CONTENT-1].reset( new ListBox( this, SdResId( CB_CONTENT ) ) ); - mpControls[FT_SLIDESPERPAGE-1].reset( new FixedText( this, SdResId( FT_SLIDESPERPAGE ) ) ); - mpControls[CB_SLIDESPERPAGE-1].reset( new ListBox( this, SdResId( CB_SLIDESPERPAGE ) ) ); - mpControls[FT_ORDER-1].reset( new FixedText( this, SdResId( FT_ORDER ) ) ); - mpControls[RBT_HORIZONTAL-1].reset( new RadioButton( this, SdResId( RBT_HORIZONTAL ) ) ); - mpControls[RBT_VERTICAL-1].reset( new RadioButton( this, SdResId( RBT_VERTICAL ) ) ); - mpControls[IMG_PREVIEW-1].reset( new FixedImage( this, SdResId( IMG_PREVIEW ) ) ); - - sal_Int32 nHeight = LogicToPixel( Size( 0, 71 ), MAP_APPFONT ).Height(); - - sal_Int32 nInsertY = nHeight; - - Window* pNextControl = 0; - - // find second fixed line - USHORT nChild = 0; - USHORT nFixedLine = 2; - while( nChildCount-- ) - { - pNextControl = GetChild( nChild++ ); - if( dynamic_cast< FixedLine* >( pNextControl ) ) - { - if( --nFixedLine == 0 ) - { - nInsertY = pNextControl->GetPosPixel().Y(); - nChild--; - nChildCount++; - break; - } - } - } - - // move lower controls down - std::vector< Window* > aLowerControls; - while( nChildCount-- ) - { - Window* pControl = GetChild( nChild++ ); - if( pControl ) - { - Point aPos( pControl->GetPosPixel() ); - aPos.Y() += nHeight; - pControl->SetPosPixel(aPos); - aLowerControls.push_back(pControl); - } - } - - // positionate new controls - for( int i = 0; i < PRINTDLG_CONTROLCOUNT; i++ ) - { - Control* pControl = mpControls[i].get(); - if( pControl ) - { - Point aPos( pControl->GetPosPixel() ); - aPos.Y() += nInsertY; - pControl->SetPosPixel(aPos); - pControl->SetZOrder( pNextControl, WINDOW_ZORDER_BEFOR ); - } - } - - Size aDialogSize( GetSizePixel() ); - aDialogSize.Height() += nHeight; - SetSizePixel( aDialogSize ); - } -} - -SdPrintDialog::~SdPrintDialog() -{ -} - -void SdPrintDialog::Init( const SdOptionsPrintItem* pPrintOpts ) -{ - if( mbImpress ) - { - bool bDraw = true, bHandout = false, bNotes = false, bOutline = false; - sal_uInt16 nPagesPerHandout = 6; - bool bHandoutHorizontal = true; - - if( pPrintOpts ) - { - const SdOptionsPrint& rOpts = pPrintOpts->GetOptionsPrint(); - bDraw = rOpts.IsDraw(); - bHandout = rOpts.IsHandout(); - bNotes = rOpts.IsNotes(); - bOutline = rOpts.IsOutline(); - nPagesPerHandout = rOpts.GetHandoutPages(); - bHandoutHorizontal = rOpts.IsHandoutHorizontal(); - } - - sal_uInt16 nPos = 0; - if( !bDraw ) - { - if( bHandout ) - nPos = 1; - else if( bNotes ) - nPos = 2; - else if( bOutline ) - nPos = 3; - } - static_cast( mpControls[CB_CONTENT-1].get() )->SelectEntryPos( nPos ); - - switch( nPagesPerHandout ) - { - case 1: nPos = 0; break; - case 2: nPos = 1; break; - case 3: nPos = 2; break; - case 4: nPos = 3; break; - case 5: - case 6: nPos = 4; break; - default:nPos = 5; break; - } - static_cast( mpControls[CB_SLIDESPERPAGE-1].get() )->SelectEntryPos( nPos ); - - - static_cast( mpControls[RBT_HORIZONTAL-1].get() )->Check( bHandoutHorizontal == true ) ; - static_cast( mpControls[RBT_VERTICAL-1].get() )->Check( bHandoutHorizontal == false ) ; - - LoadPreviewImages(); - - Image* pImage = mpPreviews[0].get(); - if( pImage ) - { - FixedImage* pPreviewImage = static_cast( mpControls[IMG_PREVIEW-1].get() ); - - Point aPos( pPreviewImage->GetPosPixel() ); - pPreviewImage->SetSizePixel( pImage->GetSizePixel() ); - aPos.X() -= pImage->GetSizePixel().Width(); - - pPreviewImage->SetPosPixel( aPos ); - } - - UpdateStates(); - - Link aLink( LINK(this,SdPrintDialog,UpdateStatesHdl) ); - static_cast( mpControls[CB_CONTENT-1].get() )->SetSelectHdl( aLink ); - static_cast( mpControls[CB_SLIDESPERPAGE-1].get() )->SetSelectHdl( aLink ); - } -} - -bool SdPrintDialog::Fill( SdOptionsPrintItem* pPrintOpts ) -{ - bool bChanges = false; - if( mbImpress && pPrintOpts ) - { - SdOptionsPrint& rOpts = pPrintOpts->GetOptionsPrint(); - - BOOL bDraw = FALSE, bHandout = FALSE, bNotes = FALSE, bOutline = FALSE; - switch( static_cast( mpControls[CB_CONTENT-1].get() )->GetSelectEntryPos() ) - { - case 1: bHandout = TRUE; break; - case 2: bNotes = TRUE; break; - case 3: bOutline = TRUE; break; - default: bDraw = TRUE; break; - } - if( rOpts.IsDraw() != bDraw ) - { - bChanges = true; - rOpts.SetDraw( bDraw ); - } - - if( rOpts.IsNotes() != bNotes ) - { - bChanges = true; - rOpts.SetNotes( bNotes ); - } - - if( rOpts.IsHandout() != bHandout ) - { - bChanges = true; - rOpts.SetHandout( bHandout ); - } - - if( rOpts.IsOutline() != bOutline ) - { - bChanges = true; - rOpts.SetOutline( bOutline ); - } - - sal_uInt16 nSlidePerHandout = 6; - switch( static_cast( mpControls[CB_SLIDESPERPAGE-1].get() )->GetSelectEntryPos() ) - { - case 0: nSlidePerHandout = 1; break; - case 1: nSlidePerHandout = 2; break; - case 2: nSlidePerHandout = 3; break; - case 3: nSlidePerHandout = 4; break; - case 5: nSlidePerHandout = 9; break; - } - - if( rOpts.GetHandoutPages() != nSlidePerHandout ) - { - bChanges = true; - rOpts.SetHandoutPages( nSlidePerHandout ); - } - - const BOOL bHorizontal = static_cast( mpControls[RBT_HORIZONTAL-1].get() )->IsChecked(); - if( rOpts.IsHandoutHorizontal() != bHorizontal ) - { - bChanges = true; - rOpts.SetHandoutHorizontal( bHorizontal ); - } - } - return bChanges; -} - -static const sal_uInt16 PREVIEW_COUNT = 6; - -void SdPrintDialog::UpdateStates() -{ - const sal_uInt16 nSlidesPerPagePos = static_cast( mpControls[CB_SLIDESPERPAGE-1].get() )->GetSelectEntryPos(); - bool bHandout = static_cast( mpControls[CB_CONTENT-1].get() )->GetSelectEntryPos() == 1; - bool bOrder = bHandout && ( nSlidesPerPagePos >= 3); - - static_cast( mpControls[FT_SLIDESPERPAGE-1].get() )->Enable( bHandout ); - static_cast( mpControls[CB_SLIDESPERPAGE-1].get() )->Enable( bHandout ); - static_cast( mpControls[FT_ORDER-1].get() )->Enable( bHandout && bOrder ); - static_cast( mpControls[RBT_HORIZONTAL-1].get() )->Enable( bHandout && bOrder ); - static_cast( mpControls[RBT_VERTICAL-1].get() )->Enable( bHandout && bOrder ); - - FixedImage* pPreviewImage = static_cast( mpControls[IMG_PREVIEW-1].get() ); - - if( pPreviewImage ) - { - pPreviewImage->Show( bHandout ); - if( bHandout ) - { - if( nSlidesPerPagePos < PREVIEW_COUNT) - { - if( mpPreviews[nSlidesPerPagePos].get() ) - pPreviewImage->SetModeImage( *mpPreviews[nSlidesPerPagePos].get(), BMP_COLOR_NORMAL ); - - if( mpPreviewsHC[nSlidesPerPagePos].get() ) - pPreviewImage->SetModeImage( *mpPreviewsHC[nSlidesPerPagePos].get(), BMP_COLOR_HIGHCONTRAST ); - } - } - } -} - -IMPL_LINK( SdPrintDialog, UpdateStatesHdl, void*, EMPTYARG ) -{ - UpdateStates(); - return 0; -} - -void SdPrintDialog::LoadPreviewImages() -{ - static const sal_uInt16 aResId[2*PREVIEW_COUNT] = { BMP_FOILH_01, BMP_FOILH_01_H, BMP_FOILH_02, BMP_FOILH_02_H, BMP_FOILH_03, BMP_FOILH_03_H, BMP_FOILH_04, BMP_FOILH_04_H, BMP_FOILH_06, BMP_FOILH_06_H, BMP_FOILH_09, BMP_FOILH_09_H }; - - mpPreviews.resize( PREVIEW_COUNT ); - mpPreviewsHC.resize( PREVIEW_COUNT ); - - const sal_uInt16* pResId( aResId ); - for( sal_uInt16 i = 0; i < PREVIEW_COUNT; i++ ) - { - mpPreviews[i].reset( new Image( Bitmap( SdResId( *pResId++ ) ) ) ); - mpPreviewsHC[i].reset( new Image( Bitmap( SdResId( *pResId++ ) ) ) ); - } -} - diff --git a/sd/source/ui/dlg/printdialog.hrc b/sd/source/ui/dlg/printdialog.hrc deleted file mode 100644 index 702dc3898b18..000000000000 --- a/sd/source/ui/dlg/printdialog.hrc +++ /dev/null @@ -1,38 +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. - * - ************************************************************************/ - -#define DLG_PRINTDIALOG 1847 -#define FL_PRINTCONTENT 1 -#define FT_CONTENT 2 -#define CB_CONTENT 3 -#define FT_SLIDESPERPAGE 4 -#define CB_SLIDESPERPAGE 5 -#define FT_ORDER 6 -#define RBT_HORIZONTAL 7 -#define RBT_VERTICAL 8 -#define IMG_PREVIEW 9 -#define PRINTDLG_CONTROLCOUNT 9 diff --git a/sd/source/ui/dlg/printdialog.src b/sd/source/ui/dlg/printdialog.src deleted file mode 100644 index be014c588b55..000000000000 --- a/sd/source/ui/dlg/printdialog.src +++ /dev/null @@ -1,130 +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. - * - ************************************************************************/ - -#include "app.hrc" -#include "printdialog.hrc" - -ModalDialog DLG_PRINTDIALOG -{ - Size = MAP_APPFONT ( 260, 77 ) ; - - FixedLine FL_PRINTCONTENT - { - Pos = MAP_APPFONT ( 6 , 0 ) ; - Size = MAP_APPFONT ( 248 , 8 ) ; - Text [ en-US ] = "Print content" ; - }; - FixedText FT_CONTENT - { - Pos = MAP_APPFONT ( 12 , 12 ) ; - Size = MAP_APPFONT ( 45 , 10 ) ; - Text [ en-US ] = "Content" ; - }; - ListBox CB_CONTENT - { - Border = TRUE ; - Pos = MAP_APPFONT ( 60 , 10 ) ; - Size = MAP_APPFONT ( 108 , 80 ) ; - TabStop = TRUE ; - DropDown = TRUE ; - StringList [ en-US ] = - { - < "Slides" ; > ; - < "Handouts" ; > ; - < "Notes" ; > ; - < "Outline" ; > ; - }; - }; - FixedText FT_SLIDESPERPAGE - { - Pos = MAP_APPFONT ( 12 , 30 ) ; - Size = MAP_APPFONT ( 45 , 8 ) ; - Text [ en-US ] = "Slides per page" ; - }; - ListBox CB_SLIDESPERPAGE - { - Border = TRUE ; - Pos = MAP_APPFONT ( 60 , 28 ) ; - Size = MAP_APPFONT ( 24 , 80 ) ; - TabStop = TRUE ; - DropDown = TRUE ; - StringList [ en-US ] = - { - < "1" ; > ; - < "2" ; > ; - < "3" ; > ; - < "4" ; > ; - < "6" ; > ; - < "9" ; > ; - }; - }; - FixedText FT_ORDER - { - Pos = MAP_APPFONT ( 12 , 47 ) ; - Size = MAP_APPFONT ( 45 , 8 ) ; - Text [ en-US ] = "Order" ; - }; - RadioButton RBT_HORIZONTAL - { - Pos = MAP_APPFONT ( 60 , 45 ) ; - Size = MAP_APPFONT ( 60 , 10 ) ; - TabStop = TRUE ; - Text [ en-US ] = "Horizontal" ; - }; - RadioButton RBT_VERTICAL - { - Pos = MAP_APPFONT ( 60 , 58 ) ; - Size = MAP_APPFONT ( 60 , 10 ) ; - TabStop = TRUE ; - Text [ en-US ] = "Vertical" ; - }; - FixedImage IMG_PREVIEW - { - Pos = MAP_APPFONT ( 168 , 28 ) ; - }; -}; - - - - - - - - - - - - - - - - - - - - - diff --git a/sd/source/ui/dlg/printdlg.cxx b/sd/source/ui/dlg/printdlg.cxx deleted file mode 100644 index cc20e0f67a84..000000000000 --- a/sd/source/ui/dlg/printdlg.cxx +++ /dev/null @@ -1,88 +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. - * - ************************************************************************/ - -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_sd.hxx" - -#ifdef SD_DLLIMPLEMENTATION -#undef SD_DLLIMPLEMENTATION -#endif - - -#include "sdresid.hxx" -#include "printdlg.hxx" -#include "printdlg.hrc" - -/************************************************************************* -|* -|* SdPrintDlg::SdPrintDlg() -|* -|* Beschreibung Dialog zum Einstellen von Printoptionen -|* -*************************************************************************/ - -SdPrintDlg::SdPrintDlg( Window* pWindow ) : - ModalDialog ( pWindow, SdResId( DLG_PRINT_WARNINGS ) ), - aFtInfo ( this, SdResId( FI_INFO ) ), - aRbtScale ( this, SdResId( RBT_SCALE ) ), - aRbtPoster ( this, SdResId( RBT_POSTER ) ), - aRbtCut ( this, SdResId( RBT_CUT ) ), - aGrpOptions ( this, SdResId( GRP_OPTIONS ) ), - aBtnOK ( this, SdResId( BTN_OK ) ), - aBtnCancel ( this, SdResId( BTN_CANCEL ) ), - aBtnHelp ( this, SdResId( BTN_HELP ) ) -{ - FreeResource(); - - aRbtScale.Check(); -} - -/************************************************************************* -|* -|* SdPrintDlg::GetAttr() -|* -|* Beschreibung Liefert eingestellte Option zurueck -|* -*************************************************************************/ - -USHORT SdPrintDlg::GetAttr() -{ - USHORT nOption = 0; - - if( aRbtScale.IsChecked() ) - nOption = 1; - else if( aRbtPoster.IsChecked() ) - nOption = 2; - else if( aRbtCut.IsChecked() ) - nOption = 3; - - return( nOption ); -} - - - - diff --git a/sd/source/ui/dlg/printdlg.src b/sd/source/ui/dlg/printdlg.src deleted file mode 100644 index 45121e72f3ff..000000000000 --- a/sd/source/ui/dlg/printdlg.src +++ /dev/null @@ -1,130 +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. - * - ************************************************************************/ - -#include "printdlg.hrc" -ModalDialog DLG_PRINT_WARNINGS -{ - OutputSize = TRUE ; - SVLook = TRUE ; - Size = MAP_APPFONT ( 212 , 87 ) ; - Moveable = TRUE ; - OKButton BTN_OK - { - Pos = MAP_APPFONT ( 156 , 6 ) ; - Size = MAP_APPFONT ( 50 , 14 ) ; - TabStop = TRUE ; - DefButton = TRUE ; - }; - CancelButton BTN_CANCEL - { - Pos = MAP_APPFONT ( 156 , 23 ) ; - Size = MAP_APPFONT ( 50 , 14 ) ; - TabStop = TRUE ; - }; - HelpButton BTN_HELP - { - Pos = MAP_APPFONT ( 156 , 43 ) ; - Size = MAP_APPFONT ( 50 , 14 ) ; - TabStop = TRUE ; - }; - FixedLine GRP_OPTIONS - { - Pos = MAP_APPFONT ( 6 , 3 ) ; - Size = MAP_APPFONT ( 144 , 8 ) ; - Text [ en-US ] = "Print options" ; - }; - RadioButton RBT_SCALE - { - Pos = MAP_APPFONT ( 12 , 42 ) ; - Size = MAP_APPFONT ( 129 , 12 ) ; - TabStop = TRUE ; - Text [ en-US ] = "~Fit page to print range" ; - }; - RadioButton RBT_POSTER - { - Pos = MAP_APPFONT ( 12 , 54 ) ; - Size = MAP_APPFONT ( 130 , 12 ) ; - TabStop = TRUE ; - Text [ en-US ] = "~Print on multiple pages" ; - }; - RadioButton RBT_CUT - { - Pos = MAP_APPFONT ( 12 , 66 ) ; - Size = MAP_APPFONT ( 127 , 12 ) ; - TabStop = TRUE ; - Text [ en-US ] = "~Trim" ; - }; - FixedText FI_INFO - { - Pos = MAP_APPFONT ( 12 , 14 ) ; - Size = MAP_APPFONT ( 134 , 25 ) ; - /* ### ACHTUNG: Neuer Text in Resource? Die Seiteneinstellungen stimmen nicht mit dem Druckbereich überein.\nSie können folgende Optionen wählen : Die Seiteneinstellungen stimmen nicht mit dem Druckbereich ³berein.\nSie k÷nnen folgende Optionen wõhlen */ - Text [ en-US ] = "The page settings do not match the print range.\nChoose one of the following options" ; - WordBreak = TRUE ; - }; - Text [ en-US ] = "Warning Print Options" ; -}; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/sd/source/ui/inc/printdialog.hxx b/sd/source/ui/inc/printdialog.hxx deleted file mode 100644 index de9791e22660..000000000000 --- a/sd/source/ui/inc/printdialog.hxx +++ /dev/null @@ -1,61 +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_PRINTDIALOG_HXX_ -#define _SD_PRINTDIALOG_HXX_ - -#include -#include -#include -#include - -class SdOptionsPrintItem; - -class SdPrintDialog : public PrintDialog -{ - public: - static SdPrintDialog* Create( Window* pWindow, bool bImpress ); - virtual ~SdPrintDialog(); - - void Init( const SdOptionsPrintItem* pPrintOpts ); - bool Fill( SdOptionsPrintItem* pPrintOpts ); - -private: - SdPrintDialog( Window* pWindow, bool bImpress ); - - void UpdateStates(); - void LoadPreviewImages(); - - DECL_LINK( UpdateStatesHdl, void* ); - - std::vector< boost::shared_ptr< Control > > mpControls; - std::vector< boost::shared_ptr< Image > > mpPreviews; - std::vector< boost::shared_ptr< Image > > mpPreviewsHC; - bool mbImpress; -}; - -#endif // _SD_PRINTDIALOG_HXX_ - diff --git a/sd/source/ui/inc/printdlg.hrc b/sd/source/ui/inc/printdlg.hrc deleted file mode 100644 index 196724143b22..000000000000 --- a/sd/source/ui/inc/printdlg.hrc +++ /dev/null @@ -1,36 +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. - * - ************************************************************************/ -#define DLG_PRINT_WARNINGS 828 -#define FI_INFO 1 -#define RBT_SCALE 1 -#define RBT_POSTER 2 -#define RBT_CUT 3 -#define GRP_OPTIONS 1 -#define BTN_OK 1 -#define BTN_CANCEL 1 -#define BTN_HELP 1 - diff --git a/sd/source/ui/inc/printdlg.hxx b/sd/source/ui/inc/printdlg.hxx deleted file mode 100644 index 2795bccc2160..000000000000 --- a/sd/source/ui/inc/printdlg.hxx +++ /dev/null @@ -1,70 +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_PRINTDLG_HXX_ -#define _SD_PRINTDLG_HXX_ - - -#include -#include - -#ifndef _SV_BUTTON_HXX //autogen -#include -#endif -#include - - -/************************************************************************* -|* -|* SdPrintDlg::SdPrintDlg() -|* -|* Beschreibung Dialog zum Einstellen von Printoptionen -|* -*************************************************************************/ - -class SdPrintDlg : public ModalDialog -{ -private: - FixedInfo aFtInfo; - RadioButton aRbtScale; - RadioButton aRbtPoster; - RadioButton aRbtCut; - FixedLine aGrpOptions; - OKButton aBtnOK; - CancelButton aBtnCancel; - HelpButton aBtnHelp; - -public: - - SdPrintDlg( Window* pWindow ); - - USHORT GetAttr(); -}; - -#endif // _SD_PRINTDLG_HXX_ - diff --git a/sd/source/ui/view/DocumentRenderer.cxx b/sd/source/ui/view/DocumentRenderer.cxx index a23d8b2ad908..0689dc0e3851 100644 --- a/sd/source/ui/view/DocumentRenderer.cxx +++ b/sd/source/ui/view/DocumentRenderer.cxx @@ -122,7 +122,7 @@ namespace { sal_Int32 GetHandoutPageCount (void) const { - sal_uInt32 nIndex = static_cast(mrProperties.getIntValue("SlidesPerPage", sal_Int32(4))); + sal_uInt32 nIndex = static_cast(mrProperties.getIntValue("SlidesPerPage", sal_Int32(0))); if (nIndex aChoice ( CreateChoice(_STR_IMPRESS_PRINT_UI_SLIDESPERPAGE_CHOICES)); maSlidesPerPage.clear(); - for (sal_Int32 nIndex=0,nCount=aChoice.getLength(); nIndex ; < "1" ; > ; < "2" ; > ; < "3" ; > ; -- cgit From d4af876f9cb4f226fd8b001e7bb0570860777845 Mon Sep 17 00:00:00 2001 From: sj Date: Sat, 5 Jun 2010 19:02:55 +0200 Subject: impress190: #i89450# taking back changes in outliner.hxx and outliner.cxx to avoid compiler warning --- sd/inc/Outliner.hxx | 3 +++ sd/source/ui/view/Outliner.cxx | 5 +++++ 2 files changed, 8 insertions(+) (limited to 'sd') diff --git a/sd/inc/Outliner.hxx b/sd/inc/Outliner.hxx index 1b608fa7b637..dfc7e3e3bf88 100644 --- a/sd/inc/Outliner.hxx +++ b/sd/inc/Outliner.hxx @@ -136,6 +136,9 @@ public: */ void StartSpelling (void); + /** Proxy for method from base class to avoid compiler warning */ + void StartSpelling(EditView&, unsigned char); + /** Initiate a find and/or replace on the next relevant text object. @return Returns when the search/replace is finished (as diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx index ed3777d49082..d4a97cfe2ef9 100644 --- a/sd/source/ui/view/Outliner.cxx +++ b/sd/source/ui/view/Outliner.cxx @@ -318,6 +318,11 @@ void Outliner::StartSpelling (void) mpSearchItem = NULL; } +/** Proxy for method from base class to avoid compiler warning */ +void Outliner::StartSpelling(EditView& rView, unsigned char c) +{ + SdrOutliner::StartSpelling( rView, c ); +} /** Free all resources acquired during the search/spell check. After a spell check the start position is restored here. -- cgit From fee32b2a33c751c3493331fe11b9f2f4b9c74318 Mon Sep 17 00:00:00 2001 From: sj Date: Sat, 5 Jun 2010 19:04:48 +0200 Subject: impress190: #i89450# fixed makefile --- sd/source/ui/func/makefile.mk | 1 - 1 file changed, 1 deletion(-) (limited to 'sd') diff --git a/sd/source/ui/func/makefile.mk b/sd/source/ui/func/makefile.mk index a7567c5c0ff2..e4df8fe9d65a 100644 --- a/sd/source/ui/func/makefile.mk +++ b/sd/source/ui/func/makefile.mk @@ -157,7 +157,6 @@ LIB3OBJFILES= \ $(SLO)$/fuolbull.obj \ $(SLO)$/fucopy.obj \ $(SLO)$/fulink.obj \ - $(SLO)$/fuspell.obj \ $(SLO)$/futhes.obj \ $(SLO)$/fusearch.obj \ $(SLO)$/fuinsfil.obj \ -- cgit From f7a274b959bef49abf7f3ff45137d03c041f4a6d Mon Sep 17 00:00:00 2001 From: sj Date: Tue, 8 Jun 2010 12:02:38 +0200 Subject: removed compiler warnings --- sd/source/filter/ppt/pptatom.hxx | 11 ----------- 1 file changed, 11 deletions(-) (limited to 'sd') diff --git a/sd/source/filter/ppt/pptatom.hxx b/sd/source/filter/ppt/pptatom.hxx index 7cadad0e7dcd..d430b7bffb7a 100644 --- a/sd/source/filter/ppt/pptatom.hxx +++ b/sd/source/filter/ppt/pptatom.hxx @@ -49,18 +49,12 @@ public: /** returns true if at least one atim with the given nRecType is found */ inline bool hasChildAtom( sal_uInt16 nRecType ) const; - /** returns true if at least one atim with the given nRecType and nRecInstnace is found */ - inline bool hasChildAtom( sal_uInt16 nRecType, sal_uInt16 nRecInstance ) const; - /** returns the first child atom with nRecType or NULL */ inline const Atom* findFirstChildAtom( sal_uInt16 nRecType ) const; /** returns the next child atom after pLast with nRecType or NULL */ const Atom* findNextChildAtom( sal_uInt16 nRecType, const Atom* pLast ) const; - /** returns the first child atom with nRecType and nRecInstance or NULL */ - inline const Atom* findFirstChildAtom( sal_uInt16 nRecType, sal_uInt16 nRecInstance ) const; - /** returns the first child atom or NULL */ inline const Atom* findFirstChildAtom() const; @@ -96,11 +90,6 @@ inline bool Atom::hasChildAtom( sal_uInt16 nRecType ) const return findFirstChildAtom( nRecType ) != NULL; } -inline bool Atom::hasChildAtom( sal_uInt16 nRecType, sal_uInt16 nRecInstance ) const -{ - return findFirstChildAtom( nRecType, nRecInstance ) != NULL; -} - inline const Atom* Atom::findFirstChildAtom( sal_uInt16 nRecType ) const { return findNextChildAtom( nRecType, NULL ); -- cgit From c9772e900464ccfda881160634d2e86a86cb104c Mon Sep 17 00:00:00 2001 From: Christian Lippka Date: Tue, 8 Jun 2010 17:47:02 +0200 Subject: #i94055# removed remaining references to SdPrintDlg --- sd/inc/sdabstdlg.hxx | 7 ------- sd/source/ui/dlg/sddlgfact.cxx | 16 ---------------- sd/source/ui/dlg/sddlgfact.hxx | 9 --------- 3 files changed, 32 deletions(-) (limited to 'sd') diff --git a/sd/inc/sdabstdlg.hxx b/sd/inc/sdabstdlg.hxx index e9ae8df1a192..f265314fa6e9 100644 --- a/sd/inc/sdabstdlg.hxx +++ b/sd/inc/sdabstdlg.hxx @@ -153,12 +153,6 @@ public: virtual void GetAttr( SfxItemSet& rOutAttrs ) = 0; }; -class AbstractSdPrintDlg : public VclAbstractDialog //add for SdPrintDlg -{ -public: - virtual USHORT GetAttr() = 0; -}; - class AbstractSdPresLayoutDlg : public VclAbstractDialog //add for SdPresLayoutDlg { public: @@ -206,7 +200,6 @@ public: virtual SfxAbstractTabDialog* CreateSdOutlineBulletTabDlg ( ::Window* pParent, const SfxItemSet* pAttr, ::sd::View* pView = NULL ) = 0; virtual SfxAbstractTabDialog* CreateSdParagraphTabDlg ( ::Window* pParent, const SfxItemSet* pAttr ) = 0; virtual AbstractSdStartPresDlg* CreateSdStartPresentationDlg( ::Window* pWindow, const SfxItemSet& rInAttrs, List& rPageNames, List* pCSList ) = 0; - virtual AbstractSdPrintDlg* CreateSdPrintDlg( ::Window* pWindow ) = 0; //add for SdPrintDlg virtual SfxAbstractTabDialog* CreateSdPresLayoutTemplateDlg( SfxObjectShell* pDocSh, ::Window* pParent, SdResId DlgId, SfxStyleSheetBase& rStyleBase, PresentationObjects ePO, SfxStyleSheetBasePool* pSSPool ) = 0; virtual AbstractSdPresLayoutDlg* CreateSdPresLayoutDlg( ::sd::DrawDocShell* pDocShell, ::sd::ViewShell* pViewShell, ::Window* pWindow, const SfxItemSet& rInAttrs) = 0; virtual SfxAbstractTabDialog* CreateSdTabTemplateDlg( ::Window* pParent, const SfxObjectShell* pDocShell, SfxStyleSheetBase& rStyleBase, SdrModel* pModel, SdrView* pView ) = 0; diff --git a/sd/source/ui/dlg/sddlgfact.cxx b/sd/source/ui/dlg/sddlgfact.cxx index 468b55f56c8a..aa0bb5ce9f27 100644 --- a/sd/source/ui/dlg/sddlgfact.cxx +++ b/sd/source/ui/dlg/sddlgfact.cxx @@ -51,7 +51,6 @@ #include "OutlineBulletDlg.hxx" #include "paragr.hxx" #include "present.hxx" -#include "printdlg.hxx" #include "prltempl.hxx" #include "sdpreslt.hxx" #include "tabtempl.hxx" @@ -76,7 +75,6 @@ IMPL_ABSTDLG_BASE(AbstractSdInsertPasteDlg_Impl); IMPL_ABSTDLG_BASE(AbstractSdInsertPagesObjsDlg_Impl); IMPL_ABSTDLG_BASE(AbstractMorphDlg_Impl); IMPL_ABSTDLG_BASE(AbstractSdStartPresDlg_Impl); -IMPL_ABSTDLG_BASE(AbstractSdPrintDlg_Impl); IMPL_ABSTDLG_BASE(AbstractSdPresLayoutDlg_Impl); IMPL_ABSTDLG_BASE(AbstractSfxDialog_Impl); IMPL_ABSTDLG_BASE(AbstractSdVectorizeDlg_Impl); @@ -326,13 +324,6 @@ void AbstractSdStartPresDlg_Impl::GetAttr( SfxItemSet& rOutAttrs ) } // AbstractSdStartPresDlg_Impl end -//AbstractSdPrintDlg_Impl begin -USHORT AbstractSdPrintDlg_Impl::GetAttr() -{ - return pDlg->GetAttr(); -} -// AbstractSdPrintDlg_Impl end - //AbstractSdPresLayoutDlg_Impl begin void AbstractSdPresLayoutDlg_Impl::GetAttr( SfxItemSet& rOutAttrs ) { @@ -498,13 +489,6 @@ AbstractSdStartPresDlg * SdAbstractDialogFactory_Impl::CreateSdStartPresentatio } // add for SdStartPresentationDlg end -// add for SdPrintDlg begin -AbstractSdPrintDlg * SdAbstractDialogFactory_Impl::CreateSdPrintDlg( ::Window* pWindow ) -{ - return new AbstractSdPrintDlg_Impl( new SdPrintDlg( pWindow ) ); -} -// add for SdPrintDlg end - // add for SdPresLayoutTemplateDlg begin SfxAbstractTabDialog * SdAbstractDialogFactory_Impl::CreateSdPresLayoutTemplateDlg( SfxObjectShell* pDocSh, ::Window* pParent, SdResId DlgId, SfxStyleSheetBase& rStyleBase, PresentationObjects ePO, SfxStyleSheetBasePool* pSSPool ) { diff --git a/sd/source/ui/dlg/sddlgfact.hxx b/sd/source/ui/dlg/sddlgfact.hxx index 44f5b0813a04..fa5e53ebac54 100644 --- a/sd/source/ui/dlg/sddlgfact.hxx +++ b/sd/source/ui/dlg/sddlgfact.hxx @@ -209,14 +209,6 @@ class AbstractSdStartPresDlg_Impl : public AbstractSdStartPresDlg virtual void GetAttr( SfxItemSet& rOutAttrs ); }; -// add for SdPrintDlg -class SdPrintDlg; -class AbstractSdPrintDlg_Impl : public AbstractSdPrintDlg -{ - DECL_ABSTDLG_BASE(AbstractSdPrintDlg_Impl,SdPrintDlg) - virtual USHORT GetAttr(); -}; - // add for SdPresLayoutDlg class SdPresLayoutDlg; class AbstractSdPresLayoutDlg_Impl : public AbstractSdPresLayoutDlg @@ -281,7 +273,6 @@ public: virtual SfxAbstractTabDialog* CreateSdOutlineBulletTabDlg ( ::Window* pParent, const SfxItemSet* pAttr, ::sd::View* pView = NULL ); virtual SfxAbstractTabDialog* CreateSdParagraphTabDlg ( ::Window* pParent, const SfxItemSet* pAttr ); virtual AbstractSdStartPresDlg* CreateSdStartPresentationDlg( ::Window* pWindow, const SfxItemSet& rInAttrs, List& rPageNames, List* pCSList ); - virtual AbstractSdPrintDlg* CreateSdPrintDlg( ::Window* pWindow ); //add for SdPrintDlg virtual SfxAbstractTabDialog* CreateSdPresLayoutTemplateDlg( SfxObjectShell* pDocSh, ::Window* pParent, SdResId DlgId, SfxStyleSheetBase& rStyleBase, PresentationObjects ePO, SfxStyleSheetBasePool* pSSPool ); virtual AbstractSdPresLayoutDlg* CreateSdPresLayoutDlg( ::sd::DrawDocShell* pDocShell, ::sd::ViewShell* pViewShell, ::Window* pWindow, const SfxItemSet& rInAttrs); virtual SfxAbstractTabDialog* CreateSdTabTemplateDlg( ::Window* pParent, const SfxObjectShell* pDocShell, SfxStyleSheetBase& rStyleBase, SdrModel* pModel, SdrView* pView ); -- cgit From 3ce72e7d973431907a4c189705ccffd0bfa035a4 Mon Sep 17 00:00:00 2001 From: Christian Lippka Date: Wed, 9 Jun 2010 11:55:10 +0200 Subject: #i111860# fix high contrast mode for toolbar menus --- sd/source/ui/controller/slidelayoutcontroller.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sd') diff --git a/sd/source/ui/controller/slidelayoutcontroller.cxx b/sd/source/ui/controller/slidelayoutcontroller.cxx index 489f6e489386..1a9201af6555 100644 --- a/sd/source/ui/controller/slidelayoutcontroller.cxx +++ b/sd/source/ui/controller/slidelayoutcontroller.cxx @@ -273,7 +273,7 @@ LayoutToolbarMenu::LayoutToolbarMenu( SlideLayoutController& rController, const sSlotStr = OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:DuplicatePage" ) ); else sSlotStr = OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:Undo" ) ); - aSlotImage = ::GetImage( mxFrame, sSlotStr, FALSE, FALSE ); + aSlotImage = ::GetImage( mxFrame, sSlotStr, FALSE, bHighContrast ); String sSlotTitle; if( bInsertPage ) -- cgit From 4f432344a30b9bc9858a590deb244ee5a0f08e2b Mon Sep 17 00:00:00 2001 From: Andre Fischer Date: Wed, 9 Jun 2010 18:34:57 +0200 Subject: impressaccessibility7: #i111669# Added state SENSITIVE to slides sorter objects. --- .../ui/accessibility/AccessibleSlideSorterObject.cxx | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) mode change 100644 => 100755 sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx (limited to 'sd') diff --git a/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx b/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx old mode 100644 new mode 100755 index 1f5e99d69f58..ae1f6f633edc --- a/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx +++ b/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx @@ -255,25 +255,21 @@ Reference SAL_CALL if (mxParent.is()) { - // SELECTABLE + // Unconditional states. pStateSet->AddState(AccessibleStateType::SELECTABLE); + pStateSet->AddState(AccessibleStateType::FOCUSABLE); + pStateSet->AddState(AccessibleStateType::ENABLED); + pStateSet->AddState(AccessibleStateType::VISIBLE); + pStateSet->AddState(AccessibleStateType::SHOWING); + pStateSet->AddState(AccessibleStateType::ACTIVE); + pStateSet->AddState(AccessibleStateType::SENSITIVE); - // SELECTED + // Conditional states. if (mrSlideSorter.GetController().GetPageSelector().IsPageSelected(mnPageNumber)) pStateSet->AddState(AccessibleStateType::SELECTED); - - // FOCUSABLE - pStateSet->AddState(AccessibleStateType::FOCUSABLE); - - // FOCUSED if (mrSlideSorter.GetController().GetFocusManager().GetFocusedPageIndex() == mnPageNumber) if (mrSlideSorter.GetController().GetFocusManager().IsFocusShowing()) pStateSet->AddState(AccessibleStateType::FOCUSED); - - pStateSet->AddState(AccessibleStateType::ENABLED); - pStateSet->AddState(AccessibleStateType::VISIBLE); - pStateSet->AddState(AccessibleStateType::SHOWING); - pStateSet->AddState(AccessibleStateType::ACTIVE); } return pStateSet; -- cgit From 510d424f855b70320b27f074fa0bf4fc8cd9b164 Mon Sep 17 00:00:00 2001 From: Andre Fischer Date: Fri, 11 Jun 2010 14:03:26 +0200 Subject: impressaccessibility7: #i111667# Replaced INVALIDATE_ALL_CHILDREN accessibility events by seperate notifications of CHILD events. --- .../ui/accessibility/AccessibleSlideSorterView.cxx | 82 +++++++++++++--------- .../ui/slidesorter/inc/view/SlideSorterView.hxx | 17 +++++ sd/source/ui/slidesorter/view/SlideSorterView.cxx | 52 ++++++++++++-- 3 files changed, 112 insertions(+), 39 deletions(-) mode change 100644 => 100755 sd/source/ui/accessibility/AccessibleSlideSorterView.cxx mode change 100644 => 100755 sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx mode change 100644 => 100755 sd/source/ui/slidesorter/view/SlideSorterView.cxx (limited to 'sd') diff --git a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx old mode 100644 new mode 100755 index 10596bd5f793..6f3508d731a8 --- a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx +++ b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx @@ -72,7 +72,6 @@ public: ::Window* pWindow); ~Implementation (void); - void UpdateVisibility (void); void UpdateChildren (void); void Clear (void); sal_Int32 GetVisibleChildCount (void) const; @@ -85,6 +84,7 @@ public: DECL_LINK(WindowEventListener, VclWindowEvent*); DECL_LINK(SelectionChangeListener, void*); DECL_LINK(FocusChangeListener, void*); + DECL_LINK(VisibilityChangeListener, void*); private: AccessibleSlideSorterView& mrAccessibleSlideSorter; @@ -789,7 +789,6 @@ AccessibleSlideSorterView::Implementation::Implementation ( { ConnectListeners(); UpdateChildren(); - UpdateVisibility(); } @@ -804,24 +803,27 @@ AccessibleSlideSorterView::Implementation::~Implementation (void) -void AccessibleSlideSorterView::Implementation::UpdateVisibility (void) +void AccessibleSlideSorterView::Implementation::UpdateChildren (void) { + if (mbModelChangeLocked) + { + // Do nothing right now. When the flag is reset, this method is + // called again. + return; + } + ::sd::slidesorter::view::SlideSorterView::PageRange aRange ( mrSlideSorter.GetView().GetVisiblePageRange()); mnFirstVisibleChild = aRange.first; mnLastVisibleChild = aRange.second; -} - - - -void AccessibleSlideSorterView::Implementation::UpdateChildren (void) -{ - // Clear the list of accessible children and adapt its size. It is - // refilled on demand when later the children are requested. + // Release all children. Clear(); + + // Create new children for the modified visible range. maPageObjects.resize(mrSlideSorter.GetModel().GetPageCount()); - UpdateVisibility(); + for (sal_Int32 nIndex(mnFirstVisibleChild); nIndex<=mnLastVisibleChild; ++nIndex) + GetAccessibleChild(nIndex); } @@ -834,6 +836,11 @@ void AccessibleSlideSorterView::Implementation::Clear (void) for (iPageObject=maPageObjects.begin(); iPageObject!=iEnd; ++iPageObject) if (*iPageObject != NULL) { + mrAccessibleSlideSorter.FireAccessibleEvent( + AccessibleEventId::CHILD, + Any(Reference(iPageObject->get())), + Any()); + Reference xComponent (Reference(iPageObject->get()), UNO_QUERY); if (xComponent.is()) xComponent->dispose(); @@ -870,8 +877,6 @@ AccessibleSlideSorterObject* AccessibleSlideSorterView::Implementation::GetVisib AccessibleSlideSorterObject* AccessibleSlideSorterView::Implementation::GetAccessibleChild ( sal_Int32 nIndex) { - OSL_ASSERT(nIndex>=0 && (sal_uInt32)nIndex=0 && (sal_uInt32)nIndexGetPage()->GetPageNum()-1)/2); + + mrAccessibleSlideSorter.FireAccessibleEvent( + AccessibleEventId::CHILD, + Any(), + Any(Reference(maPageObjects[nIndex].get()))); + } + } pChild = maPageObjects[nIndex].get(); } + else + { + OSL_ASSERT(nIndex>=0 && (sal_uInt32)nIndexAddSelectionChangeListener( LINK(this,AccessibleSlideSorterView::Implementation,SelectionChangeListener)); - mrSlideSorter.GetController().GetFocusManager().AddFocusChangeListener( LINK(this,AccessibleSlideSorterView::Implementation,FocusChangeListener)); + mrSlideSorter.GetView().AddVisibilityChangeListener( + LINK(this,AccessibleSlideSorterView::Implementation,VisibilityChangeListener)); } @@ -921,9 +939,10 @@ void AccessibleSlideSorterView::Implementation::ReleaseListeners (void) { mrSlideSorter.GetController().GetFocusManager().RemoveFocusChangeListener( LINK(this,AccessibleSlideSorterView::Implementation,FocusChangeListener)); - mrSlideSorter.GetController().GetSelectionManager()->RemoveSelectionChangeListener( LINK(this,AccessibleSlideSorterView::Implementation,SelectionChangeListener)); + mrSlideSorter.GetView().RemoveVisibilityChangeListener( + LINK(this,AccessibleSlideSorterView::Implementation,VisibilityChangeListener)); if (mpWindow != NULL) mpWindow->RemoveEventListener( @@ -951,14 +970,7 @@ void AccessibleSlideSorterView::Implementation::Notify ( switch (rSdrHint.GetKind()) { case HINT_PAGEORDERCHG: - if ( ! mbModelChangeLocked) - { - UpdateChildren(); - mrAccessibleSlideSorter.FireAccessibleEvent( - AccessibleEventId::INVALIDATE_ALL_CHILDREN, - Any(), - Any()); - } + UpdateChildren(); break; default: break; @@ -976,10 +988,6 @@ void AccessibleSlideSorterView::Implementation::Notify ( case sd::ViewShellHint::HINT_COMPLEX_MODEL_CHANGE_END: mbModelChangeLocked = false; UpdateChildren(); - mrAccessibleSlideSorter.FireAccessibleEvent( - AccessibleEventId::INVALIDATE_ALL_CHILDREN, - Any(), - Any()); break; default: break; @@ -996,11 +1004,7 @@ IMPL_LINK(AccessibleSlideSorterView::Implementation, WindowEventListener, VclWin { case VCLEVENT_WINDOW_MOVE: case VCLEVENT_WINDOW_RESIZE: - UpdateVisibility(); - mrAccessibleSlideSorter.FireAccessibleEvent( - AccessibleEventId::INVALIDATE_ALL_CHILDREN, - Any(), - Any()); + UpdateChildren(); break; case VCLEVENT_WINDOW_GETFOCUS: @@ -1062,4 +1066,16 @@ IMPL_LINK(AccessibleSlideSorterView::Implementation, FocusChangeListener, void*, } + + +IMPL_LINK(AccessibleSlideSorterView::Implementation, VisibilityChangeListener, void*, EMPTYARG ) +{ + UpdateChildren(); + + return 1; +} + + + + } // end of namespace ::accessibility diff --git a/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx b/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx old mode 100644 new mode 100755 index d5c8dd4bf241..3c76c2d09e1d --- a/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx @@ -232,6 +232,21 @@ public: */ void AddSdrObject (SdrObject& rObject); + /** Add a listener that is called when the set of visible slides. + @param rListener + When this method is called multiple times for the same listener + the second and all following calls are ignored. Each listener + is added only once. + */ + void AddVisibilityChangeListener (const Link& rListener); + + /** Remove a listener that is called when the set of visible slides changes. + @param rListener + It is save to pass a listener that was not added or has been + removed previously. Such calls are ignored. + */ + void RemoveVisibilityChangeListener (const Link& rListener); + protected: virtual void Notify (SfxBroadcaster& rBroadcaster, const SfxHint& rHint); @@ -266,6 +281,8 @@ private: Orientation meOrientation; + ::std::vector maVisibilityChangeListeners; + /** Adapt the coordinates of the given bounding box according to the other parameters. @param rModelPageObjectBoundingBox diff --git a/sd/source/ui/slidesorter/view/SlideSorterView.cxx b/sd/source/ui/slidesorter/view/SlideSorterView.cxx old mode 100644 new mode 100755 index 82aac5b2cd9e..0b67125dd48d --- a/sd/source/ui/slidesorter/view/SlideSorterView.cxx +++ b/sd/source/ui/slidesorter/view/SlideSorterView.cxx @@ -70,10 +70,9 @@ #include #include #include - -#ifndef _SFXITEMPOOL_HXX #include -#endif + +#include using namespace std; using namespace ::sd::slidesorter::model; @@ -466,12 +465,23 @@ void SlideSorterView::DeterminePageObjectVisibilities (void) pContact = pDescriptor->GetViewObjectContact(); if (pDescriptor.get() != NULL) - pDescriptor->SetVisible (bIsVisible); + pDescriptor->SetVisible(bIsVisible); } } - mnFirstVisiblePageIndex = nFirstIndex; - mnLastVisiblePageIndex = nLastIndex; + + if (mnFirstVisiblePageIndex != nFirstIndex + || mnLastVisiblePageIndex != nLastIndex) + { + mnFirstVisiblePageIndex = nFirstIndex; + mnLastVisiblePageIndex = nLastIndex; + + // Tell the listeners that the visibility of some objects has changed. + ::std::vector aChangeListeners (maVisibilityChangeListeners); + BOOST_FOREACH(Link& rLink, aChangeListeners) + rLink.Call(NULL); + } + } } @@ -843,4 +853,34 @@ void SlideSorterView::AddSdrObject (SdrObject& rObject) rObject.SetModel(&maPageModel); } + + + +void SlideSorterView::AddVisibilityChangeListener (const Link& rListener) +{ + if (::std::find ( + maVisibilityChangeListeners.begin(), + maVisibilityChangeListeners.end(), + rListener) == maVisibilityChangeListeners.end()) + { + maVisibilityChangeListeners.push_back(rListener); + } +} + + + + +void SlideSorterView::RemoveVisibilityChangeListener(const Link&rListener) +{ + maVisibilityChangeListeners.erase ( + ::std::find ( + maVisibilityChangeListeners.begin(), + maVisibilityChangeListeners.end(), + rListener)); +} + + + + + } } } // end of namespace ::sd::slidesorter::view -- cgit From 1867b5faf01089e5c47d3f9380b7da9ab6916e4f Mon Sep 17 00:00:00 2001 From: tono Date: Tue, 15 Jun 2010 22:35:25 +0900 Subject: i#111956: MinGW port fix: dependency to shared library: pure porting fix --- sd/util/makefile.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sd') diff --git a/sd/util/makefile.mk b/sd/util/makefile.mk index a9be975d5b0a..10ad7251f258 100644 --- a/sd/util/makefile.mk +++ b/sd/util/makefile.mk @@ -229,7 +229,7 @@ SHL4OBJS += $(SLO)$/pchname.obj \ .ENDIF # "$(GUI)$(COM)" == "WNTMSC" # $(ISDLIB) is build in SHL1TARGET -.IF ("$(GUI)"=="UNX" || "$(COM)"=="GCC") && "$(GUI)"!="OS2" +.IF "$(GUI)"=="UNX" || ("$(COM)"=="GCC" && "$(GUI)"=="WNT") SHL4DEPN=$(SHL1TARGETN) SHL5DEPN=$(SHL1TARGETN) .ELSE -- cgit From 847c992a251bcbbcaf71d3b1b366d70971b4ef03 Mon Sep 17 00:00:00 2001 From: obo Date: Wed, 16 Jun 2010 13:50:55 +0200 Subject: masterfix: #i10000# remove conflict marks --- sd/source/ui/inc/PaneDockingWindow.hxx | 4 +--- sd/source/ui/inc/framework/ViewShellWrapper.hxx | 4 ---- 2 files changed, 1 insertion(+), 7 deletions(-) (limited to 'sd') diff --git a/sd/source/ui/inc/PaneDockingWindow.hxx b/sd/source/ui/inc/PaneDockingWindow.hxx index fdae7280d439..a335c327de79 100755 --- a/sd/source/ui/inc/PaneDockingWindow.hxx +++ b/sd/source/ui/inc/PaneDockingWindow.hxx @@ -65,8 +65,7 @@ public: virtual ~PaneDockingWindow (void); virtual void StateChanged( StateChangedType nType ); -<<<<<<< local -======= + virtual void DataChanged( const DataChangedEvent& rDCEvt ); /** Initializing the title tool box either creates a new title tool box @@ -126,7 +125,6 @@ private: last invocation the size of the docking window has changed. */ void Layout (void); ->>>>>>> other }; } // end of namespace ::sd diff --git a/sd/source/ui/inc/framework/ViewShellWrapper.hxx b/sd/source/ui/inc/framework/ViewShellWrapper.hxx index 96e59d484270..12483f462d5e 100755 --- a/sd/source/ui/inc/framework/ViewShellWrapper.hxx +++ b/sd/source/ui/inc/framework/ViewShellWrapper.hxx @@ -89,10 +89,6 @@ public: */ ::boost::shared_ptr GetViewShell (void); -<<<<<<< local -======= - ->>>>>>> other // XUnoTunnel virtual sal_Int64 SAL_CALL getSomething (const com::sun::star::uno::Sequence& rId) -- cgit From 8c75156a84a5088506c49101efad199dc7b8d05e Mon Sep 17 00:00:00 2001 From: obo Date: Thu, 17 Jun 2010 09:00:57 +0200 Subject: masterfix: #i10000# resolve merge problems --- sd/source/ui/dlg/PaneDockingWindow.cxx | 229 --------------------------------- sd/source/ui/inc/PaneDockingWindow.hxx | 60 --------- 2 files changed, 289 deletions(-) (limited to 'sd') diff --git a/sd/source/ui/dlg/PaneDockingWindow.cxx b/sd/source/ui/dlg/PaneDockingWindow.cxx index 8bcba545f739..c1dedd5d8293 100755 --- a/sd/source/ui/dlg/PaneDockingWindow.cxx +++ b/sd/source/ui/dlg/PaneDockingWindow.cxx @@ -57,235 +57,6 @@ PaneDockingWindow::~PaneDockingWindow (void) { } -<<<<<<< local -======= - - - -void PaneDockingWindow::Resize (void) -{ - SfxDockingWindow::Resize(); - mbIsLayoutPending = true; -} - - - - -void PaneDockingWindow::Layout (void) -{ - mbIsLayoutPending = false; - - Size aWindowSize (GetOutputSizePixel()); - Size aToolBoxSize (0,0); - int nTitleBarHeight (GetSettings().GetStyleSettings().GetTitleHeight()); - - // Place the title tool box. - if (mpTitleToolBox.get() != NULL) - { - if (IsFloatingMode()) - mpTitleToolBox->HideItem (1); - else - mpTitleToolBox->ShowItem (1); - - aToolBoxSize = mpTitleToolBox->CalcWindowSizePixel(); - if (aToolBoxSize.Height() > nTitleBarHeight) - nTitleBarHeight = aToolBoxSize.Height(); - mpTitleToolBox->SetPosSizePixel ( - Point(aWindowSize.Width()-aToolBoxSize.Width(), - (nTitleBarHeight-aToolBoxSize.Height())/2), - aToolBoxSize); - } - - // Place the content window. - if (nTitleBarHeight < aToolBoxSize.Height()) - nTitleBarHeight = aToolBoxSize.Height(); - aWindowSize.Height() -= nTitleBarHeight; - mpContentWindow->SetPosSizePixel( - Point(maBorder.Left(),nTitleBarHeight+maBorder.Top()), - Size (aWindowSize.Width()-maBorder.Left()-maBorder.Right(), - aWindowSize.Height()-maBorder.Top()-maBorder.Bottom())); -} - - - - -void PaneDockingWindow::Paint (const Rectangle& rRectangle) -{ - if (mbIsLayoutPending) - Layout(); - - SfxDockingWindow::Paint (rRectangle); - int nTitleBarHeight (GetSettings().GetStyleSettings().GetTitleHeight()); - Size aToolBoxSize = mpTitleToolBox->CalcWindowSizePixel(); - if (aToolBoxSize.Height() > nTitleBarHeight) - nTitleBarHeight = aToolBoxSize.Height(); - Color aOriginalLineColor (GetLineColor()); - Color aOriginalFillColor (GetFillColor()); - SetFillColor (GetSettings().GetStyleSettings().GetDialogColor()); - SetLineColor (); - - // Make font bold. - const Font& rOriginalFont (GetFont()); - Font aFont (rOriginalFont); - aFont.SetWeight (WEIGHT_BOLD); - SetFont (aFont); - - // Set border values. - Size aWindowSize (GetOutputSizePixel()); - int nOuterLeft = 0; - int nInnerLeft = nOuterLeft + maBorder.Left() - 1; - int nOuterRight = aWindowSize.Width() - 1; - int nInnerRight = nOuterRight - maBorder.Right() + 1; - int nInnerTop = nTitleBarHeight + maBorder.Top() - 1; - int nOuterBottom = aWindowSize.Height() - 1; - int nInnerBottom = nOuterBottom - maBorder.Bottom() + 1; - - // Paint title bar background. - Rectangle aTitleBarBox (Rectangle( - nOuterLeft, - 0, - nOuterRight, - nInnerTop-1)); - DrawRect (aTitleBarBox); - - if (nInnerLeft > nOuterLeft) - DrawRect ( - Rectangle (nOuterLeft, nInnerTop, nInnerLeft, nInnerBottom)); - if (nOuterRight > nInnerRight) - DrawRect ( - Rectangle (nInnerRight, nInnerTop, nOuterRight, nInnerBottom)); - if (nInnerBottom < nOuterBottom) - DrawRect ( - Rectangle (nOuterLeft, nInnerBottom, nOuterRight, nOuterBottom)); - - // Paint bevel border. - SetFillColor (); - SetLineColor (GetSettings().GetStyleSettings().GetShadowColor()); - if (maBorder.Top() > 0) - DrawLine ( - Point(nInnerLeft,nInnerTop), - Point(nInnerLeft,nInnerBottom)); - if (maBorder.Left() > 0) - DrawLine ( - Point(nInnerLeft,nInnerTop), - Point(nInnerRight,nInnerTop)); - SetLineColor (GetSettings().GetStyleSettings().GetLightColor()); - if (maBorder.Bottom() > 0) - DrawLine ( - Point(nInnerRight,nInnerBottom), - Point(nInnerLeft,nInnerBottom)); - if (maBorder.Right() > 0) - DrawLine ( - Point(nInnerRight,nInnerBottom), - Point(nInnerRight,nInnerTop)); - - // Paint title bar text. - SetLineColor (GetSettings().GetStyleSettings().GetActiveTextColor()); - SetFillColor (); - aTitleBarBox.Left() += 3; - DrawText (aTitleBarBox, msTitle, - TEXT_DRAW_LEFT - | TEXT_DRAW_VCENTER - | TEXT_DRAW_MULTILINE - | TEXT_DRAW_WORDBREAK); - - // Restore original values of the output device. - SetFont (rOriginalFont); - SetFillColor (aOriginalFillColor); -} - - - - -void PaneDockingWindow::InitializeTitleToolBox (void) -{ - if (mpTitleToolBox.get() == NULL) - { - // Initialize the title tool box. - mpTitleToolBox.reset (new ToolBox(this)); - mpTitleToolBox->SetSelectHdl ( - LINK(this, PaneDockingWindow, ToolboxSelectHandler)); - mpTitleToolBox->SetOutStyle (TOOLBOX_STYLE_FLAT); - mpTitleToolBox->SetBackground (Wallpaper ( - GetSettings().GetStyleSettings().GetDialogColor())); - mpTitleToolBox->Show(); - } - else - mpTitleToolBox->Clear(); - - // Get the closer bitmap and set it as right most button. - Bitmap aBitmap (SdResId (BMP_CLOSE_DOC)); - Bitmap aBitmapHC (SdResId (BMP_CLOSE_DOC_H)); - Image aImage = Image (aBitmap, Color (COL_LIGHTMAGENTA)); - Image aImageHC = Image (aBitmapHC, Color (BMP_COLOR_HIGHCONTRAST)); - mpTitleToolBox->InsertItem (1, - GetSettings().GetStyleSettings().GetHighContrastMode() - ? aImageHC - : aImage); - mpTitleToolBox->ShowItem (1); -} - - - - -USHORT PaneDockingWindow::AddMenu ( - const String& rsMenuName, - ULONG nHelpId, - const Link& rCallback) -{ - // Add the menu before the closer button. - USHORT nItemCount (mpTitleToolBox->GetItemCount()); - USHORT nItemId (nItemCount+1); - mpTitleToolBox->InsertItem ( - nItemId, - rsMenuName, - TIB_DROPDOWNONLY, - nItemCount>0 ? nItemCount-1 : (USHORT)-1); - mpTitleToolBox->SetHelpId( nItemId, nHelpId ); - mpTitleToolBox->SetClickHdl (rCallback); - mpTitleToolBox->SetDropdownClickHdl (rCallback); - - // The tool box has likely changed its size. The title bar has to be - // resized. - Resize(); - Invalidate(); - - return nItemCount+1; -} - - - - -IMPL_LINK(PaneDockingWindow, ToolboxSelectHandler, ToolBox*, pToolBox) -{ - USHORT nId = pToolBox->GetCurItemId(); - - if (nId == 1) - { - EndTracking(); - SfxBoolItem aVisibility (mnChildWindowId, FALSE); - GetBindings().GetDispatcher()->Execute ( - mnChildWindowId, - SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, - &aVisibility, - NULL); - } - - return 0; -} - - - - -long PaneDockingWindow::Notify( NotifyEvent& rNEvt ) -{ - return SfxDockingWindow::Notify (rNEvt); -} - - - - ->>>>>>> other void PaneDockingWindow::StateChanged( StateChangedType nType ) { switch (nType) diff --git a/sd/source/ui/inc/PaneDockingWindow.hxx b/sd/source/ui/inc/PaneDockingWindow.hxx index a335c327de79..1874df10dd53 100755 --- a/sd/source/ui/inc/PaneDockingWindow.hxx +++ b/sd/source/ui/inc/PaneDockingWindow.hxx @@ -65,66 +65,6 @@ public: virtual ~PaneDockingWindow (void); virtual void StateChanged( StateChangedType nType ); - - virtual void DataChanged( const DataChangedEvent& rDCEvt ); - - /** 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); - - ::Window* GetContentWindow (void); - - ::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; - - /** 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; - - /** 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 -- cgit From 8154a584acc8bd95f30f466defaf8e15324b346e Mon Sep 17 00:00:00 2001 From: tono Date: Fri, 18 Jun 2010 22:43:04 +0900 Subject: Backed out changeset: d80a58fd55d9 --- sd/util/makefile.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sd') diff --git a/sd/util/makefile.mk b/sd/util/makefile.mk index 10ad7251f258..a9be975d5b0a 100644 --- a/sd/util/makefile.mk +++ b/sd/util/makefile.mk @@ -229,7 +229,7 @@ SHL4OBJS += $(SLO)$/pchname.obj \ .ENDIF # "$(GUI)$(COM)" == "WNTMSC" # $(ISDLIB) is build in SHL1TARGET -.IF "$(GUI)"=="UNX" || ("$(COM)"=="GCC" && "$(GUI)"=="WNT") +.IF ("$(GUI)"=="UNX" || "$(COM)"=="GCC") && "$(GUI)"!="OS2" SHL4DEPN=$(SHL1TARGETN) SHL5DEPN=$(SHL1TARGETN) .ELSE -- cgit From 0292b26959a28a6e42306aa0b5644b33a705e10f Mon Sep 17 00:00:00 2001 From: tono Date: Fri, 18 Jun 2010 22:49:15 +0900 Subject: Backed out changeset: f63af3433bcb --- sd/util/makefile.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sd') diff --git a/sd/util/makefile.mk b/sd/util/makefile.mk index a9be975d5b0a..bfe4d1fd1b40 100644 --- a/sd/util/makefile.mk +++ b/sd/util/makefile.mk @@ -229,7 +229,7 @@ SHL4OBJS += $(SLO)$/pchname.obj \ .ENDIF # "$(GUI)$(COM)" == "WNTMSC" # $(ISDLIB) is build in SHL1TARGET -.IF ("$(GUI)"=="UNX" || "$(COM)"=="GCC") && "$(GUI)"!="OS2" +.IF "$(GUI)" == "UNX" SHL4DEPN=$(SHL1TARGETN) SHL5DEPN=$(SHL1TARGETN) .ELSE -- cgit From 3216fb4a80ca9213e39d625436316de2a1d4bbef Mon Sep 17 00:00:00 2001 From: tono Date: Fri, 18 Jun 2010 23:06:49 +0900 Subject: i#111956: MinGW port fix: dependency to shared library: pure porting fix again --- sd/util/makefile.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sd') diff --git a/sd/util/makefile.mk b/sd/util/makefile.mk index bfe4d1fd1b40..10ad7251f258 100644 --- a/sd/util/makefile.mk +++ b/sd/util/makefile.mk @@ -229,7 +229,7 @@ SHL4OBJS += $(SLO)$/pchname.obj \ .ENDIF # "$(GUI)$(COM)" == "WNTMSC" # $(ISDLIB) is build in SHL1TARGET -.IF "$(GUI)" == "UNX" +.IF "$(GUI)"=="UNX" || ("$(COM)"=="GCC" && "$(GUI)"=="WNT") SHL4DEPN=$(SHL1TARGETN) SHL5DEPN=$(SHL1TARGETN) .ELSE -- cgit From 6d3db84c4929bd4944ce9b1d8e9ab77bc23c92ed Mon Sep 17 00:00:00 2001 From: obo Date: Tue, 29 Jun 2010 12:23:10 +0200 Subject: masterfix: #i112776# smoketestoo_native fails for wntmsci12 (nonpro) --- sd/source/ui/slidesorter/view/SlideSorterView.cxx | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'sd') diff --git a/sd/source/ui/slidesorter/view/SlideSorterView.cxx b/sd/source/ui/slidesorter/view/SlideSorterView.cxx index 6ff6a1bf3109..d2c2310329a6 100755 --- a/sd/source/ui/slidesorter/view/SlideSorterView.cxx +++ b/sd/source/ui/slidesorter/view/SlideSorterView.cxx @@ -432,10 +432,15 @@ void SlideSorterView::DeterminePageObjectVisibilities (void) // Tell the listeners that the visibility of some objects has changed. ::std::vector aChangeListeners (maVisibilityChangeListeners); - BOOST_FOREACH(Link& rLink, aChangeListeners) - rLink.Call(NULL); + for (::std::vector::const_iterator + iListener=aChangeListeners.begin(), + iEnd=aChangeListeners.end(); + iListener!=iEnd; + ++iListener) + { + iListener->Call(NULL); + } } - } } -- cgit From 4adb61dc6bb380ff31e145e6a77c92c0b26b42bd Mon Sep 17 00:00:00 2001 From: obo Date: Tue, 29 Jun 2010 15:31:44 +0200 Subject: masterfix: #i112758# integration of renaissance2 in m81 broke smoketestoo_native --- sd/source/ui/inc/view/viewoverlaymanager.hxx | 5 --- sd/source/ui/view/viewoverlaymanager.cxx | 60 ++++++++++++++++------------ 2 files changed, 35 insertions(+), 30 deletions(-) (limited to 'sd') diff --git a/sd/source/ui/inc/view/viewoverlaymanager.hxx b/sd/source/ui/inc/view/viewoverlaymanager.hxx index 0693d1faea7a..9b56267ff327 100755 --- a/sd/source/ui/inc/view/viewoverlaymanager.hxx +++ b/sd/source/ui/inc/view/viewoverlaymanager.hxx @@ -59,12 +59,7 @@ public: virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint); - 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(); - ViewShellBase& mrBase; ULONG mnUpdateTagsEvent; diff --git a/sd/source/ui/view/viewoverlaymanager.cxx b/sd/source/ui/view/viewoverlaymanager.cxx index ab165eea600b..447f50ec2222 100755 --- a/sd/source/ui/view/viewoverlaymanager.cxx +++ b/sd/source/ui/view/viewoverlaymanager.cxx @@ -45,6 +45,7 @@ #include #include +#include #include #include @@ -79,9 +80,6 @@ class ImageButtonHdl; // -------------------------------------------------------------------- -BitmapEx ViewOverlayManager::maSmallButtonImages[BMP_PLACEHOLDER_SMALL_END - BMP_PLACEHOLDER_SMALL_START]; -BitmapEx ViewOverlayManager::maLargeButtonImages[BMP_PLACEHOLDER_LARGE_END - BMP_PLACEHOLDER_LARGE_START]; - static USHORT gButtonSlots[] = { SID_INSERT_TABLE, SID_INSERT_DIAGRAM, SID_INSERT_GRAPHIC, SID_INSERT_AVMEDIA }; static USHORT gButtonToolTips[] = { STR_INSERT_TABLE, STR_INSERT_CHART, STR_INSERT_PICTURE, STR_INSERT_MOVIE }; @@ -97,6 +95,32 @@ static BitmapEx loadImageResource( USHORT nId ) // -------------------------------------------------------------------- +static BitmapEx* getButtonImage( int index, bool large ) +{ + static vcl::DeleteOnDeinit< BitmapEx > gSmallButtonImages[BMP_PLACEHOLDER_SMALL_END - BMP_PLACEHOLDER_SMALL_START] = { 0, 0, 0, 0, 0, 0, 0, 0 }; + static vcl::DeleteOnDeinit< BitmapEx > gLargeButtonImages[BMP_PLACEHOLDER_LARGE_END - BMP_PLACEHOLDER_LARGE_START] = { 0, 0, 0, 0, 0, 0, 0, 0 }; + + if( !gSmallButtonImages[0].get() ) + { + for( sal_uInt16 i = 0; i < (BMP_PLACEHOLDER_SMALL_END-BMP_PLACEHOLDER_SMALL_START); i++ ) + { + gSmallButtonImages[i].set( new BitmapEx( loadImageResource( BMP_PLACEHOLDER_SMALL_START + i ) ) ); + gLargeButtonImages[i].set( new BitmapEx( loadImageResource( BMP_PLACEHOLDER_LARGE_START + i ) ) ); + } + } + + if( large ) + { + return gLargeButtonImages[index].get(); + } + else + { + return gSmallButtonImages[index].get(); + } +} + +// -------------------------------------------------------------------- + const sal_uInt32 SMART_TAG_HDL_NUM = SAL_MAX_UINT32; class ChangePlaceholderTag : public SmartTag @@ -374,20 +398,20 @@ BitmapEx ChangePlaceholderTag::createOverlayImage( int nHighlight ) Size aShapeSizePix = pDev->LogicToPixel(rSnapRect.GetSize()); long nShapeSizePix = std::min(aShapeSizePix.Width(),aShapeSizePix.Height()); - BitmapEx* pImages = (nShapeSizePix > 250) ? &ViewOverlayManager::maLargeButtonImages[0] : &ViewOverlayManager::maSmallButtonImages[0]; + bool bLarge = nShapeSizePix > 250; - Size aSize( pImages->GetSizePixel() ); + Size aSize( getButtonImage( 0, bLarge )->GetSizePixel() ); aRet.SetSizePixel( Size( aSize.Width() << 1, aSize.Height() << 1 ) ); const Rectangle aRectSrc( Point( 0, 0 ), aSize ); - aRet = pImages[(nHighlight == 0) ? 4 : 0]; + aRet = *(getButtonImage((nHighlight == 0) ? 4 : 0, bLarge)); aRet.Expand( aSize.Width(), aSize.Height(), NULL, TRUE ); - aRet.CopyPixel( Rectangle( Point( aSize.Width(), 0 ), aSize ), aRectSrc, &pImages[(nHighlight == 1) ? 5 : 1] ); - aRet.CopyPixel( Rectangle( Point( 0, aSize.Height() ), aSize ), aRectSrc, &pImages[(nHighlight == 2) ? 6 : 2] ); - aRet.CopyPixel( Rectangle( Point( aSize.Width(), aSize.Height() ), aSize ), aRectSrc, &pImages[(nHighlight == 3) ? 7 : 3] ); + aRet.CopyPixel( Rectangle( Point( aSize.Width(), 0 ), aSize ), aRectSrc, getButtonImage((nHighlight == 1) ? 5 : 1, bLarge) ); + aRet.CopyPixel( Rectangle( Point( 0, aSize.Height() ), aSize ), aRectSrc, getButtonImage((nHighlight == 2) ? 6 : 2, bLarge) ); + aRet.CopyPixel( Rectangle( Point( aSize.Width(), aSize.Height() ), aSize ), aRectSrc, getButtonImage((nHighlight == 3) ? 7 : 3, bLarge) ); } return aRet; @@ -411,9 +435,9 @@ void ChangePlaceholderTag::addCustomHandles( SdrHdlList& rHandlerList ) if( 50 > nShapeSizePix ) return; - BitmapEx* pImages = (nShapeSizePix > 250) ? &ViewOverlayManager::maLargeButtonImages[0] : &ViewOverlayManager::maSmallButtonImages[0]; + bool bLarge = nShapeSizePix > 250; - Size aButtonSize( pDev->PixelToLogic(pImages[0].GetSizePixel()) ); + Size aButtonSize( pDev->PixelToLogic( getButtonImage(0, bLarge )->GetSizePixel()) ); const int nColumns = 2; const int nRows = 2; @@ -490,17 +514,6 @@ ViewOverlayManager::~ViewOverlayManager() // -------------------------------------------------------------------- -void ViewOverlayManager::UpdateImages() -{ - for( sal_uInt16 i = 0; i < (BMP_PLACEHOLDER_SMALL_END-BMP_PLACEHOLDER_SMALL_START); i++ ) - { - maSmallButtonImages[i] = loadImageResource( BMP_PLACEHOLDER_SMALL_START + i ); - maLargeButtonImages[i] = loadImageResource( BMP_PLACEHOLDER_LARGE_START + i ); - } -} - -// -------------------------------------------------------------------- - void ViewOverlayManager::Notify(SfxBroadcaster&, const SfxHint& rHint) { const SfxSimpleHint* pSimpleHint = dynamic_cast(&rHint); @@ -548,9 +561,6 @@ bool ViewOverlayManager::CreateTags() if( pPage ) { - if( !maSmallButtonImages[0] ) - UpdateImages(); - const std::list< SdrObject* >& rShapes = pPage->GetPresentationShapeList().getList(); for( std::list< SdrObject* >::const_iterator iter( rShapes.begin() ); iter != rShapes.end(); iter++ ) -- cgit