incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From arie...@apache.org
Subject svn commit: r1356139 - in /incubator/ooo/trunk/main: configure.in offapi/com/sun/star/presentation/XSlideShow.idl sd/source/ui/slideshow/makefile.mk set_soenv.in slideshow/source/engine/makefile.mk
Date Mon, 02 Jul 2012 09:28:56 GMT
Author: arielch
Date: Mon Jul  2 09:28:55 2012
New Revision: 1356139

URL: http://svn.apache.org/viewvc?rev=1356139&view=rev
Log:
i120145 - Remove ENABLE_PRESENTER_EXTRA_UI

Modified:
    incubator/ooo/trunk/main/configure.in
    incubator/ooo/trunk/main/offapi/com/sun/star/presentation/XSlideShow.idl
    incubator/ooo/trunk/main/sd/source/ui/slideshow/makefile.mk
    incubator/ooo/trunk/main/set_soenv.in
    incubator/ooo/trunk/main/slideshow/source/engine/makefile.mk

Modified: incubator/ooo/trunk/main/configure.in
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/configure.in?rev=1356139&r1=1356138&r2=1356139&view=diff
==============================================================================
--- incubator/ooo/trunk/main/configure.in (original)
+++ incubator/ooo/trunk/main/configure.in Mon Jul  2 09:28:55 2012
@@ -461,10 +461,6 @@ AC_ARG_WITH(beanshell-jar,
 [  --with-beanshell-jar=JARFILE   Specify path to jarfile manually ],
 [ BSH_JAR="$withval"
 ])
-AC_ARG_ENABLE(presenter-extra-ui,
-[  --enable-presenter-extra-ui   enables extra functionality during slideshow,
-                                 e.g. selecting pen color, erasing drawings etc.
-],,enable_presenter_extra_ui=no)
 AC_ARG_ENABLE(minimizer,
 [  --enable-minimizer          enables the build of the Presentation Minimizer extension
 ],,)
@@ -6190,16 +6186,6 @@ fi
 
 AC_SUBST(ENABLE_OPENGL)
 
-AC_MSG_CHECKING([whether to build extra presenter ui])
-if test -n "$enable_presenter_extra_ui" -a "$enable_presenter_extra_ui" != "no"; then
-   AC_MSG_RESULT([yes])
-   ENABLE_PRESENTER_EXTRA_UI=YES
-else
-   AC_MSG_RESULT([no])
-   ENABLE_PRESENTER_EXTRA_UI=NO
-fi
-AC_SUBST(ENABLE_PRESENTER_EXTRA_UI)
-
 AC_MSG_CHECKING([whether to build the Presentation Minimizer extension])
 if test -n "$enable_minimizer" -a "$enable_minimizer" != "no"; then
    AC_MSG_RESULT([yes])

Modified: incubator/ooo/trunk/main/offapi/com/sun/star/presentation/XSlideShow.idl
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/offapi/com/sun/star/presentation/XSlideShow.idl?rev=1356139&r1=1356138&r2=1356139&view=diff
==============================================================================
--- incubator/ooo/trunk/main/offapi/com/sun/star/presentation/XSlideShow.idl (original)
+++ incubator/ooo/trunk/main/offapi/com/sun/star/presentation/XSlideShow.idl Mon Jul  2 09:28:55
2012
@@ -148,8 +148,7 @@ interface XSlideShow : ::com::sun::star:
         The slide to display.
 
         @param xDrawPages
-	For future use.
-	This parameter can be NULL when the ENABLE_PRESENTER_EXTRA_UI feature is disabled.
+        For future use.
 
         @param xAnimationNode
         The animation node determine the animations to display.

Modified: incubator/ooo/trunk/main/sd/source/ui/slideshow/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sd/source/ui/slideshow/makefile.mk?rev=1356139&r1=1356138&r2=1356139&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sd/source/ui/slideshow/makefile.mk (original)
+++ incubator/ooo/trunk/main/sd/source/ui/slideshow/makefile.mk Mon Jul  2 09:28:55 2012
@@ -35,10 +35,6 @@ AUTOSEG=true
 .INCLUDE :  settings.mk
 .INCLUDE :  $(PRJ)$/util$/makefile.pmk
 
-.IF "$(ENABLE_PRESENTER_EXTRA_UI)"=="YES"
-ENABLE_PRESENTER_EXTRA_UI is not used anymore
-.ENDIF
-
 # --- Files --------------------------------------------------------
 
 

Modified: incubator/ooo/trunk/main/set_soenv.in
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/set_soenv.in?rev=1356139&r1=1356138&r2=1356139&view=diff
==============================================================================
--- incubator/ooo/trunk/main/set_soenv.in (original)
+++ incubator/ooo/trunk/main/set_soenv.in Mon Jul  2 09:28:55 2012
@@ -1688,7 +1688,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_EXTRA_UI","@ENABLE_PRESENTER_EXTRA_UI@","e" );
 ToFile( "ENABLE_MINIMIZER",   "@ENABLE_MINIMIZER@","e" );
 ToFile( "ENABLE_PRESENTER_SCREEN","@ENABLE_PRESENTER_SCREEN@","e" );
 ToFile( "ENABLE_REPORTBUILDER","@ENABLE_REPORTBUILDER@","e" );

Modified: incubator/ooo/trunk/main/slideshow/source/engine/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/slideshow/source/engine/makefile.mk?rev=1356139&r1=1356138&r2=1356139&view=diff
==============================================================================
--- incubator/ooo/trunk/main/slideshow/source/engine/makefile.mk (original)
+++ incubator/ooo/trunk/main/slideshow/source/engine/makefile.mk Mon Jul  2 09:28:55 2012
@@ -33,10 +33,6 @@ ENABLE_EXCEPTIONS=TRUE
 .INCLUDE :	settings.mk
 .INCLUDE : $(PRJ)$/util$/makefile.pmk
 
-.IF "$(ENABLE_PRESENTER_EXTRA_UI)"=="YES"
-ENABLE_PRESENTER_EXTRA_UI is not used anymore
-.ENDIF
-
 # --- Common ----------------------------------------------------------
 
 ENVCFLAGS += -DBOOST_SPIRIT_USE_OLD_NAMESPACE



Mime
View raw message