diff options
author | Andras Timar <atimar@suse.com> | 2011-11-22 19:15:03 +0100 |
---|---|---|
committer | Andras Timar <atimar@suse.com> | 2011-11-22 19:15:51 +0100 |
commit | eb339bf18c1e76b208d3bfb21120717a97e23d45 (patch) | |
tree | ab084fb3786fc7385d03d253828be60fbe6c4746 /sdext/source | |
parent | e2de4357f5e1bf6d7f205402f6823032c9d35b1b (diff) |
remove (empty) help of Presentation Minimizer fdo#39306
Diffstat (limited to 'sdext/source')
-rw-r--r-- | sdext/source/minimizer/help/help_de.odt | bin | 8987 -> 0 bytes | |||
-rw-r--r-- | sdext/source/minimizer/help/help_en-US.odt | bin | 8987 -> 0 bytes | |||
-rw-r--r-- | sdext/source/minimizer/makefile.mk | 11 | ||||
-rw-r--r-- | sdext/source/minimizer/optimizerdialog.cxx | 48 | ||||
-rw-r--r-- | sdext/source/minimizer/optimizerdialogcontrols.cxx | 1 | ||||
-rw-r--r-- | sdext/source/minimizer/pppoptimizertoken.cxx | 3 | ||||
-rw-r--r-- | sdext/source/minimizer/pppoptimizertoken.hxx | 3 | ||||
-rw-r--r-- | sdext/source/minimizer/registry/data/org/openoffice/Office/extension/SunPresentationMinimizer.xcu | 7 | ||||
-rw-r--r-- | sdext/source/minimizer/registry/schema/org/openoffice/Office/extension/SunPresentationMinimizer.xcs | 6 |
9 files changed, 2 insertions, 77 deletions
diff --git a/sdext/source/minimizer/help/help_de.odt b/sdext/source/minimizer/help/help_de.odt Binary files differdeleted file mode 100644 index bb9bc0395c0f..000000000000 --- a/sdext/source/minimizer/help/help_de.odt +++ /dev/null diff --git a/sdext/source/minimizer/help/help_en-US.odt b/sdext/source/minimizer/help/help_en-US.odt Binary files differdeleted file mode 100644 index bb9bc0395c0f..000000000000 --- a/sdext/source/minimizer/help/help_en-US.odt +++ /dev/null diff --git a/sdext/source/minimizer/makefile.mk b/sdext/source/minimizer/makefile.mk index 7932e59949fe..f28b41e5e68a 100644 --- a/sdext/source/minimizer/makefile.mk +++ b/sdext/source/minimizer/makefile.mk @@ -100,18 +100,13 @@ COMPONENT_BITMAPS= \ COMPONENT_IMAGES=\ $(EXTENSIONDIR)$/bitmaps$/extension_32.png -# rather freestyle or common to all? -COMPONENT_HELP= \ - $(EXTENSIONDIR)$/help$/help_de.odt \ - $(EXTENSIONDIR)$/help$/help_en-US.odt - DESCRIPTION_SRC:=$(MISC)/$(EXTENSIONNAME)_in/description.xml COMPONENT_DESCRIPTION= \ $(foreach,lang,$(alllangiso) $(EXTENSIONDIR)$/description-$(lang).txt) # make sure to add your custom files here -EXTENSION_PACKDEPS=$(COMPONENT_BITMAPS) $(COMPONENT_IMAGES) $(COMPONENT_HELP) $(COMPONENT_DESCRIPTION) +EXTENSION_PACKDEPS=$(COMPONENT_BITMAPS) $(COMPONENT_IMAGES) $(COMPONENT_DESCRIPTION) ZIP2TARGET= presentation_minimizer_develop .IF "$(WITH_LANG)"!="" @@ -143,10 +138,6 @@ $(COMPONENT_IMAGES) : $(SOLARSRC)$/$(RSCDEFIMG)$/desktop$/res$/$$(@:f) @@-$(MKDIRHIER) $(@:d) $(COPY) $< $@ -$(COMPONENT_HELP) : help$/$$(@:f) - @@-$(MKDIRHIER) $(@:d) - $(COPY) $< $@ - $(DESCRIPTION_SRC) : description.xml @@-$(MKDIRHIER) $(@:d) .IF "$(WITH_LANG)" != "" diff --git a/sdext/source/minimizer/optimizerdialog.cxx b/sdext/source/minimizer/optimizerdialog.cxx index 3d60123496fd..650b4e2a4f0d 100644 --- a/sdext/source/minimizer/optimizerdialog.cxx +++ b/sdext/source/minimizer/optimizerdialog.cxx @@ -513,52 +513,6 @@ void ActionListener::actionPerformed( const ActionEvent& rEvent ) { switch( TKGet( rEvent.ActionCommand ) ) { - case TK_btnNavHelp : - { - try - { - static Reference< XFrame > xHelpFrame; - if ( !xHelpFrame.is() ) - { - rtl::OUString sHelpFile( mrOptimizerDialog.getPath( TK_HelpFile ) ); - Reference< XDesktop > desktop( mrOptimizerDialog.GetComponentContext()->getServiceManager()->createInstanceWithContext( - OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Desktop")), mrOptimizerDialog.GetComponentContext() ), UNO_QUERY_THROW ); - Reference< XSimpleFileAccess > xSimpleFileAccess( mrOptimizerDialog.GetComponentContext()->getServiceManager()->createInstanceWithContext( - OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.SimpleFileAccess")), mrOptimizerDialog.GetComponentContext() ), UNO_QUERY_THROW ); - Reference< XInputStream > xInputStream( xSimpleFileAccess->openFileRead( sHelpFile ) ); - Reference< XDesktop > xDesktop( mrOptimizerDialog.GetComponentContext()->getServiceManager()->createInstanceWithContext( - OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Desktop")), mrOptimizerDialog.GetComponentContext() ), UNO_QUERY_THROW ); - Reference< XFrame > xDesktopFrame( xDesktop, UNO_QUERY_THROW ); - xHelpFrame = Reference< XFrame >( xDesktopFrame->findFrame( TKGet( TK__blank ), 0 ) ); - Reference< XCloseBroadcaster > xCloseBroadcaster( xHelpFrame, UNO_QUERY_THROW ); - xCloseBroadcaster->addCloseListener( new HelpCloseListener( xHelpFrame ) ); - Reference< XComponentLoader > xLoader( xHelpFrame, UNO_QUERY_THROW ); - - Sequence< PropertyValue > aLoadProps( 2 ); - aLoadProps[ 0 ].Name = TKGet( TK_ReadOnly ); - aLoadProps[ 0 ].Value <<= (sal_Bool)( sal_True ); - aLoadProps[ 1 ].Name = TKGet( TK_InputStream ); - aLoadProps[ 1 ].Value <<= xInputStream; - - Reference< XComponent >( xLoader->loadComponentFromURL( OUString(RTL_CONSTASCII_USTRINGPARAM("private:stream")), - TKGet( TK__self ), 0, aLoadProps ) ); - - Reference< XPropertySet > xPropSet( xHelpFrame, UNO_QUERY_THROW ); - Reference< XLayoutManager > xLayoutManager; - if ( xPropSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("LayoutManager")) ) >>= xLayoutManager ) - { - xLayoutManager->setVisible( sal_False ); - xLayoutManager->hideElement( OUString(RTL_CONSTASCII_USTRINGPARAM("private:resource/menubar/menubar")) ); - xLayoutManager->destroyElement( OUString(RTL_CONSTASCII_USTRINGPARAM("private:resource/statusbar/statusbar")) ); - } - } - } - catch( Exception& ) - { - - } - } - break; case TK_btnNavBack : mrOptimizerDialog.SwitchPage( mrOptimizerDialog.mnCurrentStep - 1 ); break; case TK_btnNavNext : mrOptimizerDialog.SwitchPage( mrOptimizerDialog.mnCurrentStep + 1 ); break; case TK_btnNavFinish : @@ -567,7 +521,6 @@ void ActionListener::actionPerformed( const ActionEvent& rEvent ) mrOptimizerDialog.SwitchPage( ITEM_ID_SUMMARY ); mrOptimizerDialog.DisablePage( ITEM_ID_SUMMARY ); - mrOptimizerDialog.setControlProperty( TKGet( TK_btnNavHelp ), TKGet( TK_Enabled ), Any( sal_False ) ); mrOptimizerDialog.setControlProperty( TKGet( TK_btnNavBack ), TKGet( TK_Enabled ), Any( sal_False ) ); mrOptimizerDialog.setControlProperty( TKGet( TK_btnNavNext ), TKGet( TK_Enabled ), Any( sal_False ) ); mrOptimizerDialog.setControlProperty( TKGet( TK_btnNavFinish ), TKGet( TK_Enabled ), Any( sal_False ) ); @@ -673,7 +626,6 @@ void ActionListener::actionPerformed( const ActionEvent& rEvent ) } else { - mrOptimizerDialog.setControlProperty( TKGet( TK_btnNavHelp ), TKGet( TK_Enabled ), Any( sal_True ) ); mrOptimizerDialog.setControlProperty( TKGet( TK_btnNavBack ), TKGet( TK_Enabled ), Any( sal_True ) ); mrOptimizerDialog.setControlProperty( TKGet( TK_btnNavNext ), TKGet( TK_Enabled ), Any( sal_False ) ); mrOptimizerDialog.setControlProperty( TKGet( TK_btnNavFinish ), TKGet( TK_Enabled ), Any( sal_True ) ); diff --git a/sdext/source/minimizer/optimizerdialogcontrols.cxx b/sdext/source/minimizer/optimizerdialogcontrols.cxx index d5af7018ec4c..1061f3248909 100644 --- a/sdext/source/minimizer/optimizerdialogcontrols.cxx +++ b/sdext/source/minimizer/optimizerdialogcontrols.cxx @@ -390,7 +390,6 @@ void OptimizerDialog::InitNavigationBar() InsertSeparator( *this, TKGet( TK_lnNavSep1 ), 0, 0, DIALOG_HEIGHT - 26, OD_DIALOG_WIDTH, 1 ); InsertSeparator( *this, TKGet( TK_lnNavSep2 ), 1, 85, 0, 1, BUTTON_POS_Y - 6 ); - InsertButton( *this, TKGet( TK_btnNavHelp ), mxActionListener, 8, BUTTON_POS_Y, BUTTON_WIDTH, BUTTON_HEIGHT, mnTabIndex++, sal_True, STR_HELP, PushButtonType_STANDARD ); InsertButton( *this, TKGet( TK_btnNavBack ), mxActionListener, nBackPosX, BUTTON_POS_Y, BUTTON_WIDTH, BUTTON_HEIGHT, mnTabIndex++, sal_False, STR_BACK, PushButtonType_STANDARD ); InsertButton( *this, TKGet( TK_btnNavNext ), mxActionListener, nNextPosX, BUTTON_POS_Y, BUTTON_WIDTH, BUTTON_HEIGHT, mnTabIndex++, sal_True, STR_NEXT, PushButtonType_STANDARD ); InsertButton( *this, TKGet( TK_btnNavFinish ), mxActionListener, nFinishPosX, BUTTON_POS_Y, BUTTON_WIDTH, BUTTON_HEIGHT, mnTabIndex++, sal_True, STR_FINISH, PushButtonType_STANDARD ); diff --git a/sdext/source/minimizer/pppoptimizertoken.cxx b/sdext/source/minimizer/pppoptimizertoken.cxx index 669132de7cba..0b47539cc368 100644 --- a/sdext/source/minimizer/pppoptimizertoken.cxx +++ b/sdext/source/minimizer/pppoptimizertoken.cxx @@ -68,7 +68,6 @@ static const TokenTable pTokenTableArray[] = { "rdmNavi", TK_rdmNavi }, { "lnNavSep1", TK_lnNavSep1 }, { "lnNavSep2", TK_lnNavSep2 }, - { "btnNavHelp", TK_btnNavHelp }, { "btnNavBack", TK_btnNavBack }, { "btnNavNext", TK_btnNavNext }, { "btnNavFinish", TK_btnNavFinish }, @@ -159,7 +158,6 @@ static const TokenTable pTokenTableArray[] = { "GraphicURL", TK_GraphicURL }, { "GraphicStreamURL", TK_GraphicStreamURL }, { "Height", TK_Height }, - { "HelpFile", TK_HelpFile }, { "Hidden", TK_Hidden }, { "ID", TK_ID }, { "ImageURL", TK_ImageURL }, @@ -242,7 +240,6 @@ static const TokenTable pTokenTableArray[] = { "STR_SUN_OPTIMIZATION_WIZARD2",STR_SUN_OPTIMIZATION_WIZARD2 }, { "STR_STEPS", STR_STEPS }, - { "STR_HELP", STR_HELP }, { "STR_BACK", STR_BACK }, { "STR_NEXT", STR_NEXT }, { "STR_FINISH", STR_FINISH }, diff --git a/sdext/source/minimizer/pppoptimizertoken.hxx b/sdext/source/minimizer/pppoptimizertoken.hxx index 19ae973c7572..bb6089630e21 100644 --- a/sdext/source/minimizer/pppoptimizertoken.hxx +++ b/sdext/source/minimizer/pppoptimizertoken.hxx @@ -36,7 +36,6 @@ enum PPPOptimizerTokenEnum TK_rdmNavi, TK_lnNavSep1, TK_lnNavSep2, - TK_btnNavHelp, TK_btnNavBack, TK_btnNavNext, TK_btnNavFinish, @@ -127,7 +126,6 @@ enum PPPOptimizerTokenEnum TK_GraphicURL, TK_GraphicStreamURL, TK_Height, - TK_HelpFile, TK_Hidden, TK_ID, TK_ImageURL, @@ -210,7 +208,6 @@ enum PPPOptimizerTokenEnum STR_SUN_OPTIMIZATION_WIZARD2, STR_STEPS, - STR_HELP, STR_BACK, STR_NEXT, STR_FINISH, diff --git a/sdext/source/minimizer/registry/data/org/openoffice/Office/extension/SunPresentationMinimizer.xcu b/sdext/source/minimizer/registry/data/org/openoffice/Office/extension/SunPresentationMinimizer.xcu index ccb4759d786d..65c07f5b4acc 100644 --- a/sdext/source/minimizer/registry/data/org/openoffice/Office/extension/SunPresentationMinimizer.xcu +++ b/sdext/source/minimizer/registry/data/org/openoffice/Office/extension/SunPresentationMinimizer.xcu @@ -5,10 +5,6 @@ <value>%origin%/../../../../../../bitmaps</value> </prop> - <prop oor:name="HelpFile" oor:type="xs:string"> - <value xml:lang="en-US">%origin%/../../../../../../help/help_en-US.odt</value> - </prop> - <node oor:name="Strings"> <prop oor:name="STR_SUN_OPTIMIZATION_WIZARD2"> <value xml:lang="en-US">Presentation Minimizer</value> @@ -16,9 +12,6 @@ <prop oor:name="STR_STEPS"> <value xml:lang="en-US">Steps</value> </prop> - <prop oor:name="STR_HELP"> - <value xml:lang="en-US">~Help</value> - </prop> <prop oor:name="STR_BACK"> <value xml:lang="en-US">< ~Back</value> </prop> diff --git a/sdext/source/minimizer/registry/schema/org/openoffice/Office/extension/SunPresentationMinimizer.xcs b/sdext/source/minimizer/registry/schema/org/openoffice/Office/extension/SunPresentationMinimizer.xcs index f121768e0e72..02e986f1145f 100644 --- a/sdext/source/minimizer/registry/schema/org/openoffice/Office/extension/SunPresentationMinimizer.xcs +++ b/sdext/source/minimizer/registry/schema/org/openoffice/Office/extension/SunPresentationMinimizer.xcs @@ -103,7 +103,6 @@ </templates> <component> <prop oor:name="BitmapPath" oor:type="xs:string"/> - <prop oor:name="HelpFile" oor:type="xs:string"/> <group oor:name="Strings"> <prop oor:name="STR_SUN_OPTIMIZATION_WIZARD2" oor:type="xs:string" oor:localized="true"> <value>Presentation Minimizer</value> @@ -111,9 +110,6 @@ <prop oor:name="STR_STEPS" oor:type="xs:string" oor:localized="true"> <value>Steps</value> </prop> - <prop oor:name="STR_HELP" oor:type="xs:string" oor:localized="true"> - <value>~Help</value> - </prop> <prop oor:name="STR_BACK" oor:type="xs:string" oor:localized="true"> <value>< ~Back</value> </prop> @@ -323,4 +319,4 @@ The current presentation contains no OLE objects.</value> </set> </group> </component> -</oor:component-schema>
\ No newline at end of file +</oor:component-schema> |