Modified: openoffice/trunk/main/sdext/source/presenter/PresenterScreen.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sdext/source/presenter/PresenterScreen.cxx?rev=1468300&r1=1468299&r2=1468300&view=diff ============================================================================== --- openoffice/trunk/main/sdext/source/presenter/PresenterScreen.cxx (original) +++ openoffice/trunk/main/sdext/source/presenter/PresenterScreen.cxx Tue Apr 16 03:57:41 2013 @@ -541,7 +541,7 @@ sal_Int32 PresenterScreen::GetScreenNumb // is set. PresenterConfigurationAccess aConfiguration ( xContext, - OUString::createFromAscii("/org.openoffice.Office.extension.PresenterScreen/"), + OUString::createFromAscii("/org.openoffice.Office.PresenterScreen/"), PresenterConfigurationAccess::READ_ONLY); bool bStartAlways (false); if (aConfiguration.GetConfigurationNode( @@ -704,7 +704,7 @@ void PresenterScreen::SetupConfiguration { PresenterConfigurationAccess aConfiguration ( rxContext, - OUString::createFromAscii("org.openoffice.Office.extension.PresenterScreen"), + OUString::createFromAscii("org.openoffice.Office.PresenterScreen"), PresenterConfigurationAccess::READ_ONLY); maViewDescriptors.clear(); ProcessViewDescriptions(aConfiguration);
Added: openoffice/trunk/main/sdext/source/presenter/PresenterScreen.hrc URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sdext/source/presenter/PresenterScreen.hrc?rev=1468300&view=auto ============================================================================== --- openoffice/trunk/main/sdext/source/presenter/PresenterScreen.hrc (added) +++ openoffice/trunk/main/sdext/source/presenter/PresenterScreen.hrc Tue Apr 16 03:57:41 2013 @@ -0,0 +1,113 @@ +/************************************************************** + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + *************************************************************/ + +#define SDEXT_PRESENTER_RES_START 255 + +#define BACKGROUND SDEXT_PRESENTER_RES_START + 1 +#define BORDERACTIVEBOTTOM SDEXT_PRESENTER_RES_START + 2 +#define BORDERACTIVEBOTTOMCALLOUT SDEXT_PRESENTER_RES_START + 3 +#define BORDERACTIVEBOTTOMLEFT SDEXT_PRESENTER_RES_START + 4 +#define BORDERACTIVEBOTTOMRIGHT SDEXT_PRESENTER_RES_START + 5 +#define BORDERACTIVELEFT SDEXT_PRESENTER_RES_START + 6 +#define BORDERACTIVERIGHT SDEXT_PRESENTER_RES_START + 7 +#define BORDERACTIVETOP SDEXT_PRESENTER_RES_START + 8 +#define BORDERACTIVETOPLEFT SDEXT_PRESENTER_RES_START + 9 +#define BORDERACTIVETOPRIGHT SDEXT_PRESENTER_RES_START + 10 +#define BORDERBOTTOM SDEXT_PRESENTER_RES_START + 11 +#define BORDERBOTTOMLEFT SDEXT_PRESENTER_RES_START + 12 +#define BORDERBOTTOMRIGHT SDEXT_PRESENTER_RES_START + 13 +#define BORDERCURRENTSLIDEBOTTOM SDEXT_PRESENTER_RES_START + 14 +#define BORDERCURRENTSLIDEBOTTOMLEFT SDEXT_PRESENTER_RES_START + 15 +#define BORDERCURRENTSLIDEBOTTOMRIGHT SDEXT_PRESENTER_RES_START + 16 +#define BORDERCURRENTSLIDELEFT SDEXT_PRESENTER_RES_START + 17 +#define BORDERCURRENTSLIDERIGHT SDEXT_PRESENTER_RES_START + 18 +#define BORDERCURRENTSLIDETOP SDEXT_PRESENTER_RES_START + 19 +#define BORDERCURRENTSLIDETOPLEFT SDEXT_PRESENTER_RES_START + 20 +#define BORDERCURRENTSLIDETOPRIGHT SDEXT_PRESENTER_RES_START + 21 +#define BORDERLEFT SDEXT_PRESENTER_RES_START + 22 +#define BORDERRIGHT SDEXT_PRESENTER_RES_START + 23 +#define BORDERTOOLBARBOTTOM SDEXT_PRESENTER_RES_START + 24 +#define BORDERTOOLBARLEFT SDEXT_PRESENTER_RES_START + 25 +#define BORDERTOOLBARRIGHT SDEXT_PRESENTER_RES_START + 26 +#define BORDERTOOLBARTOP SDEXT_PRESENTER_RES_START + 27 +#define BORDERTOOLBARTOPLEFT SDEXT_PRESENTER_RES_START + 28 +#define BORDERTOOLBARTOPRIGHT SDEXT_PRESENTER_RES_START + 29 +#define BORDERTOP SDEXT_PRESENTER_RES_START + 30 +#define BORDERTOPLEFT SDEXT_PRESENTER_RES_START + 31 +#define BORDERTOPRIGHT SDEXT_PRESENTER_RES_START + 32 +#define BUTTONEFFECTNEXTDISABLED SDEXT_PRESENTER_RES_START + 33 +#define BUTTONEFFECTNEXTMOUSEOVER SDEXT_PRESENTER_RES_START + 34 +#define BUTTONEFFECTNEXTNORMAL SDEXT_PRESENTER_RES_START + 35 +#define BUTTONEFFECTNEXTSELECTED SDEXT_PRESENTER_RES_START + 36 +#define BUTTONFRAMECENTERMOUSEOVER SDEXT_PRESENTER_RES_START + 37 +#define BUTTONFRAMECENTERNORMAL SDEXT_PRESENTER_RES_START + 38 +#define BUTTONFRAMELEFTMOUSEOVER SDEXT_PRESENTER_RES_START + 39 +#define BUTTONFRAMELEFTNORMAL SDEXT_PRESENTER_RES_START + 40 +#define BUTTONFRAMERIGHTMOUSEOVER SDEXT_PRESENTER_RES_START + 41 +#define BUTTONFRAMERIGHTNORMAL SDEXT_PRESENTER_RES_START + 42 +#define BUTTONHELPDISABLED SDEXT_PRESENTER_RES_START + 43 +#define BUTTONHELPMOUSEOVER SDEXT_PRESENTER_RES_START + 44 +#define BUTTONHELPNORMAL SDEXT_PRESENTER_RES_START + 45 +#define BUTTONHELPSELECTED SDEXT_PRESENTER_RES_START + 46 +#define BUTTONMINUSDISABLED SDEXT_PRESENTER_RES_START + 47 +#define BUTTONMINUSMOUSEOVER SDEXT_PRESENTER_RES_START + 48 +#define BUTTONMINUSNORMAL SDEXT_PRESENTER_RES_START + 49 +#define BUTTONMINUSSELECTED SDEXT_PRESENTER_RES_START + 50 +#define BUTTONNOTESDISABLED SDEXT_PRESENTER_RES_START + 51 +#define BUTTONNOTESMOUSEOVER SDEXT_PRESENTER_RES_START + 52 +#define BUTTONNOTESNORMAL SDEXT_PRESENTER_RES_START + 53 +#define BUTTONNOTESSELECTED SDEXT_PRESENTER_RES_START + 54 +#define BUTTONPLUSDISABLED SDEXT_PRESENTER_RES_START + 55 +#define BUTTONPLUSMOUSEOVER SDEXT_PRESENTER_RES_START + 56 +#define BUTTONPLUSNORMAL SDEXT_PRESENTER_RES_START + 57 +#define BUTTONPLUSSELECTED SDEXT_PRESENTER_RES_START + 58 +#define BUTTONSLIDENEXTDISABLED SDEXT_PRESENTER_RES_START + 59 +#define BUTTONSLIDENEXTMOUSEOVER SDEXT_PRESENTER_RES_START + 60 +#define BUTTONSLIDENEXTNORMAL SDEXT_PRESENTER_RES_START + 61 +#define BUTTONSLIDEPREVIOUSDISABLED SDEXT_PRESENTER_RES_START + 62 +#define BUTTONSLIDEPREVIOUSMOUSEOVER SDEXT_PRESENTER_RES_START + 63 +#define BUTTONSLIDEPREVIOUSNORMAL SDEXT_PRESENTER_RES_START + 64 +#define BUTTONSLIDEPREVIOUSSELECTED SDEXT_PRESENTER_RES_START + 65 +#define BUTTONSLIDESORTERDISABLED SDEXT_PRESENTER_RES_START + 66 +#define BUTTONSLIDESORTERMOUSEOVER SDEXT_PRESENTER_RES_START + 67 +#define BUTTONSLIDESORTERNORMAL SDEXT_PRESENTER_RES_START + 68 +#define BUTTONSLIDESORTERSELECTED SDEXT_PRESENTER_RES_START + 69 +#define LABELMOUSEOVERCENTER SDEXT_PRESENTER_RES_START + 70 +#define LABELMOUSEOVERLEFT SDEXT_PRESENTER_RES_START + 71 +#define LABELMOUSEOVERRIGHT SDEXT_PRESENTER_RES_START + 72 +#define SCROLLBARARROWDOWNDISABLED SDEXT_PRESENTER_RES_START + 73 +#define SCROLLBARARROWDOWNMOUSEOVER SDEXT_PRESENTER_RES_START + 74 +#define SCROLLBARARROWDOWNNORMAL SDEXT_PRESENTER_RES_START + 75 +#define SCROLLBARARROWDOWNSELECTED SDEXT_PRESENTER_RES_START + 76 +#define SCROLLBARARROWUPDISABLED SDEXT_PRESENTER_RES_START + 77 +#define SCROLLBARARROWUPMOUSEOVER SDEXT_PRESENTER_RES_START + 78 +#define SCROLLBARARROWUPNORMAL SDEXT_PRESENTER_RES_START + 79 +#define SCROLLBARARROWUPSELECTED SDEXT_PRESENTER_RES_START + 80 +#define SCROLLBARPAGERMIDDLEMOUSEOVER SDEXT_PRESENTER_RES_START + 81 +#define SCROLLBARPAGERMIDDLENORMAL SDEXT_PRESENTER_RES_START + 82 +#define SCROLLBARTHUMBBOTTOMMOUSEOVER SDEXT_PRESENTER_RES_START + 83 +#define SCROLLBARTHUMBBOTTOMNORMAL SDEXT_PRESENTER_RES_START + 84 +#define SCROLLBARTHUMBMIDDLEMOUSEOVER SDEXT_PRESENTER_RES_START + 85 +#define SCROLLBARTHUMBMIDDLENORMAL SDEXT_PRESENTER_RES_START + 86 +#define SCROLLBARTHUMBTOPMOUSEOVER SDEXT_PRESENTER_RES_START + 87 +#define SCROLLBARTHUMBTOPNORMAL SDEXT_PRESENTER_RES_START + 88 +#define VIEWBACKGROUND SDEXT_PRESENTER_RES_START + 89 + Added: openoffice/trunk/main/sdext/source/presenter/PresenterScreen.src URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sdext/source/presenter/PresenterScreen.src?rev=1468300&view=auto ============================================================================== --- openoffice/trunk/main/sdext/source/presenter/PresenterScreen.src (added) +++ openoffice/trunk/main/sdext/source/presenter/PresenterScreen.src Tue Apr 16 03:57:41 2013 @@ -0,0 +1,113 @@ +/************************************************************** + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + *************************************************************/ + +#include "PresenterScreen.hrc" + +Bitmap BACKGROUND{ File = "presenter/Background.png"; }; +Bitmap BORDERACTIVEBOTTOM{ File = "presenter/BorderActiveBottom.png"; }; +Bitmap BORDERACTIVEBOTTOMCALLOUT{ File = "presenter/BorderActiveBottomCallout.png"; }; +Bitmap BORDERACTIVEBOTTOMLEFT{ File = "presenter/BorderActiveBottomLeft.png"; }; +Bitmap BORDERACTIVEBOTTOMRIGHT{ File = "presenter/BorderActiveBottomRight.png"; }; +Bitmap BORDERACTIVELEFT{ File = "presenter/BorderActiveLeft.png"; }; +Bitmap BORDERACTIVERIGHT{ File = "presenter/BorderActiveRight.png"; }; +Bitmap BORDERACTIVETOP{ File = "presenter/BorderActiveTop.png"; }; +Bitmap BORDERACTIVETOPLEFT{ File = "presenter/BorderActiveTopLeft.png"; }; +Bitmap BORDERACTIVETOPRIGHT{ File = "presenter/BorderActiveTopRight.png"; }; +Bitmap BORDERBOTTOM{ File = "presenter/BorderBottom.png"; }; +Bitmap BORDERBOTTOMLEFT{ File = "presenter/BorderBottomLeft.png"; }; +Bitmap BORDERBOTTOMRIGHT{ File = "presenter/BorderBottomRight.png"; }; +Bitmap BORDERCURRENTSLIDEBOTTOM{ File = "presenter/BorderCurrentSlideBottom.png"; }; +Bitmap BORDERCURRENTSLIDEBOTTOMLEFT{ File = "presenter/BorderCurrentSlideBottomLeft.png"; }; +Bitmap BORDERCURRENTSLIDEBOTTOMRIGHT{ File = "presenter/BorderCurrentSlideBottomRight.png"; }; +Bitmap BORDERCURRENTSLIDELEFT{ File = "presenter/BorderCurrentSlideLeft.png"; }; +Bitmap BORDERCURRENTSLIDERIGHT{ File = "presenter/BorderCurrentSlideRight.png"; }; +Bitmap BORDERCURRENTSLIDETOP{ File = "presenter/BorderCurrentSlideTop.png"; }; +Bitmap BORDERCURRENTSLIDETOPLEFT{ File = "presenter/BorderCurrentSlideTopLeft.png"; }; +Bitmap BORDERCURRENTSLIDETOPRIGHT{ File = "presenter/BorderCurrentSlideTopRight.png"; }; +Bitmap BORDERLEFT{ File = "presenter/BorderLeft.png"; }; +Bitmap BORDERRIGHT{ File = "presenter/BorderRight.png"; }; +Bitmap BORDERTOOLBARBOTTOM{ File = "presenter/BorderToolbarBottom.png"; }; +Bitmap BORDERTOOLBARLEFT{ File = "presenter/BorderToolbarLeft.png"; }; +Bitmap BORDERTOOLBARRIGHT{ File = "presenter/BorderToolbarRight.png"; }; +Bitmap BORDERTOOLBARTOP{ File = "presenter/BorderToolbarTop.png"; }; +Bitmap BORDERTOOLBARTOPLEFT{ File = "presenter/BorderToolbarTopLeft.png"; }; +Bitmap BORDERTOOLBARTOPRIGHT{ File = "presenter/BorderToolbarTopRight.png"; }; +Bitmap BORDERTOP{ File = "presenter/BorderTop.png"; }; +Bitmap BORDERTOPLEFT{ File = "presenter/BorderTopLeft.png"; }; +Bitmap BORDERTOPRIGHT{ File = "presenter/BorderTopRight.png"; }; +Bitmap BUTTONEFFECTNEXTDISABLED{ File = "presenter/ButtonEffectNextDisabled.png"; }; +Bitmap BUTTONEFFECTNEXTMOUSEOVER{ File = "presenter/ButtonEffectNextMouseOver.png"; }; +Bitmap BUTTONEFFECTNEXTNORMAL{ File = "presenter/ButtonEffectNextNormal.png"; }; +Bitmap BUTTONEFFECTNEXTSELECTED{ File = "presenter/ButtonEffectNextSelected.png"; }; +Bitmap BUTTONFRAMECENTERMOUSEOVER{ File = "presenter/ButtonFrameCenterMouseOver.png"; }; +Bitmap BUTTONFRAMECENTERNORMAL{ File = "presenter/ButtonFrameCenterNormal.png"; }; +Bitmap BUTTONFRAMELEFTMOUSEOVER{ File = "presenter/ButtonFrameLeftMouseOver.png"; }; +Bitmap BUTTONFRAMELEFTNORMAL{ File = "presenter/ButtonFrameLeftNormal.png"; }; +Bitmap BUTTONFRAMERIGHTMOUSEOVER{ File = "presenter/ButtonFrameRightMouseOver.png"; }; +Bitmap BUTTONFRAMERIGHTNORMAL{ File = "presenter/ButtonFrameRightNormal.png"; }; +Bitmap BUTTONHELPDISABLED{ File = "presenter/ButtonHelpDisabled.png"; }; +Bitmap BUTTONHELPMOUSEOVER{ File = "presenter/ButtonHelpMouseOver.png"; }; +Bitmap BUTTONHELPNORMAL{ File = "presenter/ButtonHelpNormal.png"; }; +Bitmap BUTTONHELPSELECTED{ File = "presenter/ButtonHelpSelected.png"; }; +Bitmap BUTTONMINUSDISABLED{ File = "presenter/ButtonMinusDisabled.png"; }; +Bitmap BUTTONMINUSMOUSEOVER{ File = "presenter/ButtonMinusMouseOver.png"; }; +Bitmap BUTTONMINUSNORMAL{ File = "presenter/ButtonMinusNormal.png"; }; +Bitmap BUTTONMINUSSELECTED{ File = "presenter/ButtonMinusSelected.png"; }; +Bitmap BUTTONNOTESDISABLED{ File = "presenter/ButtonNotesDisabled.png"; }; +Bitmap BUTTONNOTESMOUSEOVER{ File = "presenter/ButtonNotesMouseOver.png"; }; +Bitmap BUTTONNOTESNORMAL{ File = "presenter/ButtonNotesNormal.png"; }; +Bitmap BUTTONNOTESSELECTED{ File = "presenter/ButtonNotesSelected.png"; }; +Bitmap BUTTONPLUSDISABLED{ File = "presenter/ButtonPlusDisabled.png"; }; +Bitmap BUTTONPLUSMOUSEOVER{ File = "presenter/ButtonPlusMouseOver.png"; }; +Bitmap BUTTONPLUSNORMAL{ File = "presenter/ButtonPlusNormal.png"; }; +Bitmap BUTTONPLUSSELECTED{ File = "presenter/ButtonPlusSelected.png"; }; +Bitmap BUTTONSLIDENEXTDISABLED{ File = "presenter/ButtonSlideNextDisabled.png"; }; +Bitmap BUTTONSLIDENEXTMOUSEOVER{ File = "presenter/ButtonSlideNextMouseOver.png"; }; +Bitmap BUTTONSLIDENEXTNORMAL{ File = "presenter/ButtonSlideNextNormal.png"; }; +Bitmap BUTTONSLIDEPREVIOUSDISABLED{ File = "presenter/ButtonSlidePreviousDisabled.png"; }; +Bitmap BUTTONSLIDEPREVIOUSMOUSEOVER{ File = "presenter/ButtonSlidePreviousMouseOver.png"; }; +Bitmap BUTTONSLIDEPREVIOUSNORMAL{ File = "presenter/ButtonSlidePreviousNormal.png"; }; +Bitmap BUTTONSLIDEPREVIOUSSELECTED{ File = "presenter/ButtonSlidePreviousSelected.png"; }; +Bitmap BUTTONSLIDESORTERDISABLED{ File = "presenter/ButtonSlideSorterDisabled.png"; }; +Bitmap BUTTONSLIDESORTERMOUSEOVER{ File = "presenter/ButtonSlideSorterMouseOver.png"; }; +Bitmap BUTTONSLIDESORTERNORMAL{ File = "presenter/ButtonSlideSorterNormal.png"; }; +Bitmap BUTTONSLIDESORTERSELECTED{ File = "presenter/ButtonSlideSorterSelected.png"; }; +Bitmap LABELMOUSEOVERCENTER{ File = "presenter/LabelMouseOverCenter.png"; }; +Bitmap LABELMOUSEOVERLEFT{ File = "presenter/LabelMouseOverLeft.png"; }; +Bitmap LABELMOUSEOVERRIGHT{ File = "presenter/LabelMouseOverRight.png"; }; +Bitmap SCROLLBARARROWDOWNDISABLED{ File = "presenter/ScrollbarArrowDownDisabled.png"; }; +Bitmap SCROLLBARARROWDOWNMOUSEOVER{ File = "presenter/ScrollbarArrowDownMouseOver.png"; }; +Bitmap SCROLLBARARROWDOWNNORMAL{ File = "presenter/ScrollbarArrowDownNormal.png"; }; +Bitmap SCROLLBARARROWDOWNSELECTED{ File = "presenter/ScrollbarArrowDownSelected.png"; }; +Bitmap SCROLLBARARROWUPDISABLED{ File = "presenter/ScrollbarArrowUpDisabled.png"; }; +Bitmap SCROLLBARARROWUPMOUSEOVER{ File = "presenter/ScrollbarArrowUpMouseOver.png"; }; +Bitmap SCROLLBARARROWUPNORMAL{ File = "presenter/ScrollbarArrowUpNormal.png"; }; +Bitmap SCROLLBARARROWUPSELECTED{ File = "presenter/ScrollbarArrowUpSelected.png"; }; +Bitmap SCROLLBARPAGERMIDDLEMOUSEOVER{ File = "presenter/ScrollbarPagerMiddleMouseOver.png"; }; +Bitmap SCROLLBARPAGERMIDDLENORMAL{ File = "presenter/ScrollbarPagerMiddleNormal.png"; }; +Bitmap SCROLLBARTHUMBBOTTOMMOUSEOVER{ File = "presenter/ScrollbarThumbBottomMouseOver.png"; }; +Bitmap SCROLLBARTHUMBBOTTOMNORMAL{ File = "presenter/ScrollbarThumbBottomNormal.png"; }; +Bitmap SCROLLBARTHUMBMIDDLEMOUSEOVER{ File = "presenter/ScrollbarThumbMiddleMouseOver.png"; }; +Bitmap SCROLLBARTHUMBMIDDLENORMAL{ File = "presenter/ScrollbarThumbMiddleNormal.png"; }; +Bitmap SCROLLBARTHUMBTOPMOUSEOVER{ File = "presenter/ScrollbarThumbTopMouseOver.png"; }; +Bitmap SCROLLBARTHUMBTOPNORMAL{ File = "presenter/ScrollbarThumbTopNormal.png"; }; +Bitmap VIEWBACKGROUND{ File = "presenter/ViewBackground.png"; }; + Modified: openoffice/trunk/main/sdext/source/presenter/PresenterScrollBar.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sdext/source/presenter/PresenterScrollBar.cxx?rev=1468300&r1=1468299&r2=1468300&view=diff ============================================================================== --- openoffice/trunk/main/sdext/source/presenter/PresenterScrollBar.cxx (original) +++ openoffice/trunk/main/sdext/source/presenter/PresenterScrollBar.cxx Tue Apr 16 03:57:41 2013 @@ -27,7 +27,6 @@ #include "PresenterScrollBar.hxx" #include "PresenterBitmapContainer.hxx" #include "PresenterCanvasHelper.hxx" -#include "PresenterComponent.hxx" #include "PresenterGeometryHelper.hxx" #include "PresenterPaintManager.hxx" #include "PresenterTimer.hxx" @@ -329,8 +328,7 @@ void PresenterScrollBar::SetCanvas (cons OUString::createFromAscii("PresenterScreenSettings/ScrollBar/Bitmaps"), ::boost::shared_ptr<PresenterBitmapContainer>(), mxComponentContext, - mxCanvas, - PresenterComponent::GetBasePath(mxComponentContext))); + mxCanvas)); mpSharedBitmaps = mpBitmaps; } catch(Exception&) Modified: openoffice/trunk/main/sdext/source/presenter/PresenterSlideSorter.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sdext/source/presenter/PresenterSlideSorter.cxx?rev=1468300&r1=1468299&r2=1468300&view=diff ============================================================================== --- openoffice/trunk/main/sdext/source/presenter/PresenterSlideSorter.cxx (original) +++ openoffice/trunk/main/sdext/source/presenter/PresenterSlideSorter.cxx Tue Apr 16 03:57:41 2013 @@ -27,7 +27,6 @@ #include "PresenterSlideSorter.hxx" #include "PresenterButton.hxx" #include "PresenterCanvasHelper.hxx" -#include "PresenterComponent.hxx" #include "PresenterGeometryHelper.hxx" #include "PresenterHelper.hxx" #include "PresenterPaintManager.hxx" @@ -2061,7 +2060,7 @@ PresenterSlideSorter::CurrentSlideFrameR { PresenterConfigurationAccess aConfiguration ( rxContext, - OUString::createFromAscii("/org.openoffice.Office.extension.PresenterScreen/"), + OUString::createFromAscii("/org.openoffice.Office.PresenterScreen/"), PresenterConfigurationAccess::READ_ONLY); Reference<container::XHierarchicalNameAccess> xBitmaps ( aConfiguration.GetConfigurationNode( @@ -2074,8 +2073,7 @@ PresenterSlideSorter::CurrentSlideFrameR A2S("PresenterScreenSettings/SlideSorter/CurrentSlideBorderBitmaps"), ::boost::shared_ptr<PresenterBitmapContainer>(), rxContext, - rxCanvas, - PresenterComponent::GetBasePath(rxContext)); + rxCanvas); mpTopLeft = aContainer.GetBitmap(A2S("TopLeft")); mpTop = aContainer.GetBitmap(A2S("Top")); Modified: openoffice/trunk/main/sdext/source/presenter/PresenterTheme.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sdext/source/presenter/PresenterTheme.cxx?rev=1468300&r1=1468299&r2=1468300&view=diff ============================================================================== --- openoffice/trunk/main/sdext/source/presenter/PresenterTheme.cxx (original) +++ openoffice/trunk/main/sdext/source/presenter/PresenterTheme.cxx Tue Apr 16 03:57:41 2013 @@ -27,7 +27,6 @@ #include "PresenterTheme.hxx" #include "PresenterBitmapContainer.hxx" #include "PresenterCanvasHelper.hxx" -#include "PresenterComponent.hxx" #include "PresenterConfigurationAccess.hxx" #include "PresenterHelper.hxx" #include <com/sun/star/awt/Point.hpp> @@ -102,7 +101,6 @@ public: Reference<XComponentContext> mxComponentContext; Reference<rendering::XCanvas> mxCanvas; Reference<drawing::XPresenterHelper> mxPresenterHelper; - OUString msBasePath; ReadContext ( const Reference<XComponentContext>& rxContext, @@ -128,8 +126,6 @@ public: BorderSize ReadBorderSize (const Reference<container::XNameAccess>& rxNode); - void SetBitmapSourceExtension (const OUString& rsExtensionName); - private: Any GetByName ( const Reference<container::XNameAccess>& rxNode, @@ -336,7 +332,7 @@ void SAL_CALL PresenterTheme::disposing PresenterConfigurationAccess aConfiguration ( mxContext, - OUString::createFromAscii("/org.openoffice.Office.extension.PresenterScreen/"), + OUString::createFromAscii("/org.openoffice.Office.PresenterScreen/"), PresenterConfigurationAccess::READ_ONLY); return aReadContext.ReadTheme(aConfiguration, msThemeName); @@ -446,7 +442,7 @@ bool PresenterTheme::ConvertToColor ( ::boost::shared_ptr<PresenterConfigurationAccess> pConfiguration ( new PresenterConfigurationAccess( mxContext, - OUString::createFromAscii("/org.openoffice.Office.extension.PresenterScreen/"), + OUString::createFromAscii("/org.openoffice.Office.PresenterScreen/"), PresenterConfigurationAccess::READ_WRITE)); // Get configuration node for the view style container of the current @@ -749,26 +745,11 @@ void PresenterTheme::Theme::Read ( mpParentTheme = rReadContext.ReadTheme(rConfiguration, sParentThemeName); } - // Read the extension that contains the bitmaps referenced in this - // theme. - OUString sBitmapSourceExtension; - if ((PresenterConfigurationAccess::GetConfigurationNode( - mxThemeRoot, A2S("BitmapSourceExtension")) >>= sBitmapSourceExtension) - && sBitmapSourceExtension.getLength()>0) - { - rReadContext.SetBitmapSourceExtension(sBitmapSourceExtension); - } - else - { - rReadContext.SetBitmapSourceExtension(PresenterComponent::gsExtensionIdentifier); - } - // Background. mpBackground = PresenterBitmapContainer::LoadBitmap( mxThemeRoot, A2S("Background"), rReadContext.mxPresenterHelper, - rReadContext.msBasePath, rReadContext.mxCanvas, SharedBitmapDescriptor()); @@ -791,8 +772,7 @@ void PresenterTheme::Theme::Read ( ? mpParentTheme->mpIconContainer : ::boost::shared_ptr<PresenterBitmapContainer>(), rReadContext.mxComponentContext, - rReadContext.mxCanvas, - rReadContext.msBasePath)); + rReadContext.mxCanvas)); // Read fonts. Reference<container::XNameAccess> xFontNode( @@ -856,8 +836,7 @@ ReadContext::ReadContext ( const Reference<rendering::XCanvas>& rxCanvas) : mxComponentContext(rxContext), mxCanvas(rxCanvas), - mxPresenterHelper(), - msBasePath() + mxPresenterHelper() { Reference<lang::XMultiComponentFactory> xFactory (rxContext->getServiceManager()); if (xFactory.is()) @@ -868,9 +847,6 @@ ReadContext::ReadContext ( rxContext), UNO_QUERY_THROW); } - - // Get base path to bitmaps. - SetBitmapSourceExtension(PresenterComponent::gsExtensionIdentifier); } @@ -1021,17 +997,6 @@ BorderSize ReadContext::ReadBorderSize ( } - - -void ReadContext::SetBitmapSourceExtension (const OUString& rsExtensionIdentifier) -{ - // Get base path to bitmaps. - msBasePath = PresenterComponent::GetBasePath(mxComponentContext, rsExtensionIdentifier); -} - - - - //===== PaneStyleContainer ==================================================== void PaneStyleContainer::Read ( @@ -1116,7 +1081,6 @@ void PaneStyleContainer::ProcessPaneStyl : ::boost::shared_ptr<PresenterBitmapContainer>(), rReadContext.mxComponentContext, rReadContext.mxCanvas, - rReadContext.msBasePath, rReadContext.mxPresenterHelper)); } @@ -1275,7 +1239,6 @@ void ViewStyleContainer::ProcessViewStyl xBackgroundNode, OUString(), rReadContext.mxPresenterHelper, - rReadContext.msBasePath, rReadContext.mxCanvas, SharedBitmapDescriptor())); if (pBackground.get() != NULL && pBackground->GetNormalBitmap().is()) Modified: openoffice/trunk/main/sdext/source/presenter/PresenterToolBar.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sdext/source/presenter/PresenterToolBar.cxx?rev=1468300&r1=1468299&r2=1468300&view=diff ============================================================================== --- openoffice/trunk/main/sdext/source/presenter/PresenterToolBar.cxx (original) +++ openoffice/trunk/main/sdext/source/presenter/PresenterToolBar.cxx Tue Apr 16 03:57:41 2013 @@ -28,7 +28,6 @@ #include "PresenterBitmapContainer.hxx" #include "PresenterCanvasHelper.hxx" -#include "PresenterComponent.hxx" #include "PresenterGeometryHelper.hxx" #include "PresenterPaintManager.hxx" #include "PresenterPaneBase.hxx" @@ -127,7 +126,6 @@ class PresenterToolBar::Context : private ::boost::noncopyable { public: - ::rtl::OUString msBasePath; Reference<drawing::XPresenterHelper> mxPresenterHelper; css::uno::Reference<css::rendering::XCanvas> mxCanvas; }; @@ -773,11 +771,9 @@ void PresenterToolBar::CreateControls ( // Expand the macro in the bitmap file names. PresenterConfigurationAccess aConfiguration ( mxComponentContext, - OUString::createFromAscii("/org.openoffice.Office.extension.PresenterScreen/"), + OUString::createFromAscii("/org.openoffice.Office.PresenterScreen/"), PresenterConfigurationAccess::READ_ONLY); - const OUString sBasePath (PresenterComponent::GetBasePath(mxComponentContext)); - mpCurrentContainerPart.reset(new ElementContainerPart()); maElementContainer.clear(); maElementContainer.push_back(mpCurrentContainerPart); @@ -791,7 +787,6 @@ void PresenterToolBar::CreateControls ( PresenterConfigurationAccess::GetConfigurationNode(xToolBarNode, A2S("Entries")), UNO_QUERY); Context aContext; - aContext.msBasePath = sBasePath; aContext.mxPresenterHelper = mpPresenterController->GetPresenterHelper(); aContext.mxCanvas = mxCanvas; if (xEntries.is() @@ -1668,7 +1663,6 @@ void ElementMode::ReadElementMode ( xIconNode, A2S(""), rContext.mxPresenterHelper, - rContext.msBasePath, rContext.mxCanvas, rpDefaultMode.get()!=NULL ? rpDefaultMode->mpIcon : SharedBitmapDescriptor()); } Modified: openoffice/trunk/main/sdext/source/presenter/PresenterWindowManager.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sdext/source/presenter/PresenterWindowManager.cxx?rev=1468300&r1=1468299&r2=1468300&view=diff ============================================================================== --- openoffice/trunk/main/sdext/source/presenter/PresenterWindowManager.cxx (original) +++ openoffice/trunk/main/sdext/source/presenter/PresenterWindowManager.cxx Tue Apr 16 03:57:41 2013 @@ -749,7 +749,7 @@ void PresenterWindowManager::RestoreView sal_Int32 nMode (0); PresenterConfigurationAccess aConfiguration ( mxComponentContext, - OUString::createFromAscii("/org.openoffice.Office.extension.PresenterScreen/"), + OUString::createFromAscii("/org.openoffice.Office.PresenterScreen/"), PresenterConfigurationAccess::READ_ONLY); aConfiguration.GetConfigurationNode(A2S("Presenter/InitialViewMode")) >>= nMode; switch (nMode) @@ -778,7 +778,7 @@ void PresenterWindowManager::StoreViewMo { PresenterConfigurationAccess aConfiguration ( mxComponentContext, - OUString::createFromAscii("/org.openoffice.Office.extension.PresenterScreen/"), + OUString::createFromAscii("/org.openoffice.Office.PresenterScreen/"), PresenterConfigurationAccess::READ_WRITE); aConfiguration.GoToChild(A2S("Presenter")); Any aValue; Copied: openoffice/trunk/main/sdext/source/presenter/ProtocolHandler.xcu (from r1468299, openoffice/trunk/main/sdext/source/presenter/registry/data/org/openoffice/Office/ProtocolHandler.xcu) URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sdext/source/presenter/ProtocolHandler.xcu?p2=openoffice/trunk/main/sdext/source/presenter/ProtocolHandler.xcu&p1=openoffice/trunk/main/sdext/source/presenter/registry/data/org/openoffice/Office/ProtocolHandler.xcu&r1=1468299&r2=1468300&rev=1468300&view=diff ============================================================================== (empty) Added: openoffice/trunk/main/sdext/source/presenter/components.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sdext/source/presenter/components.cxx?rev=1468300&view=auto ============================================================================== --- openoffice/trunk/main/sdext/source/presenter/components.cxx (added) +++ openoffice/trunk/main/sdext/source/presenter/components.cxx Tue Apr 16 03:57:41 2013 @@ -0,0 +1,74 @@ +/************************************************************** + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + *************************************************************/ + +// MARKER(update_precomp.py): autogen include statement, do not remove +#include "precompiled_sdext.hxx" + +#include <cppuhelper/factory.hxx> +#include <cppuhelper/implementationentry.hxx> + +#include "PresenterProtocolHandler.hxx" +#include "PresenterScreen.hxx" + + +namespace sdext { namespace presenter { + + +rtl_StandardModuleCount g_moduleCount = MODULE_COUNT_INIT; + +static struct cppu::ImplementationEntry gServiceEntries[] = +{ + { + PresenterProtocolHandler::Create, + PresenterProtocolHandler::getImplementationName_static, + PresenterProtocolHandler::getSupportedServiceNames_static, + cppu::createSingleComponentFactory, &g_moduleCount.modCnt, 0 + }, + { + PresenterScreenJob::Create, + PresenterScreenJob::getImplementationName_static, + PresenterScreenJob::getSupportedServiceNames_static, + cppu::createSingleComponentFactory, 0, 0 + }, + { 0, 0, 0, 0, 0, 0 } +}; + +extern "C" +{ + SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_canUnload( TimeValue *pTime ) + { + return g_moduleCount.canUnload( &g_moduleCount , pTime ); + } + + SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( + const sal_Char ** ppEnvTypeName, uno_Environment ** ) + { + *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; + } + + SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( + const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) + { + return cppu::component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey , gServiceEntries); + } +} + +} } // end of namespace sdext::presenter Modified: openoffice/trunk/main/sdext/source/presenter/makefile.mk URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sdext/source/presenter/makefile.mk?rev=1468300&r1=1468299&r2=1468300&view=diff ============================================================================== --- openoffice/trunk/main/sdext/source/presenter/makefile.mk (original) +++ openoffice/trunk/main/sdext/source/presenter/makefile.mk Tue Apr 16 03:57:41 2013 @@ -1,5 +1,5 @@ #************************************************************** -# +# # Licensed to the Apache Software Foundation (ASF) under one # or more contributor license agreements. See the NOTICE file # distributed with this work for additional information @@ -7,20 +7,18 @@ # to you under the Apache License, Version 2.0 (the # "License"); you may not use this file except in compliance # with the License. You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, # software distributed under the License is distributed on an # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -# +# #************************************************************** - - PRJ=..$/.. PRJNAME=sdext TARGET=PresenterScreen @@ -28,21 +26,19 @@ GEN_HID=FALSE EXTNAME=PresenterScreen ENABLE_EXCEPTIONS=TRUE -# survive zip dependencies -MAXLINELENGTH:=80000 + +PACKAGE=org.openoffice.Office +ABSXCSROOT=$(SOLARXMLDIR) +XCSROOT=.. +DTDDIR=$(ABSXCSROOT) +XSLDIR=$(ABSXCSROOT)$/processing +PROCESSOUT=$(MISC)$/$(TARGET) +PROCESSORDIR=$(SOLARBINDIR) # --- Settings ---------------------------------- -.INCLUDE : rtlbootstrap.mk .INCLUDE : settings.mk -PACKAGE=com.sun.PresenterScreen-$(PLATFORMID) - -.IF "$(ENABLE_PRESENTER_SCREEN)" == "NO" -@all: - @echo "Presenter Screen build disabled." -.ELSE - .IF "$(L10N_framework)" != "" @all: @@ -52,307 +48,116 @@ PACKAGE=com.sun.PresenterScreen-$(PLATFO .INCLUDE : $(PRJ)$/util$/makefile.pmk - DLLPRE= -common_build_zip= # --- Files ------------------------------------- -SLOFILES= \ - $(SLO)$/PresenterAccessibility.obj \ - $(SLO)$/PresenterAnimation.obj \ - $(SLO)$/PresenterAnimator.obj \ - $(SLO)$/PresenterBitmapContainer.obj \ - $(SLO)$/PresenterButton.obj \ - $(SLO)$/PresenterCanvasHelper.obj \ - $(SLO)$/PresenterConfigurationAccess.obj \ - $(SLO)$/PresenterController.obj \ - $(SLO)$/PresenterCurrentSlideObserver.obj \ - $(SLO)$/PresenterFrameworkObserver.obj \ - $(SLO)$/PresenterGeometryHelper.obj \ - $(SLO)$/PresenterHelper.obj \ - $(SLO)$/PresenterHelpView.obj \ - $(SLO)$/PresenterNotesView.obj \ - $(SLO)$/PresenterPaintManager.obj \ - $(SLO)$/PresenterPane.obj \ - $(SLO)$/PresenterPaneAnimator.obj \ - $(SLO)$/PresenterPaneBase.obj \ - $(SLO)$/PresenterPaneBorderManager.obj \ - $(SLO)$/PresenterPaneBorderPainter.obj \ - $(SLO)$/PresenterPaneContainer.obj \ - $(SLO)$/PresenterPaneFactory.obj \ - $(SLO)$/PresenterProtocolHandler.obj \ - $(SLO)$/PresenterScreen.obj \ - $(SLO)$/PresenterScrollBar.obj \ - $(SLO)$/PresenterSlidePreview.obj \ - $(SLO)$/PresenterSlideShowView.obj \ - $(SLO)$/PresenterSlideSorter.obj \ - $(SLO)$/PresenterSprite.obj \ - $(SLO)$/PresenterSpritePane.obj \ - $(SLO)$/PresenterTextView.obj \ - $(SLO)$/PresenterTheme.obj \ - $(SLO)$/PresenterTimer.obj \ - $(SLO)$/PresenterToolBar.obj \ - $(SLO)$/PresenterUIPainter.obj \ - $(SLO)$/PresenterViewFactory.obj \ - $(SLO)$/PresenterWindowManager.obj \ - $(SLO)$/PresenterComponent.obj +SLOFILES=\ + $(SLO)$/components.obj \ + $(SLO)$/PresenterAccessibility.obj \ + $(SLO)$/PresenterAnimation.obj \ + $(SLO)$/PresenterAnimator.obj \ + $(SLO)$/PresenterBitmapContainer.obj \ + $(SLO)$/PresenterButton.obj \ + $(SLO)$/PresenterCanvasHelper.obj \ + $(SLO)$/PresenterConfigurationAccess.obj \ + $(SLO)$/PresenterController.obj \ + $(SLO)$/PresenterCurrentSlideObserver.obj \ + $(SLO)$/PresenterFrameworkObserver.obj \ + $(SLO)$/PresenterGeometryHelper.obj \ + $(SLO)$/PresenterHelper.obj \ + $(SLO)$/PresenterHelpView.obj \ + $(SLO)$/PresenterNotesView.obj \ + $(SLO)$/PresenterPaintManager.obj \ + $(SLO)$/PresenterPane.obj \ + $(SLO)$/PresenterPaneAnimator.obj \ + $(SLO)$/PresenterPaneBase.obj \ + $(SLO)$/PresenterPaneBorderManager.obj \ + $(SLO)$/PresenterPaneBorderPainter.obj \ + $(SLO)$/PresenterPaneContainer.obj \ + $(SLO)$/PresenterPaneFactory.obj \ + $(SLO)$/PresenterProtocolHandler.obj \ + $(SLO)$/PresenterScreen.obj \ + $(SLO)$/PresenterScrollBar.obj \ + $(SLO)$/PresenterSlidePreview.obj \ + $(SLO)$/PresenterSlideShowView.obj \ + $(SLO)$/PresenterSlideSorter.obj \ + $(SLO)$/PresenterSprite.obj \ + $(SLO)$/PresenterSpritePane.obj \ + $(SLO)$/PresenterTextView.obj \ + $(SLO)$/PresenterTheme.obj \ + $(SLO)$/PresenterTimer.obj \ + $(SLO)$/PresenterToolBar.obj \ + $(SLO)$/PresenterUIPainter.obj \ + $(SLO)$/PresenterViewFactory.obj \ + $(SLO)$/PresenterWindowManager.obj \ # --- Library ----------------------------------- -SHL1TARGET= $(TARGET).uno +SHL1TARGET=$(TARGET).uno -SHL1STDLIBS= $(CPPUHELPERLIB) \ - $(CPPULIB) \ - $(SALLIB) +SHL1STDLIBS= \ + $(CPPUHELPERLIB) \ + $(CPPULIB) \ + $(SALLIB) SHL1DEPN= -SHL1IMPLIB= i$(SHL1TARGET) -SHL1LIBS= $(SLB)$/$(TARGET).lib -SHL1DEF= $(MISC)$/$(SHL1TARGET).def -SHL1VERSIONMAP=$(SOLARENV)/src/reg-component.map +SHL1IMPLIB= i$(SHL1TARGET) +SHL1LIBS= $(SLB)$/$(TARGET).lib +SHL1DEF= $(MISC)$/$(SHL1TARGET).def +SHL1VERSIONMAP=$(SOLARENV)/src/component.map SHL1RPATH= OXT -DEF1NAME= $(SHL1TARGET) +DEF1NAME= $(SHL1TARGET) -ZIP2TARGET= presenter-screen_develop -ZIP2DIR= $(COMMONMISC) -ZIP2EXT= .zip -ZIP2FLAGS=-r -ZIP2LIST= */com.sun.PresenterScreen/*.xhp - -ZIP1TARGET= presenter-screen -ZIP1DIR= $(MISC)$/$(TARGET) -ZIP1EXT= .oxt -ZIP1FLAGS=-r -ZIP1LIST= * - -EXTENSIONDIR=$(ZIP1DIR) - -.INCLUDE : extension_pre.mk - -.IF "$(WITH_LANG)"=="" -FIND_XCU=registry/data -.ELSE # "$(WITH_LANG)"=="" -FIND_XCU=$(MISC)$/$(EXTNAME)_in$/merge -.ENDIF # "$(WITH_LANG)"=="" - -COMPONENT_FILES= \ - $(ZIP1DIR)$/registry$/data$/org$/openoffice$/Office$/Jobs.xcu \ - $(ZIP1DIR)$/registry$/data$/org$/openoffice$/Office$/ProtocolHandler.xcu \ - $(ZIP1DIR)$/registry$/schema/org$/openoffice$/Office$/extension$/PresenterScreen.xcs \ - $(ZIP1DIR)$/registry$/data/$/org$/openoffice$/Office$/extension$/PresenterScreen.xcu - -COMPONENT_BITMAPS= \ - $(ZIP1DIR)$/bitmaps$/BorderTop.png \ - $(ZIP1DIR)$/bitmaps$/BorderTopLeft.png \ - $(ZIP1DIR)$/bitmaps$/BorderTopRight.png \ - $(ZIP1DIR)$/bitmaps$/BorderLeft.png \ - $(ZIP1DIR)$/bitmaps$/BorderRight.png \ - $(ZIP1DIR)$/bitmaps$/BorderBottomLeft.png \ - $(ZIP1DIR)$/bitmaps$/BorderBottomRight.png \ - $(ZIP1DIR)$/bitmaps$/BorderBottom.png \ - \ - $(ZIP1DIR)$/bitmaps$/BorderActiveTop.png \ - $(ZIP1DIR)$/bitmaps$/BorderActiveTopLeft.png \ - $(ZIP1DIR)$/bitmaps$/BorderActiveTopRight.png \ - $(ZIP1DIR)$/bitmaps$/BorderActiveLeft.png \ - $(ZIP1DIR)$/bitmaps$/BorderActiveRight.png \ - $(ZIP1DIR)$/bitmaps$/BorderActiveBottomLeft.png \ - $(ZIP1DIR)$/bitmaps$/BorderActiveBottomRight.png \ - $(ZIP1DIR)$/bitmaps$/BorderActiveBottom.png \ - $(ZIP1DIR)$/bitmaps$/BorderActiveBottomCallout.png \ - \ - $(ZIP1DIR)$/bitmaps$/BorderCurrentSlideTop.png \ - $(ZIP1DIR)$/bitmaps$/BorderCurrentSlideTopLeft.png \ - $(ZIP1DIR)$/bitmaps$/BorderCurrentSlideTopRight.png \ - $(ZIP1DIR)$/bitmaps$/BorderCurrentSlideLeft.png \ - $(ZIP1DIR)$/bitmaps$/BorderCurrentSlideRight.png \ - $(ZIP1DIR)$/bitmaps$/BorderCurrentSlideBottomLeft.png \ - $(ZIP1DIR)$/bitmaps$/BorderCurrentSlideBottomRight.png \ - $(ZIP1DIR)$/bitmaps$/BorderCurrentSlideBottom.png \ - \ - $(ZIP1DIR)$/bitmaps$/BorderToolbarTop.png \ - $(ZIP1DIR)$/bitmaps$/BorderToolbarTopLeft.png \ - $(ZIP1DIR)$/bitmaps$/BorderToolbarTopRight.png \ - $(ZIP1DIR)$/bitmaps$/BorderToolbarLeft.png \ - $(ZIP1DIR)$/bitmaps$/BorderToolbarRight.png \ - $(ZIP1DIR)$/bitmaps$/BorderToolbarBottom.png \ - \ - $(ZIP1DIR)$/bitmaps$/Background.png \ - $(ZIP1DIR)$/bitmaps$/ViewBackground.png \ - \ - $(ZIP1DIR)$/bitmaps$/ButtonSlidePreviousNormal.png \ - $(ZIP1DIR)$/bitmaps$/ButtonSlidePreviousMouseOver.png \ - $(ZIP1DIR)$/bitmaps$/ButtonSlidePreviousSelected.png \ - $(ZIP1DIR)$/bitmaps$/ButtonSlidePreviousDisabled.png \ - $(ZIP1DIR)$/bitmaps$/ButtonEffectNextNormal.png \ - $(ZIP1DIR)$/bitmaps$/ButtonEffectNextMouseOver.png \ - $(ZIP1DIR)$/bitmaps$/ButtonEffectNextSelected.png \ - $(ZIP1DIR)$/bitmaps$/ButtonEffectNextDisabled.png \ - $(ZIP1DIR)$/bitmaps$/ButtonNotesNormal.png \ - $(ZIP1DIR)$/bitmaps$/ButtonNotesMouseOver.png \ - $(ZIP1DIR)$/bitmaps$/ButtonNotesSelected.png \ - $(ZIP1DIR)$/bitmaps$/ButtonNotesDisabled.png \ - $(ZIP1DIR)$/bitmaps$/ButtonSlideSorterNormal.png \ - $(ZIP1DIR)$/bitmaps$/ButtonSlideSorterMouseOver.png \ - $(ZIP1DIR)$/bitmaps$/ButtonSlideSorterSelected.png \ - $(ZIP1DIR)$/bitmaps$/ButtonSlideSorterDisabled.png \ - $(ZIP1DIR)$/bitmaps$/ButtonHelpNormal.png \ - $(ZIP1DIR)$/bitmaps$/ButtonHelpMouseOver.png \ - $(ZIP1DIR)$/bitmaps$/ButtonHelpSelected.png \ - $(ZIP1DIR)$/bitmaps$/ButtonHelpDisabled.png \ - \ - $(ZIP1DIR)$/bitmaps/ScrollbarArrowUpNormal.png \ - $(ZIP1DIR)$/bitmaps/ScrollbarArrowUpMouseOver.png \ - $(ZIP1DIR)$/bitmaps/ScrollbarArrowUpSelected.png \ - $(ZIP1DIR)$/bitmaps/ScrollbarArrowUpDisabled.png \ - $(ZIP1DIR)$/bitmaps/ScrollbarArrowDownNormal.png \ - $(ZIP1DIR)$/bitmaps/ScrollbarArrowDownMouseOver.png \ - $(ZIP1DIR)$/bitmaps/ScrollbarArrowDownSelected.png \ - $(ZIP1DIR)$/bitmaps/ScrollbarArrowDownDisabled.png \ - $(ZIP1DIR)$/bitmaps/ScrollbarPagerMiddleNormal.png \ - $(ZIP1DIR)$/bitmaps/ScrollbarPagerMiddleMouseOver.png \ - $(ZIP1DIR)$/bitmaps/ScrollbarThumbTopNormal.png \ - $(ZIP1DIR)$/bitmaps/ScrollbarThumbTopMouseOver.png \ - $(ZIP1DIR)$/bitmaps/ScrollbarThumbBottomNormal.png \ - $(ZIP1DIR)$/bitmaps/ScrollbarThumbBottomMouseOver.png \ - $(ZIP1DIR)$/bitmaps/ScrollbarThumbMiddleNormal.png \ - $(ZIP1DIR)$/bitmaps/ScrollbarThumbMiddleMouseOver.png \ - \ - $(ZIP1DIR)$/bitmaps$/ButtonPlusNormal.png \ - $(ZIP1DIR)$/bitmaps$/ButtonPlusMouseOver.png \ - $(ZIP1DIR)$/bitmaps$/ButtonPlusSelected.png \ - $(ZIP1DIR)$/bitmaps$/ButtonPlusDisabled.png \ - $(ZIP1DIR)$/bitmaps$/ButtonMinusNormal.png \ - $(ZIP1DIR)$/bitmaps$/ButtonMinusMouseOver.png \ - $(ZIP1DIR)$/bitmaps$/ButtonMinusSelected.png \ - $(ZIP1DIR)$/bitmaps$/ButtonMinusDisabled.png \ - \ - $(ZIP1DIR)$/bitmaps$/ButtonFrameLeftNormal.png \ - $(ZIP1DIR)$/bitmaps$/ButtonFrameCenterNormal.png \ - $(ZIP1DIR)$/bitmaps$/ButtonFrameRightNormal.png \ - $(ZIP1DIR)$/bitmaps$/ButtonFrameLeftMouseOver.png \ - $(ZIP1DIR)$/bitmaps$/ButtonFrameCenterMouseOver.png \ - $(ZIP1DIR)$/bitmaps$/ButtonFrameRightMouseOver.png \ - \ - $(ZIP1DIR)$/bitmaps$/LabelMouseOverLeft.png \ - $(ZIP1DIR)$/bitmaps$/LabelMouseOverCenter.png \ - $(ZIP1DIR)$/bitmaps$/LabelMouseOverRight.png - -COMPONENT_IMAGES=\ - $(ZIP1DIR)$/bitmaps$/extension_32.png \ - $(ZIP1DIR)$/bitmaps$/extension_32_h.png - -COMPONENT_LIBRARY= \ - $(ZIP1DIR)$/$(TARGET).uno$(DLLPOST) - -PLATFORMID:=$(RTL_OS:l)_$(RTL_ARCH:l) - -COMPONENT_HELP= \ - $(ZIP1DIR)$/help/component.txt \ - $(foreach,l,$(alllangiso) $(ZIP1DIR)$/help$/$l$/com.sun.PresenterScreen-$(PLATFORMID)$/presenter.xhp) - -ZIP1DEPS= \ - $(PACKLICS) \ - $(DESCRIPTION) \ - $(COMPONENT_MANIFEST) \ - $(COMPONENT_FILES) \ - $(COMPONENT_BITMAPS) \ - $(COMPONENT_IMAGES) \ - $(COMPONENT_LIBRARY) \ - $(COMPONENT_HELP) - -# $(COMPONENT_MERGED_XCU) \ +# ------------------------------------------------------------------------------ +# Resource files -LINKNAME:=help -XHPLINKSRC:=$(ZIP1DIR)/help +SRS1NAME=$(TARGET) +SRC1FILES = \ + $(TARGET).src \ -my_XHPFILES= \ - presenter.xhp +SRSFILELIST=\ + $(SRS)$/$(TARGET).srs \ -LINKLINKFILES= \ - $(PACKAGE)/{$(my_XHPFILES)} +RESLIB1NAME=$(TARGET) +RESLIB1SRSFILES= $(SRSFILELIST) -# --- Targets ---------------------------------- -.INCLUDE : target.mk -.INCLUDE : extension_helplink.mk +PACKAGEDIR=$(subst,.,$/ $(PACKAGE)) +SPOOLDIR=$(MISC)$/registry$/spool -$(SLO)$/PresenterComponent.obj : $(INCCOM)$/PresenterExtensionIdentifier.hxx +XCUFILES= \ + Jobs.xcu \ + ProtocolHandler.xcu -$(INCCOM)$/PresenterExtensionIdentifier.hxx : PresenterExtensionIdentifier.txx - $(TYPE) $< | sed s/UPDATED_PLATFORM/$(PLATFORMID)/ > $@ +MYXCUFILES= \ + $(SPOOLDIR)$/$(PACKAGEDIR)$/Jobs$/Jobs-presenterscreen.xcu \ + $(SPOOLDIR)$/$(PACKAGEDIR)$/ProtocolHandler/ProtocolHandler-presenterscreen.xcu -$(ZIP1DIR)$/help$/component.txt : help$/$$(@:f) - @@-$(MKDIRHIER) $(@:d) - $(COPY) $< $@ -$(ZIP1DIR)/help/%/com.sun.PresenterScreen-$(PLATFORMID)/presenter.xhp : $(COMMONMISC)/%/com.sun.PresenterScreen/presenter.xhp - @echo creating $@ - @-$(MKDIRHIER) $(@:d) - $(TYPE) $< | sed "s/PLATFORMID/$(PLATFORMID)/" | sed 's/@PRESENTEREXTENSIONPRODUCTNAME@/Presenter Console/g' > $@ +# --- Targets ---------------------------------- -.IF "$(ZIP1TARGETN)"!="" -$(ZIP1TARGETN) : $(HELPLINKALLTARGETS) +.INCLUDE : target.mk -.ENDIF # "$(ZIP1TARGETN)"!="" +ALLTAR : $(MYXCUFILES) -$(COMPONENT_BITMAPS) : bitmaps$/$$(@:f) - @-$(MKDIRHIER) $(@:d) - +$(COPY) $< $@ +XCU_SOURCEDIR:=. -$(COMPONENT_IMAGES) : $(SOLARSRC)$/$(RSCDEFIMG)$/desktop$/res$/$$(@:f) - @@-$(MKDIRHIER) $(@:d) - $(COPY) $< $@ +$(SPOOLDIR)$/$(PACKAGEDIR)$/Jobs$/Jobs-presenterscreen.xcu : $(XCU_SOURCEDIR)$/Jobs.xcu + @-$(MKDIRHIER) $(@:d) + @$(COPY) $< $@ -$(COMPONENT_LIBRARY) : $(DLLDEST)$/$$(@:f) +$(SPOOLDIR)$/$(PACKAGEDIR)$/ProtocolHandler$/ProtocolHandler-presenterscreen.xcu : $(XCU_SOURCEDIR)$/ProtocolHandler.xcu @-$(MKDIRHIER) $(@:d) - +$(COPY) $< $@ -.IF "$(OS)$(CPU)"=="WNTI" - .IF "$(COM)"=="GCC" - $(GNUCOPY) $(SOLARBINDIR)$/mingwm10.dll $(ZIP1DIR) - .ELSE - .IF "$(PACKMS)"!="" - .IF "$(CCNUMVER)" <= "001399999999" - $(GNUCOPY) $(PACKMS)$/msvcr71.dll $(ZIP1DIR) - $(GNUCOPY) $(PACKMS)$/msvcp71.dll $(ZIP1DIR) - .ELSE - .IF "$(CCNUMVER)" <= "001499999999" - $(GNUCOPY) $(PACKMS)$/msvcr80.dll $(ZIP1DIR) - $(GNUCOPY) $(PACKMS)$/msvcp80.dll $(ZIP1DIR) - $(GNUCOPY) $(PACKMS)$/msvcm80.dll $(ZIP1DIR) - $(GNUCOPY) $(PACKMS)$/Microsoft.VC80.CRT.manifest $(ZIP1DIR) - .ELSE - $(GNUCOPY) $(PACKMS)$/msvcr90.dll $(ZIP1DIR) - $(GNUCOPY) $(PACKMS)$/msvcp90.dll $(ZIP1DIR) - $(GNUCOPY) $(PACKMS)$/msvcm90.dll $(ZIP1DIR) - $(GNUCOPY) $(PACKMS)$/Microsoft.VC90.CRT.manifest $(ZIP1DIR) - .ENDIF - .ENDIF - .ELSE # "$(PACKMS)"!="" - .IF "$(CCNUMVER)" <= "001399999999" - $(GNUCOPY) $(SOLARBINDIR)$/msvcr71.dll $(ZIP1DIR) - $(GNUCOPY) $(SOLARBINDIR)$/msvcp71.dll $(ZIP1DIR) - .ELSE - .IF "$(CCNUMVER)" <= "001499999999" - $(GNUCOPY) $(SOLARBINDIR)$/msvcr80.dll $(ZIP1DIR) - $(GNUCOPY) $(SOLARBINDIR)$/msvcp80.dll $(ZIP1DIR) - $(GNUCOPY) $(SOLARBINDIR)$/msvcm80.dll $(ZIP1DIR) - $(GNUCOPY) $(SOLARBINDIR)$/Microsoft.VC80.CRT.manifest $(ZIP1DIR) - .ELSE - $(GNUCOPY) $(SOLARBINDIR)$/msvcr90.dll $(ZIP1DIR) - $(GNUCOPY) $(SOLARBINDIR)$/msvcp90.dll $(ZIP1DIR) - $(GNUCOPY) $(SOLARBINDIR)$/msvcm90.dll $(ZIP1DIR) - $(GNUCOPY) $(SOLARBINDIR)$/Microsoft.VC90.CRT.manifest $(ZIP1DIR) - .ENDIF - .ENDIF - .ENDIF # "$(PACKMS)"!="" - .ENDIF #"$(COM)"=="GCC" -.ENDIF + @$(COPY) $< $@ + +ALLTAR : $(MISC)/PresenterScreen.component -.INCLUDE : extension_post.mk +$(MISC)/PresenterScreen.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt PresenterScreen.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt PresenterScreen.component .ENDIF # L10N_framework -.ENDIF # "$(ENABLE_PRESENTER_SCREEN)" != "NO" Modified: openoffice/trunk/main/set_soenv.in URL: http://svn.apache.org/viewvc/openoffice/trunk/main/set_soenv.in?rev=1468300&r1=1468299&r2=1468300&view=diff ============================================================================== --- openoffice/trunk/main/set_soenv.in (original) +++ openoffice/trunk/main/set_soenv.in Tue Apr 16 03:57:41 2013 @@ -1676,7 +1676,6 @@ ToFile( "ENABLE_CAIRO", "@ENABLE_CA ToFile( "ENABLE_CAIRO_CANVAS", "@ENABLE_CAIRO_CANVAS@", "e" ); ToFile( "ENABLE_OPENGL", "@ENABLE_OPENGL@", "e" ); ToFile( "ENABLE_PDFIMPORT", "@ENABLE_PDFIMPORT@", "e" ); -ToFile( "ENABLE_PRESENTER_SCREEN","@ENABLE_PRESENTER_SCREEN@","e" ); ToFile( "ENABLE_REPORTBUILDER","@ENABLE_REPORTBUILDER@","e" ); ToFile( "SYSTEM_JFREEREPORT","@SYSTEM_JFREEREPORT@","e" ); ToFile( "OOO_JUNIT_JAR", "@OOO_JUNIT_JAR@", "e" );
