diff options
290 files changed, 2726 insertions, 1169 deletions
diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..e9cb034 --- /dev/null +++ b/.gitignore @@ -0,0 +1,11 @@ +# backup and temporary files +*~ +.*.sw[op] + +# the build directories +/*/unxlng?? +/*/unxlng??.pro +/*/wntmsc??? +/*/wntmsc???.pro +/*/unxmac??.pro +/*/unxmac?? diff --git a/apache-commons/java/codec/makefile.mk b/apache-commons/java/codec/makefile.mk index 6976731..8464353 100644 --- a/apache-commons/java/codec/makefile.mk +++ b/apache-commons/java/codec/makefile.mk @@ -49,16 +49,17 @@ TARFILE_ROOTDIR=commons-codec-1.3 PATCH_FILES=$(PRJ)$/patches$/codec.patch -#CONVERTFILES=build.xml - OUT2CLASS=dist$/commons-codec-1.3.jar +ANT_OPTS+="-Dfile.encoding=ISO-8859-1" +.EXPORT : ANT_OPTS + .IF "$(JAVACISGCJ)"=="yes" JAVA_HOME= .EXPORT : JAVA_HOME BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar .ELSE -BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) jar +BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) jar .ENDIF .ENDIF # $(SOLAR_JAVA)!= "" diff --git a/apache-commons/java/httpclient/makefile.mk b/apache-commons/java/httpclient/makefile.mk index 6e05150..55302e8 100644 --- a/apache-commons/java/httpclient/makefile.mk +++ b/apache-commons/java/httpclient/makefile.mk @@ -49,21 +49,20 @@ TARFILE_MD5=2c9b0f83ed5890af02c0df1c1776f39b TARFILE_ROOTDIR=commons-httpclient-3.1 -#PATCH_FILES=$(PRJ)$/patches$/httpclient.patch - -#CONVERTFILES=build.xml - OUT2CLASS=dist$/commons-httpclient.jar COMMONS_LOGGING_JAR=..$/..$/..$/..$/$(INPATH)$/class$/commons-logging-1.1.1-SNAPSHOT.jar COMMONS_CODEC_JAR=..$/..$/..$/..$/$/$(INPATH)$/class$/commons-codec-1.3.jar +ANT_OPTS+="-Dfile.encoding=ISO-8859-1" +.EXPORT : ANT_OPTS + .IF "$(JAVACISGCJ)"=="yes" JAVA_HOME= .EXPORT : JAVA_HOME BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -Dcommons-logging.jar=$(COMMONS_LOGGING_JAR) -Dcommons-codec.jar=$(COMMONS_CODEC_JAR) -f $(ANT_BUILDFILE) dist .ELSE -BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dcommons-logging.jar=$(COMMONS_LOGGING_JAR) -Dcommons-codec.jar=$(COMMONS_CODEC_JAR) -f $(ANT_BUILDFILE) dist +BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dcommons-logging.jar=$(COMMONS_LOGGING_JAR) -Dcommons-codec.jar=$(COMMONS_CODEC_JAR) -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) dist .ENDIF .ENDIF # $(SOLAR_JAVA)!= "" diff --git a/apache-commons/java/lang/makefile.mk b/apache-commons/java/lang/makefile.mk index 0bf15d0..88a7e1f 100644 --- a/apache-commons/java/lang/makefile.mk +++ b/apache-commons/java/lang/makefile.mk @@ -49,12 +49,11 @@ TARFILE_MD5=2ae988b339daec234019a7066f96733e TARFILE_ROOTDIR=commons-lang-2.3-src -#PATCH_FILES=$(PRJ)$/patches$/logging.patch - -#CONVERTFILES=build.xml - OUT2CLASS=dist$/commons-lang-2.3.jar +ANT_OPTS+="-Dfile.encoding=ISO-8859-1" +.EXPORT : ANT_OPTS + .IF "$(JAVACISGCJ)"=="yes" JAVA_HOME= .EXPORT : JAVA_HOME diff --git a/apache-commons/java/logging/makefile.mk b/apache-commons/java/logging/makefile.mk index 5df8c34..cc1f1a6 100644 --- a/apache-commons/java/logging/makefile.mk +++ b/apache-commons/java/logging/makefile.mk @@ -53,6 +53,9 @@ CONVERTFILES=build.xml OUT2CLASS=target$/commons-logging-1.1.1-SNAPSHOT.jar +ANT_OPTS+="-Dfile.encoding=ISO-8859-1" +.EXPORT : ANT_OPTS + .IF "$(SYSTEM_TOMCAT)" != "YES" SERVLETAPI_JAR := $(SOLARVER)$/$(INPATH)$/bin$(UPDMINOREXT)$/servlet-api.jar .ENDIF diff --git a/ct2n/ConvertTextToNumber-1.3.2-no-license.patch b/ct2n/ConvertTextToNumber-1.3.2-no-license.patch new file mode 100644 index 0000000..1d8b805 --- /dev/null +++ b/ct2n/ConvertTextToNumber-1.3.2-no-license.patch @@ -0,0 +1,16 @@ +diff -purN misc/description.xml misc/build/description.xml +--- misc/description.xml 2009-02-03 00:07:30.000000000 +0100 ++++ misc/build/description.xml 2010-03-05 21:38:48.000000000 +0100 +@@ -5,12 +5,4 @@ + xmlns:xlink="http://www.w3.org/1999/xlink">
+ <identifier value="nl.nouenoff.ct2n"/>
+ <version value="1.3.2"/>
+- <!-- <dependencies>
+-
+- </dependencies> -->
+- <registration>
+- <simple-license accept-by="admin" default-license-id="ID0" suppress-on-update="true" >
+- <license-text xlink:href="registration/COPYING" lang="en" license-id="ID0" />
+- </simple-license>
+- </registration>
+ </description>
diff --git a/ct2n/ConvertTextToNumber-1.3.2-no-visible-by-default.patch b/ct2n/ConvertTextToNumber-1.3.2-no-visible-by-default.patch new file mode 100644 index 0000000..e764b55 --- /dev/null +++ b/ct2n/ConvertTextToNumber-1.3.2-no-visible-by-default.patch @@ -0,0 +1,104 @@ +diff -purN misc/Office/UI/BaseWindowState.xcu misc/build/Office/UI/BaseWindowState.xcu +--- misc/Office/UI/BaseWindowState.xcu 2008-02-09 23:26:50.000000000 +0100 ++++ misc/build/Office/UI/BaseWindowState.xcu 2010-03-05 21:36:37.000000000 +0100 +@@ -9,6 +9,9 @@ + <prop oor:name="UIName" oor:type="xs:string">
+ <value>CT2N</value>
+ </prop>
++ <prop oor:name="Visible" oor:type="xs:boolean">
++ <value>false</value>
++ </prop>
+ </node>
+ </node>
+ </node>
+diff -purN misc/Office/UI/BasicIDEWindowState.xcu misc/build/Office/UI/BasicIDEWindowState.xcu +--- misc/Office/UI/BasicIDEWindowState.xcu 2008-02-09 23:26:50.000000000 +0100 ++++ misc/build/Office/UI/BasicIDEWindowState.xcu 2010-03-05 21:36:46.000000000 +0100 +@@ -9,6 +9,9 @@ + <prop oor:name="UIName" oor:type="xs:string">
+ <value>CT2N</value>
+ </prop>
++ <prop oor:name="Visible" oor:type="xs:boolean">
++ <value>false</value>
++ </prop>
+ </node>
+ </node>
+ </node>
+diff -purN misc/Office/UI/CalcWindowState.xcu misc/build/Office/UI/CalcWindowState.xcu +--- misc/Office/UI/CalcWindowState.xcu 2008-02-09 23:26:50.000000000 +0100 ++++ misc/build/Office/UI/CalcWindowState.xcu 2010-03-05 21:36:32.000000000 +0100 +@@ -9,6 +9,9 @@ + <prop oor:name="UIName" oor:type="xs:string">
+ <value>CT2N</value>
+ </prop>
++ <prop oor:name="Visible" oor:type="xs:boolean">
++ <value>false</value>
++ </prop>
+ </node>
+ </node>
+ </node>
+diff -purN misc/Office/UI/DrawWindowState.xcu misc/build/Office/UI/DrawWindowState.xcu +--- misc/Office/UI/DrawWindowState.xcu 2008-02-09 23:26:50.000000000 +0100 ++++ misc/build/Office/UI/DrawWindowState.xcu 2010-03-05 21:36:54.000000000 +0100 +@@ -9,6 +9,9 @@ + <prop oor:name="UIName" oor:type="xs:string">
+ <value>CT2N</value>
+ </prop>
++ <prop oor:name="Visible" oor:type="xs:boolean">
++ <value>false</value>
++ </prop>
+ </node>
+ </node>
+ </node>
+diff -purN misc/Office/UI/ImpressWindowState.xcu misc/build/Office/UI/ImpressWindowState.xcu +--- misc/Office/UI/ImpressWindowState.xcu 2008-02-09 23:26:50.000000000 +0100 ++++ misc/build/Office/UI/ImpressWindowState.xcu 2010-03-05 21:36:59.000000000 +0100 +@@ -9,6 +9,9 @@ + <prop oor:name="UIName" oor:type="xs:string">
+ <value>CT2N</value>
+ </prop>
++ <prop oor:name="Visible" oor:type="xs:boolean">
++ <value>false</value>
++ </prop>
+ </node>
+ </node>
+ </node>
+diff -purN misc/Office/UI/MathWindowState.xcu misc/build/Office/UI/MathWindowState.xcu +--- misc/Office/UI/MathWindowState.xcu 2008-02-09 23:26:50.000000000 +0100 ++++ misc/build/Office/UI/MathWindowState.xcu 2010-03-05 21:37:03.000000000 +0100 +@@ -9,6 +9,9 @@ + <prop oor:name="UIName" oor:type="xs:string">
+ <value>CT2N</value>
+ </prop>
++ <prop oor:name="Visible" oor:type="xs:boolean">
++ <value>false</value>
++ </prop>
+ </node>
+ </node>
+ </node>
+diff -purN misc/Office/UI/StartModuleWindowState.xcu misc/build/Office/UI/StartModuleWindowState.xcu +--- misc/Office/UI/StartModuleWindowState.xcu 2008-02-09 23:26:50.000000000 +0100 ++++ misc/build/Office/UI/StartModuleWindowState.xcu 2010-03-05 21:37:09.000000000 +0100 +@@ -9,6 +9,9 @@ + <prop oor:name="UIName" oor:type="xs:string">
+ <value>CT2N</value>
+ </prop>
++ <prop oor:name="Visible" oor:type="xs:boolean">
++ <value>false</value>
++ </prop>
+ </node>
+ </node>
+ </node>
+diff -purN misc/Office/UI/WriterWindowState.xcu misc/build/Office/UI/WriterWindowState.xcu +--- misc/Office/UI/WriterWindowState.xcu 2008-02-09 23:26:50.000000000 +0100 ++++ misc/build/Office/UI/WriterWindowState.xcu 2010-03-05 21:37:17.000000000 +0100 +@@ -9,6 +9,9 @@ + <prop oor:name="UIName" oor:type="xs:string">
+ <value>CT2N</value>
+ </prop>
++ <prop oor:name="Visible" oor:type="xs:boolean">
++ <value>false</value>
++ </prop>
+ </node>
+ </node>
+ </node>
diff --git a/ct2n/delzip b/ct2n/delzip new file mode 100644 index 0000000..00d6fa1 --- /dev/null +++ b/ct2n/delzip @@ -0,0 +1,2 @@ +*.orig +so_*_ct2n diff --git a/ct2n/makefile.mk b/ct2n/makefile.mk new file mode 100644 index 0000000..62e7052 --- /dev/null +++ b/ct2n/makefile.mk @@ -0,0 +1,70 @@ +#************************************************************************* +# +# 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.10 $ +# +# 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 +# <http://www.openoffice.org/license.html> +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +PRJ=. + +PRJNAME=ct2n +TARGET=ct2n + +# --- Settings ----------------------------------------------------- + +.INCLUDE : settings.mk + +# --- Files -------------------------------------------------------- + +TARFILE_MD5=451ccf439a36a568653b024534669971 +TARFILE_NAME=ConvertTextToNumber-1.3.2 +TARFILE_ROOTDIR=. +BUILD_DIR=. + +PATCH_FILES=\ + ConvertTextToNumber-1.3.2-no-license.patch \ + ConvertTextToNumber-1.3.2-no-visible-by-default.patch + +CONFIGURE_DIR= +CONFIGURE_ACTION= +CONFIGURE_FLAGS= +BUILD_ACTION= + +ZIP1TARGET=ConvertTextToNumber +ZIP1EXT=.oxt +ZIP1FLAGS=-u -r +ZIP1DIR=$(MISC)/build$/$(TARFILE_ROOTDIR) +ZIP1LIST= * -x "*.orig" -x "so_*_ct2n" +ZIP1DEPS=$(PACKAGE_DIR)/$(PREDELIVER_FLAG_FILE) + +# --- Targets ------------------------------------------------------ + +.INCLUDE : set_ext.mk +.INCLUDE : tg_ext.mk +.INCLUDE : target.mk + +ZIP1TARGET : $(PACKAGE_DIR)/$(PREDELIVER_FLAG_FILE) diff --git a/ct2n/prj/build.lst b/ct2n/prj/build.lst new file mode 100644 index 0000000..91f44b7 --- /dev/null +++ b/ct2n/prj/build.lst @@ -0,0 +1,3 @@ +ct2n ct2n : solenv NULL NULL +ct2n ct2n usr1 - all ct2n_mkout NULL +ct2n ct2n nmake - all ct2n_ct2n NULL diff --git a/ct2n/prj/d.lst b/ct2n/prj/d.lst new file mode 100644 index 0000000..7d146c1 --- /dev/null +++ b/ct2n/prj/d.lst @@ -0,0 +1 @@ +..\%__SRC%\bin\ConvertTextToNumber*.oxt %_DEST%\bin%_EXT%\* diff --git a/jfreereport/java/flute/makefile.mk b/jfreereport/java/flute/makefile.mk index 413b951..0e4d28b 100644 --- a/jfreereport/java/flute/makefile.mk +++ b/jfreereport/java/flute/makefile.mk @@ -51,7 +51,7 @@ JAVA_HOME= .EXPORT : JAVA_HOME BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true" -Dbuild.id="10682" -Dproject.revision="$(FLUTE_VERSION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar .ELSE -BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true" -Dbuild.id="10682" -Dproject.revision="$(FLUTE_VERSION)" -f $(ANT_BUILDFILE) jar +BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true" -Dbuild.id="10682" -Dproject.revision="$(FLUTE_VERSION)" -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) jar .ENDIF .ENDIF # $(SOLAR_JAVA)!= "" diff --git a/jfreereport/java/jfreereport/makefile.mk b/jfreereport/java/jfreereport/makefile.mk index 483400d..fb082f9 100644 --- a/jfreereport/java/jfreereport/makefile.mk +++ b/jfreereport/java/jfreereport/makefile.mk @@ -50,7 +50,7 @@ JAVA_HOME= .EXPORT : JAVA_HOME BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar .ELSE -BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) jar +BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) jar .ENDIF .ENDIF # $(SOLAR_JAVA)!= "" diff --git a/jfreereport/java/libbase/makefile.mk b/jfreereport/java/libbase/makefile.mk index bcbe1e6..cdc5015 100644 --- a/jfreereport/java/libbase/makefile.mk +++ b/jfreereport/java/libbase/makefile.mk @@ -51,7 +51,7 @@ JAVA_HOME= .EXPORT : JAVA_HOME BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true" -Dbuild.id="10682" -Dproject.revision="$(LIBBASE_VERSION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar .ELSE -BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true" -Dbuild.id="10682" -Dproject.revision="$(LIBBASE_VERSION)" -f $(ANT_BUILDFILE) jar +BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true" -Dbuild.id="10682" -Dproject.revision="$(LIBBASE_VERSION)" -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) jar .ENDIF .ENDIF # $(SOLAR_JAVA)!= "" diff --git a/jfreereport/java/libfonts/makefile.mk b/jfreereport/java/libfonts/makefile.mk index 2c7e60e..594562d 100644 --- a/jfreereport/java/libfonts/makefile.mk +++ b/jfreereport/java/libfonts/makefile.mk @@ -50,7 +50,7 @@ JAVA_HOME= .EXPORT : JAVA_HOME BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true" -Dbuild.id="10682" -Dproject.revision="$(LIBFONTS_VERSION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar .ELSE -BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true" -Dbuild.id="10682" -Dproject.revision="$(LIBFONTS_VERSION)" -f $(ANT_BUILDFILE) jar +BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true" -Dbuild.id="10682" -Dproject.revision="$(LIBFONTS_VERSION)" -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) jar .ENDIF .ENDIF # $(SOLAR_JAVA)!= "" diff --git a/jfreereport/java/libformula/makefile.mk b/jfreereport/java/libformula/makefile.mk index 195130d..33ff65f 100644 --- a/jfreereport/java/libformula/makefile.mk +++ b/jfreereport/java/libformula/makefile.mk @@ -50,7 +50,7 @@ JAVA_HOME= .EXPORT : JAVA_HOME BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true" -Dbuild.id="10682" -Dproject.revision="$(LIBFORMULA_VERSION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar .ELSE -BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true" -Dbuild.id="10682" -Dproject.revision="$(LIBFORMULA_VERSION)" -f $(ANT_BUILDFILE) jar +BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true" -Dbuild.id="10682" -Dproject.revision="$(LIBFORMULA_VERSION)" -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) jar .ENDIF diff --git a/jfreereport/java/liblayout/makefile.mk b/jfreereport/java/liblayout/makefile.mk index 778b1b1..7e4977d 100644 --- a/jfreereport/java/liblayout/makefile.mk +++ b/jfreereport/java/liblayout/makefile.mk @@ -50,7 +50,7 @@ JAVA_HOME= .EXPORT : JAVA_HOME BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar .ELSE -BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) jar +BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) jar .ENDIF .ENDIF # $(SOLAR_JAVA)!= "" diff --git a/jfreereport/java/libloader/makefile.mk b/jfreereport/java/libloader/makefile.mk index bb1b6f2..356295b 100644 --- a/jfreereport/java/libloader/makefile.mk +++ b/jfreereport/java/libloader/makefile.mk @@ -51,7 +51,7 @@ JAVA_HOME= .EXPORT : JAVA_HOME BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true" -Dbuild.id="10682" -Dproject.revision="$(LIBLOADER_VERSION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar .ELSE -BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true" -Dbuild.id="10682" -Dproject.revision="$(LIBLOADER_VERSION)" -f $(ANT_BUILDFILE) jar +BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true" -Dbuild.id="10682" -Dproject.revision="$(LIBLOADER_VERSION)" -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) jar .ENDIF .ENDIF # $(SOLAR_JAVA)!= "" diff --git a/jfreereport/java/librepository/makefile.mk b/jfreereport/java/librepository/makefile.mk index 37da075..38b091e 100644 --- a/jfreereport/java/librepository/makefile.mk +++ b/jfreereport/java/librepository/makefile.mk @@ -51,7 +51,7 @@ JAVA_HOME= .EXPORT : JAVA_HOME BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true" -Dbuild.id="10682" -Dproject.revision="$(LIBREPOSITORY_VERSION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar .ELSE -BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true" -Dbuild.id="10682" -Dproject.revision="$(LIBREPOSITORY_VERSION)" -f $(ANT_BUILDFILE) jar +BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true" -Dbuild.id="10682" -Dproject.revision="$(LIBREPOSITORY_VERSION)" -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) jar .ENDIF .ENDIF # $(SOLAR_JAVA)!= "" diff --git a/jfreereport/java/libserializer/makefile.mk b/jfreereport/java/libserializer/makefile.mk index 170d3fa..d5ee7cc 100644 --- a/jfreereport/java/libserializer/makefile.mk +++ b/jfreereport/java/libserializer/makefile.mk @@ -50,7 +50,7 @@ JAVA_HOME= .EXPORT : JAVA_HOME BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true" -Dbuild.id="10682" -Dproject.revision="$(LIBSERIALIZER_VERSION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar .ELSE -BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true" -Dbuild.id="10682" -Dproject.revision="$(LIBSERIALIZER_VERSION)" -f $(ANT_BUILDFILE) jar +BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true" -Dbuild.id="10682" -Dproject.revision="$(LIBSERIALIZER_VERSION)" -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) jar .ENDIF .ENDIF # $(SOLAR_JAVA)!= "" diff --git a/jfreereport/java/libxml/makefile.mk b/jfreereport/java/libxml/makefile.mk index 356d05f..1ae17a1 100644 --- a/jfreereport/java/libxml/makefile.mk +++ b/jfreereport/java/libxml/makefile.mk @@ -50,7 +50,7 @@ JAVA_HOME= .EXPORT : JAVA_HOME BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true" -Dbuild.id="10682" -Dproject.revision="$(LIBXML_VERSION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar .ELSE -BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true" -Dbuild.id="10682" -Dproject.revision="$(LIBXML_VERSION)" -f $(ANT_BUILDFILE) jar +BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true" -Dbuild.id="10682" -Dproject.revision="$(LIBXML_VERSION)" -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) jar .ENDIF .ENDIF # $(SOLAR_JAVA)!= "" diff --git a/jfreereport/java/sac/makefile.mk b/jfreereport/java/sac/makefile.mk index 01d6186..899fc25 100644 --- a/jfreereport/java/sac/makefile.mk +++ b/jfreereport/java/sac/makefile.mk @@ -60,7 +60,7 @@ JAVA_HOME= .EXPORT : JAVA_HOME BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true" -Dproject.revision="$(VERSION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) all .ELSE -BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true" -Dproject.revision="$(VERSION)" -f $(ANT_BUILDFILE) all +BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true" -Dproject.revision="$(VERSION)" -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) all .ENDIF .ENDIF # $(SOLAR_JAVA)!= "" diff --git a/jfreereport/patches/common_build.patch b/jfreereport/patches/common_build.patch index 3d5330b..7cdc7f8 100755 --- a/jfreereport/patches/common_build.patch +++ b/jfreereport/patches/common_build.patch @@ -1,5 +1,23 @@ --- misc/libloader-1.1.3/common_build.xml 2009-11-16 10:25:34.000000000 +0100 +++ misc/build/libloader-1.1.3/common_build.xml 2009-12-04 10:22:24.277647200 +0100 +@@ -261,7 +261,7 @@ TYPICAL TARGET SEQUENCE + <property name="project.revision" value="${Implementation-Version}" description="Sets the version number of the project based on the Implementation-Version found in the manifest file (if one is supplied and nothing is specified in the build.properties)" /> + <fail message="A project revision number has not been determined!"> + <condition> +- <matches string="${project.revision}" pattern="\$\{.*\}" /> ++ <contains string="${project.revision}" substring="\$\{" /> + </condition> + </fail> + +@@ -270,7 +270,7 @@ TYPICAL TARGET SEQUENCE + <property name="impl.title" value="${Implementation-Title}" description="Sets the title of the project based on the Implementation-Title found in the manifest file (if one is supplied and nothing is specified in the build.properties)" /> + <fail message="A project title has not been determined!"> + <condition> +- <matches string="${impl.title}" pattern="\$\{.*\}" /> ++ <contains string="${impl.title}" substring="\$\{" /> + </condition> + </fail> + @@ -497,7 +497,7 @@ Sets a property build.id to the either "development" or the svn revision if in release mode diff --git a/languagetool/JLanguageTool-1.0.0.patch b/languagetool/JLanguageTool-1.0.0.patch new file mode 100644 index 0000000..2b025c9 --- /dev/null +++ b/languagetool/JLanguageTool-1.0.0.patch @@ -0,0 +1,137 @@ +--- misc/JLanguageTool-1.0.0/build.properties 2009-11-01 17:02:22.000000000 +0100 ++++ misc/build/JLanguageTool-1.0.0/build.properties 2010-03-10 15:33:21.000000000 +0100 +@@ -54,10 +54,10 @@ + ext.log4j.lib = ${ext.dir}/build/cobertura/log4j-1.2.9.jar + ext.jakarta-oro.lib = ${ext.dir}/build/cobertura/jakarta-oro-2.0.8.jar + +-ext.ooo.juh.lib = ${ext.ooo.dir}/juh.jar +-ext.ooo.unoil.lib = ${ext.ooo.dir}/unoil.jar +-ext.ooo.ridl.lib = ${ext.ooo.dir}/ridl.jar +-ext.ooo.jurt.lib = ${ext.ooo.dir}/jurt.jar ++ext.ooo.juh.lib = ${solver.ooo.dir}/juh.jar ++ext.ooo.unoil.lib = ${solver.ooo.dir}/unoil.jar ++ext.ooo.ridl.lib = ${solver.ooo.dir}/ridl.jar ++ext.ooo.jurt.lib = ${solver.ooo.dir}/jurt.jar + + build.meta-inf = ${build.dir}/META-INF + final.name = LanguageTool +--- misc/JLanguageTool-1.0.0/build.xml 2009-10-26 14:28:30.000000000 +0100 ++++ misc/build/JLanguageTool-1.0.0/build.xml 2010-03-10 15:33:21.000000000 +0100 +@@ -20,6 +20,8 @@ + <pathelement location="${ext.logging.lib}" /> + <pathelement location="${ext.segment.lib}" /> + <!-- --> ++ <pathelement location="${ext.junit.lib}"/> ++ <!-- --> + <pathelement location="${ext.ooo.juh.lib}" /> + <pathelement location="${ext.ooo.unoil.lib}" /> + <pathelement location="${ext.ooo.ridl.lib}" /> +@@ -367,11 +369,11 @@ + <!-- ================================================================== --> + + <target name="dist" depends="ooo-internal" description="Builds one ZIP for both OpenOffice.org and stand-alone use"> +-<zip compress="yes" destfile="${dist.dir}/LanguageTool-${version}.oxt" basedir="${dist.dir}" includes="**" excludes="deploy.sh,undeploy.sh,turn.sh,jdic.jar,printlocales.jar,linux/**,windows/**,sunos/**,mac/**" /> ++<zip compress="yes" destfile="${dist.dir}/LanguageTool.oxt" basedir="${dist.dir}" includes="**" excludes="deploy.sh,undeploy.sh,turn.sh,jdic.jar,printlocales.jar,linux/**,windows/**,sunos/**,mac/**" /> + </target> + + <target name="fast" depends="ooo-internal" description="like dist, but without ZIP compression (for development only)"> +-<zip compress="no" destfile="${dist.dir}/LanguageTool-${version}.oxt" basedir="${dist.dir}" includes="**" excludes="deploy.sh,undeploy.sh,turn.sh,jdic.jar,printlocales.jar,linux/**,windows/**,sunos/**,mac/**" /> ++<zip compress="no" destfile="${dist.dir}/LanguageTool.oxt" basedir="${dist.dir}" includes="**" excludes="deploy.sh,undeploy.sh,turn.sh,jdic.jar,printlocales.jar,linux/**,windows/**,sunos/**,mac/**" /> + </target> + + <target name="ooo-internal" depends="clean,init,build,ooo-build"> +@@ -402,11 +404,6 @@ + <copy file="${ext.segment.lib}" todir="${dist.dir}" /> + <copy file="${ext.logging.lib}" todir="${dist.dir}" /> + <copy file="${ext.junit.lib}" todir="${dist.dir}" /> +-<!-- JAXB jars for Java 1.5 --> +-<copy file="${ext.jaxb-api.lib}" todir="${dist.dir}" /> +-<copy file="${ext.jaxb-impl.lib}" todir="${dist.dir}" /> +-<copy file="${ext.jsr.lib}" todir="${dist.dir}" /> +-<copy file="${ext.activation.lib}" todir="${dist.dir}" /> + + + <copy todir="${dist.dir}/linux"> +@@ -472,7 +472,6 @@ + <copy file="${resource.dir}/sv/swedish.info" todir="${dist.dir}/resource/sv" /> + <copy file="${resource.dir}/sv/swedish.dict" todir="${dist.dir}/resource/sv" /> + <copy file="${resource.dir}/sv/compounds.txt" todir="${dist.dir}/resource/sv" /> +-<copy file="${resource.dir}/uk/ukrainian.dict" todir="${dist.dir}/resource/uk" /> + <copy file="${resource.dir}/ru/russian.dict" todir="${dist.dir}/resource/ru" /> + <copy file="${resource.dir}/ru/russian.info" todir="${dist.dir}/resource/ru" /> + <copy file="${resource.dir}/ru/russian_tags.txt" todir="${dist.dir}/resource/ru" /> +@@ -494,7 +493,6 @@ + <copy file="${resource.dir}/sk/slovak_synth.dict" todir="${dist.dir}/resource/sk" /> + <copy file="${resource.dir}/sk/slovak_synth.info" todir="${dist.dir}/resource/sk" /> + <copy file="${resource.dir}/sk/slovak_tags.txt" todir="${dist.dir}/resource/sk" /> +-<copy file="${resource.dir}/xx/dummy.dict" tofile="${dist.dir}/resource/cs/czech.dict" /> + + <!-- prepare properties file automatically --> + <javac encoding="${encoding}" srcdir="${src.dir}/dev" includes="de/danielnaber/languagetool/dev/PrintLocales.java" destdir="${build.classes}" target="${target}" debug="${debug}"> +--- misc/JLanguageTool-1.0.0/src/java/de/danielnaber/languagetool/gui/Configuration.java 2009-01-01 23:39:30.000000000 +0100 ++++ misc/build/JLanguageTool-1.0.0/src/java/de/danielnaber/languagetool/gui/Configuration.java 2010-03-10 15:33:21.000000000 +0100 +@@ -23,6 +23,7 @@ + import java.io.FileNotFoundException; + import java.io.FileOutputStream; + import java.io.IOException; ++import java.lang.ClassLoader; + import java.util.HashSet; + import java.util.Iterator; + import java.util.Properties; +@@ -154,8 +155,19 @@ + final String motherTongueStr = (String) props + .get(MOTHER_TONGUE_CONFIG_KEY); + if (motherTongueStr != null) { ++ // FIXME: hack to disable the functionality for JRE 1.5 ++ // javax.xml.bind.JAXBException is part of JRE 1.6 ++ boolean isJRE15 = false; ++ try { ++ ClassLoader cl = ClassLoader.getSystemClassLoader(); ++ cl.loadClass("javax.xml.bind.JAXBException"); ++ } catch (ClassNotFoundException e) { ++ isJRE15 = true; ++ } ++ if (!isJRE15) { + motherTongue = Language.getLanguageForShortName(motherTongueStr); + } ++ } + final String runServerString = (String) props.get(SERVER_RUN_CONFIG_KEY); + if (runServerString != null) { + runServer = runServerString.equals("true"); +--- misc/JLanguageTool-1.0.0/src/java/de/danielnaber/languagetool/openoffice/Main.java 2009-10-24 16:52:03.000000000 +0200 ++++ misc/build/JLanguageTool-1.0.0/src/java/de/danielnaber/languagetool/openoffice/Main.java 2010-03-10 15:33:21.000000000 +0100 +@@ -24,6 +24,7 @@ + * @author Marcin Miłkowski + */ + import java.io.File; ++import java.lang.ClassLoader; + import java.util.ArrayList; + import java.util.Arrays; + import java.util.Comparator; +@@ -455,6 +456,14 @@ + * @return An array of Locales supported by LT. + */ + public final Locale[] getLocales() { ++ // FIXME: hack to disable the functionality for JRE 1.5 ++ // javax.xml.bind.JAXBException is part of JRE 1.6 ++ try { ++ ClassLoader cl = ClassLoader.getSystemClassLoader(); ++ cl.loadClass("javax.xml.bind.JAXBException"); ++ } catch (ClassNotFoundException e) { ++ return new Locale[0]; ++ } + try { + int dims = 0; + for (final Language element : Language.LANGUAGES) { +@@ -609,9 +618,9 @@ + if (version != null + && (version.startsWith("1.0") || version.startsWith("1.1") + || version.startsWith("1.2") || version.startsWith("1.3") || version +- .startsWith("1.4"))) { ++ .startsWith("1.4") || version.startsWith("1.5"))) { + final DialogThread dt = new DialogThread( +- "Error: LanguageTool requires Java 1.5 or later. Current version: " ++ "Error: LanguageTool requires Java 1.6 or later. Current version: " + + version); + dt.start(); + return false; diff --git a/languagetool/makefile.mk b/languagetool/makefile.mk new file mode 100644 index 0000000..03c8754 --- /dev/null +++ b/languagetool/makefile.mk @@ -0,0 +1,63 @@ +#************************************************************************* +# +# 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 +# +# 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 +# <http://www.openoffice.org/license.html> +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +PRJ=. + +PRJNAME=languagetool +TARGET=languagetool + +.IF "$(SOLAR_JAVA)"!="" +# --- Settings ----------------------------------------------------- + +.INCLUDE : settings.mk +.INCLUDE : antsettings.mk + +# --- Files -------------------------------------------------------- + +TARFILE_NAME=JLanguageTool-1.0.0 +TARFILE_MD5=47e1edaa44269bc537ae8cabebb0f638 +TARFILE_ROOTDIR=JLanguageTool-1.0.0 +PATCH_FILES=JLanguageTool-1.0.0.patch + +.IF "$(JAVACISGCJ)"=="yes" +JAVA_HOME= +.EXPORT : JAVA_HOME +BUILD_ACTION=$(ANT) -v -Dsolver.ooo.dir=$(SOLARVER)$/$(INPATH)$/bin -Dbuild.compiler=gcj dist +.ELSE +BUILD_ACTION=$(ANT) -v -Dsolver.ooo.dir=$(SOLARVER)$/$(INPATH)$/bin -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) dist +.ENDIF + +# --- Targets ------------------------------------------------------ + +.INCLUDE : set_ext.mk +.INCLUDE : target.mk +.INCLUDE : tg_ext.mk + +.ELSE +all: + @echo java disabled +.ENDIF diff --git a/languagetool/prj/build.lst b/languagetool/prj/build.lst new file mode 100644 index 0000000..98e25c3 --- /dev/null +++ b/languagetool/prj/build.lst @@ -0,0 +1,3 @@ +lt languagetool : javaunohelper jurt ridljar unoil NULL +lt languagetool usr1 - all lt_mkout NULL +lt languagatool nmake - all lt_languagetool NULL diff --git a/languagetool/prj/d.lst b/languagetool/prj/d.lst new file mode 100644 index 0000000..b3c00b3 --- /dev/null +++ b/languagetool/prj/d.lst @@ -0,0 +1 @@ +..\%__SRC%\misc\build\JLanguageTool*\dist\LanguageTool.oxt %_DEST%\bin%_EXT%\ diff --git a/migrationanalysis/src/msokill/StdAfx.cpp b/migrationanalysis/src/msokill/StdAfx.cpp index 511051c..2785112 100644 --- a/migrationanalysis/src/msokill/StdAfx.cpp +++ b/migrationanalysis/src/msokill/StdAfx.cpp @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -33,3 +34,5 @@ // TODO: reference any additional headers you need in STDAFX.H // and not in this file + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/migrationanalysis/src/msokill/StdAfx.h b/migrationanalysis/src/msokill/StdAfx.h index 35f5ef0..88357f6 100644 --- a/migrationanalysis/src/msokill/StdAfx.h +++ b/migrationanalysis/src/msokill/StdAfx.h @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -52,3 +53,5 @@ // Microsoft Visual C++ will insert additional declarations immediately before the previous line. #endif // !defined(AFX_STDAFX_H__12149A50_72AF_409A_9B43_8ACCD98F50CE__INCLUDED_) + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/migrationanalysis/src/msokill/makefile.mk b/migrationanalysis/src/msokill/makefile.mk index 918c7c4..bee81b0 100644 --- a/migrationanalysis/src/msokill/makefile.mk +++ b/migrationanalysis/src/msokill/makefile.mk @@ -51,7 +51,6 @@ LIBSALCPPRT= APP1NOSAL= TRUE APP1TARGET= msokill -#APP1STDLIB STDLIB1=msi.lib\ shell32.lib\ oleaut32.lib\ diff --git a/migrationanalysis/src/msokill/msokill.cpp b/migrationanalysis/src/msokill/msokill.cpp index 0954413..32f6022 100644 --- a/migrationanalysis/src/msokill/msokill.cpp +++ b/migrationanalysis/src/msokill/msokill.cpp @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -256,4 +257,5 @@ void printUsage() { printf(" --close: Attempt to close any open dialogs owned by \n"); printf(" MSO apps so Application.Quit() can succeed\n"); printf(" --kill : Kill any open MSO apps. Use with caution and only as a last resort\n\n"); -}
\ No newline at end of file +} +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/migrationanalysis/src/wizard/res_defines.h b/migrationanalysis/src/wizard/res_defines.h index 7529f03..63c63c8 100644 --- a/migrationanalysis/src/wizard/res_defines.h +++ b/migrationanalysis/src/wizard/res_defines.h @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ #ifndef RES_DEFINES_H_INCLUDED
#define RES_DEFINES_H_INCLUDED
@@ -148,3 +149,5 @@ #define RID_STR_TERMINATE_YES 1832
#define RID_STR_TERMINATE_NO 1833
#endif
+ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/mysqlc/source/description.xml b/mysqlc/source/description.xml index 727fc6b..eaf42f6 100755 --- a/mysqlc/source/description.xml +++ b/mysqlc/source/description.xml @@ -5,11 +5,6 @@ <identifier value="UPDATED_IDENTIFIER"/> <version value="#VERSION#" /> <platform value="UPDATED_SUPPORTED_PLATFORM" /> - <registration> - <simple-license accept-by="admin" default-license-id="lic-en-US" suppress-if-required="true" > - <license-text xlink:href="licensefile" lang="isocode" license-id="lic-isocode"/> - </simple-license> - </registration> <display-name> <name lang="en-US">#TITLE#</name> </display-name> @@ -21,7 +16,6 @@ </publisher> <icon> <default xlink:href="images/extension_32.png" /> - <high-contrast xlink:href="images/extension_32_h.png" /> </icon> <extension-description> <src lang="#LANG#" xlink:href="description/description_#LANG#.txt"/> diff --git a/mysqlc/source/makefile.mk b/mysqlc/source/makefile.mk index 49c6734..8ffa8e1 100755 --- a/mysqlc/source/makefile.mk +++ b/mysqlc/source/makefile.mk @@ -35,9 +35,7 @@ ENABLE_EXCEPTIONS=TRUE LIBTARGET=NO EXTENSIONNAME:=mysql-connector-ooo -.IF "$(SYSTEM_MYSQL)" == "YES" EXTERNAL_WARNINGS_NOT_ERRORS = TRUE -.ENDIF # --- Settings ----------------------------------------------------- @@ -116,9 +114,6 @@ CDEFS+=-DCPPDBC_EXPORTS -DCPPCONN_LIB_BUILD CDEFS += -DCPPCONN_LIB=\"$(DLLPRE)mysqlcppconn$(DLLPOST)\" .ELSE CDEFS += -DCPPCONN_LIB=\"$(shell readlink /usr/lib/libmysqlcppconn.so)\" -.IF "$(USE_SYSTEM_STL)"!="YES" -CDEFS += -DADAPT_EXT_STL -.ENDIF .ENDIF # --------------- MySQL settings ------------------ @@ -225,9 +220,7 @@ COMPONENT_LIBRARIES=\ $(COMPONENT_LIBRARY) COMPONENT_IMAGES= \ - $(EXTENSIONDIR)$/images$/extension_32.png \ - $(EXTENSIONDIR)$/images$/extension_32_h.png - + $(EXTENSIONDIR)$/images$/extension_32.png # ........ component description ........ # one file for each WITH_LANG token @@ -283,18 +276,6 @@ $(EXTENSIONDIR)$/registry$/data$/org$/openoffice$/Office$/DataAccess$/Drivers.xc @@-$(MKDIRHIER) $(EXTENSIONDIR)$/registry$/data$/org$/openoffice$/Office$/DataAccess @$(COPY) $< $(EXTENSIONDIR)$/registry$/data$/org$/openoffice$/Office$/DataAccess$/Drivers.xcu > $(NULLDEV) -# The below doesn't work - it's completely beyond me .... $@ is some strange path when echoed, so the whole construct -# doesn't work .... :( - -#$(foreach,i,$(COMPONENT_XCU) $(EXTENSIONDIR)$/$i : $i) -# @echo ----------------- -# @echo $@ -# @echo $< -# @echo ----------------- -# -$(MKDIRHIER) $(@:d) -# (COPY) $< $@ -# @echo ----------------- - # non-existing descriptions: copy from the English version .IF "$(strip $(MISSING_LANGS))" != "" $(foreach,i,$(MISSING_LANGS) $(EXTENSIONDIR)$/description$/description_$i.txt): .$/description$/description_en-US.txt diff --git a/mysqlc/source/mysqlc.xml b/mysqlc/source/mysqlc.xml index cb1b4e6..5c19802 100644 --- a/mysqlc/source/mysqlc.xml +++ b/mysqlc/source/mysqlc.xml @@ -17,12 +17,10 @@ <project-build-dependency> cppuhelper </project-build-dependency> <project-build-dependency> cppu </project-build-dependency> <project-build-dependency> sal </project-build-dependency> - <project-build-dependency> vos </project-build-dependency> <runtime-module-dependency> cppuhelper </runtime-module-dependency> <runtime-module-dependency> cppu1 </runtime-module-dependency> <runtime-module-dependency> sal1 </runtime-module-dependency> - <runtime-module-dependency> vos </runtime-module-dependency> <type> com.sun.star.registry.XRegistryKey </type> <type> com.sun.star.util.XCancellable </type> diff --git a/mysqlc/source/mysqlc_connection.cxx b/mysqlc/source/mysqlc_connection.cxx index 17bf54f..82536d8 100644 --- a/mysqlc/source/mysqlc_connection.cxx +++ b/mysqlc/source/mysqlc_connection.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -5,9 +6,6 @@ * * OpenOffice.org - a multi-platform office productivity suite * -* $RCSfile: mysqlc_connection.cxx,v $ -* -* $Revision: 1.1.2.6 $* * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -35,13 +33,11 @@ #include "mysqlc_preparedstatement.hxx" #include "mysqlc_general.hxx" -#include <preextstl.h> #include <cppconn/driver.h> #include <cppconn/connection.h> #include <cppconn/statement.h> #include <cppconn/metadata.h> #include <cppconn/exception.h> -#include <postextstl.h> #include <com/sun/star/sdbc/ColumnValue.hpp> #include <com/sun/star/sdbc/XRow.hpp> @@ -134,7 +130,7 @@ void OConnection::construct(const OUString& url, const Sequence< PropertyValue > // parse url. Url has the following format: // external server: sdbc:mysqlc:[hostname]:[port]/[dbname] - if (!url.compareTo(OUString::createFromAscii(MYSQLC_URI_PREFIX), sizeof(MYSQLC_URI_PREFIX)-1)) { + if (!url.compareTo(OUString(RTL_CONSTASCII_USTRINGPARAM(MYSQLC_URI_PREFIX)), sizeof(MYSQLC_URI_PREFIX)-1)) { nIndex = 12; } else { bEmbedded = sal_True; @@ -188,10 +184,10 @@ void OConnection::construct(const OUString& url, const Sequence< PropertyValue > if (bEmbedded == sal_False) { try { sql::ConnectOptionsMap connProps; - ext_std::string host_str = OUStringToOString(aHostName, m_settings.encoding).getStr(); - ext_std::string user_str = OUStringToOString(aUser, m_settings.encoding).getStr(); - ext_std::string pass_str = OUStringToOString(aPass, m_settings.encoding).getStr(); - ext_std::string schema_str = OUStringToOString(aDbName, m_settings.encoding).getStr(); + std::string host_str = OUStringToOString(aHostName, m_settings.encoding).getStr(); + std::string user_str = OUStringToOString(aUser, m_settings.encoding).getStr(); + std::string pass_str = OUStringToOString(aPass, m_settings.encoding).getStr(); + std::string schema_str = OUStringToOString(aDbName, m_settings.encoding).getStr(); connProps["hostName"] = sql::ConnectPropertyVal(host_str); connProps["userName"] = sql::ConnectPropertyVal(user_str); connProps["password"] = sql::ConnectPropertyVal(pass_str); @@ -221,7 +217,7 @@ void OConnection::construct(const OUString& url, const Sequence< PropertyValue > #if OSL_DEBUG_LEVEL > 0 ::rtl::OString sMessage( "OConnection::construct: malformed URI: " ); sMessage += ::rtl::OUStringToOString( e.getMessage(), osl_getThreadTextEncoding() ); - OSL_ENSURE( false, sMessage.getStr() ); + OSL_FAIL( sMessage.getStr() ); #endif } @@ -249,7 +245,7 @@ void OConnection::construct(const OUString& url, const Sequence< PropertyValue > } m_settings.schema = aDbName; - OSL_TRACE(OUStringToOString(m_settings.schema, getConnectionEncoding()).getStr()); + OSL_TRACE("%s", OUStringToOString(m_settings.schema, getConnectionEncoding()).getStr()); // Check if the server is 4.1 or above if (this->getMysqlVersion() < 40100) { @@ -791,3 +787,5 @@ sal_Int32 OConnection::getMysqlVersion() * vim600: noet sw=4 ts=4 fdm=marker * vim<600: noet sw=4 ts=4 */ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/mysqlc/source/mysqlc_connection.hxx b/mysqlc/source/mysqlc_connection.hxx index 4315f85..578c339 100644 --- a/mysqlc/source/mysqlc_connection.hxx +++ b/mysqlc/source/mysqlc_connection.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -5,10 +6,6 @@ * * OpenOffice.org - a multi-platform office productivity suite * -* $RCSfile: mysqlc_connection.hxx,v $ -* -* $Revision: 1.1.2.4 $ -* * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -46,9 +43,8 @@ #include <com/sun/star/sdbc/XWarningsSupplier.hpp> #include <com/sun/star/util/XStringSubstitution.hpp> -#include <preextstl.h> #include <cppconn/driver.h> -#include <postextstl.h> + #include <cppuhelper/compbase3.hxx> #include <cppuhelper/weakref.hxx> #include <rtl/string.hxx> @@ -250,3 +246,4 @@ namespace connectivity * vim<600: noet sw=4 ts=4 */ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/mysqlc/source/mysqlc_databasemetadata.cxx b/mysqlc/source/mysqlc_databasemetadata.cxx index af6dc8e..16a1af6 100644 --- a/mysqlc/source/mysqlc_databasemetadata.cxx +++ b/mysqlc/source/mysqlc_databasemetadata.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -5,10 +6,6 @@ * * OpenOffice.org - a multi-platform office productivity suite * -* $RCSfile: mysqlc_databasemetadata.cxx,v $ -* -* $Revision: 1.1.2.5 $ -* * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -54,15 +51,15 @@ using namespace com::sun::star::sdbc; using ::rtl::OUString; using mysqlc_sdbc_driver::getStringFromAny; -#include <preextstl.h> #include <cppconn/connection.h> #include <cppconn/resultset.h> #include <cppconn/metadata.h> #include <cppconn/statement.h> #include <cppconn/prepared_statement.h> -#include <postextstl.h> -static ext_std::string wild("%"); +#include <sal/macros.h> + +static std::string wild("%"); using ::rtl::OUStringToOString; @@ -116,7 +113,7 @@ ODatabaseMetaData::~ODatabaseMetaData() /* {{{ ODatabaseMetaData::impl_getStringMetaData() -I- */ -OUString ODatabaseMetaData::impl_getStringMetaData(const sal_Char* _methodName, const ext_std::string& (sql::DatabaseMetaData::*_Method)() ) +OUString ODatabaseMetaData::impl_getStringMetaData(const sal_Char* _methodName, const std::string& (sql::DatabaseMetaData::*_Method)() ) { OSL_TRACE( "mysqlc::ODatabaseMetaData::%s", _methodName); OUString stringMetaData; @@ -135,7 +132,7 @@ OUString ODatabaseMetaData::impl_getStringMetaData(const sal_Char* _methodName, /* {{{ ODatabaseMetaData::impl_getStringMetaData() -I- */ -OUString ODatabaseMetaData::impl_getStringMetaData(const sal_Char* _methodName, ext_std::string (sql::DatabaseMetaData::*_Method)() ) +OUString ODatabaseMetaData::impl_getStringMetaData(const sal_Char* _methodName, std::string (sql::DatabaseMetaData::*_Method)() ) { OSL_TRACE( "mysqlc::ODatabaseMetaData::%s", _methodName); OUString stringMetaData; @@ -1656,7 +1653,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumnPrivileges( Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.helper.DatabaseMetaDataResultSet"))),UNO_QUERY); std::vector< std::vector< Any > > rRows; - ext_std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""), + std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""), sch(OUStringToOString(schema, m_rConnection.getConnectionEncoding()).getStr()), tab(OUStringToOString(table, m_rConnection.getConnectionEncoding()).getStr()), cNamePattern(OUStringToOString(columnNamePattern, m_rConnection.getConnectionEncoding()).getStr()); @@ -1698,7 +1695,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumns( OSL_TRACE("ODatabaseMetaData::getColumns"); Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.helper.DatabaseMetaDataResultSet"))),UNO_QUERY); std::vector< std::vector< Any > > rRows; - ext_std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""), + std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""), sPattern(OUStringToOString(schemaPattern, m_rConnection.getConnectionEncoding()).getStr()), tNamePattern(OUStringToOString(tableNamePattern, m_rConnection.getConnectionEncoding()).getStr()), cNamePattern(OUStringToOString(columnNamePattern, m_rConnection.getConnectionEncoding()).getStr()); @@ -1752,11 +1749,11 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.helper.DatabaseMetaDataResultSet"))),UNO_QUERY); std::vector< std::vector< Any > > rRows; - ext_std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""), + std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""), sPattern(OUStringToOString(schemaPattern, m_rConnection.getConnectionEncoding()).getStr()), tNamePattern(OUStringToOString(tableNamePattern, m_rConnection.getConnectionEncoding()).getStr()); - ext_std::list<sql::SQLString> tabTypes; + std::list<sql::SQLString> tabTypes; for (const OUString *pStart = types.getConstArray(), *p = pStart, *pEnd = pStart + nLength; p != pEnd; ++p) { tabTypes.push_back(OUStringToOString(*p, m_rConnection.getConnectionEncoding()).getStr()); } @@ -1824,7 +1821,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getProcedures( Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.helper.DatabaseMetaDataResultSet"))),UNO_QUERY); std::vector< std::vector< Any > > rRows; - ext_std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""), + std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""), sPattern(OUStringToOString(schemaPattern, m_rConnection.getConnectionEncoding()).getStr()), pNamePattern(OUStringToOString(procedureNamePattern, m_rConnection.getConnectionEncoding()).getStr()); @@ -1884,7 +1881,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getExportedKeys( OSL_TRACE("ODatabaseMetaData::getExportedKeys"); Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.helper.DatabaseMetaDataResultSet"))),UNO_QUERY); std::vector< std::vector< Any > > rRows; - ext_std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""), + std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""), sch(OUStringToOString(schema, m_rConnection.getConnectionEncoding()).getStr()), tab(OUStringToOString(table, m_rConnection.getConnectionEncoding()).getStr()); @@ -1926,7 +1923,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getImportedKeys( Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.helper.DatabaseMetaDataResultSet"))),UNO_QUERY); std::vector< std::vector< Any > > rRows; - ext_std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""), + std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""), sch(OUStringToOString(schema, m_rConnection.getConnectionEncoding()).getStr()), tab(OUStringToOString(table, m_rConnection.getConnectionEncoding()).getStr()); @@ -1967,7 +1964,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getPrimaryKeys( Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.helper.DatabaseMetaDataResultSet"))),UNO_QUERY); std::vector< std::vector< Any > > rRows; - ext_std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""), + std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""), sch(OUStringToOString(schema, m_rConnection.getConnectionEncoding()).getStr()), tab(OUStringToOString(table, m_rConnection.getConnectionEncoding()).getStr()); @@ -2010,7 +2007,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getIndexInfo( Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.helper.DatabaseMetaDataResultSet"))),UNO_QUERY); std::vector< std::vector< Any > > rRows; - ext_std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""), + std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""), sch(OUStringToOString(schema, m_rConnection.getConnectionEncoding()).getStr()), tab(OUStringToOString(table, m_rConnection.getConnectionEncoding()).getStr()); @@ -2053,7 +2050,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getBestRowIdentifier( Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.helper.DatabaseMetaDataResultSet"))),UNO_QUERY); std::vector< std::vector< Any > > rRows; - ext_std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""), + std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""), sch(OUStringToOString(schema, m_rConnection.getConnectionEncoding()).getStr()), tab(OUStringToOString(table, m_rConnection.getConnectionEncoding()).getStr()); @@ -2094,7 +2091,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTablePrivileges( Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.helper.DatabaseMetaDataResultSet"))),UNO_QUERY); std::vector< std::vector< Any > > rRows; - ext_std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""), + std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""), sPattern(OUStringToOString(schemaPattern, m_rConnection.getConnectionEncoding()).getStr()), tPattern(OUStringToOString(tableNamePattern, m_rConnection.getConnectionEncoding()).getStr()); @@ -2105,7 +2102,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTablePrivileges( "ALTER", "DELETE", "DROP", "INDEX", "INSERT", "LOCK TABLES", "SELECT", "UPDATE" }; Any userName; userName <<= getUserName(); - for (size_t i = 0; i < sizeof( allPrivileges ) / sizeof( allPrivileges[0]); ++i) { + for (size_t i = 0; i < SAL_N_ELEMENTS( allPrivileges ); ++i) { std::vector< Any > aRow; aRow.push_back(makeAny( sal_Int32( i ) )); aRow.push_back(catalog); // TABLE_CAT @@ -2159,7 +2156,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getCrossReference( Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.helper.DatabaseMetaDataResultSet"))),UNO_QUERY); std::vector< std::vector< Any > > rRows; - ext_std::string primaryCat(primaryCatalog.hasValue()? OUStringToOString(getStringFromAny(primaryCatalog), m_rConnection.getConnectionEncoding()).getStr():""), + std::string primaryCat(primaryCatalog.hasValue()? OUStringToOString(getStringFromAny(primaryCatalog), m_rConnection.getConnectionEncoding()).getStr():""), foreignCat(foreignCatalog.hasValue()? OUStringToOString(getStringFromAny(foreignCatalog), m_rConnection.getConnectionEncoding()).getStr():""), pSchema(OUStringToOString(primarySchema, m_rConnection.getConnectionEncoding()).getStr()), pTable(OUStringToOString(primaryTable, m_rConnection.getConnectionEncoding()).getStr()), @@ -2215,3 +2212,4 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getUDTs( * vim<600: noet sw=4 ts=4 */ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/mysqlc/source/mysqlc_databasemetadata.hxx b/mysqlc/source/mysqlc_databasemetadata.hxx index 586aeb1..c3c2d3f 100644 --- a/mysqlc/source/mysqlc_databasemetadata.hxx +++ b/mysqlc/source/mysqlc_databasemetadata.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -5,10 +6,6 @@ * * OpenOffice.org - a multi-platform office productivity suite * -* $RCSfile: mysqlc_databasemetadata.hxx,v $ -* -* $Revision: 1.1.2.3 $ -* * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -32,16 +29,10 @@ #include "mysqlc_connection.hxx" -#ifndef _COM_SUN_STAR_SDBC_XDATABASEMETADATA_HPP_ #include <com/sun/star/sdbc/XDatabaseMetaData.hpp> -#endif -#ifndef _CPPUHELPER_IMPLBASE1_HXX_ #include <cppuhelper/implbase1.hxx> -#endif -#include <preextstl.h> #include <cppconn/metadata.h> -#include <postextstl.h> namespace connectivity { @@ -69,8 +60,8 @@ namespace connectivity bool identifier_quote_string_set; private: - OUString impl_getStringMetaData( const sal_Char* _methodName, const ext_std::string& (sql::DatabaseMetaData::*_Method)() ); - OUString impl_getStringMetaData( const sal_Char* _methodName, ext_std::string (sql::DatabaseMetaData::*_Method)() ); + OUString impl_getStringMetaData( const sal_Char* _methodName, const std::string& (sql::DatabaseMetaData::*_Method)() ); + OUString impl_getStringMetaData( const sal_Char* _methodName, std::string (sql::DatabaseMetaData::*_Method)() ); OUString impl_getStringMetaData( const sal_Char* _methodName, const sql::SQLString& (sql::DatabaseMetaData::*_Method)() ); OUString impl_getStringMetaData( const sal_Char* _methodName, sql::SQLString (sql::DatabaseMetaData::*_Method)() ); sal_Int32 impl_getInt32MetaData( const sal_Char* _methodName, unsigned int (sql::DatabaseMetaData::*_Method)() ); @@ -243,3 +234,5 @@ namespace connectivity } #endif // CONNECTIVITY_SDATABASEMETADATA_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/mysqlc/source/mysqlc_driver.cxx b/mysqlc/source/mysqlc_driver.cxx index c28d6eb..5e41020 100644 --- a/mysqlc/source/mysqlc_driver.cxx +++ b/mysqlc/source/mysqlc_driver.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -5,10 +6,6 @@ * * OpenOffice.org - a multi-platform office productivity suite * -* $RCSfile: mysqlc_driver.cxx,v $ -* -* $Revision: 1.1.2.5 $ -* * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -38,12 +35,10 @@ using namespace connectivity::mysqlc; using ::rtl::OUString; #include <stdio.h> -#include <preextstl.h> #include <cppconn/exception.h> #ifdef SYSTEM_MYSQL_CPPCONN #include <mysql_driver.h> #endif -#include <postextstl.h> /* {{{ MysqlCDriver::MysqlCDriver() -I- */ @@ -101,7 +96,7 @@ Sequence< OUString > MysqlCDriver::getSupportedServiceNames_Static() // which service is supported // for more information @see com.sun.star.sdbc.Driver Sequence< OUString > aSNS(1); - aSNS[0] = OUString::createFromAscii("com.sun.star.sdbc.Driver"); + aSNS[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbc.Driver")); return aSNS; } /* }}} */ @@ -151,7 +146,7 @@ void MysqlCDriver::impl_initCppConn_lck_throw() #else if ( !m_bAttemptedLoadCppConn ) { - const ::rtl::OUString sModuleName = ::rtl::OUString::createFromAscii( CPPCONN_LIB ); + const ::rtl::OUString sModuleName(RTL_CONSTASCII_USTRINGPARAM( CPPCONN_LIB )); m_hCppConnModule = osl_loadModuleRelative( &thisModule, sModuleName.pData, 0 ); m_bAttemptedLoadCppConn = true; } @@ -159,7 +154,7 @@ void MysqlCDriver::impl_initCppConn_lck_throw() // attempted to load - was it successful? if ( !m_hCppConnModule ) { - OSL_ENSURE( false, "MysqlCDriver::impl_initCppConn_lck_throw: could not load the " CPPCONN_LIB " library!"); + OSL_FAIL( "MysqlCDriver::impl_initCppConn_lck_throw: could not load the " CPPCONN_LIB " library!"); throw SQLException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Unable to load the " CPPCONN_LIB " library." ) ), *this, @@ -176,7 +171,7 @@ void MysqlCDriver::impl_initCppConn_lck_throw() const FGetMySQLDriver pFactoryFunction = (FGetMySQLDriver)( osl_getFunctionSymbol( m_hCppConnModule, sSymbolName.pData ) ); if ( !pFactoryFunction ) { - OSL_ENSURE( false, "MysqlCDriver::impl_initCppConn_lck_throw: could not find the factory symbol in " CPPCONN_LIB "!"); + OSL_FAIL( "MysqlCDriver::impl_initCppConn_lck_throw: could not find the factory symbol in " CPPCONN_LIB "!"); throw SQLException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( CPPCONN_LIB " is invalid: missing the driver factory function." ) ), *this, @@ -242,7 +237,7 @@ sal_Bool SAL_CALL MysqlCDriver::acceptsURL(const OUString& url) throw(SQLException, RuntimeException) { OSL_TRACE("MysqlCDriver::acceptsURL"); - return (!url.compareTo(OUString::createFromAscii("sdbc:mysqlc:"), sizeof("sdbc:mysqlc:")-1)); + return (!url.compareTo(OUString(RTL_CONSTASCII_USTRINGPARAM("sdbc:mysqlc:")), sizeof("sdbc:mysqlc:")-1)); } /* }}} */ @@ -259,14 +254,14 @@ Sequence< DriverPropertyInfo > SAL_CALL MysqlCDriver::getPropertyInfo(const OUSt OUString(RTL_CONSTASCII_USTRINGPARAM("Hostname")) ,OUString(RTL_CONSTASCII_USTRINGPARAM("Name of host")) ,sal_True - ,OUString::createFromAscii("localhost") + ,OUString(RTL_CONSTASCII_USTRINGPARAM("localhost")) ,Sequence< OUString >()) ); aDriverInfo.push_back(DriverPropertyInfo( OUString(RTL_CONSTASCII_USTRINGPARAM("Port")) ,OUString(RTL_CONSTASCII_USTRINGPARAM("Port")) ,sal_True - ,OUString::createFromAscii("3306") + ,OUString(RTL_CONSTASCII_USTRINGPARAM("3306")) ,Sequence< OUString >()) ); return Sequence< DriverPropertyInfo >(&(aDriverInfo[0]),aDriverInfo.size()); @@ -367,3 +362,5 @@ void checkDisposed(sal_Bool _bThrow) * vim600: noet sw=4 ts=4 fdm=marker * vim<600: noet sw=4 ts=4 */ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/mysqlc/source/mysqlc_driver.hxx b/mysqlc/source/mysqlc_driver.hxx index c88c4f7..ec69b32 100644 --- a/mysqlc/source/mysqlc_driver.hxx +++ b/mysqlc/source/mysqlc_driver.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -5,10 +6,6 @@ * * OpenOffice.org - a multi-platform office productivity suite * -* $RCSfile: mysqlc_driver.hxx,v $ -* -* $Revision: 1.1.2.4 $ -* * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -36,9 +33,7 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <cppuhelper/compbase2.hxx> -#include <preextstl.h> #include <cppconn/driver.h> -#include <postextstl.h> #include <osl/module.h> namespace connectivity @@ -118,3 +113,5 @@ namespace connectivity * vim600: noet sw=4 ts=4 fdm=marker * vim<600: noet sw=4 ts=4 */ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/mysqlc/source/mysqlc_general.cxx b/mysqlc/source/mysqlc_general.cxx index be5e5c8..1f94388 100644 --- a/mysqlc/source/mysqlc_general.cxx +++ b/mysqlc/source/mysqlc_general.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -5,10 +6,6 @@ * * OpenOffice.org - a multi-platform office productivity suite * -* $RCSfile: mysqlc_general.cxx,v $ -* -* $Revision: 1.1.2.3 $ -* * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -157,20 +154,22 @@ int mysqlToOOOType(int cppConnType) return com::sun::star::sdbc::DataType::VARCHAR; } - OSL_ENSURE( false, "mysqlToOOOType: unhandled case, falling back to VARCHAR" ); + OSL_FAIL( "mysqlToOOOType: unhandled case, falling back to VARCHAR" ); return com::sun::star::sdbc::DataType::VARCHAR; } -::rtl::OUString convert(const ::ext_std::string& _string, const rtl_TextEncoding encoding) +::rtl::OUString convert(const ::std::string& _string, const rtl_TextEncoding encoding) { return ::rtl::OUString( _string.c_str(), _string.size(), encoding ); } -::ext_std::string convert(const ::rtl::OUString& _string, const rtl_TextEncoding encoding) +::std::string convert(const ::rtl::OUString& _string, const rtl_TextEncoding encoding) { - return ::ext_std::string( ::rtl::OUStringToOString( _string, encoding ).getStr() ); + return ::std::string( ::rtl::OUStringToOString( _string, encoding ).getStr() ); } } /* namespace */ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/mysqlc/source/mysqlc_general.hxx b/mysqlc/source/mysqlc_general.hxx index ee8825d..cf121dd 100644 --- a/mysqlc/source/mysqlc_general.hxx +++ b/mysqlc/source/mysqlc_general.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -5,10 +6,6 @@ * * OpenOffice.org - a multi-platform office productivity suite * -* $RCSfile: mysqlc_general.hxx,v $ -* -* $Revision: 1.1.2.3 $ -* * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -33,9 +30,7 @@ #include <com/sun/star/uno/XInterface.hpp> #include <com/sun/star/sdbc/SQLException.hpp> -#include <preextstl.h> #include <cppconn/exception.h> -#include <postextstl.h> namespace mysqlc_sdbc_driver { @@ -60,9 +55,11 @@ namespace mysqlc_sdbc_driver int mysqlToOOOType(int mysqlType) throw (); - ::rtl::OUString convert(const ::ext_std::string& _string, const rtl_TextEncoding encoding); + ::rtl::OUString convert(const ::std::string& _string, const rtl_TextEncoding encoding); - ::ext_std::string convert(const ::rtl::OUString& _string, const rtl_TextEncoding encoding); + ::std::string convert(const ::rtl::OUString& _string, const rtl_TextEncoding encoding); } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/mysqlc/source/mysqlc_preparedstatement.cxx b/mysqlc/source/mysqlc_preparedstatement.cxx index 326277d..6017f71 100644 --- a/mysqlc/source/mysqlc_preparedstatement.cxx +++ b/mysqlc/source/mysqlc_preparedstatement.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -5,10 +6,6 @@ * * OpenOffice.org - a multi-platform office productivity suite * -* $RCSfile: mysqlc_preparedstatement.cxx,v $ -* -* $Revision: 1.1.2.5 $ -* * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -234,7 +231,7 @@ void SAL_CALL OPreparedStatement::setString(sal_Int32 parameter, const OUString& checkParameterIndex(parameter); try { - ext_std::string stringie(::rtl::OUStringToOString(x, m_pConnection->getConnectionEncoding()).getStr()); + std::string stringie(::rtl::OUStringToOString(x, m_pConnection->getConnectionEncoding()).getStr()); ((sql::PreparedStatement *)cppStatement)->setString(parameter, stringie); } catch (sql::MethodNotImplementedException) { mysqlc_sdbc_driver::throwFeatureNotImplementedException("OPreparedStatement::clearParameters", *this); @@ -344,7 +341,7 @@ void SAL_CALL OPreparedStatement::setDate(sal_Int32 parameter, const Date& aData checkDisposed(OPreparedStatement::rBHelper.bDisposed); checkParameterIndex(parameter); - ext_std::string dateStr; + std::string dateStr; char buf[20]; dateStr.append(my_i_to_a(buf, sizeof(buf)-1, aData.Year)); dateStr.append("-", 1); @@ -372,7 +369,7 @@ void SAL_CALL OPreparedStatement::setTime(sal_Int32 parameter, const Time& aVal) checkDisposed(OPreparedStatement::rBHelper.bDisposed); checkParameterIndex(parameter); - ext_std::string timeStr; + std::string timeStr; char buf[20]; timeStr.append(my_i_to_a(buf, sizeof(buf)-1, aVal.Hours)); timeStr.append(":", 1); @@ -400,7 +397,7 @@ void SAL_CALL OPreparedStatement::setTimestamp(sal_Int32 parameter, const DateTi checkDisposed(OPreparedStatement::rBHelper.bDisposed); checkParameterIndex(parameter); - ext_std::string timeStr; + std::string timeStr; char buf[20]; timeStr.append(my_i_to_a(buf, sizeof(buf)-1, aVal.Year)); timeStr.append("-", 1); @@ -805,7 +802,7 @@ void SAL_CALL OPreparedStatement::setBytes(sal_Int32 parameter, const Sequence< checkDisposed(OPreparedStatement::rBHelper.bDisposed); checkParameterIndex(parameter); - ext_std::string blobby((char *)x.getConstArray(), x.getLength()); + std::string blobby((char *)x.getConstArray(), x.getLength()); try { ((sql::PreparedStatement *)cppStatement)->setString(parameter, blobby); } catch (sql::MethodNotImplementedException) { @@ -942,3 +939,5 @@ void OPreparedStatement::checkParameterIndex(sal_Int32 column) * vim600: noet sw=4 ts=4 fdm=marker * vim<600: noet sw=4 ts=4 */ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/mysqlc/source/mysqlc_preparedstatement.hxx b/mysqlc/source/mysqlc_preparedstatement.hxx index 18d1a0c..3247bb5 100644 --- a/mysqlc/source/mysqlc_preparedstatement.hxx +++ b/mysqlc/source/mysqlc_preparedstatement.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -5,10 +6,6 @@ * * OpenOffice.org - a multi-platform office productivity suite * -* $RCSfile: mysqlc_preparedstatement.hxx,v $ -* -* $Revision: 1.1.2.4 $ -* * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -32,25 +29,13 @@ #include "mysqlc_statement.hxx" #include "mysqlc_resultset.hxx" -#ifndef _COM_SUN_STAR_SDBC_XPREPAREDSTATEMENT_HPP_ #include <com/sun/star/sdbc/XPreparedStatement.hpp> -#endif -#ifndef _COM_SUN_STAR_SDBC_XPARAMETERS_HPP_ #include <com/sun/star/sdbc/XParameters.hpp> -#endif -#ifndef _COM_SUN_STAR_SDBC_XRESULTSETMETADATASUPPLIER_HPP_ #include <com/sun/star/sdbc/XResultSetMetaDataSupplier.hpp> -#endif -#ifndef _COM_SUN_STAR_SDBC_XPREPAREDBATCHEXECUTION_HPP_ #include <com/sun/star/sdbc/XPreparedBatchExecution.hpp> -#endif -#ifndef _COM_SUN_STAR_IO_XINPUTSTREAM_HPP_ #include <com/sun/star/io/XInputStream.hpp> -#endif -#include <preextstl.h> #include <cppconn/prepared_statement.h> -#include <postextstl.h> namespace connectivity { @@ -194,3 +179,5 @@ namespace connectivity * vim<600: noet sw=4 ts=4 */ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/mysqlc/source/mysqlc_propertyids.cxx b/mysqlc/source/mysqlc_propertyids.cxx index e8894f1..7587959 100644 --- a/mysqlc/source/mysqlc_propertyids.cxx +++ b/mysqlc/source/mysqlc_propertyids.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -5,10 +6,6 @@ * * OpenOffice.org - a multi-platform office productivity suite * -* $RCSfile: mysqlc_propertyids.cxx,v $ -* -* $Revision: 1.1.2.2 $ -* * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -27,9 +24,7 @@ * for a copy of the LGPLv3 License. ************************************************************************/ -#ifndef _OSL_DIAGNOSE_H_ #include <osl/diagnose.h> -#endif #include "mysqlc_propertyids.hxx" using ::rtl::OUString; @@ -208,3 +203,5 @@ OUString OPropertyMap::fillValue(sal_Int32 idx) * vim600: noet sw=4 ts=4 fdm=marker * vim<600: noet sw=4 ts=4 */ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/mysqlc/source/mysqlc_propertyids.hxx b/mysqlc/source/mysqlc_propertyids.hxx index 7d73114..9fc802e 100644 --- a/mysqlc/source/mysqlc_propertyids.hxx +++ b/mysqlc/source/mysqlc_propertyids.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ #ifndef _CONNECTIVITY_PROPERTYIDS_HXX_ #define _CONNECTIVITY_PROPERTYIDS_HXX_ @@ -134,3 +135,4 @@ pProperties[nPos++] = Property(OPropertyMap::getPropMap().getNameByIndex(PROPERT #endif // _CONNECTIVITY_PROPERTYIDS_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/mysqlc/source/mysqlc_resultset.cxx b/mysqlc/source/mysqlc_resultset.cxx index 91aee1b..7f397b7 100644 --- a/mysqlc/source/mysqlc_resultset.cxx +++ b/mysqlc/source/mysqlc_resultset.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -5,10 +6,6 @@ * * OpenOffice.org - a multi-platform office productivity suite * -* $RCSfile: mysqlc_resultset.cxx,v $ -* -* $Revision: 1.1.2.5 $ -* * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -240,18 +237,6 @@ sal_Bool SAL_CALL OResultSet::getBoolean(sal_Int32 column) mysqlc_sdbc_driver::translateAndThrow(e, *this, m_encoding); } return sal_False; -#if 0 - OUString str = getString(column); - switch (str[0]) { - case '1': - case 't': - case 'T': - case 'y': - case 'Y': - return sal_True; - } - return sal_False; -#endif } /* }}} */ @@ -1524,3 +1509,5 @@ void OResultSet::checkColumnIndex(sal_Int32 index) * vim600: noet sw=4 ts=4 fdm=marker * vim<600: noet sw=4 ts=4 */ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/mysqlc/source/mysqlc_resultset.hxx b/mysqlc/source/mysqlc_resultset.hxx index a39bdcf..369c9a2 100644 --- a/mysqlc/source/mysqlc_resultset.hxx +++ b/mysqlc/source/mysqlc_resultset.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -5,10 +6,6 @@ * * OpenOffice.org - a multi-platform office productivity suite * -* $RCSfile: mysqlc_resultset.hxx,v $ -* -* $Revision: 1.1.2.4 $ -* * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -121,7 +118,6 @@ namespace connectivity throw(RuntimeException); void SAL_CALL acquire() throw(); - void SAL_CALL release() throw(); //XTypeProvider @@ -134,37 +130,27 @@ namespace connectivity // XResultSet sal_Bool SAL_CALL next() throw(SQLException, RuntimeException); - sal_Bool SAL_CALL isBeforeFirst() throw(SQLException, RuntimeException); - sal_Bool SAL_CALL isAfterLast() throw(SQLException, RuntimeException); - sal_Bool SAL_CALL isFirst() throw(SQLException, RuntimeException); - sal_Bool SAL_CALL isLast() throw(SQLException, RuntimeException); void SAL_CALL beforeFirst() throw(SQLException, RuntimeException); - void SAL_CALL afterLast() throw(SQLException, RuntimeException); sal_Bool SAL_CALL first() throw(SQLException, RuntimeException); - sal_Bool SAL_CALL last() throw(SQLException, RuntimeException); sal_Int32 SAL_CALL getRow() throw(SQLException, RuntimeException); sal_Bool SAL_CALL absolute(sal_Int32 row) throw(SQLException, RuntimeException); - sal_Bool SAL_CALL relative(sal_Int32 rows) throw(SQLException, RuntimeException); - sal_Bool SAL_CALL previous() throw(SQLException, RuntimeException); void SAL_CALL refreshRow() throw(SQLException, RuntimeException); sal_Bool SAL_CALL rowUpdated() throw(SQLException, RuntimeException); - sal_Bool SAL_CALL rowInserted() throw(SQLException, RuntimeException); - sal_Bool SAL_CALL rowDeleted() throw(SQLException, RuntimeException); ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getStatement() @@ -175,34 +161,25 @@ namespace connectivity OUString SAL_CALL getString(sal_Int32 column) throw(SQLException, RuntimeException); sal_Bool SAL_CALL getBoolean(sal_Int32 column) throw(SQLException, RuntimeException); - sal_Int8 SAL_CALL getByte(sal_Int32 column) throw(SQLException, RuntimeException); - sal_Int16 SAL_CALL getShort(sal_Int32 column) throw(SQLException, RuntimeException); - sal_Int32 SAL_CALL getInt(sal_Int32 column) throw(SQLException, RuntimeException); - sal_Int64 SAL_CALL getLong(sal_Int32 column) throw(SQLException, RuntimeException); float SAL_CALL getFloat(sal_Int32 column) throw(SQLException, RuntimeException); - double SAL_CALL getDouble(sal_Int32 column) throw(SQLException, RuntimeException); ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getBytes(sal_Int32 column) throw(SQLException, RuntimeException); - ::com::sun::star::util::Date SAL_CALL getDate(sal_Int32 column) throw(SQLException, RuntimeException); - ::com::sun::star::util::Time SAL_CALL getTime(sal_Int32 column) throw(SQLException, RuntimeException); - ::com::sun::star::util::DateTime SAL_CALL getTimestamp(sal_Int32 column) throw(SQLException, RuntimeException); my_XInputStreamRef SAL_CALL getBinaryStream(sal_Int32 column) throw(SQLException, RuntimeException); - my_XInputStreamRef SAL_CALL getCharacterStream(sal_Int32 column) throw(SQLException, RuntimeException); @@ -211,13 +188,10 @@ namespace connectivity ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRef > SAL_CALL getRef(sal_Int32 column) throw(SQLException, RuntimeException); - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XBlob > SAL_CALL getBlob(sal_Int32 column) throw(SQLException, RuntimeException); - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XClob > SAL_CALL getClob(sal_Int32 column) throw(SQLException, RuntimeException); - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XArray > SAL_CALL getArray(sal_Int32 column) throw(SQLException, RuntimeException); @@ -238,58 +212,37 @@ namespace connectivity // XResultSetUpdate void SAL_CALL insertRow() throw(SQLException, RuntimeException); - void SAL_CALL updateRow() throw(SQLException, RuntimeException); - void SAL_CALL deleteRow() throw(SQLException, RuntimeException); - void SAL_CALL cancelRowUpdates() throw(SQLException, RuntimeException); - void SAL_CALL moveToInsertRow() throw(SQLException, RuntimeException); - void SAL_CALL moveToCurrentRow() throw(SQLException, RuntimeException); // XRowUpdate void SAL_CALL updateNull(sal_Int32 column) throw(SQLException, RuntimeException); - void SAL_CALL updateBoolean(sal_Int32 column, sal_Bool x) throw(SQLException, RuntimeException); - void SAL_CALL updateByte(sal_Int32 column, sal_Int8 x) throw(SQLException, RuntimeException); - void SAL_CALL updateShort(sal_Int32 column, sal_Int16 x) throw(SQLException, RuntimeException); - void SAL_CALL updateInt(sal_Int32 column, sal_Int32 x) throw(SQLException, RuntimeException); - void SAL_CALL updateLong(sal_Int32 column, sal_Int64 x) throw(SQLException, RuntimeException); - void SAL_CALL updateFloat(sal_Int32 column, float x) throw(SQLException, RuntimeException); - void SAL_CALL updateDouble(sal_Int32 column, double x) throw(SQLException, RuntimeException); - void SAL_CALL updateString(sal_Int32 column, const OUString& x) throw(SQLException, RuntimeException); - void SAL_CALL updateBytes(sal_Int32 column, const ::com::sun::star::uno::Sequence< sal_Int8 >& x) throw(SQLException, RuntimeException); - void SAL_CALL updateDate(sal_Int32 column, const ::com::sun::star::util::Date& x) throw(SQLException, RuntimeException); - void SAL_CALL updateTime(sal_Int32 column, const ::com::sun::star::util::Time& x) throw(SQLException, RuntimeException); - void SAL_CALL updateTimestamp(sal_Int32 column, const ::com::sun::star::util::DateTime& x) throw(SQLException, RuntimeException); - void SAL_CALL updateBinaryStream(sal_Int32 column, const my_XInputStreamRef& x, sal_Int32 length) throw(SQLException, RuntimeException); - void SAL_CALL updateCharacterStream(sal_Int32 column, const my_XInputStreamRef& x, sal_Int32 length) throw(SQLException, RuntimeException); - void SAL_CALL updateObject(sal_Int32 column, const Any& x) throw(SQLException, RuntimeException); - void SAL_CALL updateNumericObject(sal_Int32 column, const Any& x, sal_Int32 scale) throw(SQLException, RuntimeException); @@ -302,15 +255,11 @@ namespace connectivity sal_Bool SAL_CALL moveToBookmark(const Any& bookmark) throw(SQLException, RuntimeException); - sal_Bool SAL_CALL moveRelativeToBookmark(const Any& bookmark, sal_Int32 rows) throw(SQLException, RuntimeException); - sal_Int32 SAL_CALL compareBookmarks(const Any& first, const Any& second) throw(SQLException, RuntimeException); - sal_Bool SAL_CALL hasOrderedBookmarks() throw(SQLException, RuntimeException); - sal_Int32 SAL_CALL hashBookmark(const Any& bookmark) throw(SQLException, RuntimeException); @@ -335,3 +284,5 @@ namespace connectivity * vim600: noet sw=4 ts=4 fdm=marker * vim<600: noet sw=4 ts=4 */ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/mysqlc/source/mysqlc_resultsetmetadata.cxx b/mysqlc/source/mysqlc_resultsetmetadata.cxx index a4fbca6..07a0a03 100644 --- a/mysqlc/source/mysqlc_resultsetmetadata.cxx +++ b/mysqlc/source/mysqlc_resultsetmetadata.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -5,10 +6,6 @@ * * OpenOffice.org - a multi-platform office productivity suite * -* $RCSfile: mysqlc_resultsetmetadata.cxx,v $ -* -* $Revision: 1.1.2.4 $ -* * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -466,3 +463,4 @@ void OResultSetMetaData::checkColumnIndex(sal_Int32 columnIndex) * vim<600: noet sw=4 ts=4 */ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/mysqlc/source/mysqlc_resultsetmetadata.hxx b/mysqlc/source/mysqlc_resultsetmetadata.hxx index b245ed4..98ed040 100644 --- a/mysqlc/source/mysqlc_resultsetmetadata.hxx +++ b/mysqlc/source/mysqlc_resultsetmetadata.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -5,10 +6,6 @@ * * OpenOffice.org - a multi-platform office productivity suite * -* $RCSfile: mysqlc_resultsetmetadata.hxx,v $ -* -* $Revision: 1.1.2.4 $ -* * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -35,9 +32,7 @@ #include <com/sun/star/sdbc/XResultSetMetaData.hpp> #include <cppuhelper/implbase1.hxx> -#include <preextstl.h> #include <cppconn/resultset_metadata.h> -#include <postextstl.h> namespace connectivity { @@ -64,7 +59,7 @@ namespace connectivity { } - inline ::rtl::OUString convert( const ::ext_std::string& _string ) const + inline ::rtl::OUString convert( const ::std::string& _string ) const { return ::rtl::OUString( _string.c_str(), _string.size(), m_encoding ); } @@ -76,11 +71,8 @@ namespace connectivity sal_Int32 SAL_CALL getColumnCount() throw(SQLException, RuntimeException); sal_Bool SAL_CALL isAutoIncrement(sal_Int32 column) throw(SQLException, RuntimeException); - sal_Bool SAL_CALL isCaseSensitive(sal_Int32 column) throw(SQLException, RuntimeException); - sal_Bool SAL_CALL isSearchable(sal_Int32 column) throw(SQLException, RuntimeException); - sal_Bool SAL_CALL isCurrency(sal_Int32 column) throw(SQLException, RuntimeException); sal_Int32 SAL_CALL isNullable(sal_Int32 column) throw(SQLException, RuntimeException); @@ -90,17 +82,13 @@ namespace connectivity sal_Int32 SAL_CALL getColumnDisplaySize(sal_Int32 column)throw(SQLException, RuntimeException); OUString SAL_CALL getColumnLabel(sal_Int32 column) throw(SQLException, RuntimeException); - OUString SAL_CALL getColumnName(sal_Int32 column) throw(SQLException, RuntimeException); - OUString SAL_CALL getSchemaName(sal_Int32 column) throw(SQLException, RuntimeException); sal_Int32 SAL_CALL getPrecision(sal_Int32 column) throw(SQLException, RuntimeException); - sal_Int32 SAL_CALL getScale(sal_Int32 column) throw(SQLException, RuntimeException); OUString SAL_CALL getTableName(sal_Int32 column) throw(SQLException, RuntimeException); - OUString SAL_CALL getCatalogName(sal_Int32 column) throw(SQLException, RuntimeException); sal_Int32 SAL_CALL getColumnType(sal_Int32 column) throw(SQLException, RuntimeException); @@ -108,9 +96,7 @@ namespace connectivity OUString SAL_CALL getColumnTypeName(sal_Int32 column) throw(SQLException, RuntimeException); sal_Bool SAL_CALL isReadOnly(sal_Int32 column) throw(SQLException, RuntimeException); - sal_Bool SAL_CALL isWritable(sal_Int32 column) throw(SQLException, RuntimeException); - sal_Bool SAL_CALL isDefinitelyWritable(sal_Int32 column)throw(SQLException, RuntimeException); OUString SAL_CALL getColumnServiceName(sal_Int32 column)throw(SQLException, RuntimeException); @@ -121,3 +107,5 @@ namespace connectivity } #endif // CONNECTIVITY_SRESULSETMETADATA_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/mysqlc/source/mysqlc_services.cxx b/mysqlc/source/mysqlc_services.cxx index dad0ce9..962dee1 100644 --- a/mysqlc/source/mysqlc_services.cxx +++ b/mysqlc/source/mysqlc_services.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -5,10 +6,6 @@ * * OpenOffice.org - a multi-platform office productivity suite * -* $RCSfile: mysqlc_services.cxx,v $ -* -* $Revision: 1.1.2.5 $ -* * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -137,7 +134,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(void * /* return sal_True; } catch (::com::sun::star::registry::InvalidRegistryException& ) { - OSL_ENSURE(sal_False, "SKELETON::component_writeInfo : could not create a registry key ! ## InvalidRegistryException !"); + OSL_FAIL("SKELETON::component_writeInfo : could not create a registry key ! ## InvalidRegistryException !"); } } return sal_False; @@ -181,3 +178,5 @@ extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( * vim600: noet sw=4 ts=4 fdm=marker * vim<600: noet sw=4 ts=4 */ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/mysqlc/source/mysqlc_statement.cxx b/mysqlc/source/mysqlc_statement.cxx index 9769658..a36ab8c 100644 --- a/mysqlc/source/mysqlc_statement.cxx +++ b/mysqlc/source/mysqlc_statement.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -5,10 +6,6 @@ * * OpenOffice.org - a multi-platform office productivity suite * -* $RCSfile: mysqlc_statement.cxx,v $ -* -* $Revision: 1.1.2.4 $ -* * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -529,3 +526,5 @@ Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL OCommonStatement * vim600: noet sw=4 ts=4 fdm=marker * vim<600: noet sw=4 ts=4 */ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/mysqlc/source/mysqlc_statement.hxx b/mysqlc/source/mysqlc_statement.hxx index d4142dd..be7a485 100644 --- a/mysqlc/source/mysqlc_statement.hxx +++ b/mysqlc/source/mysqlc_statement.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ #ifndef MYSQLC_STATEMENT_HXX #define MYSQLC_STATEMENT_HXX @@ -13,9 +14,7 @@ #include <com/sun/star/sdbc/XWarningsSupplier.hpp> #include <com/sun/star/util/XCancellable.hpp> -#include <preextstl.h> #include <cppconn/statement.h> -#include <postextstl.h> #include <cppuhelper/compbase5.hxx> #include <list> @@ -187,3 +186,5 @@ namespace connectivity * vim600: noet sw=4 ts=4 fdm=marker * vim<600: noet sw=4 ts=4 */ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/mysqlc/source/mysqlc_subcomponent.hxx b/mysqlc/source/mysqlc_subcomponent.hxx index f2f7307..07e4ea1 100644 --- a/mysqlc/source/mysqlc_subcomponent.hxx +++ b/mysqlc/source/mysqlc_subcomponent.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -5,10 +6,6 @@ * * OpenOffice.org - a multi-platform office productivity suite * -* $RCSfile: mysqlc_subcomponent.hxx,v $ -* -* $Revision: 1.1.2.2 $ -* * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -30,24 +27,12 @@ #ifndef _CONNECTIVITY_OSUBCOMPONENT_HXX_ #define _CONNECTIVITY_OSUBCOMPONENT_HXX_ -#ifndef _CPPUHELPER_WEAK_HXX_ #include <cppuhelper/weak.hxx> -#endif -#ifndef _CPPUHELPER_INTERFACECONTAINER_H_ #include <cppuhelper/interfacecontainer.h> -#endif -#ifndef _COM_SUN_STAR_LANG_DISPOSEDEXCEPTION_HPP_ #include <com/sun/star/lang/DisposedException.hpp> -#endif -#ifndef _CPPUHELPER_PROPSHLP_HXX #include <cppuhelper/propshlp.hxx> -#endif -#ifndef _OSL_MUTEX_HXX_ #include <osl/mutex.hxx> -#endif -#ifndef _OSL_DIAGNOSE_H_ #include <osl/diagnose.h> -#endif namespace cppu { class IPropertyArrayHelper; @@ -253,3 +238,4 @@ namespace connectivity } #endif // _CONNECTIVITY_OSUBCOMPONENT_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/mysqlc/source/mysqlc_types.cxx b/mysqlc/source/mysqlc_types.cxx index 9e284f0..292560e 100644 --- a/mysqlc/source/mysqlc_types.cxx +++ b/mysqlc/source/mysqlc_types.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -5,10 +6,6 @@ * * OpenOffice.org - a multi-platform office productivity suite * -* $RCSfile: mysqlc_types.cxx,v $ -* -* $Revision: 1.1.2.2 $ -* * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -790,3 +787,5 @@ TypeInfoDef mysqlc_types[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }; + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/mysqlc/source/mysqlc_types.hxx b/mysqlc/source/mysqlc_types.hxx index 65baad6..8407ee9 100644 --- a/mysqlc/source/mysqlc_types.hxx +++ b/mysqlc/source/mysqlc_types.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -5,10 +6,6 @@ * * OpenOffice.org - a multi-platform office productivity suite * -* $RCSfile: mysqlc_types.hxx,v $ -* -* $Revision: 1.1.2.2 $ -* * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -54,3 +51,5 @@ struct TypeInfoDef { extern TypeInfoDef mysqlc_types[]; #endif /* MYSQLC_TYPES_HXX */ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/mysqlc/source/registry/data/org/openoffice/Office/DataAccess/Drivers.xcu b/mysqlc/source/registry/data/org/openoffice/Office/DataAccess/Drivers.xcu index b9f239e..feaac8f 100644 --- a/mysqlc/source/registry/data/org/openoffice/Office/DataAccess/Drivers.xcu +++ b/mysqlc/source/registry/data/org/openoffice/Office/DataAccess/Drivers.xcu @@ -7,9 +7,6 @@ * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: DataAccess.xcu,v $ - * $Revision: 1.27 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/nlpsolver/locale/NLPSolverCommon_ast.properties b/nlpsolver/locale/NLPSolverCommon_ast.properties new file mode 100644 index 0000000..e60e305 --- /dev/null +++ b/nlpsolver/locale/NLPSolverCommon_ast.properties @@ -0,0 +1,22 @@ +# x-no-translate +#BaseNLPSolver +NLPSolverCommon.Properties.AssumeNonNegative=Asumir variables non-negatives +#BaseEvolutionarySolver +NLPSolverCommon.Properties.SwarmSize=Tama\u00F1u del ensame +NLPSolverCommon.Properties.LibrarySize=Tama\u00F1u de biblioteca +NLPSolverCommon.Properties.LearningCycles=Ciclos de deprendimientu +NLPSolverCommon.Properties.GuessVariableRange=Albidrar llendes variables +NLPSolverCommon.Properties.VariableRangeThreshold=Intervalu de llendes variables (al albidrar) +NLPSolverCommon.Properties.UseACRComparator=Usar el comparador ACR (en llugar del BCH) +NLPSolverCommon.Properties.UseRandomStartingPoint=Usar puntu d'aniciu al debalu +NLPSolverCommon.Properties.StagnationLimit=Llende d'estancamientu +NLPSolverCommon.Properties.Tolerance=Tolerancia d'estancamientu +NLPSolverCommon.Properties.EnhancedSolverStatus=Amosar est\u00E1u del resolvedor enant\u00E1u +#DEPS +NLPSolverCommon.Properties.AgentSwitchRate=Tasa de conmutaci\u00F3n d'axente (Probabilid\u00E1 DE) +NLPSolverCommon.Properties.DEFactor=DE: Factor d'escala (0-1.2) +NLPSolverCommon.Properties.DECR=DE: Probabilid\u00E1 de cruciamientu (0_1) +NLPSolverCommon.Properties.PSC1=PS: Constante cognitiva +NLPSolverCommon.Properties.PSC2=PS: Constante social +NLPSolverCommon.Properties.PSWeight=PS: Coeficiente de restricci\u00F3n +NLPSolverCommon.Properties.PSCL=PS: Probabilid\u00E1 de mutaci\u00F3n (0-0.005) diff --git a/nlpsolver/locale/NLPSolverCommon_ca.properties b/nlpsolver/locale/NLPSolverCommon_ca.properties new file mode 100644 index 0000000..b9c0bd9 --- /dev/null +++ b/nlpsolver/locale/NLPSolverCommon_ca.properties @@ -0,0 +1,22 @@ +# x-no-translate +#BaseNLPSolver +NLPSolverCommon.Properties.AssumeNonNegative=Assumeix variables no negatives +#BaseEvolutionarySolver +NLPSolverCommon.Properties.SwarmSize=Mida de l'eixam +NLPSolverCommon.Properties.LibrarySize=Mida la biblioteca +NLPSolverCommon.Properties.LearningCycles=Cicles d'aprenentatge +NLPSolverCommon.Properties.GuessVariableRange=Estimaci\u00F3 dels l\u00EDmits de la variable +NLPSolverCommon.Properties.VariableRangeThreshold=Llindar dels l\u00EDmits de la variable (en l'estimaci\u00F3) +NLPSolverCommon.Properties.UseACRComparator=Usa el comparador ACR (en comptes del BCH) +NLPSolverCommon.Properties.UseRandomStartingPoint=Utilitza un punt d'inici aleatori +NLPSolverCommon.Properties.StagnationLimit=L\u00EDmit d'estagnaci\u00F3 +NLPSolverCommon.Properties.Tolerance=Toler\u00E0ncia d'estagnaci\u00F3 +NLPSolverCommon.Properties.EnhancedSolverStatus=Mostra l'estat millorat del solucionador +#DEPS +NLPSolverCommon.Properties.AgentSwitchRate=Taxa d'intercanvi de l'agent (probabilitat de l'evoluci\u00F3 diferencial) +NLPSolverCommon.Properties.DEFactor=ED: factor d'escala (0-1,2) +NLPSolverCommon.Properties.DECR=ED: probabilitat d'encreuament (0-1) +NLPSolverCommon.Properties.PSC1=EP: constant cognitiva +NLPSolverCommon.Properties.PSC2=EP: constant social +NLPSolverCommon.Properties.PSWeight=EP: coeficient de constricci\u00F3 +NLPSolverCommon.Properties.PSCL=EP: probabilitat de mutaci\u00F3 (0-0,005) diff --git a/nlpsolver/locale/NLPSolverCommon_de.properties b/nlpsolver/locale/NLPSolverCommon_de.properties new file mode 100644 index 0000000..56108cd --- /dev/null +++ b/nlpsolver/locale/NLPSolverCommon_de.properties @@ -0,0 +1,22 @@ +# x-no-translate +#BaseNLPSolver +NLPSolverCommon.Properties.AssumeNonNegative=Nicht-negative Variablen voraussetzen +#BaseEvolutionarySolver +NLPSolverCommon.Properties.SwarmSize=Schwarmgr\u00F6\u00DFe +NLPSolverCommon.Properties.LibrarySize=Gr\u00F6\u00DFe der Bibliothek +NLPSolverCommon.Properties.LearningCycles=Lernzyklen +NLPSolverCommon.Properties.GuessVariableRange=Variablengrenzen raten +NLPSolverCommon.Properties.VariableRangeThreshold=Variablengrenzbereich (beim Raten) +NLPSolverCommon.Properties.UseACRComparator=ACR Komparator (statt BCH) nutzen +NLPSolverCommon.Properties.UseRandomStartingPoint=Zuf\u00E4lligen Startpunkt w\u00E4hlen +NLPSolverCommon.Properties.StagnationLimit=Beendigungsgrenze +NLPSolverCommon.Properties.Tolerance=Beendigungstoleranz +NLPSolverCommon.Properties.EnhancedSolverStatus=Erweiterten Solver-Status anzeigen +#DEPS +NLPSolverCommon.Properties.AgentSwitchRate=Agent Switch Rate (DE Wahrscheinlichkeit) +NLPSolverCommon.Properties.DEFactor=DE: Skalierungsfaktor (0-1,2) +NLPSolverCommon.Properties.DECR=DE: Crossover-Wahrscheinlichkeit (0-1) +NLPSolverCommon.Properties.PSC1=PS: Kognitivit\u00E4tskonstante +NLPSolverCommon.Properties.PSC2=PS: Sozialkonstante +NLPSolverCommon.Properties.PSWeight=PS: Konstriktionskoeffizient +NLPSolverCommon.Properties.PSCL=PS: Mutationswahrscheinlichkeit (0-0,005) diff --git a/nlpsolver/locale/NLPSolverCommon_en_GB.properties b/nlpsolver/locale/NLPSolverCommon_en_GB.properties new file mode 100644 index 0000000..f5ff239 --- /dev/null +++ b/nlpsolver/locale/NLPSolverCommon_en_GB.properties @@ -0,0 +1,22 @@ +# x-no-translate +#BaseNLPSolver +NLPSolverCommon.Properties.AssumeNonNegative=Assume Non-Negative Variables +#BaseEvolutionarySolver +NLPSolverCommon.Properties.SwarmSize=Size of Swarm +NLPSolverCommon.Properties.LibrarySize=Size of Library +NLPSolverCommon.Properties.LearningCycles=Learning Cycles +NLPSolverCommon.Properties.GuessVariableRange=Variable Bounds Guessing +NLPSolverCommon.Properties.VariableRangeThreshold=Variable Bounds Threshold (when guessing) +NLPSolverCommon.Properties.UseACRComparator=Use ACR Comparator (instead of BCH) +NLPSolverCommon.Properties.UseRandomStartingPoint=Use Random starting point +NLPSolverCommon.Properties.StagnationLimit=Stagnation Limit +NLPSolverCommon.Properties.Tolerance=Stagnation Tolerance +NLPSolverCommon.Properties.EnhancedSolverStatus=Show enhanced solver status +#DEPS +NLPSolverCommon.Properties.AgentSwitchRate=Agent Switch Rate (DE Probability) +NLPSolverCommon.Properties.DEFactor=DE: Scaling Factor (0-1.2) +NLPSolverCommon.Properties.DECR=DE: Crossover Probability (0-1) +NLPSolverCommon.Properties.PSC1=PS: Cognitive Constant +NLPSolverCommon.Properties.PSC2=PS: Social Constant +NLPSolverCommon.Properties.PSWeight=PS: Constriction Coefficient +NLPSolverCommon.Properties.PSCL=PS: Mutation Probability (0-0.005) diff --git a/nlpsolver/locale/NLPSolverCommon_es.properties b/nlpsolver/locale/NLPSolverCommon_es.properties new file mode 100644 index 0000000..b1c20a2 --- /dev/null +++ b/nlpsolver/locale/NLPSolverCommon_es.properties @@ -0,0 +1,22 @@ +# x-no-translate +#BaseNLPSolver +NLPSolverCommon.Properties.AssumeNonNegative=Asumir variables no-negativas +#BaseEvolutionarySolver +NLPSolverCommon.Properties.SwarmSize=Tama\u00F1o del enjambre +NLPSolverCommon.Properties.LibrarySize=Tama\u00F1o de la biblioteca +NLPSolverCommon.Properties.LearningCycles=Ciclos de aprendizaje +NLPSolverCommon.Properties.GuessVariableRange=Estimaci\u00F3n de los l\u00EDmites de las variables +NLPSolverCommon.Properties.VariableRangeThreshold=Umbral de los l\u00EDmites de las variables (al estimar) +NLPSolverCommon.Properties.UseACRComparator=Usar el comparador ACR (en vez del BCH) +NLPSolverCommon.Properties.UseRandomStartingPoint=Usar un punto inicial aleatorio +NLPSolverCommon.Properties.StagnationLimit=Limite de estancamiento +NLPSolverCommon.Properties.Tolerance=Tolerancia de estancamiento +NLPSolverCommon.Properties.EnhancedSolverStatus=Mostrar el estado extendido del solucionador +#DEPS +NLPSolverCommon.Properties.AgentSwitchRate=Tasa de cambio del agente (probabilidad DE) +NLPSolverCommon.Properties.DEFactor=DE: factor de escala (0-1,2) +NLPSolverCommon.Properties.DECR=DE: Probabilidad de cruce (0-1) +NLPSolverCommon.Properties.PSC1=PS: Constante cognitiva +NLPSolverCommon.Properties.PSC2=PS: Constante social +NLPSolverCommon.Properties.PSWeight=PS: Coeficiente de constricci\u00F3n +NLPSolverCommon.Properties.PSCL=PS: Probabilidad de mutaci\u00F3n (0-0,005) diff --git a/nlpsolver/locale/NLPSolverCommon_fa.properties b/nlpsolver/locale/NLPSolverCommon_fa.properties new file mode 100644 index 0000000..b596522 --- /dev/null +++ b/nlpsolver/locale/NLPSolverCommon_fa.properties @@ -0,0 +1,22 @@ +# x-no-translate +#BaseNLPSolver +NLPSolverCommon.Properties.AssumeNonNegative=\u0641\u0631\u0636 \u06A9\u0631\u062F\u0646 \u0645\u062A\u063A\u06CC\u0631\u0647\u0627\u06CC \u0646\u0627\u0645\u0646\u0641\u06CC +#BaseEvolutionarySolver +NLPSolverCommon.Properties.SwarmSize=\u0627\u0646\u062F\u0627\u0632\u0647 \u062F\u0633\u062A\u0647 +NLPSolverCommon.Properties.LibrarySize=\u0627\u0646\u062F\u0627\u0632\u0647 \u06A9\u062A\u0627\u0628\u200C\u062E\u0627\u0646\u0647 +NLPSolverCommon.Properties.LearningCycles=\u0686\u0631\u062E\u0647\u200C\u0647\u0627\u06CC \u06CC\u0627\u062F\u200C\u06AF\u06CC\u0631\u06CC +NLPSolverCommon.Properties.GuessVariableRange=\u062D\u062F\u0633 \u0632\u062F\u0646 \u06A9\u0631\u0627\u0646\u200C\u0647\u0627\u06CC \u0645\u062A\u063A\u06CC\u0631 +NLPSolverCommon.Properties.VariableRangeThreshold=\u0622\u0633\u062A\u0627\u0646\u0647 \u06A9\u0631\u0627\u0646\u200C\u0647\u0627\u06CC \u0645\u062A\u063A\u06CC\u0631 (\u062F\u0631 \u0632\u0645\u0627\u0646 \u062D\u062F\u0633 \u0632\u062F\u0646) +NLPSolverCommon.Properties.UseACRComparator=\u0627\u0633\u062A\u0641\u0627\u062F\u0647 \u0627\u0632 \u0645\u0642\u0627\u06CC\u0633\u0647 \u06A9\u0646\u0646\u062F\u0647 ACR (\u0628\u0647\u200C\u062C\u0627\u06CC BCH) +NLPSolverCommon.Properties.UseRandomStartingPoint=\u0627\u0633\u062A\u0641\u0627\u062F\u0647 \u0627\u0632 \u0646\u0642\u0637\u0647 \u0622\u063A\u0627\u0632 \u062A\u0635\u0627\u062F\u0641\u06CC +NLPSolverCommon.Properties.StagnationLimit=\u062D\u062F \u0627\u06CC\u0633\u062A\u0627\u06CC\u06CC +NLPSolverCommon.Properties.Tolerance=\u062A\u062D\u0645\u0644 \u0627\u06CC\u0633\u062A\u0627\u06CC\u06CC +NLPSolverCommon.Properties.EnhancedSolverStatus=\u0646\u0645\u0627\u06CC\u0634 \u0648\u0636\u0639\u06CC\u062A \u062D\u0644\u200C\u06A9\u0646\u0646\u062F\u0647 \u0628\u0647\u0628\u0648\u062F\u200C\u06CC\u0627\u0641\u062A\u0647 +#DEPS +NLPSolverCommon.Properties.AgentSwitchRate=\u0646\u0631\u062E \u062A\u0639\u0648\u06CC\u0636 \u0639\u0627\u0645\u0644 (\u0627\u062D\u062A\u0645\u0627\u0644 DE) +NLPSolverCommon.Properties.DEFactor=DE: \u0636\u0631\u06CC\u0628 \u0645\u0642\u06CC\u0627\u0633 (0-1.2) +NLPSolverCommon.Properties.DECR=DE: \u0627\u062D\u062A\u0645\u0627\u0644 \u062A\u0642\u0627\u0637\u0639 (0-1) +NLPSolverCommon.Properties.PSC1=PS: \u062B\u0627\u0628\u062A \u0634\u0646\u0627\u062E\u062A +NLPSolverCommon.Properties.PSC2=PS: \u062B\u0627\u0628\u062A \u0627\u062C\u062A\u0645\u0627\u0639\u06CC +NLPSolverCommon.Properties.PSWeight=PS: \u0636\u0631\u06CC\u0628 \u0627\u0646\u0642\u0628\u0627\u0636 +NLPSolverCommon.Properties.PSCL=PS: \u0627\u062D\u062A\u0645\u0627\u0644 \u062F\u06AF\u0631\u06AF\u0648\u0646\u06CC (0-0.005) diff --git a/nlpsolver/locale/NLPSolverCommon_fi.properties b/nlpsolver/locale/NLPSolverCommon_fi.properties new file mode 100644 index 0000000..0bc8cbd --- /dev/null +++ b/nlpsolver/locale/NLPSolverCommon_fi.properties @@ -0,0 +1,22 @@ +# x-no-translate +#BaseNLPSolver +NLPSolverCommon.Properties.AssumeNonNegative=Oleta muuttujat ei-negatiivisiksi +#BaseEvolutionarySolver +NLPSolverCommon.Properties.SwarmSize=Parven koko +NLPSolverCommon.Properties.LibrarySize=Kirjaston koko +NLPSolverCommon.Properties.LearningCycles=Oppimissyklit +NLPSolverCommon.Properties.GuessVariableRange=Arvaa muuttujien rajat +NLPSolverCommon.Properties.VariableRangeThreshold=Muuttujarajojen kynnysarvo (arvaamalla) +NLPSolverCommon.Properties.UseACRComparator=K\u00E4yt\u00E4 ACR-vertailijaa (BCH:n sijaan) +NLPSolverCommon.Properties.UseRandomStartingPoint=K\u00E4yt\u00E4 satunnaista aloituspistett\u00E4 +NLPSolverCommon.Properties.StagnationLimit=Pys\u00E4htymisraja +NLPSolverCommon.Properties.Tolerance=Pys\u00E4htymisen sieto +NLPSolverCommon.Properties.EnhancedSolverStatus=N\u00E4yt\u00E4 ratkaisimen tila laajasti +#DEPS +NLPSolverCommon.Properties.AgentSwitchRate=Agentin vaihtoaste (DE-todenn\u00E4k\u00F6isyys) +NLPSolverCommon.Properties.DEFactor=DE: Skaalaustekij\u00E4 (0-1,2) +NLPSolverCommon.Properties.DECR=DE: Sekoitustodenn\u00E4k\u00F6isyys (0-1) +NLPSolverCommon.Properties.PSC1=PS: Kognitiivinen vakio +NLPSolverCommon.Properties.PSC2=PS: Sosiaalinen vakio +NLPSolverCommon.Properties.PSWeight=PS: Supistumispaino +NLPSolverCommon.Properties.PSCL=PS: Mutaatiotodenn\u00E4k\u00F6isyys (0-0,005) diff --git a/nlpsolver/locale/NLPSolverCommon_fr.properties b/nlpsolver/locale/NLPSolverCommon_fr.properties new file mode 100644 index 0000000..bf26078 --- /dev/null +++ b/nlpsolver/locale/NLPSolverCommon_fr.properties @@ -0,0 +1,22 @@ +# x-no-translate +#BaseNLPSolver +NLPSolverCommon.Properties.AssumeNonNegative=Supposer des variables non n\u00E9gatives +#BaseEvolutionarySolver +NLPSolverCommon.Properties.SwarmSize=Taille de la colonie +NLPSolverCommon.Properties.LibrarySize=Taille de la biblioth\u00E8que +NLPSolverCommon.Properties.LearningCycles=Cycles d'apprentissage +NLPSolverCommon.Properties.GuessVariableRange=Estimation des limites de la variable +NLPSolverCommon.Properties.VariableRangeThreshold=Seuil des limites de la variable (lors de l'estimation) +NLPSolverCommon.Properties.UseACRComparator=Utiliser le comparateur ACR (au lieu de BCH) +NLPSolverCommon.Properties.UseRandomStartingPoint=Utiliser un point de d\u00E9part al\u00E9atoire +NLPSolverCommon.Properties.StagnationLimit=Limite de stagnation +NLPSolverCommon.Properties.Tolerance=Tol\u00E9rance de stagnation +NLPSolverCommon.Properties.EnhancedSolverStatus=Afficher les statuts \u00E9tendus du solveur +#DEPS +NLPSolverCommon.Properties.AgentSwitchRate=Taux de changement de l'agent (probabilit\u00E9 DE) +NLPSolverCommon.Properties.DEFactor=DE : facteur d'\u00E9chelle (0-1,2) +NLPSolverCommon.Properties.DECR=DE: probabilit\u00E9 de croisement (0-1) +NLPSolverCommon.Properties.PSC1=PS : constante cognitive +NLPSolverCommon.Properties.PSC2=PS : constante sociale +NLPSolverCommon.Properties.PSWeight=PS : coefficient de r\u00E9duction +NLPSolverCommon.Properties.PSCL=PS : probabilit\u00E9 de mutation (0-0,005) diff --git a/nlpsolver/locale/NLPSolverCommon_gl.properties b/nlpsolver/locale/NLPSolverCommon_gl.properties new file mode 100644 index 0000000..a6d386a --- /dev/null +++ b/nlpsolver/locale/NLPSolverCommon_gl.properties @@ -0,0 +1,22 @@ +# x-no-translate +#BaseNLPSolver +NLPSolverCommon.Properties.AssumeNonNegative=Asumir vari\u00E1beis como non negativas +#BaseEvolutionarySolver +NLPSolverCommon.Properties.SwarmSize=Tama\u00F1o da colonia +NLPSolverCommon.Properties.LibrarySize=Tama\u00F1o da biblioteca +NLPSolverCommon.Properties.LearningCycles=Ciclos de aprendizaxe +NLPSolverCommon.Properties.GuessVariableRange=Estimaci\u00F3n dos l\u00EDmites das vari\u00E1beis +NLPSolverCommon.Properties.VariableRangeThreshold=Limiar dos l\u00EDmites das vari\u00E1beis (ao estimar) +NLPSolverCommon.Properties.UseACRComparator=Utilizar o comparador ACR (no canto do BCH) +NLPSolverCommon.Properties.UseRandomStartingPoint=Utilizar punto de inicio aleatorio +NLPSolverCommon.Properties.StagnationLimit=L\u00EDmite de estancamento +NLPSolverCommon.Properties.Tolerance=Tolerancia de estancamento +NLPSolverCommon.Properties.EnhancedSolverStatus=Amosar o status estendido do solver +#DEPS +NLPSolverCommon.Properties.AgentSwitchRate=Taxa de alternancia do axente (probabilidade DE) +NLPSolverCommon.Properties.DEFactor=DE: Factor de escala (0-1.2) +NLPSolverCommon.Properties.DECR=DE: Probabilidade de cruzamento (0 - 1) +NLPSolverCommon.Properties.PSC1=PS: Constante cognitiva +NLPSolverCommon.Properties.PSC2=PS: Constante social +NLPSolverCommon.Properties.PSWeight=PS: Coeficiente de constrici\u00F3n +NLPSolverCommon.Properties.PSCL=PS: Probabilidade de mutaci\u00F3n (0-0.005) diff --git a/nlpsolver/locale/NLPSolverCommon_hu.properties b/nlpsolver/locale/NLPSolverCommon_hu.properties new file mode 100644 index 0000000..06e38d2 --- /dev/null +++ b/nlpsolver/locale/NLPSolverCommon_hu.properties @@ -0,0 +1,22 @@ +# x-no-translate +#BaseNLPSolver +NLPSolverCommon.Properties.AssumeNonNegative=Nem negat\u00EDv v\u00E1ltoz\u00F3k felt\u00E9telez\u00E9se +#BaseEvolutionarySolver +NLPSolverCommon.Properties.SwarmSize=Popul\u00E1ci\u00F3 m\u00E9rete +NLPSolverCommon.Properties.LibrarySize=K\u00F6nyvt\u00E1r m\u00E9rete +NLPSolverCommon.Properties.LearningCycles=Tanul\u00E1si ciklusok +NLPSolverCommon.Properties.GuessVariableRange=V\u00E1ltoz\u00F3 korl\u00E1tainak kital\u00E1l\u00E1sa +NLPSolverCommon.Properties.VariableRangeThreshold=V\u00E1ltoz\u00F3 korl\u00E1tj\u00E1nak k\u00FCsz\u00F6be (kital\u00E1l\u00E1sn\u00E1l) +NLPSolverCommon.Properties.UseACRComparator=ACR kompar\u00E1tor haszn\u00E1lata (BCH helyett) +NLPSolverCommon.Properties.UseRandomStartingPoint=V\u00E9letlen kezd\u0151pont haszn\u00E1lata +NLPSolverCommon.Properties.StagnationLimit=Stagn\u00E1l\u00E1si korl\u00E1t +NLPSolverCommon.Properties.Tolerance=Stagn\u00E1l\u00E1si t\u0171r\u00E9shat\u00E1r +NLPSolverCommon.Properties.EnhancedSolverStatus=A Megold\u00F3 r\u00E9szletes \u00E1llapota +#DEPS +NLPSolverCommon.Properties.AgentSwitchRate=Egyed v\u00E1lt\u00E1si r\u00E1t\u00E1ja (DE val\u00F3sz\u00EDn\u0171s\u00E9g) +NLPSolverCommon.Properties.DEFactor=DE: Sk\u00E1lafaktor (0\u20131,2) +NLPSolverCommon.Properties.DECR=DE: Keresztez\u0151d\u00E9s val\u00F3sz\u00EDn\u0171s\u00E9ge (0\u20131) +NLPSolverCommon.Properties.PSC1=PS: Kognit\u00EDv \u00E1lland\u00F3 +NLPSolverCommon.Properties.PSC2=PS: K\u00F6z\u00F6ss\u00E9gi \u00E1lland\u00F3 +NLPSolverCommon.Properties.PSWeight=PS: \u00D6sszeh\u00FAz\u00F3d\u00E1si egy\u00FCtthat\u00F3 +NLPSolverCommon.Properties.PSCL=PS: Mut\u00E1ci\u00F3 val\u00F3sz\u00EDn\u0171s\u00E9ge (0\u20130,005) diff --git a/nlpsolver/locale/NLPSolverCommon_it.properties b/nlpsolver/locale/NLPSolverCommon_it.properties new file mode 100644 index 0000000..be424e8 --- /dev/null +++ b/nlpsolver/locale/NLPSolverCommon_it.properties @@ -0,0 +1,22 @@ +# x-no-translate +#BaseNLPSolver +NLPSolverCommon.Properties.AssumeNonNegative=Presumi variabili non-negative +#BaseEvolutionarySolver +NLPSolverCommon.Properties.SwarmSize=Dimensione dello sciame +NLPSolverCommon.Properties.LibrarySize=Dimensione della libreria +NLPSolverCommon.Properties.LearningCycles=Cicli di apprendimento +NLPSolverCommon.Properties.GuessVariableRange=Calcolo approssimato limiti variabili +NLPSolverCommon.Properties.VariableRangeThreshold=Soglia limiti variabili (durante il calcolo approssimato) +NLPSolverCommon.Properties.UseACRComparator=Usa comparatore ACR (anzich\u00E9 BCH) +NLPSolverCommon.Properties.UseRandomStartingPoint=Usa punto di avvio casuale +NLPSolverCommon.Properties.StagnationLimit=Limite di stagnazione +NLPSolverCommon.Properties.Tolerance=Tolleranza di stagnazione +NLPSolverCommon.Properties.EnhancedSolverStatus=Mostra stato del risolutore avanzato +#DEPS +NLPSolverCommon.Properties.AgentSwitchRate=Agent Switch Rate (probabilit\u00E0 DE) +NLPSolverCommon.Properties.DEFactor=DE: Fattore di scala (0-1,2) +NLPSolverCommon.Properties.DECR=DE: Probabilit\u00E0 di attraversamento (0-1) +NLPSolverCommon.Properties.PSC1=PS: Costante cognitiva +NLPSolverCommon.Properties.PSC2=PS: Costante sociale +NLPSolverCommon.Properties.PSWeight=PS: Coefficiente di costrizione +NLPSolverCommon.Properties.PSCL=PS: Probabilit\u00E0 di mutazione (0-0,005) diff --git a/nlpsolver/locale/NLPSolverCommon_ja.properties b/nlpsolver/locale/NLPSolverCommon_ja.properties new file mode 100644 index 0000000..e1dec89 --- /dev/null +++ b/nlpsolver/locale/NLPSolverCommon_ja.properties @@ -0,0 +1,22 @@ +# x-no-translate +#BaseNLPSolver +NLPSolverCommon.Properties.AssumeNonNegative=\u975E\u8CA0\u306E\u5909\u6570\u3092\u4EEE\u5B9A\u3059\u308B +#BaseEvolutionarySolver +NLPSolverCommon.Properties.SwarmSize=\u96C6\u56E3\u306E\u30B5\u30A4\u30BA +NLPSolverCommon.Properties.LibrarySize=\u30E9\u30A4\u30D6\u30E9\u30EA\u306E\u30B5\u30A4\u30BA +NLPSolverCommon.Properties.LearningCycles=\u5B66\u7FD2\u5468\u671F +NLPSolverCommon.Properties.GuessVariableRange=\u5909\u6570\u7BC4\u56F2\u306E\u63A8\u6E2C +NLPSolverCommon.Properties.VariableRangeThreshold=(\u63A8\u6E2C\u3059\u308B\u969B\u306E)\u5909\u6570\u7BC4\u56F2\u306E\u3057\u304D\u3044\u5024 +NLPSolverCommon.Properties.UseACRComparator=(BCH \u306E\u4EE3\u308F\u308A\u306B) ACR \u6BD4\u8F03\u5B50\u3092\u4F7F\u3046 +NLPSolverCommon.Properties.UseRandomStartingPoint=\u30E9\u30F3\u30C0\u30E0\u306A\u958B\u59CB\u70B9\u3092\u4F7F\u3046 +NLPSolverCommon.Properties.StagnationLimit=\u3088\u3069\u307F\u9650\u754C +NLPSolverCommon.Properties.Tolerance=\u3088\u3069\u307F\u8A31\u5BB9\u8AA4\u5DEE +NLPSolverCommon.Properties.EnhancedSolverStatus=\u88DC\u6B63\u3055\u308C\u305F\u30BD\u30EB\u30D0\u30FC\u306E\u72B6\u614B\u3092\u8868\u793A +#DEPS +NLPSolverCommon.Properties.AgentSwitchRate=\u30A8\u30FC\u30B8\u30A7\u30F3\u30C8\u30B9\u30A4\u30C3\u30C1\u30EC\u30FC\u30C8(DE \u78BA\u7387) +NLPSolverCommon.Properties.DEFactor=DE: \u30B9\u30B1\u30FC\u30EB\u4FC2\u6570 (0-1.2) +NLPSolverCommon.Properties.DECR=DE: \u4EA4\u5DEE\u78BA\u7387 (0-1) +NLPSolverCommon.Properties.PSC1=PS: \u8A8D\u8B58\u5B9A\u6570 +NLPSolverCommon.Properties.PSC2=PS: \u793E\u4F1A\u5B9A\u6570 +NLPSolverCommon.Properties.PSWeight=PS: \u5727\u7E2E\u4FC2\u6570 +NLPSolverCommon.Properties.PSCL=PS: \u7A81\u7136\u5909\u7570\u78BA\u7387 (0-0.005) diff --git a/nlpsolver/locale/NLPSolverCommon_ko.properties b/nlpsolver/locale/NLPSolverCommon_ko.properties new file mode 100644 index 0000000..9caa039 --- /dev/null +++ b/nlpsolver/locale/NLPSolverCommon_ko.properties @@ -0,0 +1,22 @@ +# x-no-translate +#BaseNLPSolver +NLPSolverCommon.Properties.AssumeNonNegative=\uC74C\uC218\uAC00 \uC544\uB2CC \uBCC0\uC218\uB97C \uAC00\uC815 +#BaseEvolutionarySolver +NLPSolverCommon.Properties.SwarmSize=\uBB34\uB9AC \uD06C\uAE30 +NLPSolverCommon.Properties.LibrarySize=\uB77C\uC774\uBE0C\uB7EC\uB9AC \uD06C\uAE30 +NLPSolverCommon.Properties.LearningCycles=\uD559\uC2B5 \uC8FC\uAE30 +NLPSolverCommon.Properties.GuessVariableRange=\uBCC0\uC218 \uBC94\uC704 \uCD94\uCE21 +NLPSolverCommon.Properties.VariableRangeThreshold=\uBCC0\uC218 \uBC94\uC704 \uC784\uACC4\uAC12 (\uCD94\uCE21\uC2DC) +NLPSolverCommon.Properties.UseACRComparator=(BCH \uB300\uC2E0) ACR \uBE44\uAD50\uC790 \uC0AC\uC6A9 +NLPSolverCommon.Properties.UseRandomStartingPoint=\uC784\uC758\uC758 \uC2DC\uC791\uC810 \uC0AC\uC6A9 +NLPSolverCommon.Properties.StagnationLimit=\uC815\uCCB4 \uD55C\uACC4 +NLPSolverCommon.Properties.Tolerance=\uC2A4\uD0DC\uADF8\uB124\uC774\uC158 \uACF5\uCC28 +NLPSolverCommon.Properties.EnhancedSolverStatus=\uD5A5\uC0C1\uB41C \uD574\uCC3E\uAE30 \uC0C1\uD0DC \uD45C\uC2DC +#DEPS +NLPSolverCommon.Properties.AgentSwitchRate=\uC5D0\uC774\uC804\uD2B8 \uC804\uD658\uB960 (DE \uD655\uB960) +NLPSolverCommon.Properties.DEFactor=DE: \uBE44\uB840 \uC778\uC790 (0-1.2) +NLPSolverCommon.Properties.DECR=DE: \uAD50\uCC28 \uD655\uB960 (0-1) +NLPSolverCommon.Properties.PSC1=PS: \uC778\uC9C0 \uC0C1\uC218 +NLPSolverCommon.Properties.PSC2=PS: \uC0AC\uD68C \uC0C1\uC218 +NLPSolverCommon.Properties.PSWeight=PS: \uC555\uCD95 \uACC4\uC218 +NLPSolverCommon.Properties.PSCL=PS: \uBCC0\uC774 \uD655\uB960 (0-0.005) diff --git a/nlpsolver/locale/NLPSolverCommon_nb.properties b/nlpsolver/locale/NLPSolverCommon_nb.properties new file mode 100644 index 0000000..3b88d95 --- /dev/null +++ b/nlpsolver/locale/NLPSolverCommon_nb.properties @@ -0,0 +1,22 @@ +# x-no-translate +#BaseNLPSolver +NLPSolverCommon.Properties.AssumeNonNegative=Assume Non-Negative Variables +#BaseEvolutionarySolver +NLPSolverCommon.Properties.SwarmSize=Size of Swarm +NLPSolverCommon.Properties.LibrarySize=Bibliotekst\u00F8rrelse +NLPSolverCommon.Properties.LearningCycles=Learning Cycles +NLPSolverCommon.Properties.GuessVariableRange=Variable Bounds Guessing +NLPSolverCommon.Properties.VariableRangeThreshold=Variable Bounds Threshold (when guessing) +NLPSolverCommon.Properties.UseACRComparator=Use ACR Comparator (instead of BCH) +NLPSolverCommon.Properties.UseRandomStartingPoint=Bruk tilfeldig startpunkt +NLPSolverCommon.Properties.StagnationLimit=Stagnasjongrense +NLPSolverCommon.Properties.Tolerance=Stagnasjongrense +NLPSolverCommon.Properties.EnhancedSolverStatus=Vis forbedret l\u00F8serstatus +#DEPS +NLPSolverCommon.Properties.AgentSwitchRate=Agent Switch Rate (DE Probability) +NLPSolverCommon.Properties.DEFactor=DE: Scaling Factor (0-1.2) +NLPSolverCommon.Properties.DECR=DE: Crossover Probability (0-1) +NLPSolverCommon.Properties.PSC1=PS: Cognitive Constant +NLPSolverCommon.Properties.PSC2=PS: Social Constant +NLPSolverCommon.Properties.PSWeight=PS: Constriction Coefficient +NLPSolverCommon.Properties.PSCL=PS: Mutation Probability (0-0.005) diff --git a/nlpsolver/locale/NLPSolverCommon_nl.properties b/nlpsolver/locale/NLPSolverCommon_nl.properties new file mode 100644 index 0000000..8288734 --- /dev/null +++ b/nlpsolver/locale/NLPSolverCommon_nl.properties @@ -0,0 +1,22 @@ +# x-no-translate +#BaseNLPSolver +NLPSolverCommon.Properties.AssumeNonNegative=Niet negatieve variabelen aannemen +#BaseEvolutionarySolver +NLPSolverCommon.Properties.SwarmSize=Grootte van Swarm +NLPSolverCommon.Properties.LibrarySize=Grootte van de bibliotheek +NLPSolverCommon.Properties.LearningCycles=Leercurve +NLPSolverCommon.Properties.GuessVariableRange=Variabele grenzen raden +NLPSolverCommon.Properties.VariableRangeThreshold=Begrenzing van variabelen (bij raden) +NLPSolverCommon.Properties.UseACRComparator=ACR-vergelijking gebruiken (in plaats van BCH) +NLPSolverCommon.Properties.UseRandomStartingPoint=Willekeurig beginpunt gebruiken +NLPSolverCommon.Properties.StagnationLimit=Stagnatielimiet +NLPSolverCommon.Properties.Tolerance=Stagnatietolerantie +NLPSolverCommon.Properties.EnhancedSolverStatus=Verbeterde oplosserstatus tonen +#DEPS +NLPSolverCommon.Properties.AgentSwitchRate=Schakelsnelheid van agent (DE-waarschijnlijkheid) +NLPSolverCommon.Properties.DEFactor=DE: Schaalfactor (0-1.2) +NLPSolverCommon.Properties.DECR=DE: Overspraakwaarschijnlijkheid (0-1) +NLPSolverCommon.Properties.PSC1=PS: Cognitieve constante +NLPSolverCommon.Properties.PSC2=PS: Sociale constante +NLPSolverCommon.Properties.PSWeight=PS: Beperkingsco\u00EBfficient +NLPSolverCommon.Properties.PSCL=PS: Mutatiewaarschijnlijkheid (0-0.005) diff --git a/nlpsolver/locale/NLPSolverCommon_pt_BR.properties b/nlpsolver/locale/NLPSolverCommon_pt_BR.properties new file mode 100644 index 0000000..4ed7ac9 --- /dev/null +++ b/nlpsolver/locale/NLPSolverCommon_pt_BR.properties @@ -0,0 +1,22 @@ +# x-no-translate +#BaseNLPSolver +NLPSolverCommon.Properties.AssumeNonNegative=Assumir vari\u00E1veis como n\u00E3o negativas +#BaseEvolutionarySolver +NLPSolverCommon.Properties.SwarmSize=Tamanho da col\u00F4nia +NLPSolverCommon.Properties.LibrarySize=Tamanho da biblioteca +NLPSolverCommon.Properties.LearningCycles=Ciclos de aprendizagem +NLPSolverCommon.Properties.GuessVariableRange=Estimativa dos limites da vari\u00E1vel +NLPSolverCommon.Properties.VariableRangeThreshold=Piso dos limites da vari\u00E1vel (ao estimar) +NLPSolverCommon.Properties.UseACRComparator=Utilizar comparador ACS (no lugar de BCH) +NLPSolverCommon.Properties.UseRandomStartingPoint=Utilizar ponto inicial aleat\u00F3rio +NLPSolverCommon.Properties.StagnationLimit=Limite de estagna\u00E7\u00E3o +NLPSolverCommon.Properties.Tolerance=Toler\u00E2ncia de estagna\u00E7\u00E3o +NLPSolverCommon.Properties.EnhancedSolverStatus=Mostrar estado aprimorado do solver +#DEPS +NLPSolverCommon.Properties.AgentSwitchRate=Taxa de altern\u00E2ncia do agente (Probabilidade DE) +NLPSolverCommon.Properties.DEFactor=DE: Fator de escala (0 - 1,2) +NLPSolverCommon.Properties.DECR=DE: Probabilidade de crossover (0 - 1) +NLPSolverCommon.Properties.PSC1=PS: Constante congnitiva +NLPSolverCommon.Properties.PSC2=PF: Constante social +NLPSolverCommon.Properties.PSWeight=PS: Coeficiente de constri\u00E7\u00E3o +NLPSolverCommon.Properties.PSCL=PS: Probabilidade de muta\u00E7\u00E3o (0 - 0,005) diff --git a/nlpsolver/locale/NLPSolverCommon_ro.properties b/nlpsolver/locale/NLPSolverCommon_ro.properties new file mode 100644 index 0000000..32bfe68 --- /dev/null +++ b/nlpsolver/locale/NLPSolverCommon_ro.properties @@ -0,0 +1,22 @@ +# x-no-translate +#BaseNLPSolver +NLPSolverCommon.Properties.AssumeNonNegative=Presupune variabile non negative +#BaseEvolutionarySolver +NLPSolverCommon.Properties.SwarmSize=M\u0103rimea coloniei +NLPSolverCommon.Properties.LibrarySize=M\u0103rimea bibliotecii +NLPSolverCommon.Properties.LearningCycles=Cicli de \u00EEnv\u0103\u021Bare +NLPSolverCommon.Properties.GuessVariableRange=Estimarea limitelor variabilei +NLPSolverCommon.Properties.VariableRangeThreshold=Pragul limitelor variabilei (la estimare) +NLPSolverCommon.Properties.UseACRComparator=Utilizeaz\u0103 comparatorul ACR (\u00EEn locul lui BCH) +NLPSolverCommon.Properties.UseRandomStartingPoint=Utilizeaz\u0103 un punct de pornire aleator +NLPSolverCommon.Properties.StagnationLimit=Limit\u0103 de stagnare +NLPSolverCommon.Properties.Tolerance=Toleran\u021B\u0103 de stagnare +NLPSolverCommon.Properties.EnhancedSolverStatus=Afi\u0219eaz\u0103 starea extins\u0103 a rezolvatorului +#DEPS +NLPSolverCommon.Properties.AgentSwitchRate=Rata de schimbare a agentului (probabilitate DE) +NLPSolverCommon.Properties.DEFactor=DE: factor de scalare (0-1.2) +NLPSolverCommon.Properties.DECR=DE: probabilitate de jonc\u021Biune (0-1) +NLPSolverCommon.Properties.PSC1=PS: constant\u0103 cognitiv\u0103 +NLPSolverCommon.Properties.PSC2=PS: constant\u0103 social\u0103 +NLPSolverCommon.Properties.PSWeight=PS: coeficient de constric\u021Bie +NLPSolverCommon.Properties.PSCL=PS: probabilitate de mutare (0-0.005) diff --git a/nlpsolver/locale/NLPSolverCommon_ru.properties b/nlpsolver/locale/NLPSolverCommon_ru.properties new file mode 100644 index 0000000..c240fed --- /dev/null +++ b/nlpsolver/locale/NLPSolverCommon_ru.properties @@ -0,0 +1,22 @@ +# x-no-translate +#BaseNLPSolver +NLPSolverCommon.Properties.AssumeNonNegative=\u041F\u0440\u0438\u043D\u044F\u0442\u044C \u043F\u0435\u0440\u0435\u043C\u0435\u043D\u043D\u044B\u0435 \u043A\u0430\u043A \u043D\u0435\u043E\u0442\u0440\u0438\u0446\u0430\u0442\u0435\u043B\u044C\u043D\u044B\u0435 +#BaseEvolutionarySolver +NLPSolverCommon.Properties.SwarmSize=\u0420\u0430\u0437\u043C\u0435\u0440 \u0440\u043E\u044F +NLPSolverCommon.Properties.LibrarySize=\u0420\u0430\u0437\u043C\u0435\u0440 \u0431\u0438\u0431\u043B\u0438\u043E\u0442\u0435\u043A\u0438 +NLPSolverCommon.Properties.LearningCycles=\u041A\u043E\u043B\u0438\u0447\u0435\u0441\u0442\u0432\u043E \u0438\u0442\u0435\u0440\u0430\u0446\u0438\u0439 +NLPSolverCommon.Properties.GuessVariableRange=\u041E\u0446\u0435\u043D\u043A\u0430 \u0433\u0440\u0430\u043D\u0438\u0446 \u043F\u0435\u0440\u0435\u043C\u0435\u043D\u043D\u044B\u0445 +NLPSolverCommon.Properties.VariableRangeThreshold=\u041F\u043E\u0440\u043E\u0433 \u0433\u0440\u0430\u043D\u0438\u0446 \u043F\u0435\u0440\u0435\u043C\u0435\u043D\u043D\u044B\u0445 (\u043F\u0440\u0438 \u043E\u0446\u0435\u043D\u043A\u0435) +NLPSolverCommon.Properties.UseACRComparator=\u0418\u0441\u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u044C \u0441\u0440\u0430\u0432\u043D\u0435\u043D\u0438\u0435 ACR (\u0432\u043C\u0435\u0441\u0442\u043E BCH) +NLPSolverCommon.Properties.UseRandomStartingPoint=\u0418\u0441\u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u044C \u0441\u043B\u0443\u0447\u0430\u0439\u043D\u0443\u044E \u043E\u0442\u043F\u0440\u0430\u0432\u043D\u0443\u044E \u0442\u043E\u0447\u043A\u0443 +NLPSolverCommon.Properties.StagnationLimit=\u041F\u0440\u0435\u0434\u0435\u043B \u0441\u0445\u043E\u0434\u0438\u043C\u043E\u0441\u0442\u0438 +NLPSolverCommon.Properties.Tolerance=\u0414\u043E\u043F\u0443\u0441\u043A \u0441\u0445\u043E\u0434\u0438\u043C\u043E\u0441\u0442\u0438 +NLPSolverCommon.Properties.EnhancedSolverStatus=\u041F\u043E\u043A\u0430\u0437\u044B\u0432\u0430\u0442\u044C \u0440\u0430\u0441\u0448\u0438\u0440\u0435\u043D\u043D\u043E\u0435 \u0441\u043E\u0441\u0442\u043E\u044F\u043D\u0438\u0435 +#DEPS +NLPSolverCommon.Properties.AgentSwitchRate=\u0423\u0440\u043E\u0432\u0435\u043D\u044C \u043F\u0435\u0440\u0435\u043A\u043B\u044E\u0447\u0435\u043D\u0438\u044F \u0430\u0433\u0435\u043D\u0442\u0430 (DE \u0432\u0435\u0440\u043E\u044F\u0442\u043D\u043E\u0441\u0442\u044C) +NLPSolverCommon.Properties.DEFactor=DE: \u041A\u043E\u044D\u0444\u0444\u0438\u0446\u0438\u0435\u043D\u0442 \u043C\u0430\u0441\u0448\u0442\u0430\u0431\u0438\u0440\u043E\u0432\u0430\u043D\u0438\u044F (0-1.2) +NLPSolverCommon.Properties.DECR=DE: \u0412\u0435\u0440\u043E\u044F\u0442\u043D\u043E\u0441\u0442\u044C \u043F\u0435\u0440\u0435\u0441\u0435\u0447\u0435\u043D\u0438\u044F (0-1) +NLPSolverCommon.Properties.PSC1=PS: \u041A\u043E\u043D\u0433\u0438\u0442\u0438\u0432\u043D\u0430\u044F \u043A\u043E\u043D\u0441\u0442\u0430\u043D\u0442\u0430 +NLPSolverCommon.Properties.PSC2=PS: \u0421\u043E\u0446\u0438\u0430\u043B\u044C\u043D\u0430\u044F \u043A\u043E\u043D\u0441\u0442\u0430\u043D\u0442\u0430 +NLPSolverCommon.Properties.PSWeight=PS: \u041A\u043E\u044D\u0444\u0444\u0438\u0446\u0438\u0435\u043D\u0442 \u0441\u0436\u0430\u0442\u0438\u044F +NLPSolverCommon.Properties.PSCL=PS: \u0412\u0435\u0440\u043E\u044F\u0442\u043D\u043E\u0441\u0442\u044C \u043C\u0443\u0442\u0430\u0446\u0438\u0438 (0-0.005) diff --git a/nlpsolver/locale/NLPSolverCommon_sk.properties b/nlpsolver/locale/NLPSolverCommon_sk.properties new file mode 100644 index 0000000..11c987b --- /dev/null +++ b/nlpsolver/locale/NLPSolverCommon_sk.properties @@ -0,0 +1,22 @@ +# x-no-translate +#BaseNLPSolver +NLPSolverCommon.Properties.AssumeNonNegative=Predpoklada\u0165 nez\u00E1porn\u00E9 premenn\u00E9 +#BaseEvolutionarySolver +NLPSolverCommon.Properties.SwarmSize=Ve\u013Ekos\u0165 roja +NLPSolverCommon.Properties.LibrarySize=Ve\u013Ekos\u0165 kni\u017Enice +NLPSolverCommon.Properties.LearningCycles=Cykly u\u010Denia +NLPSolverCommon.Properties.GuessVariableRange=Odhadn\u00FA\u0165 ohrani\u010Denie premenn\u00FDch +NLPSolverCommon.Properties.VariableRangeThreshold=Prahov\u00E1 hodnota ohrani\u010Denia premenn\u00FDch (pri odhade) +NLPSolverCommon.Properties.UseACRComparator=Pou\u017Ei\u0165 kompar\u00E1tor ACR (namiesto BCH) +NLPSolverCommon.Properties.UseRandomStartingPoint=Pou\u017Ei\u0165 n\u00E1hodn\u00FD \u0161tartovac\u00ED bod +NLPSolverCommon.Properties.StagnationLimit=Hranica stagn\u00E1cie +NLPSolverCommon.Properties.Tolerance=Tolerancia stagn\u00E1cie +NLPSolverCommon.Properties.EnhancedSolverStatus=Uk\u00E1za\u0165 roz\u0161\u00EDren\u00FD status rie\u0161i\u010Da +#DEPS +NLPSolverCommon.Properties.AgentSwitchRate=Agent Switch Rate (DE Probability) +NLPSolverCommon.Properties.DEFactor=DE: Scaling Factor (0-1.2) +NLPSolverCommon.Properties.DECR=DE: Crossover Probability (0-1) +NLPSolverCommon.Properties.PSC1=PS: Cognitive Constant +NLPSolverCommon.Properties.PSC2=PS: Social Constant +NLPSolverCommon.Properties.PSWeight=PS: koeficient stla\u010Denia +NLPSolverCommon.Properties.PSCL=PS: Mutation Probability (0-0.005) diff --git a/nlpsolver/locale/NLPSolverCommon_sl.properties b/nlpsolver/locale/NLPSolverCommon_sl.properties new file mode 100644 index 0000000..8ef157c --- /dev/null +++ b/nlpsolver/locale/NLPSolverCommon_sl.properties @@ -0,0 +1,24 @@ +# x-no-translate +#BaseNLPSolver +NLPSolverCommon.Properties.AssumeNonNegative=Domnevaj nenegativne spremenljivke + +#BaseEvolutionarySolver +NLPSolverCommon.Properties.SwarmSize=Velikost roja +NLPSolverCommon.Properties.LibrarySize=Velikost knji\u017Enice +NLPSolverCommon.Properties.LearningCycles=U\u010Dni cikli +NLPSolverCommon.Properties.GuessVariableRange=Uganjevanje meja spremenljivk +NLPSolverCommon.Properties.VariableRangeThreshold=Prag meja spremenljivk (pri uganjevanju) +NLPSolverCommon.Properties.UseACRComparator=Uporabi primerjalnik ACR (namesto BCH) +NLPSolverCommon.Properties.UseRandomStartingPoint=Uporabi naklju\u010Dno za\u010Detno to\u010Dko +NLPSolverCommon.Properties.StagnationLimit=Meja stagnacije +NLPSolverCommon.Properties.Tolerance=Toleranca stagnacije +NLPSolverCommon.Properties.EnhancedSolverStatus=Poka\u017Ei podrobnej\u0161e stanje Re\u0161evalca + +#DEPS +NLPSolverCommon.Properties.AgentSwitchRate=Hitrost preklopa agenta (verjetnost DE) +NLPSolverCommon.Properties.DEFactor=DE: faktor spremembe merila (0-1,2) +NLPSolverCommon.Properties.DECR=DE: verjetnost prehajanja (0-1) +NLPSolverCommon.Properties.PSC1=PS: kognitivna konstanta +NLPSolverCommon.Properties.PSC2=PS: socialna konstanta +NLPSolverCommon.Properties.PSWeight=PS: koeficient kr\u010Denja +NLPSolverCommon.Properties.PSCL=PS: verjetnost mutacije (0-0,005) diff --git a/nlpsolver/locale/NLPSolverCommon_zh_CN.properties b/nlpsolver/locale/NLPSolverCommon_zh_CN.properties new file mode 100644 index 0000000..c2eb6f1 --- /dev/null +++ b/nlpsolver/locale/NLPSolverCommon_zh_CN.properties @@ -0,0 +1,22 @@ +# x-no-translate +#BaseNLPSolver +NLPSolverCommon.Properties.AssumeNonNegative=\u5047\u5B9A\u975E\u8D1F\u53D8\u91CF +#BaseEvolutionarySolver +NLPSolverCommon.Properties.SwarmSize=Swam \u5C3A\u5BF8 +NLPSolverCommon.Properties.LibrarySize=\u5E93\u5C3A\u5BF8 +NLPSolverCommon.Properties.LearningCycles=\u5B66\u4E60\u5468\u671F +NLPSolverCommon.Properties.GuessVariableRange=\u53D8\u91CF\u8FB9\u754C\u63A8\u6D4B +NLPSolverCommon.Properties.VariableRangeThreshold=\u53D8\u91CF\u8FB9\u754C\u4E34\u754C (\u63A8\u6D4B\u65F6) +NLPSolverCommon.Properties.UseACRComparator=\u4F7F\u7528 ACR \u6BD4\u8F83\u5668 (\u66FF\u4EE3 BCH) +NLPSolverCommon.Properties.UseRandomStartingPoint=\u4F7F\u7528\u968F\u673A\u8D77\u59CB\u70B9 +NLPSolverCommon.Properties.StagnationLimit=\u505C\u6EDE\u9650\u5236 +NLPSolverCommon.Properties.Tolerance=\u505C\u6EDE\u5BB9\u9650 +NLPSolverCommon.Properties.EnhancedSolverStatus=\u663E\u793A\u589E\u5F3A\u6C42\u89E3\u5668\u72B6\u6001 +#DEPS +NLPSolverCommon.Properties.AgentSwitchRate=\u4EE3\u7406\u5207\u6362\u901F\u7387 (DE \u7387) +NLPSolverCommon.Properties.DEFactor=DE: \u6BD4\u4F8B\u7CFB\u6570 (0-1.2) +NLPSolverCommon.Properties.DECR=DE: \u4EA4\u914D\u7387 (0-1) +NLPSolverCommon.Properties.PSC1=PS: \u8BA4\u77E5\u5E38\u91CF +NLPSolverCommon.Properties.PSC2=PS: \u793E\u4F1A\u5E38\u91CF +NLPSolverCommon.Properties.PSWeight=PS: \u6536\u7F29\u7CFB\u6570 +NLPSolverCommon.Properties.PSCL=PS: \u7A81\u53D8\u7387 (0-0.005) diff --git a/nlpsolver/locale/NLPSolverCommon_zh_TW.properties b/nlpsolver/locale/NLPSolverCommon_zh_TW.properties new file mode 100644 index 0000000..6001cca --- /dev/null +++ b/nlpsolver/locale/NLPSolverCommon_zh_TW.properties @@ -0,0 +1,22 @@ +# x-no-translate +#BaseNLPSolver +NLPSolverCommon.Properties.AssumeNonNegative=\u5047\u8A2D\u975E\u8CA0\u503C\u8B8A\u6578 +#BaseEvolutionarySolver +NLPSolverCommon.Properties.SwarmSize=\u7FA4\u5927\u5C0F +NLPSolverCommon.Properties.LibrarySize=\u7A0B\u5F0F\u5EAB\u5927\u5C0F +NLPSolverCommon.Properties.LearningCycles=\u5B78\u7FD2\u9031\u671F +NLPSolverCommon.Properties.GuessVariableRange=\u8B8A\u6578\u7BC4\u570D\u731C\u6E2C +NLPSolverCommon.Properties.VariableRangeThreshold=\u8B8A\u6578\u7BC4\u570D\u95BE\u503C (\u731C\u6E2C\u6642) +NLPSolverCommon.Properties.UseACRComparator=\u4F7F\u7528 ACR \u6BD4\u8F03\u5B50 (\u66FF\u4EE3BCH) +NLPSolverCommon.Properties.UseRandomStartingPoint=\u4F7F\u7528\u96A8\u6A5F\u8D77\u9EDE +NLPSolverCommon.Properties.StagnationLimit=\u505C\u6EEF\u9650\u5236 +NLPSolverCommon.Properties.Tolerance=\u505C\u6EEF\u5BB9\u9650 +NLPSolverCommon.Properties.EnhancedSolverStatus=\u986F\u793A\u589E\u5F37\u89E3\u6C7A\u7A0B\u5F0F\u72C0\u614B +#DEPS +NLPSolverCommon.Properties.AgentSwitchRate=\u4EE3\u7406\u5207\u63DB\u901F\u7387 (DE \u6982\u7387) +NLPSolverCommon.Properties.DEFactor=DE: \u6BD4\u4F8B\u7E2E\u653E\u4FC2\u6578 (0-1.2) +NLPSolverCommon.Properties.DECR=DE: \u4EA4\u914D\u7387 (0-1) +NLPSolverCommon.Properties.PSC1=PS: \u8A8D\u77E5\u5E38\u6578 +NLPSolverCommon.Properties.PSC2=PS: \u793E\u6703\u5E38\u6578 +NLPSolverCommon.Properties.PSWeight=PS: \u6536\u7E2E\u4FC2\u6578 +NLPSolverCommon.Properties.PSCL=PS: \u7A81\u8B8A\u6982\u7387 diff --git a/nlpsolver/locale/NLPSolverStatusDialog_ast.properties b/nlpsolver/locale/NLPSolverStatusDialog_ast.properties new file mode 100644 index 0000000..7134369 --- /dev/null +++ b/nlpsolver/locale/NLPSolverStatusDialog_ast.properties @@ -0,0 +1,28 @@ +# x-no-translate +#Dialog +NLPSolverStatusDialog.Dialog.Caption=Est\u00E1u del resolvedor +#Controls +NLPSolverStatusDialog.Controls.lblSolution=Soluci\u00F3n actual: +NLPSolverStatusDialog.Controls.lblIteration=Iteraci\u00F3n: +NLPSolverStatusDialog.Controls.lblStagnation=Estancamientu: +NLPSolverStatusDialog.Controls.lblRuntime=Tiempu d'execuci\u00F3n: +NLPSolverStatusDialog.Controls.btnStop=Aparar +NLPSolverStatusDialog.Controls.btnOK=Aceutar +NLPSolverStatusDialog.Controls.btnContinue=Siguir +#Messages +NLPSolverStatusDialog.Message.StopIteration=S'alcanzaron les repeticiones m\u00E1ximes. +NLPSolverStatusDialog.Message.StopStagnation=Procesu par\u00E1u por estancamientu. +NLPSolverStatusDialog.Message.StopUser=Procesu par\u00E1u por aciu d'interrupci\u00F3n del usuariu. +NLPSolverStatusDialog.Message.CurrentIteration=Procesu par\u00E1u na iteraci\u00F3n %d de %d. +#Time formatting +NLPSolverStatusDialog.Time.Nanoseconds=Nanosegundos +NLPSolverStatusDialog.Time.Microseconds=Microsegundos +NLPSolverStatusDialog.Time.Milliseconds=Milisegundos +NLPSolverStatusDialog.Time.Second=Segundu +NLPSolverStatusDialog.Time.Seconds=Segundos +NLPSolverStatusDialog.Time.Minute=Minutu +NLPSolverStatusDialog.Time.Minutes=Minutos +NLPSolverStatusDialog.Time.Hour=Hora +NLPSolverStatusDialog.Time.Hours=Hores +NLPSolverStatusDialog.Time.Day=D\u00EDa +NLPSolverStatusDialog.Time.Days=D\u00EDes diff --git a/nlpsolver/locale/NLPSolverStatusDialog_ca.properties b/nlpsolver/locale/NLPSolverStatusDialog_ca.properties new file mode 100644 index 0000000..11f653c --- /dev/null +++ b/nlpsolver/locale/NLPSolverStatusDialog_ca.properties @@ -0,0 +1,28 @@ +# x-no-translate +#Dialog +NLPSolverStatusDialog.Dialog.Caption=Estat del solucionador +#Controls +NLPSolverStatusDialog.Controls.lblSolution=Soluci\u00F3 actual: +NLPSolverStatusDialog.Controls.lblIteration=Iteraci\u00F3: +NLPSolverStatusDialog.Controls.lblStagnation=Estagnaci\u00F3: +NLPSolverStatusDialog.Controls.lblRuntime=Temps d'execuci\u00F3: +NLPSolverStatusDialog.Controls.btnStop=Para +NLPSolverStatusDialog.Controls.btnOK=D'acord +NLPSolverStatusDialog.Controls.btnContinue=Continua +#Messages +NLPSolverStatusDialog.Message.StopIteration=S'ha assolit el nombre m\u00E0xim d'iteracions. +NLPSolverStatusDialog.Message.StopStagnation=El proc\u00E9s ha finalitzat a causa de l'estagnaci\u00F3. +NLPSolverStatusDialog.Message.StopUser=El proc\u00E9s ha finalitzat a causa d'una interrupci\u00F3 de l'usuari. +NLPSolverStatusDialog.Message.CurrentIteration=El proc\u00E9s ha finalitzat a la iteraci\u00F3 %d de %d. +#Time formatting +NLPSolverStatusDialog.Time.Nanoseconds=Nanosegons +NLPSolverStatusDialog.Time.Microseconds=Microsegons +NLPSolverStatusDialog.Time.Milliseconds=Mil\u00B7lisegons +NLPSolverStatusDialog.Time.Second=Segon +NLPSolverStatusDialog.Time.Seconds=Segons +NLPSolverStatusDialog.Time.Minute=Minut +NLPSolverStatusDialog.Time.Minutes=Minuts +NLPSolverStatusDialog.Time.Hour=Hora +NLPSolverStatusDialog.Time.Hours=Hores +NLPSolverStatusDialog.Time.Day=Dia +NLPSolverStatusDialog.Time.Days=Dies diff --git a/nlpsolver/locale/NLPSolverStatusDialog_de.properties b/nlpsolver/locale/NLPSolverStatusDialog_de.properties new file mode 100644 index 0000000..ed263cd --- /dev/null +++ b/nlpsolver/locale/NLPSolverStatusDialog_de.properties @@ -0,0 +1,28 @@ +# x-no-translate +#Dialog +NLPSolverStatusDialog.Dialog.Caption=Solverstatus +#Controls +NLPSolverStatusDialog.Controls.lblSolution=Aktuelle L\u00F6sung: +NLPSolverStatusDialog.Controls.lblIteration=Wiederholungen: +NLPSolverStatusDialog.Controls.lblStagnation=Stagnation: +NLPSolverStatusDialog.Controls.lblRuntime=Laufzeit: +NLPSolverStatusDialog.Controls.btnStop=Unterbechen +NLPSolverStatusDialog.Controls.btnOK=OK +NLPSolverStatusDialog.Controls.btnContinue=Fortsetzen +#Messages +NLPSolverStatusDialog.Message.StopIteration=Maximale Anzahl Iterationen erreicht. +NLPSolverStatusDialog.Message.StopStagnation=Prozess durch Stagnation beendet. +NLPSolverStatusDialog.Message.StopUser=Prozess durch Benutzer unterbrochen. +NLPSolverStatusDialog.Message.CurrentIteration=Prozess bei Iteration %d von %d angehalten. +#Time formatting +NLPSolverStatusDialog.Time.Nanoseconds=Nanosekunden +NLPSolverStatusDialog.Time.Microseconds=Mikrosekunden +NLPSolverStatusDialog.Time.Milliseconds=Millisekunden +NLPSolverStatusDialog.Time.Second=Sekunde +NLPSolverStatusDialog.Time.Seconds=Sekunden +NLPSolverStatusDialog.Time.Minute=Minute +NLPSolverStatusDialog.Time.Minutes=Minuten +NLPSolverStatusDialog.Time.Hour=Stunde +NLPSolverStatusDialog.Time.Hours=Stunden +NLPSolverStatusDialog.Time.Day=Tag +NLPSolverStatusDialog.Time.Days=Tage diff --git a/nlpsolver/locale/NLPSolverStatusDialog_en_GB.properties b/nlpsolver/locale/NLPSolverStatusDialog_en_GB.properties new file mode 100644 index 0000000..45edc4e --- /dev/null +++ b/nlpsolver/locale/NLPSolverStatusDialog_en_GB.properties @@ -0,0 +1,28 @@ +# x-no-translate +#Dialog +NLPSolverStatusDialog.Dialog.Caption=Solver Status +#Controls +NLPSolverStatusDialog.Controls.lblSolution=Current Solution: +NLPSolverStatusDialog.Controls.lblIteration=Iteration: +NLPSolverStatusDialog.Controls.lblStagnation=Stagnation: +NLPSolverStatusDialog.Controls.lblRuntime=Run-time: +NLPSolverStatusDialog.Controls.btnStop=Stop +NLPSolverStatusDialog.Controls.btnOK=OK +NLPSolverStatusDialog.Controls.btnContinue=Continue +#Messages +NLPSolverStatusDialog.Message.StopIteration=Maximum iterations reached. +NLPSolverStatusDialog.Message.StopStagnation=Process stopped due to stagnation. +NLPSolverStatusDialog.Message.StopUser=Process stopped due to user interruption. +NLPSolverStatusDialog.Message.CurrentIteration=Process stopped at iteration %d of %d. +#Time formatting +NLPSolverStatusDialog.Time.Nanoseconds=Nanoseconds +NLPSolverStatusDialog.Time.Microseconds=Microseconds +NLPSolverStatusDialog.Time.Milliseconds=Milliseconds +NLPSolverStatusDialog.Time.Second=Second +NLPSolverStatusDialog.Time.Seconds=Seconds +NLPSolverStatusDialog.Time.Minute=Minute +NLPSolverStatusDialog.Time.Minutes=Minutes +NLPSolverStatusDialog.Time.Hour=Hour +NLPSolverStatusDialog.Time.Hours=Hours +NLPSolverStatusDialog.Time.Day=Day +NLPSolverStatusDialog.Time.Days=Days diff --git a/nlpsolver/locale/NLPSolverStatusDialog_es.properties b/nlpsolver/locale/NLPSolverStatusDialog_es.properties new file mode 100644 index 0000000..321af52 --- /dev/null +++ b/nlpsolver/locale/NLPSolverStatusDialog_es.properties @@ -0,0 +1,28 @@ +# x-no-translate +#Dialog +NLPSolverStatusDialog.Dialog.Caption=Estado del solucionador +#Controls +NLPSolverStatusDialog.Controls.lblSolution=Soluci\u00F3n actual: +NLPSolverStatusDialog.Controls.lblIteration=Iteraci\u00F3n: +NLPSolverStatusDialog.Controls.lblStagnation=Estancamiento: +NLPSolverStatusDialog.Controls.lblRuntime=Tiempo de ejecuci\u00F3n: +NLPSolverStatusDialog.Controls.btnStop=Detener +NLPSolverStatusDialog.Controls.btnOK=Aceptar +NLPSolverStatusDialog.Controls.btnContinue=Continuar +#Messages +NLPSolverStatusDialog.Message.StopIteration=Se alcanz\u00F3 la cantidad m\u00E1xima de iteraciones. +NLPSolverStatusDialog.Message.StopStagnation=El proceso se detuvo debido al estancamiento. +NLPSolverStatusDialog.Message.StopUser=El proceso se detuvo debido a la interrupci\u00F3n del usuario. +NLPSolverStatusDialog.Message.CurrentIteration=El proceso se detuvo en la iteraci\u00F3n %d de %d. +#Time formatting +NLPSolverStatusDialog.Time.Nanoseconds=Nanosegundos +NLPSolverStatusDialog.Time.Microseconds=Microsegundos +NLPSolverStatusDialog.Time.Milliseconds=Milisegundos +NLPSolverStatusDialog.Time.Second=Segundo +NLPSolverStatusDialog.Time.Seconds=Segundos +NLPSolverStatusDialog.Time.Minute=Minuto +NLPSolverStatusDialog.Time.Minutes=Minutos +NLPSolverStatusDialog.Time.Hour=Hora +NLPSolverStatusDialog.Time.Hours=Horas +NLPSolverStatusDialog.Time.Day=D\u00EDa +NLPSolverStatusDialog.Time.Days=D\u00EDas diff --git a/nlpsolver/locale/NLPSolverStatusDialog_fa.properties b/nlpsolver/locale/NLPSolverStatusDialog_fa.properties new file mode 100644 index 0000000..c59745f --- /dev/null +++ b/nlpsolver/locale/NLPSolverStatusDialog_fa.properties @@ -0,0 +1,28 @@ +# x-no-translate +#Dialog +NLPSolverStatusDialog.Dialog.Caption=\u0648\u0636\u0639\u06CC\u062A \u062D\u0644\u200C\u06A9\u0646\u0646\u062F\u0647 +#Controls +NLPSolverStatusDialog.Controls.lblSolution=\u0631\u0627\u0647 \u062D\u0644 \u06A9\u0646\u0648\u0646\u06CC: +NLPSolverStatusDialog.Controls.lblIteration=\u062A\u06A9\u0631\u0627\u0631: +NLPSolverStatusDialog.Controls.lblStagnation=\u0631\u06A9\u0648\u062F: +NLPSolverStatusDialog.Controls.lblRuntime=\u0632\u0645\u0627\u0646 \u0627\u062C\u0631\u0627: +NLPSolverStatusDialog.Controls.btnStop=\u062A\u0648\u0642\u0641 +NLPSolverStatusDialog.Controls.btnOK=\u062A\u0623\u06CC\u06CC\u062F +NLPSolverStatusDialog.Controls.btnContinue=\u0627\u062F\u0627\u0645\u0647 +#Messages +NLPSolverStatusDialog.Message.StopIteration=\u062D\u062F\u0627\u06A9\u062B\u0631 \u062A\u06A9\u0631\u0627\u0631\u0647\u0627 \u062D\u0627\u0635\u0644 \u0634\u062F\u0647 \u0627\u0633\u062A. +NLPSolverStatusDialog.Message.StopStagnation=\u067E\u0631\u062F\u0627\u0632\u0634 \u0628\u0647\u200C\u0639\u0644\u062A \u0631\u06A9\u0648\u062F \u0645\u062A\u0648\u0642\u0641 \u0634\u062F. +NLPSolverStatusDialog.Message.StopUser=\u067E\u0631\u062F\u0627\u0632\u0634 \u0628\u0647\u200C\u0639\u0644\u062A \u0642\u0637\u0639 \u062A\u0648\u0633\u0637 \u06A9\u0627\u0631\u0628\u0631 \u0645\u062A\u0648\u0642\u0641 \u0634\u062F. +NLPSolverStatusDialog.Message.CurrentIteration=\u067E\u0631\u062F\u0627\u0632\u0634 \u062F\u0631 \u062A\u06A9\u0631\u0627\u0631 %d \u0627\u0632 %d \u0645\u062A\u0648\u0642\u0641 \u0634\u062F. +#Time formatting +NLPSolverStatusDialog.Time.Nanoseconds=\u0646\u0627\u0646\u0648\u062B\u0627\u0646\u06CC\u0647 +NLPSolverStatusDialog.Time.Microseconds=\u0645\u06CC\u06A9\u0631\u0648\u062B\u0627\u0646\u06CC\u0647 +NLPSolverStatusDialog.Time.Milliseconds=\u0645\u06CC\u0644\u06CC\u200C\u200E\u062B\u0627\u0646\u06CC\u0647 +NLPSolverStatusDialog.Time.Second=\u062B\u0627\u0646\u06CC\u0647 +NLPSolverStatusDialog.Time.Seconds=\u062B\u0627\u0646\u06CC\u0647\u200C\u0647\u0627 +NLPSolverStatusDialog.Time.Minute=\u062F\u0642\u06CC\u0642\u0647 +NLPSolverStatusDialog.Time.Minutes=\u062F\u0642\u0627\u06CC\u0642 +NLPSolverStatusDialog.Time.Hour=\u0633\u0627\u0639\u062A +NLPSolverStatusDialog.Time.Hours=\u0633\u0627\u0639\u062A\u200C\u0647\u0627 +NLPSolverStatusDialog.Time.Day=\u0631\u0648\u0632 +NLPSolverStatusDialog.Time.Days=\u0631\u0648\u0632\u200C\u0647\u0627 diff --git a/nlpsolver/locale/NLPSolverStatusDialog_fi.properties b/nlpsolver/locale/NLPSolverStatusDialog_fi.properties new file mode 100644 index 0000000..90945e3 --- /dev/null +++ b/nlpsolver/locale/NLPSolverStatusDialog_fi.properties @@ -0,0 +1,28 @@ +# x-no-translate +#Dialog +NLPSolverStatusDialog.Dialog.Caption=Ratkaisimen tila +#Controls +NLPSolverStatusDialog.Controls.lblSolution=Nykyinen ratkaisu: +NLPSolverStatusDialog.Controls.lblIteration=Iteraatio: +NLPSolverStatusDialog.Controls.lblStagnation=Pys\u00E4htyneisyys: +NLPSolverStatusDialog.Controls.lblRuntime=Ajoaika: +NLPSolverStatusDialog.Controls.btnStop=Pys\u00E4yt\u00E4 +NLPSolverStatusDialog.Controls.btnOK=OK +NLPSolverStatusDialog.Controls.btnContinue=Jatka +#Messages +NLPSolverStatusDialog.Message.StopIteration=Maksimim\u00E4\u00E4r\u00E4 iteraatioita tehty. +NLPSolverStatusDialog.Message.StopStagnation=Pys\u00E4htyneisyys pys\u00E4ytti prosessin. +NLPSolverStatusDialog.Message.StopUser=K\u00E4ytt\u00E4j\u00E4n keskeytys pys\u00E4ytti prosessin. +NLPSolverStatusDialog.Message.CurrentIteration=Prosessi pys\u00E4htynyt iteraatiossa %d/%d. +#Time formatting +NLPSolverStatusDialog.Time.Nanoseconds=nanosekuntia +NLPSolverStatusDialog.Time.Microseconds=mikrosekuntia +NLPSolverStatusDialog.Time.Milliseconds=millisekuntia +NLPSolverStatusDialog.Time.Second=sekunti +NLPSolverStatusDialog.Time.Seconds=sekuntia +NLPSolverStatusDialog.Time.Minute=minuutti +NLPSolverStatusDialog.Time.Minutes=minuuttia +NLPSolverStatusDialog.Time.Hour=tunti +NLPSolverStatusDialog.Time.Hours=tuntia +NLPSolverStatusDialog.Time.Day=p\u00E4iv\u00E4 +NLPSolverStatusDialog.Time.Days=p\u00E4iv\u00E4\u00E4 diff --git a/nlpsolver/locale/NLPSolverStatusDialog_fr.properties b/nlpsolver/locale/NLPSolverStatusDialog_fr.properties new file mode 100644 index 0000000..de6c1a9 --- /dev/null +++ b/nlpsolver/locale/NLPSolverStatusDialog_fr.properties @@ -0,0 +1,28 @@ +# x-no-translate +#Dialog +NLPSolverStatusDialog.Dialog.Caption=\u00C9tat du solveur +#Controls +NLPSolverStatusDialog.Controls.lblSolution=Solution actuelle : +NLPSolverStatusDialog.Controls.lblIteration=It\u00E9ration : +NLPSolverStatusDialog.Controls.lblStagnation=Stagnation : +NLPSolverStatusDialog.Controls.lblRuntime=Dur\u00E9e d'ex\u00E9cution : +NLPSolverStatusDialog.Controls.btnStop=Arr\u00EAter +NLPSolverStatusDialog.Controls.btnOK=OK +NLPSolverStatusDialog.Controls.btnContinue=Continuer +#Messages +NLPSolverStatusDialog.Message.StopIteration=Maximum d'it\u00E9rations atteint. +NLPSolverStatusDialog.Message.StopStagnation=Processus arr\u00EAt\u00E9 en raison de la stagnation. +NLPSolverStatusDialog.Message.StopUser=Processus arr\u00EAt\u00E9 en raison de l'interruption par l'utilisateur. +NLPSolverStatusDialog.Message.CurrentIteration=Processus arr\u00EAt\u00E9 \u00E0 l'it\u00E9ration %d de %d. +#Time formatting +NLPSolverStatusDialog.Time.Nanoseconds=Nanosecondes +NLPSolverStatusDialog.Time.Microseconds=Microsecondes +NLPSolverStatusDialog.Time.Milliseconds=Millisecondes +NLPSolverStatusDialog.Time.Second=Seconde +NLPSolverStatusDialog.Time.Seconds=Secondes +NLPSolverStatusDialog.Time.Minute=Minute +NLPSolverStatusDialog.Time.Minutes=Minutes +NLPSolverStatusDialog.Time.Hour=Heure +NLPSolverStatusDialog.Time.Hours=Heures +NLPSolverStatusDialog.Time.Day=Jour +NLPSolverStatusDialog.Time.Days=Jours diff --git a/nlpsolver/locale/NLPSolverStatusDialog_gl.properties b/nlpsolver/locale/NLPSolverStatusDialog_gl.properties new file mode 100644 index 0000000..aad6987 --- /dev/null +++ b/nlpsolver/locale/NLPSolverStatusDialog_gl.properties @@ -0,0 +1,28 @@ +# x-no-translate +#Dialog +NLPSolverStatusDialog.Dialog.Caption=Status do solver +#Controls +NLPSolverStatusDialog.Controls.lblSolution=Soluci\u00F3n actual: +NLPSolverStatusDialog.Controls.lblIteration=Iteraci\u00F3n: +NLPSolverStatusDialog.Controls.lblStagnation=Estancamento: +NLPSolverStatusDialog.Controls.lblRuntime=Tempo de execuci\u00F3n: +NLPSolverStatusDialog.Controls.btnStop=Alto +NLPSolverStatusDialog.Controls.btnOK=Aceptar +NLPSolverStatusDialog.Controls.btnContinue=Continuar +#Messages +NLPSolverStatusDialog.Message.StopIteration=Acadouse o n\u00FAmero m\u00E1ximo de iteraci\u00F3ns. +NLPSolverStatusDialog.Message.StopStagnation=O proceso det\u00EDvose debido a estancamento +NLPSolverStatusDialog.Message.StopUser=O proceso det\u00EDvose debido \u00E1 interrupci\u00F3n do usuario. +NLPSolverStatusDialog.Message.CurrentIteration=O proceso det\u00EDvose na iteraci\u00F3n %d de %d. +#Time formatting +NLPSolverStatusDialog.Time.Nanoseconds=Nanosegundos +NLPSolverStatusDialog.Time.Microseconds=Microsegundos +NLPSolverStatusDialog.Time.Milliseconds=Milisegundos +NLPSolverStatusDialog.Time.Second=Segundo +NLPSolverStatusDialog.Time.Seconds=Segundos +NLPSolverStatusDialog.Time.Minute=Minuto +NLPSolverStatusDialog.Time.Minutes=Minutos +NLPSolverStatusDialog.Time.Hour=Hora +NLPSolverStatusDialog.Time.Hours=Horas +NLPSolverStatusDialog.Time.Day=D\u00EDa +NLPSolverStatusDialog.Time.Days=D\u00EDas diff --git a/nlpsolver/locale/NLPSolverStatusDialog_hu.properties b/nlpsolver/locale/NLPSolverStatusDialog_hu.properties new file mode 100644 index 0000000..b2584b0 --- /dev/null +++ b/nlpsolver/locale/NLPSolverStatusDialog_hu.properties @@ -0,0 +1,28 @@ +# x-no-translate +#Dialog +NLPSolverStatusDialog.Dialog.Caption=A Megold\u00F3 \u00E1llapota +#Controls +NLPSolverStatusDialog.Controls.lblSolution=Jelenlegi megold\u00E1s: +NLPSolverStatusDialog.Controls.lblIteration=Iter\u00E1ci\u00F3: +NLPSolverStatusDialog.Controls.lblStagnation=Stagn\u00E1l\u00E1s: +NLPSolverStatusDialog.Controls.lblRuntime=Fut\u00E1sid\u0151: +NLPSolverStatusDialog.Controls.btnStop=Le\u00E1ll\u00EDt\u00E1s +NLPSolverStatusDialog.Controls.btnOK=OK +NLPSolverStatusDialog.Controls.btnContinue=Folytat\u00E1s +#Messages +NLPSolverStatusDialog.Message.StopIteration=El\u00E9rte a max. iter\u00E1ci\u00F3s l\u00E9p\u00E9st. +NLPSolverStatusDialog.Message.StopStagnation=A folyamat le\u00E1llt, mert stagn\u00E1l. +NLPSolverStatusDialog.Message.StopUser=A folyamat le\u00E1llt, mert a felhaszn\u00E1l\u00F3 megszak\u00EDtotta. +NLPSolverStatusDialog.Message.CurrentIteration=A folyamat le\u00E1llt a(z) %d. / %d iter\u00E1ci\u00F3n\u00E1l. +#Time formatting +NLPSolverStatusDialog.Time.Nanoseconds=nanoszekundum +NLPSolverStatusDialog.Time.Microseconds=mikroszekundum +NLPSolverStatusDialog.Time.Milliseconds=ezredm\u00E1sodperc +NLPSolverStatusDialog.Time.Second=m\u00E1sodperc +NLPSolverStatusDialog.Time.Seconds=m\u00E1sodperc +NLPSolverStatusDialog.Time.Minute=perc +NLPSolverStatusDialog.Time.Minutes=perc +NLPSolverStatusDialog.Time.Hour=\u00F3ra +NLPSolverStatusDialog.Time.Hours=\u00F3ra +NLPSolverStatusDialog.Time.Day=nap +NLPSolverStatusDialog.Time.Days=nap diff --git a/nlpsolver/locale/NLPSolverStatusDialog_is.properties b/nlpsolver/locale/NLPSolverStatusDialog_is.properties new file mode 100644 index 0000000..74a8b69 --- /dev/null +++ b/nlpsolver/locale/NLPSolverStatusDialog_is.properties @@ -0,0 +1,28 @@ +# x-no-translate +#Dialog +NLPSolverStatusDialog.Dialog.Caption=Solver Status +#Controls +NLPSolverStatusDialog.Controls.lblSolution=Current Solution: +NLPSolverStatusDialog.Controls.lblIteration=\u00CDtrun: +NLPSolverStatusDialog.Controls.lblStagnation=Stagnation: +NLPSolverStatusDialog.Controls.lblRuntime=Runtime: +NLPSolverStatusDialog.Controls.btnStop=St\u00F6\u00F0va +NLPSolverStatusDialog.Controls.btnOK=\u00CD lagi +NLPSolverStatusDialog.Controls.btnContinue=Halda \u00E1fram +#Messages +NLPSolverStatusDialog.Message.StopIteration=Mesta fj\u00F6lda \u00EDtrana er n\u00E1\u00F0. +NLPSolverStatusDialog.Message.StopStagnation=Process stopped due to stagnation. +NLPSolverStatusDialog.Message.StopUser=Process stopped due to user interruption. +NLPSolverStatusDialog.Message.CurrentIteration=Process stopped at iteration %d of %d. +#Time formatting +NLPSolverStatusDialog.Time.Nanoseconds=Nan\u00F3sek\u00FAndur +NLPSolverStatusDialog.Time.Microseconds=M\u00EDkr\u00F3sek\u00FAndur +NLPSolverStatusDialog.Time.Milliseconds=Mill\u00EDsek\u00FAndur +NLPSolverStatusDialog.Time.Second=Sek\u00FAnda +NLPSolverStatusDialog.Time.Seconds=Sek\u00FAndur +NLPSolverStatusDialog.Time.Minute=M\u00EDn\u00FAta +NLPSolverStatusDialog.Time.Minutes=M\u00EDn\u00FAtur +NLPSolverStatusDialog.Time.Hour=Klukkustund +NLPSolverStatusDialog.Time.Hours=Klukkustundir +NLPSolverStatusDialog.Time.Day=Dagur +NLPSolverStatusDialog.Time.Days=Days diff --git a/nlpsolver/locale/NLPSolverStatusDialog_it.properties b/nlpsolver/locale/NLPSolverStatusDialog_it.properties new file mode 100644 index 0000000..fe147ab --- /dev/null +++ b/nlpsolver/locale/NLPSolverStatusDialog_it.properties @@ -0,0 +1,28 @@ +# x-no-translate +#Dialog +NLPSolverStatusDialog.Dialog.Caption=Stato del risolutore +#Controls +NLPSolverStatusDialog.Controls.lblSolution=Soluzione attuale: +NLPSolverStatusDialog.Controls.lblIteration=Iterazione: +NLPSolverStatusDialog.Controls.lblStagnation=Stagnazione: +NLPSolverStatusDialog.Controls.lblRuntime=Tempo di esecuzione: +NLPSolverStatusDialog.Controls.btnStop=Interrompi +NLPSolverStatusDialog.Controls.btnOK=OK +NLPSolverStatusDialog.Controls.btnContinue=Continua +#Messages +NLPSolverStatusDialog.Message.StopIteration=Numero massimo di iterazioni raggiunto. +NLPSolverStatusDialog.Message.StopStagnation=Processo interrotto per stagnazione. +NLPSolverStatusDialog.Message.StopUser=Processo interrotto dall'utente. +NLPSolverStatusDialog.Message.CurrentIteration=Processo interrotto all'iterazione %d di %d. +#Time formatting +NLPSolverStatusDialog.Time.Nanoseconds=Nanosecondi +NLPSolverStatusDialog.Time.Microseconds=Microsecondi +NLPSolverStatusDialog.Time.Milliseconds=Millisecondi +NLPSolverStatusDialog.Time.Second=Secondo +NLPSolverStatusDialog.Time.Seconds=Secondi +NLPSolverStatusDialog.Time.Minute=Minuto +NLPSolverStatusDialog.Time.Minutes=Minuti +NLPSolverStatusDialog.Time.Hour=Ora +NLPSolverStatusDialog.Time.Hours=Ore +NLPSolverStatusDialog.Time.Day=Giorno +NLPSolverStatusDialog.Time.Days=Giorni diff --git a/nlpsolver/locale/NLPSolverStatusDialog_ja.properties b/nlpsolver/locale/NLPSolverStatusDialog_ja.properties new file mode 100644 index 0000000..2210dd3 --- /dev/null +++ b/nlpsolver/locale/NLPSolverStatusDialog_ja.properties @@ -0,0 +1,28 @@ +# x-no-translate +#Dialog +NLPSolverStatusDialog.Dialog.Caption=\u30BD\u30EB\u30D0\u30FC\u306E\u72B6\u614B +#Controls +NLPSolverStatusDialog.Controls.lblSolution=\u73FE\u5728\u306E\u89E3: +NLPSolverStatusDialog.Controls.lblIteration=\u53CD\u5FA9: +NLPSolverStatusDialog.Controls.lblStagnation=\u3088\u3069\u307F: +NLPSolverStatusDialog.Controls.lblRuntime=\u5B9F\u884C\u6642\u9593: +NLPSolverStatusDialog.Controls.btnStop=\u505C\u6B62 +NLPSolverStatusDialog.Controls.btnOK=OK +NLPSolverStatusDialog.Controls.btnContinue=\u7D9A\u884C +#Messages +NLPSolverStatusDialog.Message.StopIteration=\u53CD\u5FA9\u306E\u6700\u5927\u5024\u306B\u9054\u3057\u307E\u3057\u305F\u3002 +NLPSolverStatusDialog.Message.StopStagnation=\u3088\u3069\u307F\u304C\u539F\u56E0\u3067\u51E6\u7406\u3092\u505C\u6B62\u3057\u307E\u3057\u305F\u3002 +NLPSolverStatusDialog.Message.StopUser=\u30E6\u30FC\u30B6\u30FC\u306E\u5272\u308A\u8FBC\u307F\u306B\u3088\u3063\u3066\u51E6\u7406\u3092\u505C\u6B62\u3057\u307E\u3057\u305F\u3002 +NLPSolverStatusDialog.Message.CurrentIteration=\u53CD\u5FA9 %d \u56DE\u76EE(%d \u56DE\u4E2D)\u306B\u51E6\u7406\u3092\u505C\u6B62\u3057\u307E\u3057\u305F\u3002 +#Time formatting +NLPSolverStatusDialog.Time.Nanoseconds=\u30CA\u30CE\u79D2 +NLPSolverStatusDialog.Time.Microseconds=\u30DE\u30A4\u30AF\u30ED\u79D2 +NLPSolverStatusDialog.Time.Milliseconds=\u30DF\u30EA\u79D2 +NLPSolverStatusDialog.Time.Second=\u79D2 +NLPSolverStatusDialog.Time.Seconds=\u79D2 +NLPSolverStatusDialog.Time.Minute=\u5206 +NLPSolverStatusDialog.Time.Minutes=\u5206 +NLPSolverStatusDialog.Time.Hour=\u6642\u9593 +NLPSolverStatusDialog.Time.Hours=\u6642\u9593 +NLPSolverStatusDialog.Time.Day=\u65E5 +NLPSolverStatusDialog.Time.Days=\u65E5 diff --git a/nlpsolver/locale/NLPSolverStatusDialog_ko.properties b/nlpsolver/locale/NLPSolverStatusDialog_ko.properties new file mode 100644 index 0000000..94c7e92 --- /dev/null +++ b/nlpsolver/locale/NLPSolverStatusDialog_ko.properties @@ -0,0 +1,28 @@ +# x-no-translate +#Dialog +NLPSolverStatusDialog.Dialog.Caption=\uD574\uCC3E\uAE30 \uC0C1\uD0DC +#Controls +NLPSolverStatusDialog.Controls.lblSolution=\uD604\uC7AC \uD574: +NLPSolverStatusDialog.Controls.lblIteration=\uD69F\uC218: +NLPSolverStatusDialog.Controls.lblStagnation=\uC815\uCCB4: +NLPSolverStatusDialog.Controls.lblRuntime=\uC2E4\uD589\uC2DC\uAC04: +NLPSolverStatusDialog.Controls.btnStop=\uC815\uC9C0 +NLPSolverStatusDialog.Controls.btnOK=\uD655\uC778 +NLPSolverStatusDialog.Controls.btnContinue=\uACC4\uC18D +#Messages +NLPSolverStatusDialog.Message.StopIteration=\uCD5C\uB300 \uD69F\uC218\uC5D0 \uB3C4\uB2EC\uD588\uC2B5\uB2C8\uB2E4. +NLPSolverStatusDialog.Message.StopStagnation=\uC815\uCCB4\uB85C \uC778\uD558\uC5EC \uBA48\uCD98 \uAC83\uC744 \uCC98\uB9AC\uD569\uB2C8\uB2E4. +NLPSolverStatusDialog.Message.StopUser=\uC0AC\uC6A9\uC790\uAC00 \uBA48\uCD98 \uAC83\uC744 \uCC98\uB9AC\uD569\uB2C8\uB2E4. +NLPSolverStatusDialog.Message.CurrentIteration=%d / %d\uD68C \uC5D0\uC11C \uBA48\uCD98 \uAC83\uC744 \uCC98\uB9AC\uD569\uB2C8\uB2E4. +#Time formatting +NLPSolverStatusDialog.Time.Nanoseconds=\uB098\uB178 \uCD08 +NLPSolverStatusDialog.Time.Microseconds=\uB9C8\uC774\uD06C\uB85C \uCD08 +NLPSolverStatusDialog.Time.Milliseconds=\uBC00\uB9AC \uCD08 +NLPSolverStatusDialog.Time.Second=\uCD08 +NLPSolverStatusDialog.Time.Seconds=\uCD08 +NLPSolverStatusDialog.Time.Minute=\uBD84 +NLPSolverStatusDialog.Time.Minutes=\uBD84 +NLPSolverStatusDialog.Time.Hour=\uC2DC +NLPSolverStatusDialog.Time.Hours=\uC2DC +NLPSolverStatusDialog.Time.Day=\uC77C +NLPSolverStatusDialog.Time.Days=\uC77C diff --git a/nlpsolver/locale/NLPSolverStatusDialog_nb.properties b/nlpsolver/locale/NLPSolverStatusDialog_nb.properties new file mode 100644 index 0000000..e1bdf3e --- /dev/null +++ b/nlpsolver/locale/NLPSolverStatusDialog_nb.properties @@ -0,0 +1,28 @@ +# x-no-translate +#Dialog +NLPSolverStatusDialog.Dialog.Caption=L\u00F8sningstatus +#Controls +NLPSolverStatusDialog.Controls.lblSolution=Gjeldende l\u00F8sning: +NLPSolverStatusDialog.Controls.lblIteration=Gjentakelse: +NLPSolverStatusDialog.Controls.lblStagnation=Stagnasjon: +NLPSolverStatusDialog.Controls.lblRuntime=Kj\u00F8retid: +NLPSolverStatusDialog.Controls.btnStop=Stopp +NLPSolverStatusDialog.Controls.btnOK=OK +NLPSolverStatusDialog.Controls.btnContinue=Fortsett +#Messages +NLPSolverStatusDialog.Message.StopIteration=Prosess stoppet p\u00E5 grunn av stagnasjon. +NLPSolverStatusDialog.Message.StopStagnation=Prosess stoppet av bruker. +NLPSolverStatusDialog.Message.StopUser=Prosess stoppet av bruker. +NLPSolverStatusDialog.Message.CurrentIteration=Prosessen stoppet p\u00E5 gjentakelse %d av %d. +#Time formatting +NLPSolverStatusDialog.Time.Nanoseconds=Nanosekund +NLPSolverStatusDialog.Time.Microseconds=Mikrosekund +NLPSolverStatusDialog.Time.Milliseconds=Millisekund +NLPSolverStatusDialog.Time.Second=Sekund +NLPSolverStatusDialog.Time.Seconds=Sekunder +NLPSolverStatusDialog.Time.Minute=Minutt +NLPSolverStatusDialog.Time.Minutes=Minutter +NLPSolverStatusDialog.Time.Hour=Timer +NLPSolverStatusDialog.Time.Hours=Timer +NLPSolverStatusDialog.Time.Day=Dag +NLPSolverStatusDialog.Time.Days=Dager diff --git a/nlpsolver/locale/NLPSolverStatusDialog_nl.properties b/nlpsolver/locale/NLPSolverStatusDialog_nl.properties new file mode 100644 index 0000000..f5eab8c --- /dev/null +++ b/nlpsolver/locale/NLPSolverStatusDialog_nl.properties @@ -0,0 +1,28 @@ +# x-no-translate +#Dialog +NLPSolverStatusDialog.Dialog.Caption=Oplosserstatus +#Controls +NLPSolverStatusDialog.Controls.lblSolution=Huidige oplossing: +NLPSolverStatusDialog.Controls.lblIteration=Iteratie: +NLPSolverStatusDialog.Controls.lblStagnation=Stagnatie: +NLPSolverStatusDialog.Controls.lblRuntime=Looptijd: +NLPSolverStatusDialog.Controls.btnStop=Stoppen +NLPSolverStatusDialog.Controls.btnOK=OK +NLPSolverStatusDialog.Controls.btnContinue=Doorgaan +#Messages +NLPSolverStatusDialog.Message.StopIteration=Maximum aantal iteraties bereikt. +NLPSolverStatusDialog.Message.StopStagnation=Proces is door stagnatie gestopt. +NLPSolverStatusDialog.Message.StopUser=Proces is door de gebruiker gestopt. +NLPSolverStatusDialog.Message.CurrentIteration=Proces is gestopt na iteratie %d van %d. +#Time formatting +NLPSolverStatusDialog.Time.Nanoseconds=Nanoseconden +NLPSolverStatusDialog.Time.Microseconds=Microseconden +NLPSolverStatusDialog.Time.Milliseconds=Milliseconden +NLPSolverStatusDialog.Time.Second=Seconde +NLPSolverStatusDialog.Time.Seconds=Seconden +NLPSolverStatusDialog.Time.Minute=Minuut +NLPSolverStatusDialog.Time.Minutes=Minuten +NLPSolverStatusDialog.Time.Hour=Uur +NLPSolverStatusDialog.Time.Hours=Uren +NLPSolverStatusDialog.Time.Day=Dag +NLPSolverStatusDialog.Time.Days=Dagen diff --git a/nlpsolver/locale/NLPSolverStatusDialog_pt_BR.properties b/nlpsolver/locale/NLPSolverStatusDialog_pt_BR.properties new file mode 100644 index 0000000..44dae56 --- /dev/null +++ b/nlpsolver/locale/NLPSolverStatusDialog_pt_BR.properties @@ -0,0 +1,28 @@ +# x-no-translate +#Dialog +NLPSolverStatusDialog.Dialog.Caption=Estado do solver +#Controls +NLPSolverStatusDialog.Controls.lblSolution=Solu\u00E7\u00E3o atual: +NLPSolverStatusDialog.Controls.lblIteration=Itera\u00E7\u00E3o: +NLPSolverStatusDialog.Controls.lblStagnation=Estagna\u00E7\u00E3o: +NLPSolverStatusDialog.Controls.lblRuntime=Tempo de execu\u00E7\u00E3o: +NLPSolverStatusDialog.Controls.btnStop=Parar +NLPSolverStatusDialog.Controls.btnOK=OK +NLPSolverStatusDialog.Controls.btnContinue=Continuar +#Messages +NLPSolverStatusDialog.Message.StopIteration=N\u00FAmero m\u00E1ximo de itera\u00E7\u00F5es atingido. +NLPSolverStatusDialog.Message.StopStagnation=O processo parou por estagna\u00E7\u00E3o. +NLPSolverStatusDialog.Message.StopUser=O processo parou por interrup\u00E7\u00E3o do usu\u00E1rio. +NLPSolverStatusDialog.Message.CurrentIteration=O processo parou na itera\u00E7\u00E3o %d de %d. +#Time formatting +NLPSolverStatusDialog.Time.Nanoseconds=Nanossegundos +NLPSolverStatusDialog.Time.Microseconds=Microssegundos +NLPSolverStatusDialog.Time.Milliseconds=Milissegundos +NLPSolverStatusDialog.Time.Second=Segundo +NLPSolverStatusDialog.Time.Seconds=Segundos +NLPSolverStatusDialog.Time.Minute=Minuto +NLPSolverStatusDialog.Time.Minutes=Minutos +NLPSolverStatusDialog.Time.Hour=Hora +NLPSolverStatusDialog.Time.Hours=Horas +NLPSolverStatusDialog.Time.Day=Dia +NLPSolverStatusDialog.Time.Days=Dias diff --git a/nlpsolver/locale/NLPSolverStatusDialog_ro.properties b/nlpsolver/locale/NLPSolverStatusDialog_ro.properties new file mode 100644 index 0000000..c3e842e --- /dev/null +++ b/nlpsolver/locale/NLPSolverStatusDialog_ro.properties @@ -0,0 +1,28 @@ +# x-no-translate +#Dialog +NLPSolverStatusDialog.Dialog.Caption=Starea rezolvatorului +#Controls +NLPSolverStatusDialog.Controls.lblSolution=Solu\u021Bia curent\u0103: +NLPSolverStatusDialog.Controls.lblIteration=Itera\u021Bie: +NLPSolverStatusDialog.Controls.lblStagnation=Stagnare: +NLPSolverStatusDialog.Controls.lblRuntime=Durat\u0103 de execu\u021Bie: +NLPSolverStatusDialog.Controls.btnStop=Opre\u0219te +NLPSolverStatusDialog.Controls.btnOK=OK +NLPSolverStatusDialog.Controls.btnContinue=Continu\u0103 +#Messages +NLPSolverStatusDialog.Message.StopIteration=S-a atins num\u0103rul maxim de itera\u021Bii. +NLPSolverStatusDialog.Message.StopStagnation=Proces oprit din cauza stagn\u0103rii. +NLPSolverStatusDialog.Message.StopUser=Proces oprit din cauza \u00EEntreruperii de c\u0103tre utilizator. +NLPSolverStatusDialog.Message.CurrentIteration=Proces oprit la itera\u021Bia %d din %d. +#Time formatting +NLPSolverStatusDialog.Time.Nanoseconds=Nanosecunde +NLPSolverStatusDialog.Time.Microseconds=Microsecunde +NLPSolverStatusDialog.Time.Milliseconds=Milisecunde +NLPSolverStatusDialog.Time.Second=Secund\u0103 +NLPSolverStatusDialog.Time.Seconds=Secunde +NLPSolverStatusDialog.Time.Minute=Minut +NLPSolverStatusDialog.Time.Minutes=Minute +NLPSolverStatusDialog.Time.Hour=Or\u0103 +NLPSolverStatusDialog.Time.Hours=Ore +NLPSolverStatusDialog.Time.Day=Zi +NLPSolverStatusDialog.Time.Days=Zile diff --git a/nlpsolver/locale/NLPSolverStatusDialog_ru.properties b/nlpsolver/locale/NLPSolverStatusDialog_ru.properties new file mode 100644 index 0000000..bbfed60 --- /dev/null +++ b/nlpsolver/locale/NLPSolverStatusDialog_ru.properties @@ -0,0 +1,28 @@ +# x-no-translate +#Dialog +NLPSolverStatusDialog.Dialog.Caption=\u0421\u043E\u0441\u0442\u043E\u044F\u043D\u0438\u0435 +#Controls +NLPSolverStatusDialog.Controls.lblSolution=\u0422\u0435\u043A\u0443\u0449\u0435\u0435 \u0440\u0435\u0448\u0435\u043D\u0438\u0435: +NLPSolverStatusDialog.Controls.lblIteration=\u0418\u0442\u0435\u0440\u0430\u0446\u0438\u044F: +NLPSolverStatusDialog.Controls.lblStagnation=\u0421\u0445\u043E\u0434\u0438\u043C\u043E\u0441\u0442\u044C: +NLPSolverStatusDialog.Controls.lblRuntime=\u0412\u0440\u0435\u043C\u044F \u0432\u044B\u043F\u043E\u043B\u043D\u0435\u043D\u0438\u044F: +NLPSolverStatusDialog.Controls.btnStop=\u041E\u0441\u0442\u0430\u043D\u043E\u0432\u0438\u0442\u044C +NLPSolverStatusDialog.Controls.btnOK=OK +NLPSolverStatusDialog.Controls.btnContinue=\u041F\u0440\u043E\u0434\u043E\u043B\u0436\u0438\u0442\u044C +#Messages +NLPSolverStatusDialog.Message.StopIteration=\u0414\u043E\u0441\u0442\u0438\u0433\u043D\u0443\u0442 \u043C\u0430\u043A\u0441\u0438\u043C\u0443\u043C \u0438\u0442\u0435\u0440\u0430\u0446\u0438\u0439. +NLPSolverStatusDialog.Message.StopStagnation=\u041F\u0440\u043E\u0446\u0435\u0441\u0441 \u043E\u0441\u0442\u0430\u043D\u043E\u0432\u043B\u0435\u043D \u0438\u0437-\u0437\u0430 \u043F\u043B\u043E\u0445\u043E\u0439 \u0441\u0445\u043E\u0434\u0438\u043C\u043E\u0441\u0442\u0438. +NLPSolverStatusDialog.Message.StopUser=\u041F\u0440\u043E\u0446\u0435\u0441\u0441 \u043F\u0440\u0435\u0440\u0432\u0430\u043D \u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u0435\u043B\u0435\u043C. +NLPSolverStatusDialog.Message.CurrentIteration=\u041F\u0440\u043E\u0446\u0435\u0441\u0441 \u043E\u0441\u0442\u0430\u043D\u043E\u0432\u043B\u0435\u043D \u043D\u0430 \u0438\u0442\u0435\u0440\u0430\u0446\u0438\u0438 %d \u0438\u0437 %d. +#Time formatting +NLPSolverStatusDialog.Time.Nanoseconds=\u041D\u0430\u043D\u043E\u0441\u0435\u043A\u0443\u043D\u0434\u044B +NLPSolverStatusDialog.Time.Microseconds=\u041C\u0438\u043A\u0440\u043E\u0441\u0435\u043A\u0443\u043D\u0434\u044B +NLPSolverStatusDialog.Time.Milliseconds=\u041C\u0438\u043B\u043B\u0438\u0441\u0435\u043A\u0443\u043D\u0434\u044B +NLPSolverStatusDialog.Time.Second=\u0421\u0435\u043A\u0443\u043D\u0434\u0430 +NLPSolverStatusDialog.Time.Seconds=\u0421\u0435\u043A\u0443\u043D\u0434\u044B +NLPSolverStatusDialog.Time.Minute=\u041C\u0438\u043D\u0443\u0442\u0430 +NLPSolverStatusDialog.Time.Minutes=\u041C\u0438\u043D\u0443\u0442\u044B +NLPSolverStatusDialog.Time.Hour=\u0427\u0430\u0441 +NLPSolverStatusDialog.Time.Hours=\u0427\u0430\u0441\u044B +NLPSolverStatusDialog.Time.Day=\u0414\u0435\u043D\u044C +NLPSolverStatusDialog.Time.Days=\u0414\u043D\u0438 diff --git a/nlpsolver/locale/NLPSolverStatusDialog_sk.properties b/nlpsolver/locale/NLPSolverStatusDialog_sk.properties new file mode 100644 index 0000000..bb2f0c7 --- /dev/null +++ b/nlpsolver/locale/NLPSolverStatusDialog_sk.properties @@ -0,0 +1,28 @@ +# x-no-translate +#Dialog +NLPSolverStatusDialog.Dialog.Caption=Stav rie\u0161i\u010Da +#Controls +NLPSolverStatusDialog.Controls.lblSolution=Aktu\u00E1lne rie\u0161enie: +NLPSolverStatusDialog.Controls.lblIteration=Iter\u00E1cia: +NLPSolverStatusDialog.Controls.lblStagnation=Stagn\u00E1cia: +NLPSolverStatusDialog.Controls.lblRuntime=Doba behu: +NLPSolverStatusDialog.Controls.btnStop=Preru\u0161i\u0165 +NLPSolverStatusDialog.Controls.btnOK=OK +NLPSolverStatusDialog.Controls.btnContinue=Pokra\u010Dova\u0165 +#Messages +NLPSolverStatusDialog.Message.StopIteration=Dosiahnut\u00E9 maximum iter\u00E1ci\u00ED +NLPSolverStatusDialog.Message.StopStagnation=Proces zastaven\u00FD pre stagn\u00E1ciu +NLPSolverStatusDialog.Message.StopUser=Proces preru\u0161en\u00FD pou\u017E\u00EDvate\u013Eom +NLPSolverStatusDialog.Message.CurrentIteration=Proces zastavil na %d iter\u00E1cii z %d. +#Time formatting +NLPSolverStatusDialog.Time.Nanoseconds=nanosek\u00FAnd +NLPSolverStatusDialog.Time.Microseconds=mikrosek\u00FAnd +NLPSolverStatusDialog.Time.Milliseconds=milisek\u00FAnd +NLPSolverStatusDialog.Time.Second=sekunda +NLPSolverStatusDialog.Time.Seconds=sek\u00FAnd +NLPSolverStatusDialog.Time.Minute=min\u00FAta +NLPSolverStatusDialog.Time.Minutes=min\u00FAt +NLPSolverStatusDialog.Time.Hour=hodina +NLPSolverStatusDialog.Time.Hours=hod\u00EDn +NLPSolverStatusDialog.Time.Day=de\u0148 +NLPSolverStatusDialog.Time.Days=dn\u00ED diff --git a/nlpsolver/locale/NLPSolverStatusDialog_sl.properties b/nlpsolver/locale/NLPSolverStatusDialog_sl.properties new file mode 100644 index 0000000..78d68c8 --- /dev/null +++ b/nlpsolver/locale/NLPSolverStatusDialog_sl.properties @@ -0,0 +1,31 @@ +# x-no-translate +#Dialog +NLPSolverStatusDialog.Dialog.Caption=Stanje Re\u0161evalca + +#Controls +NLPSolverStatusDialog.Controls.lblSolution=Trenutna re\u0161itev: +NLPSolverStatusDialog.Controls.lblIteration=Iteracija: +NLPSolverStatusDialog.Controls.lblStagnation=Stagnacija: +NLPSolverStatusDialog.Controls.lblRuntime=\u010Cas izvajanja: +NLPSolverStatusDialog.Controls.btnStop=Ustavi +NLPSolverStatusDialog.Controls.btnOK=V redu +NLPSolverStatusDialog.Controls.btnContinue=Nadaljuj + +#Messages +NLPSolverStatusDialog.Message.StopIteration=Dose\u017Eeno najve\u010Dje \u0161tevilo iteracij. +NLPSolverStatusDialog.Message.StopStagnation=Zaradi stagnacije se je proces ustavil. +NLPSolverStatusDialog.Message.StopUser=Zaradi prekinitve s strani uporabnika se je proces ustavil. +NLPSolverStatusDialog.Message.CurrentIteration=Proces se je ustavil pri iteraciji %d od %d. + +#Time formatting +NLPSolverStatusDialog.Time.Nanoseconds=nanosekund +NLPSolverStatusDialog.Time.Microseconds=mikrosekund +NLPSolverStatusDialog.Time.Milliseconds=milisekund +NLPSolverStatusDialog.Time.Second=sekunda +NLPSolverStatusDialog.Time.Seconds=sekund +NLPSolverStatusDialog.Time.Minute=minuta +NLPSolverStatusDialog.Time.Minutes=minut +NLPSolverStatusDialog.Time.Hour=ura +NLPSolverStatusDialog.Time.Hours=ur +NLPSolverStatusDialog.Time.Day=dan +NLPSolverStatusDialog.Time.Days=dni
\ No newline at end of file diff --git a/nlpsolver/locale/NLPSolverStatusDialog_zh_CN.properties b/nlpsolver/locale/NLPSolverStatusDialog_zh_CN.properties new file mode 100644 index 0000000..0a3d4e3 --- /dev/null +++ b/nlpsolver/locale/NLPSolverStatusDialog_zh_CN.properties @@ -0,0 +1,28 @@ +# x-no-translate +#Dialog +NLPSolverStatusDialog.Dialog.Caption=\u6C42\u89E3\u5668\u72B6\u6001 +#Controls +NLPSolverStatusDialog.Controls.lblSolution=\u5F53\u524D\u89E3\u7B54: +NLPSolverStatusDialog.Controls.lblIteration=\u8FED\u4EE3: +NLPSolverStatusDialog.Controls.lblStagnation=\u505C\u6EDE: +NLPSolverStatusDialog.Controls.lblRuntime=\u8FD0\u884C\u65F6\u95F4: +NLPSolverStatusDialog.Controls.btnStop=\u505C\u6B62 +NLPSolverStatusDialog.Controls.btnOK=\u786E\u5B9A +NLPSolverStatusDialog.Controls.btnContinue=\u7EE7\u7EED +#Messages +NLPSolverStatusDialog.Message.StopIteration=\u8FBE\u5230\u6700\u5927\u8FED\u4EE3\u3002 +NLPSolverStatusDialog.Message.StopStagnation=\u5904\u7406\u56E0\u505C\u6EDE\u505C\u6B62\u3002 +NLPSolverStatusDialog.Message.StopUser=\u5904\u7406\u56E0\u7528\u6237\u4E2D\u65AD\u505C\u6B62\u3002 +NLPSolverStatusDialog.Message.CurrentIteration=\u5904\u7406\u505C\u6B62\u4E8E\u8FED\u4EE3 %d\uFF08\u5171 %d\uFF09\u3002 +#Time formatting +NLPSolverStatusDialog.Time.Nanoseconds=\u7EB3\u79D2 +NLPSolverStatusDialog.Time.Microseconds=\u5FAE\u79D2 +NLPSolverStatusDialog.Time.Milliseconds=\u6BEB\u79D2 +NLPSolverStatusDialog.Time.Second=\u79D2 +NLPSolverStatusDialog.Time.Seconds=\u79D2 +NLPSolverStatusDialog.Time.Minute=\u5206\u949F +NLPSolverStatusDialog.Time.Minutes=\u5206\u949F +NLPSolverStatusDialog.Time.Hour=\u5C0F\u65F6 +NLPSolverStatusDialog.Time.Hours=\u5C0F\u65F6 +NLPSolverStatusDialog.Time.Day=\u5929 +NLPSolverStatusDialog.Time.Days=\u5929 diff --git a/nlpsolver/locale/NLPSolverStatusDialog_zh_TW.properties b/nlpsolver/locale/NLPSolverStatusDialog_zh_TW.properties new file mode 100644 index 0000000..e1c3393 --- /dev/null +++ b/nlpsolver/locale/NLPSolverStatusDialog_zh_TW.properties @@ -0,0 +1,28 @@ +# x-no-translate +#Dialog +NLPSolverStatusDialog.Dialog.Caption=\u89E3\u6C7A\u7A0B\u5F0F\u72C0\u614B +#Controls +NLPSolverStatusDialog.Controls.lblSolution=\u76EE\u524D\u89E3\u7B54: +NLPSolverStatusDialog.Controls.lblIteration=\u758A\u4EE3: +NLPSolverStatusDialog.Controls.lblStagnation=\u505C\u6EEF: +NLPSolverStatusDialog.Controls.lblRuntime=\u904B\u884C\u6642\u9593: +NLPSolverStatusDialog.Controls.btnStop=\u505C\u6B62 +NLPSolverStatusDialog.Controls.btnOK=\u78BA\u5B9A +NLPSolverStatusDialog.Controls.btnContinue=\u7E7C\u7E8C +#Messages +NLPSolverStatusDialog.Message.StopIteration=\u5DF2\u5230\u9054\u6700\u5927\u758A\u4EE3\u3002 +NLPSolverStatusDialog.Message.StopStagnation=\u8655\u7406\u56E0\u505C\u6EEF\u800C\u505C\u6B62\u3002 +NLPSolverStatusDialog.Message.StopUser=\u8655\u7406\u56E0\u4F7F\u7528\u8005\u4E2D\u65B7\u800C\u505C\u6B62\u3002 +NLPSolverStatusDialog.Message.CurrentIteration=\u8655\u7406\u505C\u6B62\u65BC\u758A\u4EE3 %d (\u5171 %d ) \u3002 +#Time formatting +NLPSolverStatusDialog.Time.Nanoseconds=\u5948\u79D2 +NLPSolverStatusDialog.Time.Microseconds=\u5FAE\u79D2 +NLPSolverStatusDialog.Time.Milliseconds=\u6BEB\u79D2 +NLPSolverStatusDialog.Time.Second=\u79D2 +NLPSolverStatusDialog.Time.Seconds=\u79D2 +NLPSolverStatusDialog.Time.Minute=\u5206 +NLPSolverStatusDialog.Time.Minutes=\u5206 +NLPSolverStatusDialog.Time.Hour=\u6642 +NLPSolverStatusDialog.Time.Hours=\u6642 +NLPSolverStatusDialog.Time.Day=\u65E5 +NLPSolverStatusDialog.Time.Days=\u65E5 diff --git a/nlpsolver/makefile.mk b/nlpsolver/makefile.mk new file mode 100644 index 0000000..ec7a063 --- /dev/null +++ b/nlpsolver/makefile.mk @@ -0,0 +1,68 @@ +#************************************************************************* +# +# 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 +# +# 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 +# <http://www.openoffice.org/license.html> +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +PRJ=. + +PRJNAME=nlpsolver +TARGET=nlpsolver + +.IF "$(SOLAR_JAVA)"!="" +# --- Settings ----------------------------------------------------- + +.INCLUDE : settings.mk +.INCLUDE : antsettings.mk + +# --- Files -------------------------------------------------------- + +TARFILE_MD5=90401bca927835b6fbae4a707ed187c8 +TARFILE_NAME=nlpsolver-0.9 +TARFILE_ROOTDIR=nlpsolver-0.9 + +PATCH_FILES=nlpsolver-0.9.patch + +ANT_FLAGS+=-Dplatforms.JDK_1.5.home=$(JAVA_HOME) -Doffice.program.dir=$(SOLARBINDIR) + +CONFIGURE_ACTION=cp -rv --preserve=timestamps ../../../../locale src/ + +.IF "$(JAVACISGCJ)"=="yes" +JAVA_HOME= +.EXPORT : JAVA_HOME +BUILD_ACTION=$(ANT) $(ANT_FLAGS) -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj uno-package +.ELSE +BUILD_ACTION=$(ANT) $(ANT_FLAGS) -Dbuild.label="build-$(RSCREVISION)" -Dplatforms.JDK_1.5.home=$(JAVA_HOME) -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) uno-package +.ENDIF + +# --- Targets ------------------------------------------------------ + +.INCLUDE : set_ext.mk +.INCLUDE : target.mk +.INCLUDE : tg_ext.mk + +.ELSE +all: + @echo java disabled +.ENDIF diff --git a/nlpsolver/nlpsolver-0.9.patch b/nlpsolver/nlpsolver-0.9.patch new file mode 100644 index 0000000..4581eb7 --- /dev/null +++ b/nlpsolver/nlpsolver-0.9.patch @@ -0,0 +1,62 @@ +--- misc/nlpsolver-0.9/nbproject/build-uno-impl.xml.old 2009-03-30 18:32:00.000000000 +0200 ++++ misc/build/nlpsolver-0.9/nbproject/build-uno-impl.xml 2009-10-28 18:22:40.000000000 +0100 +@@ -197,7 +197,7 @@ + <!-- enter the class path with external jars, if external jars exit and the user did not enter his own --> + <target name="-do-class-path" depends="-external-jars,-check-class-path" unless="class.path.exists"> + <manifest file="${build.dir}/MANIFEST.MF" mode="update"> +- <attribute name="Class-Path" value="${external.jars}"/> ++ <attribute name="Class-Path" value="${external.jar.dir}/EvolutionarySolver.jar"/> + </manifest> + </target> + <target name="-check-class-path"> +--- misc/nlpsolver-0.9/nbproject/project.properties.old 2009-03-30 18:32:00.000000000 +0200 ++++ misc/build/nlpsolver-0.9/nbproject/project.properties 2009-10-28 18:09:01.000000000 +0100 +@@ -27,8 +27,10 @@ file.reference.EvolutionarySolver.jar=Th + includes=**
+ jar.compress=false
+ javac.classpath=\
+- ${libs.StarOffice 9.classpath}:\
+- ${libs.OpenOffice.org 3.0.classpath}:\
++ ${solar.jar}/juh.jar:\
++ ${solar.jar}/jurt.jar:\
++ ${solar.jar}/ridl.jar:\
++ ${solar.jar}/unoil.jar:\
+ ${reference.EvolutionarySolver.jar}
+ # Space-separated list of extra javac options
+ javac.compilerargs=
+--- misc/nlpsolver-0.9/nbproject/build-impl.xml.old 2009-03-30 18:32:00.000000000 +0200 ++++ misc/build/nlpsolver-0.9/nbproject/build-impl.xml 2009-10-28 18:19:53.000000000 +0100 +@@ -360,6 +360,8 @@ is divided into following sections: + -->
+ <target depends="init" name="deps-jar" unless="no.deps">
+ <ant antfile="${project.EvolutionarySolver}/build.xml" inheritall="false" target="jar"/>
++ <mkdir dir="${dist.dir}/${external.jar.dir}"/>
++ <copy file="${reference.EvolutionarySolver.jar}" todir="${dist.dir}/${external.jar.dir}"/>
+ </target>
+ <target depends="init,-check-automatic-build,-clean-after-automatic-build" name="-verify-automatic-build"/>
+ <target depends="init" name="-check-automatic-build">
+--- misc/nlpsolver-0.9/src/description.xml.old 2009-03-30 16:56:42.000000000 +0200 ++++ misc/build/nlpsolver-0.9/src/description.xml 2009-10-28 18:29:13.000000000 +0100 +@@ -12,11 +12,6 @@ + <extension-description> + <src lang="en" xlink:href="description/extensiondescription.txt"/> + </extension-description> +- <registration> +- <simple-license accept-by="admin" default-license-id="en"> +- <license-text lang="en" license-id="en" xlink:href="licenses/lgpl-3.0.txt"/> +- </simple-license> +- </registration> + <dependencies> + <OpenOffice.org-minimal-version xmlns:d="http://openoffice.org/extensions/description/2006" d:name="OpenOffice.org 3.0" value="3.0"/> + </dependencies> +--- misc/build/nlpsolver-0.9/src/locale/NLPSolverCommon_en_US.properties.old 2009-03-30 18:20:06.000000000 +0200 ++++ misc/build/nlpsolver-0.9/src/locale/NLPSolverCommon_en_US.properties 2010-12-18 22:08:47.084693100 +0100 +@@ -2,7 +2,7 @@ + NLPSolverCommon.Properties.AssumeNonNegative=Assume Non-Negative Variables
+
+ #BaseEvolutionarySolver
+-NLPSolverCommon.Properties.SwarmSize=Size of Swam
++NLPSolverCommon.Properties.SwarmSize=Size of Swarm
+ NLPSolverCommon.Properties.LibrarySize=Size of Library
+ NLPSolverCommon.Properties.LearningCycles=Learning Cycles
+ NLPSolverCommon.Properties.GuessVariableRange=Variable Bounds Guessing
diff --git a/nlpsolver/prj/build.lst b/nlpsolver/prj/build.lst new file mode 100644 index 0000000..15554e7 --- /dev/null +++ b/nlpsolver/prj/build.lst @@ -0,0 +1,3 @@ +nlpsolver nlpsolver : javaunohelper unoil jurt NULL +nlpsolver nlpsolver usr1 - all nlpsolver_mkout NULL +nlpsolver nlpsolver nmake - all nlpsolver_nlpsolver NULL diff --git a/nlpsolver/prj/d.lst b/nlpsolver/prj/d.lst new file mode 100644 index 0000000..0e8c137 --- /dev/null +++ b/nlpsolver/prj/d.lst @@ -0,0 +1 @@ +..\%__SRC%\misc\build\nlpsolver-0.9/dist\NLPSolver.oxt %_DEST%\bin%_EXT%\NLPSolver.oxt diff --git a/reportbuilder/java/com/sun/star/report/SDBCReportDataFactory.java b/reportbuilder/java/com/sun/star/report/SDBCReportDataFactory.java index d3f7017..fd22393 100644 --- a/reportbuilder/java/com/sun/star/report/SDBCReportDataFactory.java +++ b/reportbuilder/java/com/sun/star/report/SDBCReportDataFactory.java @@ -573,13 +573,13 @@ public class SDBCReportDataFactory implements DataSourceFactory final Boolean escape = (Boolean) prop.getPropertyValue(ESCAPEPROCESSING); rowSetProp.setPropertyValue(ESCAPEPROCESSING, escape); final String queryCommand = (String) prop.getPropertyValue(UNO_COMMAND); - statement = "SELECT * FROM (" + queryCommand + ")"; + statement = "SELECT * FROM (" + queryCommand + ") AS \"__LibreOffice_report_result\""; } } else { - statement = "SELECT * FROM (" + command + ")"; + statement = "SELECT * FROM (" + command + ") AS \"__LibreOffice_report_result\""; } } rowSetProp.setPropertyValue(UNO_COMMAND, statement); diff --git a/reportbuilder/java/com/sun/star/report/function/metadata/makefile.mk b/reportbuilder/java/com/sun/star/report/function/metadata/makefile.mk index 8694dec..a245264 100644 --- a/reportbuilder/java/com/sun/star/report/function/metadata/makefile.mk +++ b/reportbuilder/java/com/sun/star/report/function/metadata/makefile.mk @@ -32,12 +32,12 @@ PACKAGE = com$/sun$/star$/report$/function$/metadata # --- Settings ----------------------------------------------------- .INCLUDE: settings.mk -.INCLUDE : $(SOLARBINDIR)/jfreereport_version.mk #----- compile .java files ----------------------------------------- .IF "$(SYSTEM_JFREEREPORT)" == "YES" EXTRAJARFILES = $(LIBBASE_JAR) $(LIBFORMULA_JAR) .ELSE +.INCLUDE : $(SOLARBINDIR)/jfreereport_version.mk JARFILES += \ libbase-$(LIBBASE_VERSION).jar \ libformula-$(LIBFORMULA_VERSION).jar diff --git a/reportbuilder/java/com/sun/star/report/pentaho/loader/InputRepositoryLoader.java b/reportbuilder/java/com/sun/star/report/pentaho/loader/InputRepositoryLoader.java index 265ea19..95a6679 100644 --- a/reportbuilder/java/com/sun/star/report/pentaho/loader/InputRepositoryLoader.java +++ b/reportbuilder/java/com/sun/star/report/pentaho/loader/InputRepositoryLoader.java @@ -36,6 +36,7 @@ import java.util.Map; import org.pentaho.reporting.libraries.resourceloader.ResourceData; import org.pentaho.reporting.libraries.resourceloader.ResourceException; import org.pentaho.reporting.libraries.resourceloader.ResourceKey; +import org.pentaho.reporting.libraries.resourceloader.ResourceException; import org.pentaho.reporting.libraries.resourceloader.ResourceKeyCreationException; import org.pentaho.reporting.libraries.resourceloader.ResourceLoader; import org.pentaho.reporting.libraries.resourceloader.ResourceLoadingException; diff --git a/reportbuilder/java/com/sun/star/report/pentaho/makefile.mk b/reportbuilder/java/com/sun/star/report/pentaho/makefile.mk index d309e1d..1f1aeb5 100644 --- a/reportbuilder/java/com/sun/star/report/pentaho/makefile.mk +++ b/reportbuilder/java/com/sun/star/report/pentaho/makefile.mk @@ -33,13 +33,13 @@ PACKAGE = com$/sun$/star$/report$/pentaho nodep=true # --- Settings ----------------------------------------------------- .INCLUDE: settings.mk -.INCLUDE : $(SOLARBINDIR)/jfreereport_version.mk #----- compile .java files ----------------------------------------- JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar .IF "$(SYSTEM_JFREEREPORT)" == "YES" EXTRAJARFILES += $(FLUTE_JAR) $(LIBBASE_JAR) $(LIBXML_JAR) $(JFREEREPORT_JAR) $(LIBLOADER_JAR) $(SAC_JAR) $(LIBLAYOUT_JAR) $(LIBSERIALIZER_JAR) $(LIBFONTS_JAR) $(LIBFORMULA_JAR) $(LIBREPOSITORY_JAR) .ELSE +.INCLUDE : $(SOLARBINDIR)/jfreereport_version.mk JARFILES += \ flute-$(FLUTE_VERSION).jar \ libserializer-$(LIBSERIALIZER_VERSION).jar \ diff --git a/reportbuilder/java/com/sun/star/report/util/makefile.mk b/reportbuilder/java/com/sun/star/report/util/makefile.mk index 70e290e..6cc9a14 100644 --- a/reportbuilder/java/com/sun/star/report/util/makefile.mk +++ b/reportbuilder/java/com/sun/star/report/util/makefile.mk @@ -32,12 +32,12 @@ PACKAGE = com$/sun$/star$/report$/util # --- Settings ----------------------------------------------------- .INCLUDE: settings.mk -.INCLUDE : $(SOLARBINDIR)/jfreereport_version.mk #----- compile .java files ----------------------------------------- .IF "$(SYSTEM_JFREEREPORT)" == "YES" EXTRAJARFILES = $(LIBBASE_JAR) $(LIBXML_JAR) $(JFREEREPORT_JAR) .ELSE +.INCLUDE : $(SOLARBINDIR)/jfreereport_version.mk JARFILES += \ libbase-$(LIBBASE_VERSION).jar \ libxml-$(LIBXML_VERSION).jar \ diff --git a/reportbuilder/registry/data/org/openoffice/Office/UI/ReportCommands.xcu b/reportbuilder/registry/data/org/openoffice/Office/UI/ReportCommands.xcu index 31bfd76..e47219b 100644 --- a/reportbuilder/registry/data/org/openoffice/Office/UI/ReportCommands.xcu +++ b/reportbuilder/registry/data/org/openoffice/Office/UI/ReportCommands.xcu @@ -74,7 +74,7 @@ </node> <node oor:name=".uno:ResetAttributes" oor:op="replace"> <prop oor:name="Label" oor:type="xs:string"> - <value xml:lang="en-US">~Default Formatting</value> + <value xml:lang="en-US">~Clear Direct Formatting</value> </prop> </node> <node oor:name=".uno:InsertPageNumberField" oor:op="replace"> diff --git a/reportbuilder/registry/schema/org/openoffice/Office/ReportDesign.xcs b/reportbuilder/registry/schema/org/openoffice/Office/ReportDesign.xcs index c290e00..f1adabe 100644 --- a/reportbuilder/registry/schema/org/openoffice/Office/ReportDesign.xcs +++ b/reportbuilder/registry/schema/org/openoffice/Office/ReportDesign.xcs @@ -52,7 +52,7 @@ <author>LLA</author> <desc>Direct download URL to the Oracle(tm) Report Builder extension.</desc> </info> - <value>http://extensions.services.openoffice.org</value> + <value>http://extensions.go-oo.org</value> </prop> <prop oor:name="Name" oor:type="xs:string"> <info> diff --git a/reportbuilder/util/description.xml b/reportbuilder/util/description.xml index 454656d..a44fbdd 100644 --- a/reportbuilder/util/description.xml +++ b/reportbuilder/util/description.xml @@ -6,11 +6,6 @@ <name lang="en-US">Report Builder</name> <!-- <name lang="en-US">Oracle(TM) Report Builder</name> --> </display-name> - <registration> - <simple-license accept-by="admin" default-license-id="lic-en-US" suppress-if-required="true" > - <license-text xlink:href="licensefile" lang="isocode" license-id="lic-isocode"/> - </simple-license> - </registration> <version value="#VERSION#"/> <identifier value="com.sun.reportdesigner"/> <dependencies> @@ -21,7 +16,6 @@ </publisher> <icon> <default xlink:href="images/extension_32.png" /> - <high-contrast xlink:href="images/extension_32_h.png" /> </icon> <extension-description> <src xlink:href="help/component.txt" lang="en" /> diff --git a/reportbuilder/util/makefile.mk b/reportbuilder/util/makefile.mk index 8106868..21e30f4 100644 --- a/reportbuilder/util/makefile.mk +++ b/reportbuilder/util/makefile.mk @@ -38,12 +38,10 @@ EXTENSION_VERSION_BASE=1.2.1 # --- Settings ---------------------------------- .INCLUDE : makefile.pmk -.INCLUDE : $(SOLARBINDIR)/jfreereport_version.mk .IF "$(L10N_framework)"=="" # ------------------------------------------------------------------ # calready set in util$/makefile.pmk -# EXTENSIONNAME:=report-builder EXTENSION_ZIPNAME:=report-builder # create Extension ----------------------------- @@ -78,8 +76,7 @@ COMPONENT_OTR_FILES= \ $(EXTENSIONDIR)$/template$/en-US$/wizard$/report$/default.otr COMPONENT_IMAGES= \ - $(EXTENSIONDIR)$/images$/extension_32.png \ - $(EXTENSIONDIR)$/images$/extension_32_h.png + $(EXTENSIONDIR)$/images$/extension_32.png COMPONENT_HTMLFILES = $(EXTENSIONDIR)$/THIRDPARTYREADMELICENSE.html \ $(EXTENSIONDIR)$/readme_en-US.html \ @@ -97,6 +94,7 @@ COMPONENT_EXTJARFILES = \ $(EXTENSIONDIR)$/reportbuilderwizard.jar .IF "$(SYSTEM_JFREEREPORT)" != "YES" +.INCLUDE : $(SOLARBINDIR)/jfreereport_version.mk COMPONENT_EXTJARFILES += \ $(EXTENSIONDIR)$/flute-$(FLUTE_VERSION).jar \ $(EXTENSIONDIR)$/libserializer-$(LIBSERIALIZER_VERSION).jar \ diff --git a/sdext/inc/pch/precompiled_sdext.cxx b/sdext/inc/pch/precompiled_sdext.cxx index e1cc890..4fb89ae 100644 --- a/sdext/inc/pch/precompiled_sdext.cxx +++ b/sdext/inc/pch/precompiled_sdext.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -27,3 +28,4 @@ #include "precompiled_sdext.hxx" +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/inc/pch/precompiled_sdext.hxx b/sdext/inc/pch/precompiled_sdext.hxx index 82847ba..46ba80c 100644 --- a/sdext/inc/pch/precompiled_sdext.hxx +++ b/sdext/inc/pch/precompiled_sdext.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -30,3 +31,4 @@ #ifdef PRECOMPILED_HEADERS #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/prj/build.lst b/sdext/prj/build.lst index 2604633..5c621d5 100644 --- a/sdext/prj/build.lst +++ b/sdext/prj/build.lst @@ -1,4 +1,4 @@ -dx sdext : L10N:l10n offuh comphelper unotools readlicense_oo cppu tools cppuhelper sal javaunohelper officecfg XPDF:xpdf LIBXSLT:libxslt xmlhelp NULL +dx sdext : TRANSLATIONS:translations offuh comphelper unotools readlicense_oo cppu tools cppuhelper sal javaunohelper officecfg XPDF:xpdf LIBXSLT:libxslt xmlhelp NULL dx sdext usr1 - all sdext_mkout NULL dx sdext\prj get - all sdext_prj NULL dx sdext\source\minimizer nmake - all sdext_minimizer sdext_minimizer_rdoooe sdext_minimizer_rdooo sdext_inc NULL diff --git a/sdext/prj/d.lst b/sdext/prj/d.lst index bcaa430..fbf4dbf 100644 --- a/sdext/prj/d.lst +++ b/sdext/prj/d.lst @@ -1,6 +1,9 @@ mkdir: %_DEST%\bin%_EXT%\minimizer mkdir: %_DEST%\bin%_EXT%\presenter mkdir: %_DEST%\bin%_EXT%\pdfimport +..\%__SRC%\bin\presentation-minimizer.oxt %_DEST%\bin%_EXT%\presentation-minimizer.oxt +..\%__SRC%\bin\presenter-screen.oxt %_DEST%\bin%_EXT%\presenter-screen.oxt +..\%__SRC%\bin\pdfimport.oxt %_DEST%\bin%_EXT%\pdfimport.oxt ..\%__SRC%\bin\pdf2xml.* %_DEST%\bin%_EXT%\pdf2xml.* ..\%__SRC%\bin\pdfunzip.* %_DEST%\bin%_EXT%\pdfunzip.* ..\%__SRC%\bin\pdfimport.oxt %_DEST%\bin%_EXT%\pdfimport\pdfimport.oxt diff --git a/sdext/source/minimizer/configurationaccess.cxx b/sdext/source/minimizer/configurationaccess.cxx index 9517e4b..0965c50 100644 --- a/sdext/source/minimizer/configurationaccess.cxx +++ b/sdext/source/minimizer/configurationaccess.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -35,6 +36,7 @@ #include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/util/XMacroExpander.hpp> #include <com/sun/star/lang/XSingleServiceFactory.hpp> +#include <sal/macros.h> using namespace ::rtl; using namespace ::com::sun::star; @@ -132,7 +134,7 @@ void OptimizerSettings::SaveSettingsToConfiguration( const Reference< XNameRepla // Any( maFilterName ), Any( mbOpenNewDocument ) }; - sal_Int32 i, nCount = sizeof( pNames ) / sizeof( OUString ); + sal_Int32 i, nCount = SAL_N_ELEMENTS( pNames ); for ( i = 0; i < nCount; i++ ) { @@ -535,3 +537,5 @@ std::vector< OptimizerSettings >::iterator ConfigurationAccess::GetOptimizerSett } return aIter; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/minimizer/configurationaccess.hxx b/sdext/source/minimizer/configurationaccess.hxx index ea9fba2..2ccc8ec 100644 --- a/sdext/source/minimizer/configurationaccess.hxx +++ b/sdext/source/minimizer/configurationaccess.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -137,3 +138,4 @@ class ConfigurationAccess #endif // _CONFIGURATION_ACCESS_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/minimizer/description.xml b/sdext/source/minimizer/description.xml index a4f172d..f10e8c2 100644 --- a/sdext/source/minimizer/description.xml +++ b/sdext/source/minimizer/description.xml @@ -11,12 +11,6 @@ <OpenOffice.org-minimal-version value="2.3" dep:name="OpenOffice.org 2.3"/> </dependencies> - <registration> - <simple-license accept-by="admin" default-license-id="lic-en-US" suppress-if-required="true" > - <license-text xlink:href="licensefile" lang="isocode" license-id="lic-isocode"/> - </simple-license> - </registration> - <version value="1.0.3"/> <platform value="UPDATED_SUPPORTED_PLATFORM"/> @@ -31,7 +25,6 @@ <icon> <default xlink:href="bitmaps/extension_32.png" /> - <high-contrast xlink:href="bitmaps/extension_32_h.png" /> </icon> </description> diff --git a/sdext/source/minimizer/fileopendialog.cxx b/sdext/source/minimizer/fileopendialog.cxx index 5aa14b7..ef5cd43 100644 --- a/sdext/source/minimizer/fileopendialog.cxx +++ b/sdext/source/minimizer/fileopendialog.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -45,9 +46,7 @@ #include <com/sun/star/ui/dialogs/XFilePreview.hpp> #include <com/sun/star/ui/dialogs/XFilterManager.hpp> #include <com/sun/star/ui/dialogs/XFilterGroupManager.hpp> -#ifndef _COM_SUN_STAR_UI_DIALOGS_XFOLDERPICKER_HDL_ #include <com/sun/star/ui/dialogs/XFolderPicker.hpp> -#endif #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/beans/PropertyValue.hpp> @@ -207,3 +206,5 @@ void FileOpenDialog::setDefaultName( const rtl::OUString& rDefaultName ) } return aFilterName; }; + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/minimizer/fileopendialog.hxx b/sdext/source/minimizer/fileopendialog.hxx index f4465ea..6cb2d61 100644 --- a/sdext/source/minimizer/fileopendialog.hxx +++ b/sdext/source/minimizer/fileopendialog.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -70,3 +71,4 @@ public : #endif // _FILEOPEN_DIALOG_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/minimizer/graphiccollector.cxx b/sdext/source/minimizer/graphiccollector.cxx index 78dc037..e5061ac 100644 --- a/sdext/source/minimizer/graphiccollector.cxx +++ b/sdext/source/minimizer/graphiccollector.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -73,7 +74,7 @@ const DeviceInfo& GraphicCollector::GetDeviceInfo( const Reference< XComponentCo void ImpAddEntity( std::vector< GraphicCollector::GraphicEntity >& rGraphicEntities, const GraphicSettings& rGraphicSettings, const GraphicCollector::GraphicUser& rUser ) { const rtl::OUString aGraphicURL( rUser.maGraphicURL ); - const rtl::OUString sPackageURL( OUString::createFromAscii( "vnd.sun.star.GraphicObject:" ) ); + const rtl::OUString sPackageURL( RTL_CONSTASCII_USTRINGPARAM("vnd.sun.star.GraphicObject:") ); if ( rGraphicSettings.mbEmbedLinkedGraphics || ( !aGraphicURL.getLength() || aGraphicURL.match( sPackageURL, 0 ) ) ) { @@ -89,7 +90,7 @@ void ImpAddEntity( std::vector< GraphicCollector::GraphicEntity >& rGraphicEntit aIter->maUser.push_back( rUser ); break; } - aIter++; + ++aIter; } if ( aIter == rGraphicEntities.end() ) { @@ -339,12 +340,12 @@ void GraphicCollector::CollectGraphics( const Reference< XComponentContext >& rx } else aGraphicIter->mbRemoveCropArea = sal_False; - aGUIter++; + ++aGUIter; } } if ( !aGraphicIter->mbRemoveCropArea ) aGraphicIter->maGraphicCropLogic = text::GraphicCrop( 0, 0, 0, 0 ); - aGraphicIter++; + ++aGraphicIter; } } catch ( Exception& ) @@ -458,3 +459,4 @@ void GraphicCollector::CountGraphics( const Reference< XComponentContext >& rxMS } } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/minimizer/graphiccollector.hxx b/sdext/source/minimizer/graphiccollector.hxx index 3688939..54a84e7 100644 --- a/sdext/source/minimizer/graphiccollector.hxx +++ b/sdext/source/minimizer/graphiccollector.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -103,3 +104,5 @@ class GraphicCollector #endif // GRAPHICCOLLECTOR_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/minimizer/impoptimizer.cxx b/sdext/source/minimizer/impoptimizer.cxx index 8a3e600..d335216 100644 --- a/sdext/source/minimizer/impoptimizer.cxx +++ b/sdext/source/minimizer/impoptimizer.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -47,9 +48,7 @@ #include <com/sun/star/frame/XDesktop.hpp> #include <com/sun/star/awt/XWindow.hpp> #include <com/sun/star/frame/XStorable.hpp> -#ifndef _COM_SUN_STAR_FRAME_FrameSearchFlag_HPP_ #include <com/sun/star/frame/FrameSearchFlag.hpp> -#endif #include <com/sun/star/frame/XDispatchProvider.hpp> #include <com/sun/star/graphic/XGraphicProvider.hpp> #include <unotools/configmgr.hxx> @@ -65,9 +64,7 @@ #include <com/sun/star/presentation/XPresentationPage.hpp> #include <com/sun/star/document/XFilter.hpp> #include <com/sun/star/document/XExporter.hpp> -#ifndef _COM_SUN_STAR_UNO_RUNTIME_EXCEPTION_HPP_ #include <com/sun/star/uno/RuntimeException.hpp> -#endif #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/graphic/XGraphicProvider.hpp> #include <com/sun/star/graphic/GraphicType.hpp> @@ -123,7 +120,7 @@ void ImpDeleteUnusedMasterPages( const Reference< XModel >& rxModel ) { if ( !aIter->bUsed ) xMasterPages->remove( aIter->xMasterPage ); - aIter++; + ++aIter; } } @@ -354,9 +351,9 @@ Reference< XGraphic > ImpCompressGraphic( const Reference< XComponentContext >& } if ( bNeedsOptimizing && aDestSizePixel.Width && aDestSizePixel.Height ) { - Reference< XStream > xTempFile( rxMSF->getServiceManager()->createInstanceWithContext( OUString::createFromAscii( "com.sun.star.io.TempFile" ), rxMSF ), UNO_QUERY_THROW ); + Reference< XStream > xTempFile( rxMSF->getServiceManager()->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.TempFile")), rxMSF ), UNO_QUERY_THROW ); Reference< XOutputStream > xOutputStream( xTempFile->getOutputStream() ); - Reference< XGraphicProvider > xGraphicProvider( rxMSF->getServiceManager()->createInstanceWithContext( OUString::createFromAscii( "com.sun.star.graphic.GraphicProvider" ), rxMSF ), UNO_QUERY_THROW ); + Reference< XGraphicProvider > xGraphicProvider( rxMSF->getServiceManager()->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.graphic.GraphicProvider")), rxMSF ), UNO_QUERY_THROW ); ImpCompressGraphic( xGraphicProvider, xGraphic, xOutputStream, aDestMimeType, aLogicalSize, rGraphicSettings.mnJPEGQuality, rGraphicSettings.mnImageResolution, bRemoveCropArea, aGraphicCropLogic ); Reference< XInputStream > xInputStream( xTempFile->getInputStream() ); @@ -374,9 +371,9 @@ Reference< XGraphic > ImpCompressGraphic( const Reference< XComponentContext >& else // this is a metafile { rtl::OUString aDestMimeType( aSourceMimeType ); - Reference< XStream > xTempFile( rxMSF->getServiceManager()->createInstanceWithContext( OUString::createFromAscii( "com.sun.star.io.TempFile" ), rxMSF ), UNO_QUERY_THROW ); + Reference< XStream > xTempFile( rxMSF->getServiceManager()->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.TempFile")), rxMSF ), UNO_QUERY_THROW ); Reference< XOutputStream > xOutputStream( xTempFile->getOutputStream() ); - Reference< XGraphicProvider > xGraphicProvider( rxMSF->getServiceManager()->createInstanceWithContext( OUString::createFromAscii( "com.sun.star.graphic.GraphicProvider" ), rxMSF ), UNO_QUERY_THROW ); + Reference< XGraphicProvider > xGraphicProvider( rxMSF->getServiceManager()->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.graphic.GraphicProvider")), rxMSF ), UNO_QUERY_THROW ); ImpCompressGraphic( xGraphicProvider, xGraphic, xOutputStream, aDestMimeType, aLogicalSize, rGraphicSettings.mnJPEGQuality, rGraphicSettings.mnImageResolution, sal_False, aGraphicCropLogic ); Reference< XInputStream > xInputStream( xTempFile->getInputStream() ); Reference< XSeekable > xSeekable( xInputStream, UNO_QUERY_THROW ); @@ -484,12 +481,12 @@ void CompressGraphics( ImpOptimizer& rOptimizer, const Reference< XComponentCont aGraphicUserIter->mxPagePropertySet->setPropertyValue( TKGet( TK_Background ), Any( rxPropertySet ) ); } } - aGraphicUserIter++; + ++aGraphicUserIter; } } } - } - aGraphicIter++; + } + ++aGraphicIter; } } catch ( Exception& ) @@ -770,3 +767,4 @@ sal_Bool ImpOptimizer::Optimize( const Sequence< PropertyValue >& rArguments ) return bRet; } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/minimizer/impoptimizer.hxx b/sdext/source/minimizer/impoptimizer.hxx index a8d9b17..9112cbd 100644 --- a/sdext/source/minimizer/impoptimizer.hxx +++ b/sdext/source/minimizer/impoptimizer.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -35,9 +36,7 @@ #include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/task/XStatusIndicator.hpp> #include <com/sun/star/beans/PropertyValue.hpp> -#ifndef _COM_SUN_STAR_LANG_XMULTI_COMPONENT_FACTORY_HPP_ #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#endif #include <com/sun/star/uno/XComponentContext.hpp> class Point; @@ -85,3 +84,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/minimizer/informationdialog.cxx b/sdext/source/minimizer/informationdialog.cxx index b2be8ac..f970ff7 100644 --- a/sdext/source/minimizer/informationdialog.cxx +++ b/sdext/source/minimizer/informationdialog.cxx @@ -1,7 +1,8 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * 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 @@ -34,6 +35,7 @@ #include <com/sun/star/graphic/XGraphicProvider.hpp> #include <com/sun/star/graphic/XGraphic.hpp> #include <rtl/ustrbuf.hxx> +#include <sal/macros.h> #include "com/sun/star/util/URL.hpp" #include "com/sun/star/util/XURLTransformer.hpp" @@ -87,7 +89,7 @@ rtl::OUString InsertFixedText( InformationDialog& rInformationDialog, const rtl: Any( nTabIndex ), Any( nWidth ) }; - sal_Int32 nCount = sizeof( pNames ) / sizeof( OUString ); + sal_Int32 nCount = SAL_N_ELEMENTS( pNames ); Sequence< rtl::OUString > aNames( pNames, nCount ); Sequence< Any > aValues( pValues, nCount ); @@ -116,7 +118,7 @@ rtl::OUString InsertImage( InformationDialog& rInformationDialog, const OUString Any( nPosY ), Any( sal_True ), Any( nWidth ) }; - sal_Int32 nCount = sizeof( pNames ) / sizeof( OUString ); + sal_Int32 nCount = SAL_N_ELEMENTS( pNames ); Sequence< rtl::OUString > aNames( pNames, nCount ); Sequence< Any > aValues( pValues, nCount ); @@ -149,7 +151,7 @@ rtl::OUString InsertCheckBox( InformationDialog& rInformationDialog, const OUStr Any( nTabIndex ), Any( nWidth ) }; - sal_Int32 nCount = sizeof( pNames ) / sizeof( OUString ); + sal_Int32 nCount = SAL_N_ELEMENTS( pNames ); Sequence< rtl::OUString > aNames( pNames, nCount ); Sequence< Any > aValues( pValues, nCount ); @@ -186,7 +188,7 @@ rtl::OUString InsertButton( InformationDialog& rInformationDialog, const OUStrin Any( nWidth ) }; - sal_Int32 nCount = sizeof( pNames ) / sizeof( OUString ); + sal_Int32 nCount = SAL_N_ELEMENTS( pNames ); Sequence< rtl::OUString > aNames( pNames, nCount ); Sequence< Any > aValues( pValues, nCount ); @@ -213,15 +215,15 @@ OUString InformationDialog::ImpGetStandardImage( const OUString& sPrivateURL ) rtl::OUString sURL; try { - mxTempFile = Reference< XStream >( mxMSF->getServiceManager()->createInstanceWithContext( OUString::createFromAscii( "com.sun.star.io.TempFile" ), mxMSF ), UNO_QUERY_THROW ); + mxTempFile = Reference< XStream >( mxMSF->getServiceManager()->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.TempFile")), mxMSF ), UNO_QUERY_THROW ); Reference< XPropertySet > xPropSet( mxTempFile, UNO_QUERY ); Reference< XOutputStream > xOutputStream( mxTempFile->getOutputStream() ); if ( xOutputStream.is() && xPropSet.is() ) { Reference< graphic::XGraphicProvider > xGraphicProvider( mxMSF->getServiceManager()->createInstanceWithContext( - OUString::createFromAscii( "com.sun.star.graphic.GraphicProvider" ), mxMSF ), UNO_QUERY_THROW ); + OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.graphic.GraphicProvider")), mxMSF ), UNO_QUERY_THROW ); Sequence< PropertyValue > aArgs( 1 ); - aArgs[ 0 ].Name = OUString::createFromAscii( "URL" ); + aArgs[ 0 ].Name = OUString(RTL_CONSTASCII_USTRINGPARAM("URL")); aArgs[ 0 ].Value <<= sPrivateURL; Reference< graphic::XGraphic > xGraphic( xGraphicProvider->queryGraphic( aArgs ) ); if ( xGraphic.is() ) @@ -234,7 +236,7 @@ OUString InformationDialog::ImpGetStandardImage( const OUString& sPrivateURL ) aArgs2[ 1 ].Value <<= xOutputStream; xGraphicProvider->storeGraphic( xGraphic, aArgs2 ); } - xPropSet->getPropertyValue( OUString::createFromAscii( "Uri" ) ) >>= sURL; + xPropSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("Uri")) ) >>= sURL; } } catch( Exception& ) @@ -267,13 +269,13 @@ void InformationDialog::InitDialog() Any( sal_Int32( 115 ) ), Any( getString( STR_SUN_OPTIMIZATION_WIZARD2 ) ), Any( sal_Int32( DIALOG_WIDTH ) ) }; - - sal_Int32 nCount = sizeof( pNames ) / sizeof( OUString ); + + sal_Int32 nCount = SAL_N_ELEMENTS( pNames ); Sequence< rtl::OUString > aNames( pNames, nCount ); Sequence< Any > aValues( pValues, nCount ); - mxDialogModelMultiPropertySet->setPropertyValues( aNames, aValues ); + mxDialogModelMultiPropertySet->setPropertyValues( aNames, aValues ); sal_Int64 nSource = mnSourceSize; sal_Int64 nDest = mnDestSize; @@ -320,7 +322,8 @@ void InformationDialog::InitDialog() OUString aInfoString( getString( eInfoString ) ); const OUString aOldSizePlaceholder( RTL_CONSTASCII_USTRINGPARAM( "%OLDFILESIZE" ) ); const OUString aNewSizePlaceholder( RTL_CONSTASCII_USTRINGPARAM( "%NEWFILESIZE" ) ); - const OUString aTitlePlaceholder( aTitle.getLength() ? OUString::createFromAscii( "%TITLE" ) : OUString::createFromAscii( "'%TITLE'" ) ); + const OUString aTitlePlaceholder( aTitle.getLength() ? OUString(RTL_CONSTASCII_USTRINGPARAM("%TITLE" )) + : OUString(RTL_CONSTASCII_USTRINGPARAM("'%TITLE'")) ); sal_Int32 i = aInfoString.indexOf( aOldSizePlaceholder, 0 ); if ( i >= 0 ) @@ -334,12 +337,12 @@ void InformationDialog::InitDialog() if ( k >= 0 ) aInfoString = aInfoString.replaceAt( k, aTitlePlaceholder.getLength(), aTitle ); - com::sun::star::uno::Reference< com::sun::star::awt::XItemListener > xItemListener; - InsertImage( *this, rtl::OUString( rtl::OUString::createFromAscii( "aboutimage" ) ), ImpGetStandardImage( rtl::OUString::createFromAscii( "private:standardimage/query" ) ), 5, 5, 25, 25 ); - InsertFixedText( *this, rtl::OUString( rtl::OUString::createFromAscii( "fixedtext" ) ), aInfoString, PAGE_POS_X, 6, PAGE_WIDTH, 24, sal_True, 0 ); + com::sun::star::uno::Reference< com::sun::star::awt::XItemListener > xItemListener; + InsertImage( *this, rtl::OUString( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("aboutimage")) ), ImpGetStandardImage( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("private:standardimage/query")) ), 5, 5, 25, 25 ); + InsertFixedText( *this, rtl::OUString( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("fixedtext")) ), aInfoString, PAGE_POS_X, 6, PAGE_WIDTH, 24, sal_True, 0 ); if ( maSaveAsURL.getLength() ) InsertCheckBox( *this, TKGet( TK_OpenNewDocument ), xItemListener, getString( STR_AUTOMATICALLY_OPEN ), PAGE_POS_X, 42, PAGE_WIDTH, 8, 1 ); - InsertButton( *this, rtl::OUString( rtl::OUString::createFromAscii( "button" ) ), mxActionListener, DIALOG_WIDTH / 2 - 25, nDialogHeight - 20, 50, 14, 2, STR_OK ); + InsertButton( *this, rtl::OUString( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("button")) ), mxActionListener, DIALOG_WIDTH / 2 - 25, nDialogHeight - 20, 50, 14, 2, STR_OK ); sal_Bool bOpenNewDocument = mrbOpenNewDocument; setControlProperty( TKGet( TK_OpenNewDocument ), TKGet( TK_State ), Any( (sal_Int16)bOpenNewDocument ) ); @@ -362,7 +365,7 @@ InformationDialog::InformationDialog( const Reference< XComponentContext > &rxMS Reference< XFrame > xFrame( mxController->getFrame() ); Reference< XWindow > xContainerWindow( xFrame->getContainerWindow() ); Reference< XWindowPeer > xWindowPeer( xContainerWindow, UNO_QUERY_THROW ); - createWindowPeer( xWindowPeer ); + createWindowPeer( xWindowPeer ); InitDialog(); } @@ -397,7 +400,7 @@ sal_Bool InformationDialog::execute() void OKActionListener::actionPerformed( const ActionEvent& rEvent ) throw ( com::sun::star::uno::RuntimeException ) { - if ( rEvent.ActionCommand == rtl::OUString( rtl::OUString::createFromAscii( "button" ) ) ) + if ( rEvent.ActionCommand == rtl::OUString( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("button")) ) ) { mrInformationDialog.endExecute( sal_True ); } @@ -406,3 +409,5 @@ void OKActionListener::disposing( const ::com::sun::star::lang::EventObject& /* throw ( com::sun::star::uno::RuntimeException ) { } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/minimizer/informationdialog.hxx b/sdext/source/minimizer/informationdialog.hxx index 4f912bc..0b38f57 100644 --- a/sdext/source/minimizer/informationdialog.hxx +++ b/sdext/source/minimizer/informationdialog.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -97,3 +98,5 @@ private: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/minimizer/makefile.mk b/sdext/source/minimizer/makefile.mk index 4158119..164f106 100644 --- a/sdext/source/minimizer/makefile.mk +++ b/sdext/source/minimizer/makefile.mk @@ -38,7 +38,6 @@ ENABLE_EXCEPTIONS=TRUE .INCLUDE : $(PRJ)$/util$/makefile.pmk # set in minimizer.pmk -#EXTENSIONNAME:=PresentationMinimizer EXTENSION_ZIPNAME:=presentation-minimizer .IF "$(ENABLE_MINIMIZER)" != "YES" @@ -98,14 +97,10 @@ COMPONENT_LIBRARIES= \ COMPONENT_BITMAPS= \ $(EXTENSIONDIR)$/bitmaps$/opt_16.png \ $(EXTENSIONDIR)$/bitmaps$/opt_26.png \ - $(EXTENSIONDIR)$/bitmaps$/opt_16_h.png \ - $(EXTENSIONDIR)$/bitmaps$/opt_26_h.png \ - $(EXTENSIONDIR)$/bitmaps$/minimizepresi_80.png \ - $(EXTENSIONDIR)$/bitmaps$/minimizepresi_80_h.png + $(EXTENSIONDIR)$/bitmaps$/minimizepresi_80.png COMPONENT_IMAGES=\ - $(EXTENSIONDIR)$/bitmaps$/extension_32.png \ - $(EXTENSIONDIR)$/bitmaps$/extension_32_h.png + $(EXTENSIONDIR)$/bitmaps$/extension_32.png # rather freestyle or common to all? COMPONENT_HELP= \ diff --git a/sdext/source/minimizer/optimizationstats.cxx b/sdext/source/minimizer/optimizationstats.cxx index ca1c9bd..a1e22ea 100644 --- a/sdext/source/minimizer/optimizationstats.cxx +++ b/sdext/source/minimizer/optimizationstats.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -100,3 +101,5 @@ void OptimizationStats::InitializeStatusValuesFromDocument( Reference< XModel > { } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/minimizer/optimizationstats.hxx b/sdext/source/minimizer/optimizationstats.hxx index d9fc021..5a45de9 100644 --- a/sdext/source/minimizer/optimizationstats.hxx +++ b/sdext/source/minimizer/optimizationstats.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -61,3 +62,5 @@ class OptimizationStats #endif // OPTIMIZATIONSTATS_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/minimizer/optimizerdialog.cxx b/sdext/source/minimizer/optimizerdialog.cxx index d795e6a..c5439df 100644 --- a/sdext/source/minimizer/optimizerdialog.cxx +++ b/sdext/source/minimizer/optimizerdialog.cxx @@ -1,7 +1,8 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * 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 @@ -33,11 +34,10 @@ #include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp> #include <com/sun/star/ucb/XSimpleFileAccess.hpp> #include <com/sun/star/io/XInputStream.hpp> -#ifndef _COM_SUN_STAR_UTIL_XCloseBroadcaster_HPP_ #include <com/sun/star/util/XCloseBroadcaster.hpp> -#endif #include <com/sun/star/frame/XComponentLoader.hpp> #include <com/sun/star/frame/XLayoutManager.hpp> +#include <sal/macros.h> #include <osl/time.h> // ------------------- @@ -80,13 +80,13 @@ void OptimizerDialog::InitDialog() Any( sal_Int32( 52 ) ), Any( getString( STR_SUN_OPTIMIZATION_WIZARD2 ) ), Any( sal_Int32( OD_DIALOG_WIDTH ) ) }; - - sal_Int32 nCount = sizeof( pNames ) / sizeof( OUString ); + + sal_Int32 nCount = SAL_N_ELEMENTS( pNames ); Sequence< rtl::OUString > aNames( pNames, nCount ); Sequence< Any > aValues( pValues, nCount ); - mxDialogModelMultiPropertySet->setPropertyValues( aNames, aValues ); + mxDialogModelMultiPropertySet->setPropertyValues( aNames, aValues ); } // ----------------------------------------------------------------------------- @@ -111,7 +111,7 @@ void OptimizerDialog::InitRoadmap() Any( mnTabIndex++ ), Any( sal_Int32( 85 ) ) }; - sal_Int32 nCount = sizeof( pNames ) / sizeof( OUString ); + sal_Int32 nCount = SAL_N_ELEMENTS( pNames ); Sequence< rtl::OUString > aNames( pNames, nCount ); Sequence< Any > aValues( pValues, nCount ); @@ -129,8 +129,7 @@ void OptimizerDialog::InitRoadmap() InsertRoadmapItem( 4, sal_True, getString( STR_SUMMARY ), ITEM_ID_SUMMARY ); rtl::OUString sBitmapPath( getPath( TK_BitmapPath ) ); - rtl::OUString sBitmap( isHighContrast() ? rtl::OUString::createFromAscii( "/minimizepresi_80_h.png" ) - : rtl::OUString::createFromAscii( "/minimizepresi_80.png" ) ); + rtl::OUString sBitmap( RTL_CONSTASCII_USTRINGPARAM("/minimizepresi_80.png") ); rtl::OUString sURL( sBitmapPath += sBitmap ); xPropertySet->setPropertyValue( TKGet( TK_ImageURL ), Any( sURL ) ); @@ -175,7 +174,7 @@ void OptimizerDialog::UpdateConfiguration() Sequence< sal_Int16 > aSelectedItems; Sequence< OUString > aStringItemList; - + // page0 aAny = getControlProperty( TKGet( TK_ListBox0Pg0 ), TKGet( TK_SelectedItems ) ); if ( aAny >>= aSelectedItems ) @@ -283,14 +282,14 @@ void OptimizerDialog::SwitchPage( sal_Int16 nNewStep ) disableControl( TKGet( TK_btnNavBack ) ); else if ( nOldStep == 0 ) enableControl( TKGet( TK_btnNavBack ) ); - + if ( nNewStep == MAX_STEP ) disableControl( TKGet( TK_btnNavNext ) ); else if ( nOldStep == MAX_STEP ) enableControl( TKGet( TK_btnNavNext ) ); setControlProperty( TKGet( TK_rdmNavi ), TKGet( TK_CurrentItemID ), Any( nNewStep ) ); - + DeactivatePage( nOldStep ); UpdateControlStates( nNewStep ); @@ -523,12 +522,12 @@ void ActionListener::actionPerformed( const ActionEvent& rEvent ) { rtl::OUString sHelpFile( mrOptimizerDialog.getPath( TK_HelpFile ) ); Reference< XDesktop > desktop( mrOptimizerDialog.GetComponentContext()->getServiceManager()->createInstanceWithContext( - OUString::createFromAscii( "com.sun.star.frame.Desktop" ), mrOptimizerDialog.GetComponentContext() ), UNO_QUERY_THROW ); + OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Desktop")), mrOptimizerDialog.GetComponentContext() ), UNO_QUERY_THROW ); Reference< XSimpleFileAccess > xSimpleFileAccess( mrOptimizerDialog.GetComponentContext()->getServiceManager()->createInstanceWithContext( - OUString::createFromAscii( "com.sun.star.ucb.SimpleFileAccess" ), mrOptimizerDialog.GetComponentContext() ), UNO_QUERY_THROW ); + 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::createFromAscii( "com.sun.star.frame.Desktop" ), mrOptimizerDialog.GetComponentContext() ), UNO_QUERY_THROW ); + 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 ); @@ -541,16 +540,16 @@ void ActionListener::actionPerformed( const ActionEvent& rEvent ) aLoadProps[ 1 ].Name = TKGet( TK_InputStream ); aLoadProps[ 1 ].Value <<= xInputStream; - Reference< XComponent >( xLoader->loadComponentFromURL( OUString::createFromAscii( "private:stream" ), + 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::createFromAscii( "LayoutManager" ) ) >>= xLayoutManager ) + if ( xPropSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("LayoutManager")) ) >>= xLayoutManager ) { - xLayoutManager->setVisible( sal_False ); - xLayoutManager->hideElement( OUString::createFromAscii( "private:resource/menubar/menubar" ) ); - xLayoutManager->destroyElement( OUString::createFromAscii( "private:resource/statusbar/statusbar" ) ); + xLayoutManager->setVisible( sal_False ); + xLayoutManager->hideElement( OUString(RTL_CONSTASCII_USTRINGPARAM("private:resource/menubar/menubar")) ); + xLayoutManager->destroyElement( OUString(RTL_CONSTASCII_USTRINGPARAM("private:resource/statusbar/statusbar")) ); } } } @@ -561,7 +560,7 @@ void ActionListener::actionPerformed( const ActionEvent& rEvent ) } break; case TK_btnNavBack : mrOptimizerDialog.SwitchPage( mrOptimizerDialog.mnCurrentStep - 1 ); break; - case TK_btnNavNext : mrOptimizerDialog.SwitchPage( mrOptimizerDialog.mnCurrentStep + 1 ); break; + case TK_btnNavNext : mrOptimizerDialog.SwitchPage( mrOptimizerDialog.mnCurrentStep + 1 ); break; case TK_btnNavFinish : { mrOptimizerDialog.UpdateConfiguration(); @@ -575,7 +574,7 @@ void ActionListener::actionPerformed( const ActionEvent& rEvent ) mrOptimizerDialog.setControlProperty( TKGet( TK_btnNavCancel ), TKGet( TK_Enabled ), Any( sal_False ) ); mrOptimizerDialog.setControlProperty( TKGet( TK_FixedText0Pg4 ), TKGet( TK_Enabled ), Any( sal_True ) ); - // check if we have to open the FileDialog + // check if we have to open the FileDialog sal_Bool bSuccessfullyExecuted = sal_True; sal_Int16 nInt16 = 0; mrOptimizerDialog.getControlProperty( TKGet( TK_RadioButton1Pg4 ), TKGet( TK_State ) ) >>= nInt16; @@ -603,7 +602,7 @@ void ActionListener::actionPerformed( const ActionEvent& rEvent ) aLocation = aLocation.copy( 0, nIndex ); // adding .mini - aLocation = aLocation.concat( OUString::createFromAscii( ".mini" ) ); + aLocation = aLocation.concat( OUString(RTL_CONSTASCII_USTRINGPARAM(".mini")) ); aFileOpenDialog.setDefaultName( aLocation ); } } @@ -653,7 +652,7 @@ void ActionListener::actionPerformed( const ActionEvent& rEvent ) aArgs[ 0 ] <<= mrOptimizerDialog.GetFrame(); Reference < XDispatch > xDispatch( mrOptimizerDialog.GetComponentContext()->getServiceManager()->createInstanceWithArgumentsAndContext( - OUString::createFromAscii( "com.sun.star.comp.PPPOptimizer" ), aArgs, mrOptimizerDialog.GetComponentContext() ), UNO_QUERY ); + OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.PPPOptimizer")), aArgs, mrOptimizerDialog.GetComponentContext() ), UNO_QUERY ); URL aURL; aURL.Protocol = OUString( RTL_CONSTASCII_USTRINGPARAM( "vnd.com.sun.star.comp.PPPOptimizer:" ) ); @@ -782,7 +781,7 @@ void SpinListenerFormattedField0Pg1::up( const SpinEvent& /* rEvent */ ) fDouble += 9; if ( fDouble > 100 ) fDouble = 100; - mrOptimizerDialog.setControlProperty( TKGet( TK_FormattedField0Pg1 ), TKGet( TK_EffectiveValue ), Any( fDouble ) ); + mrOptimizerDialog.setControlProperty( TKGet( TK_FormattedField0Pg1 ), TKGet( TK_EffectiveValue ), Any( fDouble ) ); mrOptimizerDialog.SetConfigProperty( TK_JPEGQuality, Any( (sal_Int32)fDouble ) ); } } @@ -796,20 +795,20 @@ void SpinListenerFormattedField0Pg1::down( const SpinEvent& /* rEvent */ ) fDouble -= 9; if ( fDouble < 0 ) fDouble = 0; - mrOptimizerDialog.setControlProperty( TKGet( TK_FormattedField0Pg1 ), TKGet( TK_EffectiveValue ), Any( fDouble ) ); + mrOptimizerDialog.setControlProperty( TKGet( TK_FormattedField0Pg1 ), TKGet( TK_EffectiveValue ), Any( fDouble ) ); mrOptimizerDialog.SetConfigProperty( TK_JPEGQuality, Any( (sal_Int32)fDouble ) ); } } void SpinListenerFormattedField0Pg1::first( const SpinEvent& /* rEvent */ ) throw ( com::sun::star::uno::RuntimeException ) { - mrOptimizerDialog.setControlProperty( TKGet( TK_FormattedField0Pg1 ), TKGet( TK_EffectiveValue ), Any( static_cast< double >( 0 ) ) ); + mrOptimizerDialog.setControlProperty( TKGet( TK_FormattedField0Pg1 ), TKGet( TK_EffectiveValue ), Any( static_cast< double >( 0 ) ) ); mrOptimizerDialog.SetConfigProperty( TK_JPEGQuality, Any( (sal_Int32)0 ) ); } void SpinListenerFormattedField0Pg1::last( const SpinEvent& /* rEvent */ ) throw ( com::sun::star::uno::RuntimeException ) { - mrOptimizerDialog.setControlProperty( TKGet( TK_FormattedField0Pg1 ), TKGet( TK_EffectiveValue ), Any( static_cast< double >( 100 ) ) ); + mrOptimizerDialog.setControlProperty( TKGet( TK_FormattedField0Pg1 ), TKGet( TK_EffectiveValue ), Any( static_cast< double >( 100 ) ) ); mrOptimizerDialog.SetConfigProperty( TK_JPEGQuality, Any( (sal_Int32)100 ) ); } void SpinListenerFormattedField0Pg1::disposing( const ::com::sun::star::lang::EventObject& /* Source */ ) @@ -837,3 +836,5 @@ void HelpCloseListener::disposing( const EventObject& ) throw ( RuntimeException { mrXFrame = NULL; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/minimizer/optimizerdialog.hxx b/sdext/source/minimizer/optimizerdialog.hxx index 91347a0..af66112 100644 --- a/sdext/source/minimizer/optimizerdialog.hxx +++ b/sdext/source/minimizer/optimizerdialog.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -27,9 +28,7 @@ #ifndef OPTIMIZERDIALOG_HXX #define OPTIMIZERDIALOG_HXX -#ifndef _OPTIMIZERDIALOG_HRC #include "optimizerdialog.hrc" -#endif #include <vector> #include "unodialog.hxx" #include "pppoptimizertoken.hxx" @@ -48,9 +47,7 @@ #include <com/sun/star/view/XSelectionSupplier.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/awt/XItemEventBroadcaster.hpp> -#ifndef _COM_SUN_STAR_UTIL_XCloseListener_HPP_ #include <com/sun/star/util/XCloseListener.hpp> -#endif #include <com/sun/star/frame/XStorable.hpp> #include <com/sun/star/frame/XDispatch.hpp> #include <com/sun/star/frame/XDesktop.hpp> @@ -247,3 +244,5 @@ private: #endif // OPTIMIZERDIALOG_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/minimizer/optimizerdialogcontrols.cxx b/sdext/source/minimizer/optimizerdialogcontrols.cxx index 86ffdea..54a796e 100644 --- a/sdext/source/minimizer/optimizerdialogcontrols.cxx +++ b/sdext/source/minimizer/optimizerdialogcontrols.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -40,10 +41,9 @@ #include <com/sun/star/drawing/XMasterPagesSupplier.hpp> #include <com/sun/star/drawing/XDrawPagesSupplier.hpp> #include <com/sun/star/awt/FontDescriptor.hpp> -#ifndef _COM_SUN_STAR_AWT_XFONTWEIGHT_HPP_ #include <com/sun/star/awt/FontWeight.hpp> -#endif #include <rtl/ustrbuf.hxx> +#include <sal/macros.h> using namespace ::rtl; using namespace ::com::sun::star::awt; @@ -90,7 +90,7 @@ rtl::OUString InsertSeparator( OptimizerDialog& rOptimizerDialog, const OUString Any( sal_Int16( 0 ) ), Any( nWidth ) }; - sal_Int32 nCount = sizeof( pNames ) / sizeof( OUString ); + sal_Int32 nCount = SAL_N_ELEMENTS( pNames ); Sequence< rtl::OUString > aNames( pNames, nCount ); Sequence< Any > aValues( pValues, nCount ); @@ -128,7 +128,7 @@ rtl::OUString InsertButton( OptimizerDialog& rOptimizerDialog, const OUString& r Any( nWidth ) }; - sal_Int32 nCount = sizeof( pNames ) / sizeof( OUString ); + sal_Int32 nCount = SAL_N_ELEMENTS( pNames ); Sequence< rtl::OUString > aNames( pNames, nCount ); Sequence< Any > aValues( pValues, nCount ); @@ -162,7 +162,7 @@ rtl::OUString InsertFixedText( OptimizerDialog& rOptimizerDialog, const rtl::OUS Any( nTabIndex ), Any( nWidth ) }; - sal_Int32 nCount = sizeof( pNames ) / sizeof( OUString ); + sal_Int32 nCount = SAL_N_ELEMENTS( pNames ); Sequence< rtl::OUString > aNames( pNames, nCount ); Sequence< Any > aValues( pValues, nCount ); @@ -199,7 +199,7 @@ rtl::OUString InsertCheckBox( OptimizerDialog& rOptimizerDialog, const OUString& Any( nTabIndex ), Any( nWidth ) }; - sal_Int32 nCount = sizeof( pNames ) / sizeof( OUString ); + sal_Int32 nCount = SAL_N_ELEMENTS( pNames ); Sequence< rtl::OUString > aNames( pNames, nCount ); Sequence< Any > aValues( pValues, nCount ); @@ -242,7 +242,7 @@ rtl::OUString InsertFormattedField( OptimizerDialog& rOptimizerDialog, const OUS Any( nTabIndex ), Any( nWidth ) }; - sal_Int32 nCount = sizeof( pNames ) / sizeof( OUString ); + sal_Int32 nCount = SAL_N_ELEMENTS( pNames ); Sequence< rtl::OUString > aNames( pNames, nCount ); Sequence< Any > aValues( pValues, nCount ); @@ -288,7 +288,7 @@ rtl::OUString InsertComboBox( OptimizerDialog& rOptimizerDialog, const OUString& Any( nTabIndex ), Any( nWidth ) }; - sal_Int32 nCount = sizeof( pNames ) / sizeof( OUString ); + sal_Int32 nCount = SAL_N_ELEMENTS( pNames ); Sequence< rtl::OUString > aNames( pNames, nCount ); Sequence< Any > aValues( pValues, nCount ); @@ -324,7 +324,7 @@ rtl::OUString InsertRadioButton( OptimizerDialog& rOptimizerDialog, const rtl::O Any( nTabIndex ), Any( nWidth ) }; - sal_Int32 nCount = sizeof( pNames ) / sizeof( OUString ); + sal_Int32 nCount = SAL_N_ELEMENTS( pNames ); Sequence< rtl::OUString > aNames( pNames, nCount ); Sequence< Any > aValues( pValues, nCount ); @@ -367,7 +367,7 @@ rtl::OUString InsertListBox( OptimizerDialog& rOptimizerDialog, const OUString& Any( nTabIndex ), Any( nWidth ) }; - sal_Int32 nCount = sizeof( pNames ) / sizeof( OUString ); + sal_Int32 nCount = SAL_N_ELEMENTS( pNames ); Sequence< rtl::OUString > aNames( pNames, nCount ); Sequence< Any > aValues( pValues, nCount ); @@ -609,7 +609,7 @@ static OUString ImpValueOfInMB( const sal_Int64& rVal, sal_Unicode nSeparator = aVal.setLength( nX + 2 ); aVal.setCharAt( nX, nSeparator ); } - aVal.append( OUString::createFromAscii( " MB" ) ); + aVal.append( OUString(RTL_CONSTASCII_USTRINGPARAM(" MB")) ); return aVal.makeStringAndClear(); } @@ -707,7 +707,7 @@ void OptimizerDialog::UpdateControlStatesPage4() if (!bVisible ) nDeletedSlides++; } - aIter++; + ++aIter; } } else @@ -740,7 +740,7 @@ void OptimizerDialog::UpdateControlStatesPage4() { if ( !aIter->bUsed ) nDeletedSlides++; - aIter++; + ++aIter; } } if ( nDeletedSlides > 1 ) @@ -868,7 +868,7 @@ void OptimizerDialog::InitPage4() Any( (sal_Int32)( 0 ) ), Any( (sal_Int32)( PAGE_WIDTH - 12 ) ) }; - sal_Int32 nCount = sizeof( pNames ) / sizeof( OUString ); + sal_Int32 nCount = SAL_N_ELEMENTS( pNames ); Sequence< rtl::OUString > aNames( pNames, nCount ); Sequence< Any > aValues( pValues, nCount ); @@ -958,3 +958,5 @@ void OptimizerDialog::DeactivatePage( sal_Int16 nStep ) while( aBeg != aEnd ) setVisible( *aBeg++, sal_False ); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/minimizer/pagecollector.cxx b/sdext/source/minimizer/pagecollector.cxx index 6033c5d..ae1a639 100644 --- a/sdext/source/minimizer/pagecollector.cxx +++ b/sdext/source/minimizer/pagecollector.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -74,7 +75,7 @@ void PageCollector::CollectCustomShowPages( const com::sun::star::uno::Reference { if ( *aIter == xDrawPage ) break; - aIter++; + ++aIter; } if ( aIter == aEnd ) rUsedPageList.push_back( xDrawPage ); @@ -108,7 +109,7 @@ void PageCollector::CollectNonCustomShowPages( const com::sun::star::uno::Refere { if ( *aIter == xDrawPage ) break; - aIter++; + ++aIter; } if ( aIter == aEnd ) rNonUsedPageList.push_back( xDrawPage ); @@ -140,7 +141,7 @@ void PageCollector::CollectMasterPages( const Reference< XModel >& rxModel, std: { if ( aIter->xMasterPage == xMasterPage ) break; - aIter++; + ++aIter; } if ( aIter == aEnd ) { @@ -167,7 +168,7 @@ void PageCollector::CollectMasterPages( const Reference< XModel >& rxModel, std: aIter->bUsed = sal_True; break; } - aIter++; + ++aIter; } if ( aIter == aEnd ) throw uno::RuntimeException(); @@ -178,3 +179,4 @@ void PageCollector::CollectMasterPages( const Reference< XModel >& rxModel, std: } } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/minimizer/pagecollector.hxx b/sdext/source/minimizer/pagecollector.hxx index d4ca582..60c0292 100644 --- a/sdext/source/minimizer/pagecollector.hxx +++ b/sdext/source/minimizer/pagecollector.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -47,3 +48,5 @@ class PageCollector }; #endif // PAGECOLLECTOR_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/minimizer/pppoptimizer.cxx b/sdext/source/minimizer/pppoptimizer.cxx index d3d0709..5e45e0e 100644 --- a/sdext/source/minimizer/pppoptimizer.cxx +++ b/sdext/source/minimizer/pppoptimizer.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -159,7 +160,7 @@ void SAL_CALL PPPOptimizer::addStatusListener( const Reference< XStatusListener throw( RuntimeException ) { // TODO - OSL_ENSURE( sal_False, "PPPOptimizer::addStatusListener()\nNot implemented yet!" ); + OSL_FAIL( "PPPOptimizer::addStatusListener()\nNot implemented yet!" ); } //=============================================== @@ -167,7 +168,7 @@ void SAL_CALL PPPOptimizer::removeStatusListener( const Reference< XStatusListen throw( RuntimeException ) { // TODO - OSL_ENSURE( sal_False, "PPPOptimizer::removeStatusListener()\nNot implemented yet!" ); + OSL_FAIL( "PPPOptimizer::removeStatusListener()\nNot implemented yet!" ); } // ----------------------------------------------------------------------------- @@ -207,3 +208,5 @@ Reference< XInterface > PPPOptimizer_createInstance( const Reference< XComponent { return (cppu::OWeakObject*) new PPPOptimizer( rSMgr ); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/minimizer/pppoptimizer.hxx b/sdext/source/minimizer/pppoptimizer.hxx index 893e687..871e8c8 100644 --- a/sdext/source/minimizer/pppoptimizer.hxx +++ b/sdext/source/minimizer/pppoptimizer.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -98,3 +99,5 @@ com::sun::star::uno::Reference< com::sun::star::uno::XInterface > PPPOptimizer_c throw( com::sun::star::uno::Exception ); #endif // PPPOPTIMIZER_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/minimizer/pppoptimizerdialog.cxx b/sdext/source/minimizer/pppoptimizerdialog.cxx index 86f06ff..a8e2241 100644 --- a/sdext/source/minimizer/pppoptimizerdialog.cxx +++ b/sdext/source/minimizer/pppoptimizerdialog.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -131,19 +132,17 @@ void SAL_CALL PPPOptimizerDialog::dispatch( const URL& rURL, const Sequence< PropertyValue >& rArguments ) throw( RuntimeException ) { - sal_Int64 nFileSizeSource = 0; - sal_Int64 nFileSizeDest = 0; if ( mxController.is() && ( rURL.Protocol.compareToAscii( "vnd.com.sun.star.comp.SunPresentationMinimizer:" ) == 0 ) ) { if ( rURL.Path.compareToAscii( "execute" ) == 0 ) { - sal_Bool bDialogExecuted = sal_False; - try { + sal_Int64 nFileSizeSource = 0; + sal_Int64 nFileSizeDest = 0; mpOptimizerDialog = new OptimizerDialog( mxMSF, mxFrame, this ); - bDialogExecuted = mpOptimizerDialog->execute(); + mpOptimizerDialog->execute(); const Any* pVal( mpOptimizerDialog->maStats.GetStatusValue( TK_FileSizeSource ) ); if ( pVal ) @@ -154,11 +153,11 @@ void SAL_CALL PPPOptimizerDialog::dispatch( const URL& rURL, if ( nFileSizeSource && nFileSizeDest ) { - rtl::OUStringBuffer sBuf( rtl::OUString::createFromAscii( "Your Presentation has been minimized from:" ) ); + rtl::OUStringBuffer sBuf( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Your Presentation has been minimized from:")) ); sBuf.append( rtl::OUString::valueOf( nFileSizeSource >> 10 ) ); - sBuf.append( rtl::OUString::createFromAscii( "KB to " ) ); + sBuf.append( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("KB to ")) ); sBuf.append( rtl::OUString::valueOf( nFileSizeDest >> 10 ) ); - sBuf.append( rtl::OUString::createFromAscii( "KB." ) ); + sBuf.append( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("KB.")) ); OUString sResult( sBuf.makeStringAndClear() ); // mpOptimizerDialog->showMessageBox( sResult, sResult, sal_False ); } @@ -182,7 +181,7 @@ void SAL_CALL PPPOptimizerDialog::addStatusListener( const Reference< XStatusLis throw( RuntimeException ) { // TODO - // OSL_ENSURE( sal_False, "PPPOptimizerDialog::addStatusListener()\nNot implemented yet!" ); + // OSL_FAIL( "PPPOptimizerDialog::addStatusListener()\nNot implemented yet!" ); } //=============================================== @@ -190,7 +189,7 @@ void SAL_CALL PPPOptimizerDialog::removeStatusListener( const Reference< XStatus throw( RuntimeException ) { // TODO - // OSL_ENSURE( sal_False, "PPPOptimizerDialog::removeStatusListener()\nNot implemented yet!" ); + // OSL_FAIL( "PPPOptimizerDialog::removeStatusListener()\nNot implemented yet!" ); } // ----------------------------------------------------------------------------- @@ -215,3 +214,5 @@ Reference< XInterface > PPPOptimizerDialog_createInstance( const Reference< XCom } // ----------------------------------------------------------------------------- + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/minimizer/pppoptimizerdialog.hxx b/sdext/source/minimizer/pppoptimizerdialog.hxx index 3035883..76fad42 100644 --- a/sdext/source/minimizer/pppoptimizerdialog.hxx +++ b/sdext/source/minimizer/pppoptimizerdialog.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -35,9 +36,7 @@ #include <com/sun/star/beans/XPropertySetInfo.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/uno/XComponentContext.hpp> -#ifndef _COM_SUN_STAR_LANG_XMULTI_COMPONENT_FACTORY_HPP_ #include <com/sun/star/lang/XMultiComponentFactory.hpp> -#endif #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/frame/XController.hpp> #include <com/sun/star/frame/XDispatch.hpp> @@ -109,3 +108,5 @@ com::sun::star::uno::Reference< com::sun::star::uno::XInterface > PPPOptimizerDi // ----------------------------------------------------------------------------- #endif // PPPOPTIMIZERDIALOG_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/minimizer/pppoptimizertoken.cxx b/sdext/source/minimizer/pppoptimizertoken.cxx index 04dab55..5fbfb16 100644 --- a/sdext/source/minimizer/pppoptimizertoken.cxx +++ b/sdext/source/minimizer/pppoptimizertoken.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -30,9 +31,17 @@ #include "pppoptimizertoken.hxx" #include <osl/mutex.hxx> -#include <hash_map> +#include <sal/macros.h> +#include <boost/unordered_map.hpp> #include <string.h> +struct THash +{ + size_t operator()( const char* s ) const + { + return rtl_str_hashCode(s); + } +}; struct TCheck { bool operator()( const char* s1, const char* s2 ) const @@ -40,7 +49,7 @@ struct TCheck return strcmp( s1, s2 ) == 0; } }; -typedef std::hash_map< const char*, PPPOptimizerTokenEnum, std::hash<const char*>, TCheck> TypeNameHashMap; +typedef boost::unordered_map< const char*, PPPOptimizerTokenEnum, THash, TCheck> TypeNameHashMap; static TypeNameHashMap* pHashMap = NULL; static ::osl::Mutex& getHashMapMutex() { @@ -310,7 +319,7 @@ PPPOptimizerTokenEnum TKGet( const rtl::OUString& rToken ) { TypeNameHashMap* pH = new TypeNameHashMap; const TokenTable* pPtr = pTokenTableArray; - const TokenTable* pEnd = pPtr + ( sizeof( pTokenTableArray ) / sizeof( TokenTable ) ); + const TokenTable* pEnd = pPtr + SAL_N_ELEMENTS( pTokenTableArray ); for ( ; pPtr < pEnd; pPtr++ ) (*pH)[ pPtr->pS ] = pPtr->pE; pHashMap = pH; @@ -336,3 +345,5 @@ rtl::OUString TKGet( const PPPOptimizerTokenEnum eToken ) : (sal_uInt32)eToken; return rtl::OUString::createFromAscii( pTokenTableArray[ i ].pS ); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/minimizer/pppoptimizertoken.hxx b/sdext/source/minimizer/pppoptimizertoken.hxx index c5010fb..3a4cf2f 100644 --- a/sdext/source/minimizer/pppoptimizertoken.hxx +++ b/sdext/source/minimizer/pppoptimizertoken.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -281,3 +282,5 @@ PPPOptimizerTokenEnum TKGet( const rtl::OUString& ); rtl::OUString TKGet( const PPPOptimizerTokenEnum ); #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/minimizer/pppoptimizeruno.cxx b/sdext/source/minimizer/pppoptimizeruno.cxx index 117010f..60c8ab3 100644 --- a/sdext/source/minimizer/pppoptimizeruno.cxx +++ b/sdext/source/minimizer/pppoptimizeruno.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -61,14 +62,14 @@ extern "C" sal_Int32 nPos; xNewKey = reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey( PPPOptimizer_getImplementationName() ); - xNewKey = xNewKey->createKey( OUString::createFromAscii( "/UNO/SERVICES" ) ); + xNewKey = xNewKey->createKey( OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES")) ); const Sequence< OUString > & rSNL1 = PPPOptimizer_getSupportedServiceNames(); const OUString * pArray1 = rSNL1.getConstArray(); for ( nPos = rSNL1.getLength(); nPos--; ) xNewKey->createKey( pArray1[nPos] ); xNewKey = reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey( PPPOptimizerDialog_getImplementationName() ); - xNewKey = xNewKey->createKey( OUString::createFromAscii( "/UNO/SERVICES" ) ); + xNewKey = xNewKey->createKey( OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES")) ); const Sequence< OUString > & rSNL2 = PPPOptimizerDialog_getSupportedServiceNames(); const OUString * pArray2 = rSNL2.getConstArray(); for ( nPos = rSNL2.getLength(); nPos--; ) @@ -78,7 +79,7 @@ extern "C" } catch (InvalidRegistryException &) { - OSL_ENSURE( sal_False, "### InvalidRegistryException!" ); + OSL_FAIL( "### InvalidRegistryException!" ); } } return sal_False; @@ -118,3 +119,5 @@ extern "C" return pRet; } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/minimizer/unodialog.cxx b/sdext/source/minimizer/unodialog.cxx index 8f907c8..554a353 100644 --- a/sdext/source/minimizer/unodialog.cxx +++ b/sdext/source/minimizer/unodialog.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -343,55 +344,6 @@ void UnoDialog::setControlProperty( const OUString& rControlName, const OUString } // ----------------------------------------------------------------------------- -#if 0 -void UnoDialog::showMessageBox( const OUString& rTitle, const OUString& rMessage, sal_Bool bErrorBox ) const -{ - try - { - Reference< XMessageBoxFactory > xMessageBoxFactory( mxMSF->getServiceManager()->createInstanceWithContext( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.Toolkit" ) ), mxMSF ), UNO_QUERY_THROW ); - if ( xMessageBoxFactory.is() ) - { - Rectangle aRectangle( 0, 0, 0, 0 ); - Reference< XMessageBox > xMessageBox( xMessageBoxFactory->createMessageBox( mxWindowPeer, aRectangle, - bErrorBox ? OUString( RTL_CONSTASCII_USTRINGPARAM( "errorbox" ) ) : OUString( RTL_CONSTASCII_USTRINGPARAM( "querybox" ) ), MessageBoxButtons::BUTTONS_OK, rTitle, rMessage ) ); - Reference< XComponent > xComponent( xMessageBox, UNO_QUERY_THROW ); - /* sal_Int16 nResult = */ xMessageBox->execute(); - xComponent->dispose(); - } - } - catch ( Exception& ) - { - } - -/* -public void showErrorMessageBox(XWindowPeer _xParentWindowPeer, String _sTitle, String _sMessage){ -XComponent xComponent = null; -try { - Object oToolkit = m_xMCF.createInstanceWithContext("com.sun.star.awt.Toolkit", m_xContext); - XMessageBoxFactory xMessageBoxFactory = (XMessageBoxFactory) UnoRuntime.queryInterface(XMessageBoxFactory.class, oToolkit); - // rectangle may be empty if position is in the center of the parent peer - - Rectangle aRectangle = new Rectangle(); - XMessageBox xMessageBox = xMessageBoxFactory.createMessageBox(_xParentWindowPeer, aRectangle, "errorbox", com.sun.star.awt.MessageBoxButtons.BUTTONS_OK, _sTitle, _sMessage); - xComponent = (XComponent) UnoRuntime.queryInterface(XComponent.class, xMessageBox); - if (xMessageBox != null){ - short nResult = xMessageBox.execute(); - } -} catch (com.sun.star.uno.Exception ex) { - ex.printStackTrace(System.out); -} -finally{ - //make sure always to dispose the component and free the memory! - if (xComponent != null){ - xComponent.dispose(); - } -}} -*/ -} - -#endif - -// ----------------------------------------------------------------------------- sal_Int32 UnoDialog::getMapsFromPixels( sal_Int32 nPixels ) const { @@ -450,3 +402,5 @@ void UnoDialog::disableControl( const OUString& rControlName ) } // ----------------------------------------------------------------------------- + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/minimizer/unodialog.hxx b/sdext/source/minimizer/unodialog.hxx index e079a1b..39c3664 100644 --- a/sdext/source/minimizer/unodialog.hxx +++ b/sdext/source/minimizer/unodialog.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -30,9 +31,7 @@ #include <com/sun/star/uno/Sequence.h> #include <com/sun/star/lang/XSingleServiceFactory.hpp> -#ifndef _COM_SUN_STAR_LANG_XMULTI_COMPONENT_FACTORY_HPP_ #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#endif #include <com/sun/star/container/XIndexContainer.hpp> #include <com/sun/star/frame/XController.hpp> #include <com/sun/star/frame/XFrame.hpp> @@ -116,9 +115,7 @@ public : void setControlProperty( const rtl::OUString& rControlName, const rtl::OUString& rPropertyName, const com::sun::star::uno::Any& rPropertyValue ); com::sun::star::uno::Any getControlProperty( const rtl::OUString& rControlName, const rtl::OUString& rPropertyName ); -#if 0 - void showMessageBox( const rtl::OUString& rTitle, const rtl::OUString& rMessage, sal_Bool bErrorBox ) const; -#endif + void enableControl( const rtl::OUString& rControlName ); void disableControl( const rtl::OUString& rControlName ); @@ -147,3 +144,5 @@ public : }; #endif // UNODIALOG_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/pdfimport/config/description.xml b/sdext/source/pdfimport/config/description.xml index f4b2633..416e549 100644 --- a/sdext/source/pdfimport/config/description.xml +++ b/sdext/source/pdfimport/config/description.xml @@ -10,12 +10,6 @@ <OpenOffice.org-minimal-version value="3.0" dep:name="OpenOffice.org 3.0"/> </dependencies> - <registration> - <simple-license accept-by="admin" default-license-id="lic-en-US" suppress-if-required="true" > - <license-text xlink:href="licensefile" lang="isocode" license-id="lic-isocode"/> - </simple-license> - </registration> - <version value="1.0.5" /> <platform value="UPDATED_SUPPORTED_PLATFORM" /> @@ -30,7 +24,6 @@ <icon> <default xlink:href="images/extension_32.png" /> - <high-contrast xlink:href="images/extension_32_h.png" /> </icon> </description> diff --git a/sdext/source/pdfimport/filterdet.cxx b/sdext/source/pdfimport/filterdet.cxx index 2cec8d8..c83919c 100644 --- a/sdext/source/pdfimport/filterdet.cxx +++ b/sdext/source/pdfimport/filterdet.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -77,7 +78,7 @@ namespace { switch(nIndex) { default: - OSL_ENSURE(false,"Unexpected case!"); + OSL_FAIL("Unexpected case!"); break; case DRAW_INDEX: bDrawState=sal_True; @@ -179,32 +180,6 @@ namespace { return aMethods; } }; -#if 0 // code currently unused (see below) - sal_Int32 queryDocumentTypeDialog( const uno::Reference<uno::XComponentContext>& xContext, - const rtl::OUString& rFilename ) - { - uno::Reference<awt::XDialogProvider2> xDialogProvider( - xContext->getServiceManager()->createInstanceWithContext( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.DialogProvider2" ) ), - xContext ), - uno::UNO_QUERY_THROW ); - rtl::Reference<ChooserDialogHandler> xHandler(new ChooserDialogHandler); - uno::Reference<awt::XDialog> xDialog = xDialogProvider->createDialogWithHandler( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("vnd.sun.star.script:PDFImport.TargetChooser?location=application") ), - uno::Reference<awt::XDialogEventHandler>( - static_cast<cppu::OWeakObject*>(xHandler.get()), uno::UNO_QUERY_THROW)); - xHandler->initControls( - uno::Reference<awt::XControlContainer>( - xDialog, - uno::UNO_QUERY_THROW ), - rFilename ); - - if( !xDialog->execute() ) - return -1; - else - return xHandler->getSelectedItem(); - } -#endif } class FileEmitContext : public pdfparse::EmitContext @@ -380,13 +355,13 @@ rtl::OUString SAL_CALL PDFDetector::detect( uno::Sequence< beans::PropertyValue rtl::OUStringToOString( pAttribs[i].Name, RTL_TEXTENCODING_UTF8 ).getStr(), rtl::OUStringToOString( aVal, RTL_TEXTENCODING_UTF8 ).getStr() ); #endif - if( pAttribs[i].Name.equalsAscii( "InputStream" ) ) + if( pAttribs[i].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "InputStream" ) ) ) pAttribs[i].Value >>= xInput; - else if( pAttribs[i].Name.equalsAscii( "URL" ) ) + else if( pAttribs[i].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "URL" ) ) ) pAttribs[i].Value >>= aURL; - else if( pAttribs[i].Name.equalsAscii( "FilterName" ) ) + else if( pAttribs[i].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "FilterName" ) ) ) nFilterNamePos = i; - else if( pAttribs[i].Name.equalsAscii( "Password" ) ) + else if( pAttribs[i].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Password" ) ) ) { nPwdPos = i; pAttribs[i].Value >>= aPwd; @@ -468,15 +443,15 @@ rtl::OUString SAL_CALL PDFDetector::detect( uno::Sequence< beans::PropertyValue osl_removeFile( aURL.pData ); if( aEmbedMimetype.getLength() ) { - if( aEmbedMimetype.equalsAscii( "application/vnd.oasis.opendocument.text" ) - || aEmbedMimetype.equalsAscii( "application/vnd.oasis.opendocument.text-master" ) ) + if( aEmbedMimetype.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "application/vnd.oasis.opendocument.text" ) ) + || aEmbedMimetype.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "application/vnd.oasis.opendocument.text-master" ) ) ) aOutFilterName = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "writer_pdf_addstream_import" ) ); - else if( aEmbedMimetype.equalsAscii( "application/vnd.oasis.opendocument.presentation" ) ) + else if( aEmbedMimetype.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "application/vnd.oasis.opendocument.presentation" ) ) ) aOutFilterName = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "impress_pdf_addstream_import" ) ); - else if( aEmbedMimetype.equalsAscii( "application/vnd.oasis.opendocument.graphics" ) - || aEmbedMimetype.equalsAscii( "application/vnd.oasis.opendocument.drawing" ) ) + else if( aEmbedMimetype.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "application/vnd.oasis.opendocument.graphics" ) ) + || aEmbedMimetype.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "application/vnd.oasis.opendocument.drawing" ) ) ) aOutFilterName = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "draw_pdf_addstream_import" ) ); - else if( aEmbedMimetype.equalsAscii( "application/vnd.oasis.opendocument.spreadsheet" ) ) + else if( aEmbedMimetype.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "application/vnd.oasis.opendocument.spreadsheet" ) ) ) aOutFilterName = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "calc_pdf_addstream_import" ) ); } } @@ -545,7 +520,7 @@ rtl::OUString SAL_CALL PDFDetector::detect( uno::Sequence< beans::PropertyValue break; default: - OSL_ENSURE(false,"Unexpected case"); + OSL_FAIL("Unexpected case"); } aOutTypeName = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("pdf_Portable_Document_Format") ); @@ -659,7 +634,7 @@ uno::Reference< io::XStream > getAdditionalStream( const rtl::OUString& if( pTrailer && pTrailer->m_pDict ) { // search document checksum entry - std::hash_map< rtl::OString, + boost::unordered_map< rtl::OString, pdfparse::PDFEntry*, rtl::OStringHash >::iterator chk; chk = pTrailer->m_pDict->m_aMap.find( "DocChecksum" ); @@ -676,7 +651,7 @@ uno::Reference< io::XStream > getAdditionalStream( const rtl::OUString& } // search for AdditionalStreams entry - std::hash_map< rtl::OString, + boost::unordered_map< rtl::OString, pdfparse::PDFEntry*, rtl::OStringHash >::iterator add_stream; add_stream = pTrailer->m_pDict->m_aMap.find( "AdditionalStreams" ); @@ -728,7 +703,7 @@ uno::Reference< io::XStream > getAdditionalStream( const rtl::OUString& uno::Reference< task::XInteractionHandler > xIntHdl; for( sal_Int32 i = 0; i < nAttribs; i++ ) { - if( pAttribs[i].Name.equalsAscii( "InteractionHandler" ) ) + if( pAttribs[i].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "InteractionHandler" ) ) ) pAttribs[i].Value >>= xIntHdl; } if( ! bMayUseUI || ! xIntHdl.is() ) @@ -778,3 +753,5 @@ uno::Reference< io::XStream > getAdditionalStream( const rtl::OUString& } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/pdfimport/filterdet.hxx b/sdext/source/pdfimport/filterdet.hxx index 9422491..2ca62d1 100644 --- a/sdext/source/pdfimport/filterdet.hxx +++ b/sdext/source/pdfimport/filterdet.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -112,3 +113,4 @@ bool getPassword( const com::sun::star::uno::Reference< com::sun::star::task::XI #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/pdfimport/inc/contentsink.hxx b/sdext/source/pdfimport/inc/contentsink.hxx index 93422c2..5919028 100755..100644 --- a/sdext/source/pdfimport/inc/contentsink.hxx +++ b/sdext/source/pdfimport/inc/contentsink.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -182,3 +183,4 @@ namespace pdfi #endif /* INCLUDED_PDFI_CONTENTSINK_HXX */ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/pdfimport/inc/odfemitter.hxx b/sdext/source/pdfimport/inc/odfemitter.hxx index d79aa34..f8c958e 100644 --- a/sdext/source/pdfimport/inc/odfemitter.hxx +++ b/sdext/source/pdfimport/inc/odfemitter.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -43,3 +44,5 @@ namespace pdfi } #endif /* INCLUDED_PDFI_ODFEMITTER_HXX */ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/pdfimport/inc/pdfihelper.hxx b/sdext/source/pdfimport/inc/pdfihelper.hxx index f7865eb..111ebcc 100755..100644 --- a/sdext/source/pdfimport/inc/pdfihelper.hxx +++ b/sdext/source/pdfimport/inc/pdfihelper.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -38,7 +39,7 @@ #include <com/sun/star/rendering/XColorSpace.hpp> #include <vector> -#include <hash_map> +#include <boost/unordered_map.hpp> // virtual resolution of the PDF OutputDev in dpi #define PDFI_OUTDEV_RESOLUTION 7200 @@ -48,7 +49,7 @@ namespace com { namespace sun { namespace star { namespace task namespace pdfi { - typedef std::hash_map< rtl::OUString, rtl::OUString, rtl::OUStringHash > PropertyMap; + typedef boost::unordered_map< rtl::OUString, rtl::OUString, rtl::OUStringHash > PropertyMap; typedef sal_Int32 ImageId; /// What to do with a polygon. values can be ORed together @@ -198,3 +199,5 @@ namespace pdfi #define USTR(x) rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( x ) ) #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/pdfimport/inc/pdfparse.hxx b/sdext/source/pdfimport/inc/pdfparse.hxx index a0a58bb..5c21323 100644 --- a/sdext/source/pdfimport/inc/pdfparse.hxx +++ b/sdext/source/pdfimport/inc/pdfparse.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -33,7 +34,7 @@ #include <rtl/string.hxx> #include <vector> -#include <hash_map> +#include <boost/unordered_map.hpp> namespace pdfparse { @@ -188,7 +189,7 @@ struct PDFArray : public PDFContainer struct PDFDict : public PDFContainer { - typedef std::hash_map<rtl::OString,PDFEntry*,rtl::OStringHash> Map; + typedef boost::unordered_map<rtl::OString,PDFEntry*,rtl::OStringHash> Map; Map m_aMap; PDFDict() {} @@ -260,7 +261,7 @@ struct PDFFile : public PDFContainer bool decrypt( const sal_uInt8* pInBuffer, sal_uInt32 nLen, sal_uInt8* pOutBuffer, unsigned int nObject, unsigned int nGeneration ) const; - + rtl::OUString getDecryptionKey() const; }; @@ -309,3 +310,5 @@ class PDFReader } // namespace #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/pdfimport/inc/saxemitter.hxx b/sdext/source/pdfimport/inc/saxemitter.hxx index 307e86c..c2871f8 100644 --- a/sdext/source/pdfimport/inc/saxemitter.hxx +++ b/sdext/source/pdfimport/inc/saxemitter.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -44,3 +45,5 @@ namespace pdfi } #endif /* INCLUDED_PDFI_SAXEMITTER_HXX */ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/pdfimport/inc/treevisitorfactory.hxx b/sdext/source/pdfimport/inc/treevisitorfactory.hxx index 52300ce..6a08f5c 100644 --- a/sdext/source/pdfimport/inc/treevisitorfactory.hxx +++ b/sdext/source/pdfimport/inc/treevisitorfactory.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -65,3 +66,4 @@ namespace pdfi #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/pdfimport/inc/wrapper.hxx b/sdext/source/pdfimport/inc/wrapper.hxx index a145dd2..119510c 100755..100644 --- a/sdext/source/pdfimport/inc/wrapper.hxx +++ b/sdext/source/pdfimport/inc/wrapper.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -61,3 +62,5 @@ namespace pdfi } #endif /* INCLUDED_PDFI_WRAPPER_HXX */ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/pdfimport/inc/xmlemitter.hxx b/sdext/source/pdfimport/inc/xmlemitter.hxx index 3eb4bed..66a43d6 100644 --- a/sdext/source/pdfimport/inc/xmlemitter.hxx +++ b/sdext/source/pdfimport/inc/xmlemitter.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -58,3 +59,4 @@ namespace pdfi #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/pdfimport/makefile.mk b/sdext/source/pdfimport/makefile.mk index 8444086..64accda 100644 --- a/sdext/source/pdfimport/makefile.mk +++ b/sdext/source/pdfimport/makefile.mk @@ -125,8 +125,7 @@ COMPONENT_LIBRARIES= \ $(EXTENSIONDIR)$/$(SHL1TARGET)$(DLLPOST) COMPONENT_IMAGES=\ - $(EXTENSIONDIR)$/images$/extension_32.png \ - $(EXTENSIONDIR)$/images$/extension_32_h.png + $(EXTENSIONDIR)$/images$/extension_32.png EXTENSION_PACKDEPS=$(CONVERTER_FILE) $(COMPONENT_DIALOGS) $(COMPONENT_HELP) $(COMPONENT_IMAGES) makefile.mk diff --git a/sdext/source/pdfimport/misc/pdfihelper.cxx b/sdext/source/pdfimport/misc/pdfihelper.cxx index bbc98d2..8209346 100644 --- a/sdext/source/pdfimport/misc/pdfihelper.cxx +++ b/sdext/source/pdfimport/misc/pdfihelper.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -78,3 +79,4 @@ rtl::OUString pdfi::convertPixelToUnitString( double fPix ) } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/pdfimport/misc/pwdinteract.cxx b/sdext/source/pdfimport/misc/pwdinteract.cxx index 30b76fc..3280bea 100644 --- a/sdext/source/pdfimport/misc/pwdinteract.cxx +++ b/sdext/source/pdfimport/misc/pwdinteract.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -161,3 +162,5 @@ bool getPassword( const uno::Reference< task::XInteractionHandler >& xHandler, } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/pdfimport/odf/odfemitter.cxx b/sdext/source/pdfimport/odf/odfemitter.cxx index 12bb0a5..665d351 100644 --- a/sdext/source/pdfimport/odf/odfemitter.cxx +++ b/sdext/source/pdfimport/odf/odfemitter.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -134,3 +135,5 @@ XmlEmitterSharedPtr createOdfEmitter( const uno::Reference<io::XOutputStream>& x } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/pdfimport/pdfiadaptor.cxx b/sdext/source/pdfimport/pdfiadaptor.cxx index 9ece9ef..ec753b6 100644 --- a/sdext/source/pdfimport/pdfiadaptor.cxx +++ b/sdext/source/pdfimport/pdfiadaptor.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -84,9 +85,9 @@ sal_Bool SAL_CALL PDFIHybridAdaptor::filter( const uno::Sequence< beans::Propert rtl::OUStringToOString( pAttribs[i].Name, RTL_TEXTENCODING_UTF8 ).getStr(), rtl::OUStringToOString( aVal, RTL_TEXTENCODING_UTF8 ).getStr() ); #endif - if( pAttribs[i].Name.equalsAscii( "EmbeddedSubstream" ) ) + if( pAttribs[i].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "EmbeddedSubstream" ) ) ) pAttribs[i].Value >>= xSubStream; - else if( pAttribs[i].Name.equalsAscii( "Password" ) ) + else if( pAttribs[i].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Password" ) ) ) { nPwPos = i; pAttribs[i].Value >>= aPwd; @@ -98,7 +99,7 @@ sal_Bool SAL_CALL PDFIHybridAdaptor::filter( const uno::Sequence< beans::Propert uno::Reference< io::XInputStream > xInput; for( sal_Int32 i = 0; i < nAttribs; i++ ) { - if( pAttribs[i].Name.equalsAscii( "InputStream" ) ) + if( pAttribs[i].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "InputStream" ) ) ) { pAttribs[i].Value >>= xInput; break; @@ -250,7 +251,7 @@ bool PDFIRawAdaptor::parse( const uno::Reference<io::XInputStream>& xInput bool bSuccess=false; - if( xInput.is() && (!rURL.getLength() || rURL.compareToAscii( "file:", 5 ) != 0) ) + if( xInput.is() ) bSuccess = xpdf_ImportFromStream( xInput, pSink, xIHdl, rPwd, m_xContext ); else bSuccess = xpdf_ImportFromFile( rURL, pSink, xIHdl, rPwd, m_xContext ); @@ -293,15 +294,15 @@ sal_Bool SAL_CALL PDFIRawAdaptor::importer( const uno::Sequence< beans::Property for( sal_Int32 i = 0; i < nAttribs; i++, pAttribs++ ) { OSL_TRACE("importer Attrib: %s\n", OUStringToOString( pAttribs->Name, RTL_TEXTENCODING_UTF8 ).getStr() ); - if( pAttribs->Name.equalsAscii( "InputStream" ) ) + if( pAttribs->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "InputStream" ) ) ) pAttribs->Value >>= xInput; - else if( pAttribs->Name.equalsAscii( "URL" ) ) + else if( pAttribs->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "URL" ) ) ) pAttribs->Value >>= aURL; - else if( pAttribs->Name.equalsAscii( "StatusIndicator" ) ) + else if( pAttribs->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "StatusIndicator" ) ) ) pAttribs->Value >>= xStatus; - else if( pAttribs->Name.equalsAscii( "InteractionHandler" ) ) + else if( pAttribs->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "InteractionHandler" ) ) ) pAttribs->Value >>= xInteractionHandler; - else if( pAttribs->Name.equalsAscii( "Password" ) ) + else if( pAttribs->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Password" ) ) ) pAttribs->Value >>= aPwd; } if( !xInput.is() ) @@ -327,3 +328,5 @@ void SAL_CALL PDFIRawAdaptor::setTargetDocument( const uno::Reference< lang::XCo } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/pdfimport/pdfiadaptor.hxx b/sdext/source/pdfimport/pdfiadaptor.hxx index ef490b7..2b0b0b9 100644 --- a/sdext/source/pdfimport/pdfiadaptor.hxx +++ b/sdext/source/pdfimport/pdfiadaptor.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -136,3 +137,5 @@ namespace pdfi } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/pdfimport/pdfparse/pdfentries.cxx b/sdext/source/pdfimport/pdfparse/pdfentries.cxx index b121a50..6b11fc7 100644 --- a/sdext/source/pdfimport/pdfparse/pdfentries.cxx +++ b/sdext/source/pdfimport/pdfparse/pdfentries.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -48,7 +49,11 @@ #include <stdio.h> -using namespace rtl; +using ::rtl::OUString; +using ::rtl::OString; +using ::rtl::OStringHash; +using ::rtl::OStringBuffer; + namespace pdfparse { @@ -545,7 +550,7 @@ void PDFDict::insertValue( const OString& rName, PDFEntry* pValue ) if( ! pValue ) eraseValue( rName ); - std::hash_map<OString,PDFEntry*,OStringHash>::iterator it = m_aMap.find( rName ); + boost::unordered_map<OString,PDFEntry*,OStringHash>::iterator it = m_aMap.find( rName ); if( it == m_aMap.end() ) { // new name/value, pair, append it @@ -639,7 +644,7 @@ unsigned int PDFStream::getDictLength( const PDFContainer* pContainer ) const if( ! m_pDict ) return 0; // find /Length entry, can either be a direct or indirect number object - std::hash_map<OString,PDFEntry*,OStringHash>::const_iterator it = + boost::unordered_map<OString,PDFEntry*,OStringHash>::const_iterator it = m_pDict->m_aMap.find( "Length" ); if( it == m_pDict->m_aMap.end() ) return 0; @@ -694,7 +699,7 @@ bool PDFObject::getDeflatedStream( char** ppStream, unsigned int* pBytes, const return false; } // is there a filter entry ? - std::hash_map<OString,PDFEntry*,OStringHash>::const_iterator it = + boost::unordered_map<OString,PDFEntry*,OStringHash>::const_iterator it = m_pStream->m_pDict->m_aMap.find( "Filter" ); if( it != m_pStream->m_pDict->m_aMap.end() ) { @@ -859,7 +864,7 @@ bool PDFObject::emit( EmitContext& rWriteContext ) const if( bDeflate && rWriteContext.m_bDeflate ) { // delete flatedecode filter - std::hash_map<OString,PDFEntry*,OStringHash>::const_iterator it = + boost::unordered_map<OString,PDFEntry*,OStringHash>::const_iterator it = pClone->m_pStream->m_pDict->m_aMap.find( "Filter" ); if( it != pClone->m_pStream->m_pDict->m_aMap.end() ) { @@ -1369,7 +1374,7 @@ PDFFileImplData* PDFFile::impl_getData() const m_pData->m_nKeyLength = static_cast<sal_uInt32>(pNum->m_fValue) / 8; } PDFName* pFilter = dynamic_cast<PDFName*>(filter->second); - if( pFilter && pFilter->getFilteredName().equalsAscii( "Standard" ) ) + if( pFilter && pFilter->getFilteredName().equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Standard" ) ) ) m_pData->m_bStandardHandler = true; if( o_ent != pDict->m_aMap.end() ) { @@ -1479,3 +1484,4 @@ PDFEntry* PDFPart::clone() const return pNewPt; } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/pdfimport/pdfparse/pdfparse.cxx b/sdext/source/pdfimport/pdfparse/pdfparse.cxx index 9b8a8e7..ad67493 100644 --- a/sdext/source/pdfimport/pdfparse/pdfparse.cxx +++ b/sdext/source/pdfimport/pdfparse/pdfparse.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -37,7 +38,6 @@ #include "pdfparse.hxx" // workaround windows compiler: do not include multi_pass.hpp -//#include <boost/spirit.hpp> #include <boost/spirit/include/classic_core.hpp> #include <boost/spirit/include/classic_utility.hpp> #include <boost/spirit/include/classic_error_handling.hpp> @@ -57,9 +57,11 @@ #endif using namespace boost::spirit; -using namespace rtl; using namespace pdfparse; +using ::rtl::OString; +using ::rtl::OStringBuffer; + class StringEmitContext : public EmitContext { OStringBuffer m_aBuf; @@ -113,7 +115,7 @@ public: typedef nil_t result_t; template <typename ScannerT> std::ptrdiff_t - operator()(ScannerT const& scan, result_t& result) const + operator()(ScannerT const& scan, result_t&) const { std::ptrdiff_t len = 0; @@ -562,7 +564,9 @@ PDFEntry* PDFReader::read( const char* pBuffer, unsigned int nLen ) try { + #if OSL_DEBUG_LEVEL > 1 boost::spirit::parse_info<const char*> aInfo = + #endif boost::spirit::parse( pBuffer, pBuffer+nLen, aGrammar, @@ -640,7 +644,9 @@ PDFEntry* PDFReader::read( const char* pFileName ) try { + #if OSL_DEBUG_LEVEL > 1 boost::spirit::parse_info< file_iterator<> > aInfo = + #endif boost::spirit::parse( file_start, file_end, aGrammar, @@ -699,3 +705,4 @@ PDFEntry* PDFReader::read( const char* pFileName ) #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/pdfimport/sax/emitcontext.cxx b/sdext/source/pdfimport/sax/emitcontext.cxx index 3902a57..da04b08 100644 --- a/sdext/source/pdfimport/sax/emitcontext.cxx +++ b/sdext/source/pdfimport/sax/emitcontext.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -69,9 +70,9 @@ SaxEmitter::SaxEmitter( const uno::Reference< xml::sax::XDocumentHandler >& xDoc aBuf.append( aFileURL ); aBuf.appendAscii( "/pdfimport.xml" ); pStream = new osl::File( aBuf.makeStringAndClear() ); - if( pStream->open( OpenFlag_Write | OpenFlag_Create ) ) + if( pStream->open( osl_File_OpenFlag_Write | osl_File_OpenFlag_Create ) ) { - pStream->open( OpenFlag_Write ); + pStream->open( osl_File_OpenFlag_Write ); pStream->setSize( 0 ); } } @@ -188,3 +189,5 @@ XmlEmitterSharedPtr createSaxEmitter( const uno::Reference< xml::sax::XDocumentH } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/pdfimport/sax/emitcontext.hxx b/sdext/source/pdfimport/sax/emitcontext.hxx index 6ebfcf2..c67615a 100644 --- a/sdext/source/pdfimport/sax/emitcontext.hxx +++ b/sdext/source/pdfimport/sax/emitcontext.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -58,3 +59,4 @@ namespace pdfi #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/pdfimport/sax/saxattrlist.cxx b/sdext/source/pdfimport/sax/saxattrlist.cxx index d042fea..abc91b5 100644 --- a/sdext/source/pdfimport/sax/saxattrlist.cxx +++ b/sdext/source/pdfimport/sax/saxattrlist.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -33,10 +34,10 @@ namespace pdfi { -SaxAttrList::SaxAttrList( const std::hash_map< rtl::OUString, rtl::OUString, rtl::OUStringHash >& rMap ) +SaxAttrList::SaxAttrList( const boost::unordered_map< rtl::OUString, rtl::OUString, rtl::OUStringHash >& rMap ) { m_aAttributes.reserve(rMap.size()); - for( std::hash_map< rtl::OUString, + for( boost::unordered_map< rtl::OUString, rtl::OUString, rtl::OUStringHash >::const_iterator it = rMap.begin(); it != rMap.end(); ++it ) @@ -91,7 +92,7 @@ rtl::OUString SAL_CALL SaxAttrList::getValueByIndex( sal_Int16 i_nIndex ) throw( rtl::OUString SAL_CALL SaxAttrList::getValueByName(const ::rtl::OUString& i_rName) throw() { - std::hash_map< rtl::OUString, size_t, rtl::OUStringHash >::const_iterator it = m_aIndexMap.find( i_rName ); + boost::unordered_map< rtl::OUString, size_t, rtl::OUStringHash >::const_iterator it = m_aIndexMap.find( i_rName ); return (it != m_aIndexMap.end()) ? m_aAttributes[it->second].m_aValue : rtl::OUString(); } @@ -102,3 +103,4 @@ com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL Sa } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/pdfimport/sax/saxattrlist.hxx b/sdext/source/pdfimport/sax/saxattrlist.hxx index ee04dc9..b1294a7 100644 --- a/sdext/source/pdfimport/sax/saxattrlist.hxx +++ b/sdext/source/pdfimport/sax/saxattrlist.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -30,7 +31,7 @@ #include <rtl/ustring.hxx> #include <vector> -#include <hash_map> +#include <boost/unordered_map.hpp> #include <cppuhelper/implbase2.hxx> #include <com/sun/star/util/XCloneable.hpp> @@ -52,11 +53,11 @@ namespace pdfi : m_aName( i_rName ), m_aValue( i_rValue ) {} }; std::vector< AttrEntry > m_aAttributes; - std::hash_map< rtl::OUString, size_t, rtl::OUStringHash > m_aIndexMap; + boost::unordered_map< rtl::OUString, size_t, rtl::OUStringHash > m_aIndexMap; public: SaxAttrList() {} - SaxAttrList( const std::hash_map< rtl::OUString, rtl::OUString, rtl::OUStringHash >& ); + SaxAttrList( const boost::unordered_map< rtl::OUString, rtl::OUString, rtl::OUStringHash >& ); SaxAttrList( const SaxAttrList& ); virtual ~SaxAttrList(); @@ -74,3 +75,5 @@ namespace pdfi } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/pdfimport/services.cxx b/sdext/source/pdfimport/services.cxx index 1fabef6..eaedf0b 100644 --- a/sdext/source/pdfimport/services.cxx +++ b/sdext/source/pdfimport/services.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -137,7 +138,7 @@ extern "C" sal_Bool SAL_CALL component_writeInfo( void* /*pServiceManager*/, voi { ::rtl::OUString sMainKeyName( sRootKey ); sMainKeyName += ::rtl::OUString::createFromAscii( pComponents->pAsciiImplementationName ); - sMainKeyName += ::rtl::OUString::createFromAscii( "/UNO/SERVICES" ); + sMainKeyName += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES")); try { @@ -146,7 +147,7 @@ extern "C" sal_Bool SAL_CALL component_writeInfo( void* /*pServiceManager*/, voi } catch( Exception& ) { - OSL_ASSERT( "OModule::writeComponentInfos: something went wrong while creating the keys!" ); + OSL_FAIL( "OModule::writeComponentInfos: something went wrong while creating the keys!" ); return sal_False; } ++pComponents; @@ -186,3 +187,4 @@ extern "C" void* SAL_CALL component_getFactory( return xFactory.get(); } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/pdfimport/test/makefile.mk b/sdext/source/pdfimport/test/makefile.mk index d0b0591..b6f60d5 100755 --- a/sdext/source/pdfimport/test/makefile.mk +++ b/sdext/source/pdfimport/test/makefile.mk @@ -68,7 +68,6 @@ SHL1STDLIBS=\ $(COMPHELPERLIB) \ $(CPPUHELPERLIB) \ $(CPPUNITLIB) \ - $(TESTSHL2LIB) \ $(ZLIB3RDLIB) \ $(CPPULIB) \ $(SALLIB) @@ -102,7 +101,6 @@ APP1STDLIBS=\ $(COMPHELPERLIB) \ $(CPPUHELPERLIB) \ $(CPPUNITLIB) \ - $(TESTSHL2LIB) \ $(ZLIB3RDLIB) \ $(CPPULIB) \ $(SALLIB) @@ -131,7 +129,6 @@ APP2STDLIBS=\ $(COMPHELPERLIB) \ $(CPPUHELPERLIB) \ $(CPPUNITLIB) \ - $(TESTSHL2LIB) \ $(ZLIB3RDLIB) \ $(CPPULIB) \ $(SALLIB) @@ -162,5 +159,3 @@ APP2STDLIBS=\ @echo ---------------------------------------------------------- testshl2 -forward $(BIN)$/ $(SHL1TARGETN) $(TOUCH) $@ - -#ALLTAR : $(MISC)$/pdfi_unittest_succeeded diff --git a/sdext/source/pdfimport/test/outputwrap.hxx b/sdext/source/pdfimport/test/outputwrap.hxx index e247f1f..24eb74d 100644 --- a/sdext/source/pdfimport/test/outputwrap.hxx +++ b/sdext/source/pdfimport/test/outputwrap.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -48,7 +49,7 @@ typedef ::cppu::WeakComponentImplHelper1< explicit OutputWrap( const rtl::OUString& rURL ) : OutputWrapBase(m_aMutex), maFile(rURL) { - maFile.open(osl_File_OpenFlag_Create|OpenFlag_Write); + maFile.open(osl_File_OpenFlag_Create|osl_File_OpenFlag_Write); } virtual void SAL_CALL writeBytes( const com::sun::star::uno::Sequence< ::sal_Int8 >& aData ) throw (com::sun::star::io::NotConnectedException,com::sun::star::io::BufferSizeExceededException, com::sun::star::io::IOException, com::sun::star::uno::RuntimeException) @@ -70,3 +71,5 @@ typedef ::cppu::WeakComponentImplHelper1< } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/pdfimport/test/pdf2xml.cxx b/sdext/source/pdfimport/test/pdf2xml.cxx index abceebc..2bf0ecb 100644 --- a/sdext/source/pdfimport/test/pdf2xml.cxx +++ b/sdext/source/pdfimport/test/pdf2xml.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -103,3 +104,5 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) return 0; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/pdfimport/test/pdfunzip.cxx b/sdext/source/pdfimport/test/pdfunzip.cxx index 9b2fbb7..be5065c 100644 --- a/sdext/source/pdfimport/test/pdfunzip.cxx +++ b/sdext/source/pdfimport/test/pdfunzip.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -38,9 +39,13 @@ #include "pdfparse.hxx" -using namespace rtl; using namespace pdfparse; +using ::rtl::OUString; +using ::rtl::OString; +using ::rtl::OStringBuffer; +using ::rtl::OStringToOUString; + void printHelp( const char* pExe ) { fprintf( stdout, @@ -306,7 +311,7 @@ int write_addStreams( const char* pInFile, const char* pOutFile, PDFFile* pPDFFi if( pTrailer && pTrailer->m_pDict ) { // search for AdditionalStreams entry - std::hash_map<rtl::OString,PDFEntry*,rtl::OStringHash>::iterator add_stream; + boost::unordered_map<rtl::OString,PDFEntry*,rtl::OStringHash>::iterator add_stream; add_stream = pTrailer->m_pDict->m_aMap.find( "AdditionalStreams" ); if( add_stream != pTrailer->m_pDict->m_aMap.end() ) { @@ -333,7 +338,7 @@ int write_fonts( const char* i_pInFile, const char* i_pOutFile, PDFFile* i_pPDFF if( ! pDict ) continue; - std::hash_map<rtl::OString,PDFEntry*,rtl::OStringHash>::iterator map_it = + boost::unordered_map<rtl::OString,PDFEntry*,rtl::OStringHash>::iterator map_it = pDict->m_aMap.find( "Type" ); if( map_it == pDict->m_aMap.end() ) continue; @@ -536,3 +541,4 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS( argc, argv ) return handleFile( pInFile, pOutFile, pPassword, aHdl ); } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/pdfimport/test/testinput.odp b/sdext/source/pdfimport/test/testinput.odp Binary files differindex fe1ac44..fe1ac44 100755..100644 --- a/sdext/source/pdfimport/test/testinput.odp +++ b/sdext/source/pdfimport/test/testinput.odp diff --git a/sdext/source/pdfimport/test/tests.cxx b/sdext/source/pdfimport/test/tests.cxx index b44dda9..9c5c609 100755..100644 --- a/sdext/source/pdfimport/test/tests.cxx +++ b/sdext/source/pdfimport/test/tests.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -68,7 +69,7 @@ #include <basegfx/polygon/b2dpolygonclipper.hxx> #include <vector> -#include <hash_map> +#include <boost/unordered_map.hpp> using namespace ::pdfparse; @@ -108,7 +109,7 @@ namespace rtl::math::approxEqual(m_aHyperlinkBounds.X2,166.7) && rtl::math::approxEqual(m_aHyperlinkBounds.Y2,406.2) ); CPPUNIT_ASSERT_MESSAGE( "Correct hyperlink URI", - m_aURI == ::rtl::OUString::createFromAscii( "http://download.openoffice.org/" ) ); + m_aURI == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("http://download.openoffice.org/")) ); const char* sText = " \n \nThis is a testtext\nNew paragraph,\nnew line\n" "Hyperlink, this is\n?\nThis is more text\noutline mode\n?\nNew paragraph\n"; @@ -368,7 +369,7 @@ namespace virtual void endText() { - m_aTextOut.append( ::rtl::OUString::createFromAscii("\n") ); + m_aTextOut.append( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\n")) ); } virtual void drawMask(const uno::Sequence<beans::PropertyValue>& xBitmap, @@ -444,11 +445,11 @@ namespace { } - typedef std::hash_map<sal_Int32,FontAttributes> IdToFontMap; - typedef std::hash_map<FontAttributes,sal_Int32,FontAttrHash> FontToIdMap; + typedef boost::unordered_map<sal_Int32,FontAttributes> IdToFontMap; + typedef boost::unordered_map<FontAttributes,sal_Int32,FontAttrHash> FontToIdMap; - typedef std::hash_map<sal_Int32,GraphicsContext> IdToGCMap; - typedef std::hash_map<GraphicsContext,sal_Int32,GraphicsContextHash> GCToIdMap; + typedef boost::unordered_map<sal_Int32,GraphicsContext> IdToGCMap; + typedef boost::unordered_map<GraphicsContext,sal_Int32,GraphicsContextHash> GCToIdMap; typedef std::vector<GraphicsContext> GraphicsContextStack; @@ -494,7 +495,7 @@ namespace CPPUNIT_ASSERT_MESSAGE( "Converting ini file to URL", osl_getFileURLFromSystemPath( - (msBaseDir+rtl::OUString::createFromAscii("pdfi_unittest_test.ini")).pData, + (msBaseDir+rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("pdfi_unittest_test.ini"))).pData, &aIniUrl.pData ) == osl_File_E_None ); mxCtx = ::cppu::defaultBootstrap_InitialComponentContext(aIniUrl); @@ -515,7 +516,7 @@ namespace void testXPDFParser() { pdfi::ContentSinkSharedPtr pSink( new TestSink() ); - pdfi::xpdf_ImportFromFile( msBaseDir + rtl::OUString::createFromAscii("pdfi_unittest_test.pdf"), + pdfi::xpdf_ImportFromFile( msBaseDir + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("pdfi_unittest_test.pdf")), pSink, uno::Reference< task::XInteractionHandler >(), rtl::OUString(), @@ -532,12 +533,12 @@ namespace aAdaptor.setTreeVisitorFactory( createDrawTreeVisitorFactory() ); ::rtl::OUString aURL, aAbsURL, aBaseURL; - osl_getFileURLFromSystemPath( (msBaseDir + rtl::OUString::createFromAscii("pdfi_unittest_draw.xml")).pData, + osl_getFileURLFromSystemPath( (msBaseDir + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("pdfi_unittest_draw.xml"))).pData, &aURL.pData ); osl_getProcessWorkingDir(&aBaseURL.pData); osl_getAbsoluteFileURL(aBaseURL.pData,aURL.pData,&aAbsURL.pData); CPPUNIT_ASSERT_MESSAGE("Exporting to ODF", - aAdaptor.odfConvert( msBaseDir + rtl::OUString::createFromAscii("pdfi_unittest_test.pdf"), + aAdaptor.odfConvert( msBaseDir + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("pdfi_unittest_test.pdf")), new OutputWrap(aAbsURL), NULL )); } @@ -548,12 +549,12 @@ namespace aAdaptor.setTreeVisitorFactory( createWriterTreeVisitorFactory() ); ::rtl::OUString aURL, aAbsURL, aBaseURL; - osl_getFileURLFromSystemPath( (msBaseDir + rtl::OUString::createFromAscii("pdfi_unittest_writer.xml")).pData, + osl_getFileURLFromSystemPath( (msBaseDir + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("pdfi_unittest_writer.xml"))).pData, &aURL.pData ); osl_getProcessWorkingDir(&aBaseURL.pData); osl_getAbsoluteFileURL(aBaseURL.pData,aURL.pData,&aAbsURL.pData); CPPUNIT_ASSERT_MESSAGE("Exporting to ODF", - aAdaptor.odfConvert( msBaseDir + rtl::OUString::createFromAscii("pdfi_unittest_test.pdf"), + aAdaptor.odfConvert( msBaseDir + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("pdfi_unittest_test.pdf")), new OutputWrap(aAbsURL), NULL )); } @@ -577,3 +578,5 @@ CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(PDFITest, "PDFITest"); // this macro creates an empty function, which will called by the RegisterAllFunctions() // to let the user the possibility to also register some functions by hand. NOADDITIONAL; + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/pdfimport/tree/drawtreevisiting.cxx b/sdext/source/pdfimport/tree/drawtreevisiting.cxx index 7f4eaf6..cd2e558 100644 --- a/sdext/source/pdfimport/tree/drawtreevisiting.cxx +++ b/sdext/source/pdfimport/tree/drawtreevisiting.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -62,7 +63,7 @@ const ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XBreakIterator > { Reference< XComponentContext > xContext( this->m_rProcessor.m_xContext, uno::UNO_SET_THROW ); Reference< XMultiComponentFactory > xMSF( xContext->getServiceManager(), uno::UNO_SET_THROW ); - Reference < XInterface > xInterface = xMSF->createInstanceWithContext(::rtl::OUString::createFromAscii("com.sun.star.i18n.BreakIterator"), xContext); + Reference < XInterface > xInterface = xMSF->createInstanceWithContext(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.i18n.BreakIterator")), xContext); mxBreakIter = uno::Reference< i18n::XBreakIterator >( xInterface, uno::UNO_QUERY ); } @@ -75,7 +76,7 @@ const ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XBreakIterator > { Reference< XComponentContext > xContext( m_rEmitContext.m_xContext, uno::UNO_SET_THROW ); Reference< XMultiComponentFactory > xMSF( xContext->getServiceManager(), uno::UNO_SET_THROW ); - Reference < XInterface > xInterface = xMSF->createInstanceWithContext(::rtl::OUString::createFromAscii("com.sun.star.i18n.BreakIterator"), xContext); + Reference < XInterface > xInterface = xMSF->createInstanceWithContext(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.i18n.BreakIterator")), xContext); mxBreakIter = uno::Reference< i18n::XBreakIterator >( xInterface, uno::UNO_QUERY ); } return mxBreakIter; @@ -111,7 +112,7 @@ void DrawXmlEmitter::visit( HyperlinkElement& elem, const std::list< Element* >: while( this_it !=elem.Children.end() && *this_it != &elem ) { (*this_it)->visitedBy( *this, this_it ); - this_it++; + ++this_it; } m_rEmitContext.rEmitter.endTag( pType ); } @@ -182,7 +183,7 @@ void DrawXmlEmitter::visit( TextElement& elem, const std::list< Element* >::cons while( this_it !=elem.Children.end() && *this_it != &elem ) { (*this_it)->visitedBy( *this, this_it ); - this_it++; + ++this_it; } m_rEmitContext.rEmitter.endTag( "text:span" ); @@ -204,7 +205,7 @@ void DrawXmlEmitter::visit( ParagraphElement& elem, const std::list< Element* >: while( this_it !=elem.Children.end() && *this_it != &elem ) { (*this_it)->visitedBy( *this, this_it ); - this_it++; + ++this_it; } m_rEmitContext.rEmitter.endTag( pTagType ); @@ -291,7 +292,7 @@ void DrawXmlEmitter::visit( FrameElement& elem, const std::list< Element* >::con while( this_it !=elem.Children.end() && *this_it != &elem ) { (*this_it)->visitedBy( *this, this_it ); - this_it++; + ++this_it; } if( bTextBox ) @@ -392,7 +393,7 @@ void DrawXmlEmitter::visit( PageElement& elem, const std::list< Element* >::cons while( this_it !=elem.Children.end() && *this_it != &elem ) { (*this_it)->visitedBy( *this, this_it ); - this_it++; + ++this_it; } m_rEmitContext.rEmitter.endTag("draw:page"); @@ -408,7 +409,7 @@ void DrawXmlEmitter::visit( DocumentElement& elem, const std::list< Element* >:: while( this_it !=elem.Children.end() && *this_it != &elem ) { (*this_it)->visitedBy( *this, this_it ); - this_it++; + ++this_it; } m_rEmitContext.rEmitter.endTag( m_bWriteDrawDocument ? "office:drawing" : "office:presentation" ); @@ -709,21 +710,14 @@ void DrawXmlOptimizer::optimizeTextElements(Element& rParent) { if( rParent.Children.empty() ) // this should not happen { - OSL_ENSURE( 0, "empty paragraph optimized" ); + OSL_FAIL( "empty paragraph optimized" ); return; } // concatenate child elements with same font id std::list< Element* >::iterator next = rParent.Children.begin(); std::list< Element* >::iterator it = next++; - FrameElement* pFrame = dynamic_cast<FrameElement*>(rParent.Parent); - bool bRotatedFrame = false; - if( pFrame ) - { - const GraphicsContext& rFrameGC = m_rProcessor.getGraphicsContext( pFrame->GCId ); - if( rFrameGC.isRotatedOrSkewed() ) - bRotatedFrame = true; - } + while( next != rParent.Children.end() ) { bool bConcat = false; @@ -936,26 +930,6 @@ void DrawXmlFinalizer::visit( ParagraphElement& elem, const std::list< Element* elem.StyleId = m_rStyleContainer.getStyleId( aStyle ); - // update page boundaries - if( elem.Parent ) - { - // check for center alignement - // criterion: paragraph is small relative to parent and distributed around its center - double p_x = elem.Parent->x; - double p_y = elem.Parent->y; - double p_w = elem.Parent->w; - double p_h = elem.Parent->h; - - PageElement* pPage = dynamic_cast<PageElement*>(elem.Parent); - if( pPage ) - { - p_x += pPage->LeftMargin; - p_y += pPage->TopMargin; - p_w -= pPage->LeftMargin+pPage->RightMargin; - p_h -= pPage->TopMargin+pPage->BottomMargin; - } - } - elem.applyToChildren(*this); } @@ -1109,3 +1083,5 @@ void DrawXmlFinalizer::visit( DocumentElement& elem, const std::list< Element* > } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/pdfimport/tree/drawtreevisiting.hxx b/sdext/source/pdfimport/tree/drawtreevisiting.hxx index fc190d7..fd485c7 100644 --- a/sdext/source/pdfimport/tree/drawtreevisiting.hxx +++ b/sdext/source/pdfimport/tree/drawtreevisiting.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -127,3 +128,5 @@ namespace pdfi } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/pdfimport/tree/genericelements.cxx b/sdext/source/pdfimport/tree/genericelements.cxx index 26026f4..d8696dd 100644 --- a/sdext/source/pdfimport/tree/genericelements.cxx +++ b/sdext/source/pdfimport/tree/genericelements.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -163,6 +164,10 @@ void PolyPolyElement::updateGeometry() y = aRange.getMinY(); w = aRange.getWidth(); h = aRange.getHeight(); + + // fdo#32330 - non-closed paths will not show up filled in LibO + if( Action & (PATH_FILL | PATH_EOFILL) ) + PolyPoly.setClosed(true); } void PolyPolyElement::visitedBy( ElementTreeVisitor& rVisitor, @@ -487,3 +492,5 @@ void DocumentElement::visitedBy( ElementTreeVisitor& rV } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/pdfimport/tree/genericelements.hxx b/sdext/source/pdfimport/tree/genericelements.hxx index e7ba942..158f251 100644 --- a/sdext/source/pdfimport/tree/genericelements.hxx +++ b/sdext/source/pdfimport/tree/genericelements.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -321,3 +322,5 @@ namespace pdfi } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/pdfimport/tree/imagecontainer.cxx b/sdext/source/pdfimport/tree/imagecontainer.cxx index 20d4b76..39312cd 100644 --- a/sdext/source/pdfimport/tree/imagecontainer.cxx +++ b/sdext/source/pdfimport/tree/imagecontainer.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -139,15 +140,17 @@ void ImageContainer::writeBase64EncodedStream( ImageId nId, EmitContext& rContex std::find_if(pAry,pAry+nLen, boost::bind(comphelper::TPropertyValueEqualFunctor(), _1, - rtl::OUString::createFromAscii("InputSequence")))); + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("InputSequence"))))); OSL_ENSURE( pValue != pAry+nLen, "InputSequence not found" ); uno::Sequence<sal_Int8> aData; if( !(pValue->Value >>= aData) ) - OSL_ENSURE(false,"Wrong data type"); + OSL_FAIL("Wrong data type"); rContext.rEmitter.write( encodeBase64( aData.getConstArray(), aData.getLength() )); } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/pdfimport/tree/imagecontainer.hxx b/sdext/source/pdfimport/tree/imagecontainer.hxx index ff97232..1efb75b 100644 --- a/sdext/source/pdfimport/tree/imagecontainer.hxx +++ b/sdext/source/pdfimport/tree/imagecontainer.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -36,7 +37,7 @@ #include <com/sun/star/awt/XBitmap.hpp> #include <vector> -#include <hash_map> +#include <boost/unordered_map.hpp> namespace pdfi { @@ -59,3 +60,4 @@ namespace pdfi #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/pdfimport/tree/pdfiprocessor.cxx b/sdext/source/pdfimport/tree/pdfiprocessor.cxx index 6c2e410..806f24a 100644 --- a/sdext/source/pdfimport/tree/pdfiprocessor.cxx +++ b/sdext/source/pdfimport/tree/pdfiprocessor.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -1458,3 +1459,5 @@ void PDFIProcessor::prepareMirrorMap() } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/pdfimport/tree/pdfiprocessor.hxx b/sdext/source/pdfimport/tree/pdfiprocessor.hxx index 37865a0..61c8d40 100644 --- a/sdext/source/pdfimport/tree/pdfiprocessor.hxx +++ b/sdext/source/pdfimport/tree/pdfiprocessor.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -47,7 +48,7 @@ #include <boost/shared_ptr.hpp> #include <list> -#include <hash_map> +#include <boost/unordered_map.hpp> #include "imagecontainer.hxx" #include "pdfihelper.hxx" @@ -206,11 +207,11 @@ namespace pdfi void setupImage(ImageId nImage); - typedef std::hash_map<sal_Int32,FontAttributes> IdToFontMap; - typedef std::hash_map<FontAttributes,sal_Int32,FontAttrHash> FontToIdMap; + typedef boost::unordered_map<sal_Int32,FontAttributes> IdToFontMap; + typedef boost::unordered_map<FontAttributes,sal_Int32,FontAttrHash> FontToIdMap; - typedef std::hash_map<sal_Int32,GraphicsContext> IdToGCMap; - typedef std::hash_map<GraphicsContext,sal_Int32,GraphicsContextHash> GCToIdMap; + typedef boost::unordered_map<sal_Int32,GraphicsContext> IdToGCMap; + typedef boost::unordered_map<GraphicsContext,sal_Int32,GraphicsContextHash> GCToIdMap; typedef std::vector<GraphicsContext> GraphicsContextStack; @@ -269,15 +270,17 @@ namespace pdfi void setGraphicsContext (GraphicsContext& rCurrentContext ){ m_rCurrentContext= rCurrentContext; } void setCurElement( Element* pCurElement ){ m_pCurElement= pCurElement; } - double getYPrevGlyphPosition(){ return m_fYPrevGlyphPosition; } - double getXPrevGlyphPosition(){ return m_fXPrevGlyphPosition; } - double getPrevGlyphHeight(){ return m_fPrevGlyphHeight; } - double getPrevGlyphWidth (){ return m_fPrevGlyphWidth; } - double getPrevGlyphsSpace() { if( (m_rRect.X1-m_fXPrevGlyphPosition)<0 ) - return 0; - else - return m_rRect.X1-m_fXPrevGlyphPosition; - } + double getYPrevGlyphPosition() const { return m_fYPrevGlyphPosition; } + double getXPrevGlyphPosition() const { return m_fXPrevGlyphPosition; } + double getPrevGlyphHeight() const { return m_fPrevGlyphHeight; } + double getPrevGlyphWidth () const { return m_fPrevGlyphWidth; } + double getPrevGlyphsSpace() const + { + if( (m_rRect.X1-m_fXPrevGlyphPosition)<0 ) + return 0; + else + return m_rRect.X1-m_fXPrevGlyphPosition; + } void setYPrevGlyphPosition( double fYPrevTextPosition ){ m_fYPrevGlyphPosition= fYPrevTextPosition; } void setXPrevGlyphPosition( double fXPrevTextPosition ){ m_fXPrevGlyphPosition= fXPrevTextPosition; } @@ -301,3 +304,5 @@ namespace pdfi #define USTR(x) rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( x ) ) #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/pdfimport/tree/style.cxx b/sdext/source/pdfimport/tree/style.cxx index 14d2543..f6c294b 100644 --- a/sdext/source/pdfimport/tree/style.cxx +++ b/sdext/source/pdfimport/tree/style.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -36,9 +37,11 @@ #include <algorithm> -using namespace rtl; using namespace pdfi; +using ::rtl::OUString; +using ::rtl::OUStringBuffer; + #define USTR(x) rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( x ) ) StyleContainer::StyleContainer() : @@ -59,7 +62,7 @@ sal_Int32 StyleContainer::impl_getStyleId( const Style& rStyle, bool bSubStyle ) for( unsigned int n = 0; n < rStyle.SubStyles.size(); ++n ) aSearchStyle.SubStyles.push_back( impl_getStyleId( *rStyle.SubStyles[n], true ) ); - std::hash_map< HashedStyle, sal_Int32, StyleHash >::iterator it = + boost::unordered_map< HashedStyle, sal_Int32, StyleHash >::iterator it = m_aStyleToId.find( aSearchStyle ); if( it != m_aStyleToId.end() ) @@ -97,7 +100,7 @@ sal_Int32 StyleContainer::getStandardStyleId( const rtl::OString& rName ) const PropertyMap* StyleContainer::getProperties( sal_Int32 nStyleId ) const { - std::hash_map< sal_Int32, HashedStyle >::const_iterator it = + boost::unordered_map< sal_Int32, HashedStyle >::const_iterator it = m_aIdToStyle.find( nStyleId ); return it != m_aIdToStyle.end() ? &(it->second.Properties) : NULL; } @@ -105,7 +108,7 @@ const PropertyMap* StyleContainer::getProperties( sal_Int32 nStyleId ) const sal_Int32 StyleContainer::setProperties( sal_Int32 nStyleId, const PropertyMap& rNewProps ) { sal_Int32 nRet = -1; - std::hash_map< sal_Int32, HashedStyle >::iterator it = + boost::unordered_map< sal_Int32, HashedStyle >::iterator it = m_aIdToStyle.find( nStyleId ); if( it != m_aIdToStyle.end() ) { @@ -133,7 +136,7 @@ sal_Int32 StyleContainer::setProperties( sal_Int32 nStyleId, const PropertyMap& aSearchStyle.IsSubStyle = it->second.IsSubStyle; // find out whether this new style already exists - std::hash_map< HashedStyle, sal_Int32, StyleHash >::iterator new_it = + boost::unordered_map< HashedStyle, sal_Int32, StyleHash >::iterator new_it = m_aStyleToId.find( aSearchStyle ); if( new_it != m_aStyleToId.end() ) { @@ -159,7 +162,7 @@ OUString StyleContainer::getStyleName( sal_Int32 nStyle ) const { OUStringBuffer aRet( 64 ); - std::hash_map< sal_Int32, HashedStyle >::const_iterator style_it = + boost::unordered_map< sal_Int32, HashedStyle >::const_iterator style_it = m_aIdToStyle.find( nStyle ); if( style_it != m_aIdToStyle.end() ) { @@ -196,7 +199,7 @@ void StyleContainer::impl_emitStyle( sal_Int32 nStyleId, EmitContext& rContext, ElementTreeVisitor& rContainedElemVisitor ) { - std::hash_map< sal_Int32, HashedStyle >::const_iterator it = m_aIdToStyle.find( nStyleId ); + boost::unordered_map< sal_Int32, HashedStyle >::const_iterator it = m_aIdToStyle.find( nStyleId ); if( it != m_aIdToStyle.end() ) { const HashedStyle& rStyle = it->second; @@ -207,7 +210,7 @@ void StyleContainer::impl_emitStyle( sal_Int32 nStyleId, for( unsigned int n = 0; n < rStyle.SubStyles.size(); ++n ) impl_emitStyle( rStyle.SubStyles[n], rContext, rContainedElemVisitor ); - if( rStyle.Contents ) + if( rStyle.Contents.getLength() ) rContext.rEmitter.write( rStyle.Contents ); if( rStyle.ContainedElement ) rStyle.ContainedElement->visitedBy( rContainedElemVisitor, @@ -220,14 +223,14 @@ void StyleContainer::emit( EmitContext& rContext, ElementTreeVisitor& rContainedElemVisitor ) { std::vector< sal_Int32 > aMasterPageSection, aAutomaticStyleSection, aOfficeStyleSection; - for( std::hash_map< sal_Int32, HashedStyle >::iterator it = m_aIdToStyle.begin(); + for( boost::unordered_map< sal_Int32, HashedStyle >::iterator it = m_aIdToStyle.begin(); it != m_aIdToStyle.end(); ++it ) { if( ! it->second.IsSubStyle ) { if( it->second.Name.equals( "style:master-page" ) ) aMasterPageSection.push_back( it->first ); - else if( getStyleName( it->first ).equalsAscii( "standard" ) ) + else if( getStyleName( it->first ).equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "standard" ) ) ) aOfficeStyleSection.push_back( it->first ); else aAutomaticStyleSection.push_back( it->first ); @@ -255,3 +258,5 @@ void StyleContainer::emit( EmitContext& rContext, impl_emitStyle( aMasterPageSection[n], rContext, rContainedElemVisitor ); rContext.rEmitter.endTag( "office:master-styles" ); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/pdfimport/tree/style.hxx b/sdext/source/pdfimport/tree/style.hxx index 3c8eaf9..8c89e31 100644 --- a/sdext/source/pdfimport/tree/style.hxx +++ b/sdext/source/pdfimport/tree/style.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -29,7 +30,7 @@ #define INCLUDED_PDFI_STYLE_HXX #include "pdfihelper.hxx" -#include <hash_map> +#include <boost/unordered_map.hpp> #include <vector> #include <rtl/ustring.hxx> #include <rtl/string.hxx> @@ -132,16 +133,16 @@ namespace pdfi friend struct StyleIdNameSort; struct StyleIdNameSort { - const std::hash_map< sal_Int32, HashedStyle >* m_pMap; + const boost::unordered_map< sal_Int32, HashedStyle >* m_pMap; - StyleIdNameSort( const std::hash_map< sal_Int32, HashedStyle >* pMap ) : + StyleIdNameSort( const boost::unordered_map< sal_Int32, HashedStyle >* pMap ) : m_pMap(pMap) {} bool operator()( sal_Int32 nLeft, sal_Int32 nRight ) { - const std::hash_map< sal_Int32, HashedStyle >::const_iterator left_it = + const boost::unordered_map< sal_Int32, HashedStyle >::const_iterator left_it = m_pMap->find( nLeft ); - const std::hash_map< sal_Int32, HashedStyle >::const_iterator right_it = + const boost::unordered_map< sal_Int32, HashedStyle >::const_iterator right_it = m_pMap->find( nRight ); if( left_it == m_pMap->end() ) return false; @@ -153,8 +154,8 @@ namespace pdfi }; sal_Int32 m_nNextId; - std::hash_map< sal_Int32, HashedStyle > m_aIdToStyle; - std::hash_map< HashedStyle, sal_Int32, StyleHash > m_aStyleToId; + boost::unordered_map< sal_Int32, HashedStyle > m_aIdToStyle; + boost::unordered_map< HashedStyle, sal_Int32, StyleHash > m_aStyleToId; void impl_emitStyle( sal_Int32 nStyleId, EmitContext& rContext, @@ -179,3 +180,5 @@ namespace pdfi } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/pdfimport/tree/treevisiting.hxx b/sdext/source/pdfimport/tree/treevisiting.hxx index 07480c4..8bd4926 100644 --- a/sdext/source/pdfimport/tree/treevisiting.hxx +++ b/sdext/source/pdfimport/tree/treevisiting.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -78,3 +79,5 @@ namespace pdfi } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/pdfimport/tree/treevisitorfactory.cxx b/sdext/source/pdfimport/tree/treevisitorfactory.cxx index 9ba05b8..6608316 100644 --- a/sdext/source/pdfimport/tree/treevisitorfactory.cxx +++ b/sdext/source/pdfimport/tree/treevisitorfactory.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -120,3 +121,4 @@ namespace pdfi } } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/pdfimport/tree/writertreevisiting.cxx b/sdext/source/pdfimport/tree/writertreevisiting.cxx index 9599bad..cb80dd2 100644 --- a/sdext/source/pdfimport/tree/writertreevisiting.cxx +++ b/sdext/source/pdfimport/tree/writertreevisiting.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -61,7 +62,7 @@ void WriterXmlEmitter::visit( HyperlinkElement& elem, const std::list< Element* while( this_it !=elem.Children.end() && *this_it != &elem ) { (*this_it)->visitedBy( *this, this_it ); - this_it++; + ++this_it; } m_rEmitContext.rEmitter.endTag( pType ); } @@ -84,7 +85,7 @@ void WriterXmlEmitter::visit( TextElement& elem, const std::list< Element* >::co while( this_it !=elem.Children.end() && *this_it != &elem ) { (*this_it)->visitedBy( *this, this_it ); - this_it++; + ++this_it; } m_rEmitContext.rEmitter.endTag( "text:span" ); @@ -106,7 +107,7 @@ void WriterXmlEmitter::visit( ParagraphElement& elem, const std::list< Element* while( this_it !=elem.Children.end() && *this_it != &elem ) { (*this_it)->visitedBy( *this, this_it ); - this_it++; + ++this_it; } m_rEmitContext.rEmitter.endTag( pTagType ); @@ -217,7 +218,7 @@ void WriterXmlEmitter::visit( FrameElement& elem, const std::list< Element* >::c while( this_it !=elem.Children.end() && *this_it != &elem ) { (*this_it)->visitedBy( *this, this_it ); - this_it++; + ++this_it; } if( bTextBox ) @@ -310,7 +311,7 @@ void WriterXmlEmitter::visit( PageElement& elem, const std::list< Element* >::co while( this_it !=elem.Children.end() && *this_it != &elem ) { (*this_it)->visitedBy( *this, this_it ); - this_it++; + ++this_it; } } @@ -728,7 +729,7 @@ void WriterXmlOptimizer::optimizeTextElements(Element& rParent) { if( rParent.Children.empty() ) // this should not happen { - OSL_ENSURE( 0, "empty paragraph optimized" ); + OSL_FAIL( "empty paragraph optimized" ); return; } @@ -1216,3 +1217,5 @@ void WriterXmlFinalizer::visit( DocumentElement& elem, const std::list< Element* } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/pdfimport/tree/writertreevisiting.hxx b/sdext/source/pdfimport/tree/writertreevisiting.hxx index 69523af..2c9e875 100644 --- a/sdext/source/pdfimport/tree/writertreevisiting.hxx +++ b/sdext/source/pdfimport/tree/writertreevisiting.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -114,3 +115,5 @@ namespace pdfi } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/pdfimport/wrapper/hash.cxx b/sdext/source/pdfimport/wrapper/hash.cxx deleted file mode 100755 index 5508ef1..0000000 --- a/sdext/source/pdfimport/wrapper/hash.cxx +++ /dev/null @@ -1,214 +0,0 @@ -/* C++ code produced by gperf version 3.0.1 */ -/* Command-line: gperf -C -t -l -L C++ -m 20 -Z PdfKeywordHash keyword_list */ -/* Computed positions: -k'4-5,$' */ - -#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \ - && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \ - && (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) \ - && ('-' == 45) && ('.' == 46) && ('/' == 47) && ('0' == 48) \ - && ('1' == 49) && ('2' == 50) && ('3' == 51) && ('4' == 52) \ - && ('5' == 53) && ('6' == 54) && ('7' == 55) && ('8' == 56) \ - && ('9' == 57) && (':' == 58) && (';' == 59) && ('<' == 60) \ - && ('=' == 61) && ('>' == 62) && ('?' == 63) && ('A' == 65) \ - && ('B' == 66) && ('C' == 67) && ('D' == 68) && ('E' == 69) \ - && ('F' == 70) && ('G' == 71) && ('H' == 72) && ('I' == 73) \ - && ('J' == 74) && ('K' == 75) && ('L' == 76) && ('M' == 77) \ - && ('N' == 78) && ('O' == 79) && ('P' == 80) && ('Q' == 81) \ - && ('R' == 82) && ('S' == 83) && ('T' == 84) && ('U' == 85) \ - && ('V' == 86) && ('W' == 87) && ('X' == 88) && ('Y' == 89) \ - && ('Z' == 90) && ('[' == 91) && ('\\' == 92) && (']' == 93) \ - && ('^' == 94) && ('_' == 95) && ('a' == 97) && ('b' == 98) \ - && ('c' == 99) && ('d' == 100) && ('e' == 101) && ('f' == 102) \ - && ('g' == 103) && ('h' == 104) && ('i' == 105) && ('j' == 106) \ - && ('k' == 107) && ('l' == 108) && ('m' == 109) && ('n' == 110) \ - && ('o' == 111) && ('p' == 112) && ('q' == 113) && ('r' == 114) \ - && ('s' == 115) && ('t' == 116) && ('u' == 117) && ('v' == 118) \ - && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \ - && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126)) -/* The character set is not based on ISO-646. */ -#error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>." -#endif - -#line 1 "keyword_list" -struct hash_entry { const char* name; enum parseKey eKey; }; - -#if defined __GNUC__ -#pragma GCC system_header -#endif - -#define TOTAL_KEYWORDS 46 -#define MIN_WORD_LENGTH 7 -#define MAX_WORD_LENGTH 19 -#define MIN_HASH_VALUE 8 -#define MAX_HASH_VALUE 68 -/* maximum key range = 61, duplicates = 0 */ - -class PdfKeywordHash -{ -private: - static inline unsigned int hash (const char *str, unsigned int len); -public: - static const struct hash_entry *in_word_set (const char *str, unsigned int len); -}; - -inline unsigned int -PdfKeywordHash::hash (register const char *str, register unsigned int len) -{ - static const unsigned char asso_values[] = - { - 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, - 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, - 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, - 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, - 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, - 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, - 69, 69, 69, 69, 69, 69, 9, 69, 38, 69, - 1, 69, 69, 69, 31, 69, 16, 35, 21, 69, - 15, 0, 69, 21, 15, 69, 69, 69, 69, 69, - 69, 69, 69, 69, 69, 69, 69, 0, 15, 69, - 69, 5, 8, 69, 4, 8, 0, 20, 2, 27, - 11, 31, 0, 69, 0, 9, 0, 5, 69, 5, - 69, 13, 69, 69, 69, 69, 69, 69, 69, 69, - 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, - 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, - 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, - 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, - 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, - 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, - 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, - 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, - 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, - 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, - 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, - 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, - 69, 69, 69, 69, 69, 69, 69 - }; - return len + asso_values[(unsigned char)str[4]+1] + asso_values[(unsigned char)str[3]] + asso_values[(unsigned char)str[len - 1]]; -} - -const struct hash_entry * -PdfKeywordHash::in_word_set (register const char *str, register unsigned int len) -{ - static const unsigned char lengthtable[] = - { - 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 8, 12, - 8, 10, 10, 12, 13, 9, 15, 16, 17, 14, 15, 15, 10, 13, - 14, 15, 14, 11, 12, 9, 9, 17, 13, 19, 11, 8, 14, 9, - 7, 9, 19, 17, 15, 10, 13, 10, 9, 8, 17, 12, 8, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 8 - }; - static const struct hash_entry wordlist[] = - { - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, -#line 29 "keyword_list" - {"setFont",SETFONT}, - {""}, {""}, {""}, -#line 8 "keyword_list" - {"clipPath",CLIPPATH}, -#line 28 "keyword_list" - {"setFillColor",SETFILLCOLOR}, -#line 19 "keyword_list" - {"fillPath",FILLPATH}, -#line 46 "keyword_list" - {"updateFont",UPDATEFONT}, -#line 17 "keyword_list" - {"eoClipPath",EOCLIPPATH}, -#line 25 "keyword_list" - {"restoreState",RESTORESTATE}, -#line 47 "keyword_list" - {"updateLineCap",UPDATELINECAP}, -#line 39 "keyword_list" - {"startPage",STARTPAGE}, -#line 43 "keyword_list" - {"updateFillColor",UPDATEFILLCOLOR}, -#line 51 "keyword_list" - {"updateMiterLimit",UPDATEMITERLIMIT}, -#line 52 "keyword_list" - {"updateStrokeColor",UPDATESTROKECOLOR}, -#line 48 "keyword_list" - {"updateLineDash",UPDATELINEDASH}, -#line 50 "keyword_list" - {"updateLineWidth",UPDATELINEWIDTH}, -#line 41 "keyword_list" - {"updateBlendMode",UPDATEBLENDMODE}, -#line 30 "keyword_list" - {"setLineCap",SETLINECAP}, -#line 21 "keyword_list" - {"intersectClip",INTERSECTCLIP}, -#line 45 "keyword_list" - {"updateFlatness",UPDATEFLATNESS}, -#line 22 "keyword_list" - {"intersectEoClip",INTERSECTEOCLIP}, -#line 49 "keyword_list" - {"updateLineJoin",UPDATELINEJOIN}, -#line 31 "keyword_list" - {"setLineDash",SETLINEDASH}, -#line 33 "keyword_list" - {"setLineWidth",SETLINEWIDTH}, -#line 24 "keyword_list" - {"pushState",PUSHSTATE}, -#line 26 "keyword_list" - {"saveState",SAVESTATE}, -#line 44 "keyword_list" - {"updateFillOpacity",UPDATEFILLOPACITY}, -#line 16 "keyword_list" - {"endTextObject",ENDTEXTOBJECT}, -#line 53 "keyword_list" - {"updateStrokeOpacity",UPDATESTROKEOPACITY}, -#line 32 "keyword_list" - {"setLineJoin",SETLINEJOIN}, -#line 23 "keyword_list" - {"popState",POPSTATE}, -#line 36 "keyword_list" - {"setStrokeColor",SETSTROKECOLOR}, -#line 42 "keyword_list" - {"updateCtm",UPDATECTM}, -#line 15 "keyword_list" - {"endPage",ENDPAGE}, -#line 20 "keyword_list" - {"hyperLink",HYPERLINK}, -#line 14 "keyword_list" - {"drawSoftMaskedImage",DRAWSOFTMASKEDIMAGE}, -#line 37 "keyword_list" - {"setTextRenderMode",SETTEXTRENDERMODE}, -#line 13 "keyword_list" - {"drawMaskedImage",DRAWMASKEDIMAGE}, -#line 40 "keyword_list" - {"strokePath",STROKEPATH}, -#line 34 "keyword_list" - {"setMiterLimit",SETMITERLIMIT}, -#line 18 "keyword_list" - {"eoFillPath",EOFILLPATH}, -#line 10 "keyword_list" - {"drawImage",DRAWIMAGE}, -#line 9 "keyword_list" - {"drawChar",DRAWCHAR}, -#line 38 "keyword_list" - {"setTransformation",SETTRANSFORMATION}, -#line 27 "keyword_list" - {"setBlendMode",SETBLENDMODE}, -#line 12 "keyword_list" - {"drawMask",DRAWMASK}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, -#line 35 "keyword_list" - {"setPageNum",SETPAGENUM}, -#line 11 "keyword_list" - {"drawLink",DRAWLINK } - }; - - if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH) - { - register int key = hash (str, len); - - if (key <= MAX_HASH_VALUE && key >= 0) - if (len == lengthtable[key]) - { - register const char *s = wordlist[key].name; - - if (*str == *s && !memcmp (str + 1, s + 1, len - 1)) - return &wordlist[key]; - } - } - return 0; -} diff --git a/sdext/source/pdfimport/wrapper/makefile.mk b/sdext/source/pdfimport/wrapper/makefile.mk index 743633c..b2fbdfa 100755 --- a/sdext/source/pdfimport/wrapper/makefile.mk +++ b/sdext/source/pdfimport/wrapper/makefile.mk @@ -51,3 +51,9 @@ SLOFILES=\ .ENDIF .INCLUDE : target.mk + +$(SLO)$/wrapper.obj: $(INCCOM)$/hash.cxx + +$(INCCOM)$/hash.cxx: keyword_list + $(GPERF) -C -t -l -L C++ -m 20 -Z PdfKeywordHash -k'4-5,$$' keyword_list > $@ + diff --git a/sdext/source/pdfimport/wrapper/wrapper.cxx b/sdext/source/pdfimport/wrapper/wrapper.cxx index 4445f22..3c48fbb 100755..100644 --- a/sdext/source/pdfimport/wrapper/wrapper.cxx +++ b/sdext/source/pdfimport/wrapper/wrapper.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -68,7 +69,7 @@ #include <boost/scoped_ptr.hpp> #include <boost/scoped_array.hpp> -#include <hash_map> +#include <boost/unordered_map.hpp> #include <string.h> #ifdef WNT #include <stdlib.h> @@ -147,7 +148,7 @@ enum parseKey { class Parser { - typedef std::hash_map< sal_Int64, + typedef boost::unordered_map< sal_Int64, FontAttributes > FontMapType; const uno::Reference<uno::XComponentContext> m_xContext; @@ -681,15 +682,15 @@ uno::Sequence<beans::PropertyValue> Parser::readImageImpl() aStreamCreationArgs, m_xContext ), uno::UNO_QUERY_THROW ); uno::Sequence<beans::PropertyValue> aSequence(3); - aSequence[0] = beans::PropertyValue( ::rtl::OUString::createFromAscii("URL"), + aSequence[0] = beans::PropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("URL")), 0, uno::makeAny(aFileName), beans::PropertyState_DIRECT_VALUE ); - aSequence[1] = beans::PropertyValue( ::rtl::OUString::createFromAscii("InputStream"), + aSequence[1] = beans::PropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("InputStream")), 0, uno::makeAny( xDataStream ), beans::PropertyState_DIRECT_VALUE ); - aSequence[2] = beans::PropertyValue( ::rtl::OUString::createFromAscii("InputSequence"), + aSequence[2] = beans::PropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("InputSequence")), 0, uno::makeAny(aDataSequence), beans::PropertyState_DIRECT_VALUE ); @@ -1002,19 +1003,19 @@ bool xpdf_ImportFromFile( const ::rtl::OUString& rUR if( checkEncryption( aSysUPath, xIHdl, aPwd, bIsEncrypted, aDocName ) == false ) return false; - rtl::OUStringBuffer converterURL = rtl::OUString::createFromAscii("xpdfimport"); + rtl::OUStringBuffer converterURL = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("xpdfimport")); // retrieve package location url (xpdfimport executable is located there) // --------------------------------------------------- uno::Reference<deployment::XPackageInformationProvider> xProvider( xContext->getValueByName( - rtl::OUString::createFromAscii("/singletons/com.sun.star.deployment.PackageInformationProvider" )), + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/singletons/com.sun.star.deployment.PackageInformationProvider"))), uno::UNO_QUERY); if( xProvider.is() ) { converterURL.insert( 0, - rtl::OUString::createFromAscii("/")); + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"))); converterURL.insert( 0, xProvider->getPackageLocation( @@ -1147,8 +1148,13 @@ bool xpdf_ImportFromStream( const uno::Reference< io::XInputStream >& xI osl_closeFile( aFile ); - return bSuccess && xpdf_ImportFromFile( aURL, rSink, xIHdl, rPwd, xContext ); + if ( bSuccess ) + bSuccess = xpdf_ImportFromFile( aURL, rSink, xIHdl, rPwd, xContext ); + osl_removeFile( aURL.pData ); + + return bSuccess; } } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/pdfimport/xpdftest/makefile.mk b/sdext/source/pdfimport/xpdftest/makefile.mk index 9ebd916..23cc79b 100644 --- a/sdext/source/pdfimport/xpdftest/makefile.mk +++ b/sdext/source/pdfimport/xpdftest/makefile.mk @@ -44,8 +44,6 @@ ENABLE_EXCEPTIONS=TRUE .INCLUDE : target.mk -#ALLTAR : $(MISC)$/test_0_succeeded $(MISC)$/test_1_succeeded - $(MISC)$/test_0_succeeded: $(BIN)$/xpdfimport$(EXECPOST) binary_0_out.def text_0_out.def testinput.pdf $(BIN)$/xpdfimport -f $(MISC)$/binary_0_out testinput.pdf > $(MISC)$/text_0_out diff --strip-trailing-cr $(MISC)$/binary_0_out binary_0_out.def diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx index 3d6020a..f7741b4 100644 --- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx +++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * OpenOffice.org - a multi-platform office productivity suite @@ -657,7 +658,7 @@ void PDFOutDev::updateFont(GfxState *state) Ref* pID = gfxFont->getID(); // TODO(Q3): Portability problem long long fontID = (long long)pID->gen << 32 | (long long)pID->num; - std::hash_map< long long, FontAttributes >::const_iterator it = + boost::unordered_map< long long, FontAttributes >::const_iterator it = m_aFontMap.find( fontID ); if( it == m_aFontMap.end() ) { @@ -904,16 +905,6 @@ void PDFOutDev::drawMaskedImage(GfxState*, Object*, Stream* str, printf( "drawImage %d %d 0", width, height ); writePng_( aBuf, str, width, height, colorMap, maskStr, maskWidth, maskHeight, maskInvert, true ); writeBinaryBuffer( aBuf ); - #if 0 - OutputBuffer aBuf; initBuf(aBuf); - OutputBuffer aMaskBuf; initBuf(aMaskBuf); - - printf( "drawMaskedImage %d %d %d %d %d", width, height, maskWidth, maskHeight, 0 /*maskInvert note: currently we do inversion here*/ ); - writeImage( aBuf, str, width, height, colorMap ); - writeMaskLF( aMaskBuf, maskStr, width, height, maskInvert ); - writeBinaryBuffer(aBuf); - writeBinaryBuffer(aMaskBuf); - #endif } void PDFOutDev::drawSoftMaskedImage(GfxState*, Object*, Stream* str, @@ -927,16 +918,6 @@ void PDFOutDev::drawSoftMaskedImage(GfxState*, Object*, Stream* str, printf( "drawImage %d %d 0", width, height ); writePng_( aBuf, str, width, height, colorMap, maskStr, maskWidth, maskHeight, maskColorMap, true ); writeBinaryBuffer( aBuf ); - #if 0 - OutputBuffer aBuf; initBuf(aBuf); - OutputBuffer aMaskBuf; initBuf(aMaskBuf); - - printf( "drawSoftMaskedImage %d %d %d %d", width, height, maskWidth, maskHeight ); - writeImage( aBuf, str, width, height, colorMap ); - writeImageLF( aMaskBuf, maskStr, maskWidth, maskHeight, maskColorMap ); - writeBinaryBuffer(aBuf); - writeBinaryBuffer(aMaskBuf); - #endif } void PDFOutDev::setPageNum( int nNumPages ) @@ -946,3 +927,5 @@ void PDFOutDev::setPageNum( int nNumPages ) } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx index 2bbfc03..3ac0f49 100644 --- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx +++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * OpenOffice.org - a multi-platform office productivity suite @@ -57,7 +58,7 @@ #pragma warning(pop) #endif -#include <hash_map> +#include <boost/unordered_map.hpp> #include <vector> class GfxPath; @@ -146,7 +147,7 @@ namespace pdfi { // not owned by this class PDFDoc* m_pDoc; - mutable std::hash_map< long long, + mutable boost::unordered_map< long long, FontAttributes > m_aFontMap; UnicodeMap* m_pUtf8Map; @@ -288,3 +289,4 @@ typedef std::vector< Output_t > OutputBuffer; #endif /* INCLUDED_PDFI_OUTDEV_HXX */ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx b/sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx index b61d80e..6029e33 100644 --- a/sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx +++ b/sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * OpenOffice.org - a multi-platform office productivity suite @@ -29,6 +30,7 @@ ************************************************************************/ #include "pnghelper.hxx" +#include <sal/macros.h> #ifdef SYSTEM_ZLIB #include "zlib.h" @@ -130,9 +132,9 @@ sal_uInt32 PngHelper::deflateBuffer( const Output_t* i_pBuf, size_t i_nLen, Outp void PngHelper::appendFileHeader( OutputBuffer& o_rOutputBuf ) { - static const Output_t aHeader[] = { 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a }; + static const unsigned char aHeader[] = { 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a }; - o_rOutputBuf.insert( o_rOutputBuf.end(), aHeader, aHeader + sizeof(aHeader)/sizeof(aHeader[0]) ); + o_rOutputBuf.insert( o_rOutputBuf.end(), aHeader, aHeader + SAL_N_ELEMENTS(aHeader) ); } size_t PngHelper::startChunk( const char* pChunkName, OutputBuffer& o_rOutputBuf ) @@ -414,3 +416,4 @@ void PngHelper::createPng( OutputBuffer& o_rOutputBuf, appendIEND( o_rOutputBuf ); } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/pdfimport/xpdfwrapper/pnghelper.hxx b/sdext/source/pdfimport/xpdfwrapper/pnghelper.hxx index 451dcf8..07b70ed 100644 --- a/sdext/source/pdfimport/xpdfwrapper/pnghelper.hxx +++ b/sdext/source/pdfimport/xpdfwrapper/pnghelper.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * OpenOffice.org - a multi-platform office productivity suite @@ -90,3 +91,5 @@ namespace pdfi } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx index ef34021..4bdc288 100644 --- a/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx +++ b/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +30,6 @@ ************************************************************************/ #include "pdfioutdev_gpl.hxx" -//#include "SecurityHandler.h" #ifdef WNT # include <io.h> # include <fcntl.h> /*_O_BINARY*/ @@ -159,11 +159,7 @@ int main(int argc, char **argv) // Check various permissions. - if ( !aDoc.isOk()|| - !aDoc.okToPrint() || - !aDoc.okToChange()|| - !aDoc.okToCopy()|| - !aDoc.okToAddNotes() ) + if ( !aDoc.isOk() ) { pdfi::PDFOutDev* pOutDev( new pdfi::PDFOutDev(&aErrDoc) ); @@ -211,3 +207,4 @@ int main(int argc, char **argv) return 0; } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/presenter/PresenterAccessibility.cxx b/sdext/source/presenter/PresenterAccessibility.cxx index e5b39c1..d2a742b 100755..100644 --- a/sdext/source/presenter/PresenterAccessibility.cxx +++ b/sdext/source/presenter/PresenterAccessibility.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -67,7 +68,7 @@ using ::rtl::OUString; namespace sdext { namespace presenter { namespace { - typedef ::cppu::WeakComponentImplHelper5 < + typedef ::cppu::PartialWeakComponentImplHelper5 < cssa::XAccessible, cssa::XAccessibleContext, cssa::XAccessibleComponent, @@ -111,7 +112,15 @@ public: void UpdateStateSet (void); - + //----- XComponent --------------------------------------------------- + + virtual void SAL_CALL dispose()throw (cssu::RuntimeException) + { WeakComponentImplHelperBase::dispose(); } + virtual void SAL_CALL addEventListener(const cssu::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (cssu::RuntimeException) + { WeakComponentImplHelperBase::addEventListener(xListener); } + virtual void SAL_CALL removeEventListener(const cssu::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (cssu::RuntimeException) + { WeakComponentImplHelperBase::removeEventListener(xListener); } + //----- XAccessible ------------------------------------------------------- virtual cssu::Reference<cssa::XAccessibleContext> SAL_CALL @@ -199,9 +208,6 @@ public: const cssu::Reference<cssa::XAccessibleEventListener>& rxListener) throw (cssu::RuntimeException); - using PresenterAccessibleObjectInterfaceBase::addEventListener; - using PresenterAccessibleObjectInterfaceBase::removeEventListener; - //----- XWindowListener --------------------------------------------------- virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent) @@ -466,7 +472,7 @@ public: OUString sName (A2S("Presenter Console")); PresenterConfigurationAccess aConfiguration ( rxContext, - OUString::createFromAscii("/org.openoffice.Office.extension.PresenterScreen/"), + OUString(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Office.extension.PresenterScreen/")), PresenterConfigurationAccess::READ_ONLY); aConfiguration.GetConfigurationNode(A2S("Presenter/Accessibility/Console/String")) >>= sName; @@ -499,7 +505,7 @@ public: { PresenterConfigurationAccess aConfiguration ( rxContext, - OUString::createFromAscii("/org.openoffice.Office.extension.PresenterScreen/"), + OUString(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Office.extension.PresenterScreen/")), PresenterConfigurationAccess::READ_ONLY); aConfiguration.GetConfigurationNode(A2S("Presenter/Accessibility/Preview/String")) >>= sName; @@ -1611,7 +1617,7 @@ void PresenterAccessible::AccessibleObject::ThrowException ( const sal_Char* pMessage, const ExceptionType eExceptionType) const { - const OUString sMessage (OUString(A2S("PresenterAccessible: ")) + OUString(A2S(pMessage))); + const OUString sMessage (OUString(A2S("PresenterAccessible: ")) + OUString::createFromAscii(pMessage)); const Reference<XInterface> xObject ( const_cast<uno::XWeak*>(static_cast<const uno::XWeak*>(this))); switch (eExceptionType) @@ -2253,7 +2259,7 @@ rtl::Reference<PresenterAccessible::AccessibleObject> AccessibleNotes::Create ( { PresenterConfigurationAccess aConfiguration ( rxContext, - OUString::createFromAscii("/org.openoffice.Office.extension.PresenterScreen/"), + OUString(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Office.extension.PresenterScreen/")), PresenterConfigurationAccess::READ_ONLY); aConfiguration.GetConfigurationNode(A2S("Presenter/Accessibility/Notes/String")) >>= sName; @@ -2485,3 +2491,5 @@ void AccessibleFocusManager::FocusObject ( } } } // end of namespace ::sd::presenter + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/presenter/PresenterAccessibility.hxx b/sdext/source/presenter/PresenterAccessibility.hxx index dcfa5b6..f6f2aaf 100755..100644 --- a/sdext/source/presenter/PresenterAccessibility.hxx +++ b/sdext/source/presenter/PresenterAccessibility.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -154,3 +155,5 @@ private: } } // end of namespace ::sd::presenter #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/presenter/PresenterAnimation.cxx b/sdext/source/presenter/PresenterAnimation.cxx index da42885..2fcf0a7 100644 --- a/sdext/source/presenter/PresenterAnimation.cxx +++ b/sdext/source/presenter/PresenterAnimation.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -138,3 +139,5 @@ void PresenterAnimation::RunEndCallbacks (void) } } // end of namespace ::sdext::presenter + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/presenter/PresenterAnimation.hxx b/sdext/source/presenter/PresenterAnimation.hxx index 47166dd..36c0cb0 100644 --- a/sdext/source/presenter/PresenterAnimation.hxx +++ b/sdext/source/presenter/PresenterAnimation.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -128,3 +129,5 @@ typedef ::boost::shared_ptr<PresenterAnimation> SharedPresenterAnimation; } } // end of namespace ::sdext::presenter #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/presenter/PresenterAnimator.cxx b/sdext/source/presenter/PresenterAnimator.cxx index 5efa3e1..557fbf6 100644 --- a/sdext/source/presenter/PresenterAnimator.cxx +++ b/sdext/source/presenter/PresenterAnimator.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -33,7 +34,7 @@ #include "PresenterTimer.hxx" #include <osl/diagnose.h> #include <osl/time.h> -#include <vos/timer.hxx> +#include <salhelper/timer.hxx> #include <boost/bind.hpp> #include <boost/function.hpp> @@ -161,7 +162,7 @@ void PresenterAnimator::ScheduleNextRun (const sal_uInt64 nStartTime) if (mnNextTime==0 || nStartTime<mnNextTime) { mnNextTime = nStartTime; - ::vos::TTimeValue aTimeValue (GetSeconds(mnNextTime), GetNanoSeconds(mnNextTime)); + ::salhelper::TTimeValue aTimeValue (GetSeconds(mnNextTime), GetNanoSeconds(mnNextTime)); PresenterTimer::ScheduleSingleTaskAbsolute ( ::boost::bind(&PresenterAnimator::Process, this), aTimeValue); @@ -169,3 +170,5 @@ void PresenterAnimator::ScheduleNextRun (const sal_uInt64 nStartTime) } } } // end of namespace ::sdext::presenter + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/presenter/PresenterAnimator.hxx b/sdext/source/presenter/PresenterAnimator.hxx index fcd3fc9..7c14256 100644 --- a/sdext/source/presenter/PresenterAnimator.hxx +++ b/sdext/source/presenter/PresenterAnimator.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -70,3 +71,5 @@ private: } } // end of namespace ::sdext::presenter #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/presenter/PresenterBitmapContainer.cxx b/sdext/source/presenter/PresenterBitmapContainer.cxx index 6bfa228..ed452c7 100644 --- a/sdext/source/presenter/PresenterBitmapContainer.cxx +++ b/sdext/source/presenter/PresenterBitmapContainer.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -496,3 +497,5 @@ void PresenterBitmapContainer::BitmapDescriptor::SetBitmap ( } } // end of namespace ::sdext::presenter + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/presenter/PresenterBitmapContainer.hxx b/sdext/source/presenter/PresenterBitmapContainer.hxx index 97d13df..ca2c166 100644 --- a/sdext/source/presenter/PresenterBitmapContainer.hxx +++ b/sdext/source/presenter/PresenterBitmapContainer.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -163,3 +164,5 @@ typedef ::boost::shared_ptr<PresenterBitmapContainer::BitmapDescriptor> SharedBi } } // end of namespace ::sdext::presenter #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/presenter/PresenterButton.cxx b/sdext/source/presenter/PresenterButton.cxx index 3798b26..494d1f8 100644 --- a/sdext/source/presenter/PresenterButton.cxx +++ b/sdext/source/presenter/PresenterButton.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -133,7 +134,7 @@ PresenterButton::PresenterButton ( mxPresenterHelper = Reference<drawing::XPresenterHelper>( xFactory->createInstanceWithContext( - OUString::createFromAscii("com.sun.star.comp.Draw.PresenterHelper"), + OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Draw.PresenterHelper")), rxComponentContext), UNO_QUERY_THROW); @@ -610,3 +611,5 @@ void PresenterButton::ThrowIfDisposed (void) const } } // end of namespace sdext::presenter + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/presenter/PresenterButton.hxx b/sdext/source/presenter/PresenterButton.hxx index eaa0ffd..b421b72 100644 --- a/sdext/source/presenter/PresenterButton.hxx +++ b/sdext/source/presenter/PresenterButton.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -183,3 +184,5 @@ private: } } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/presenter/PresenterCanvasHelper.cxx b/sdext/source/presenter/PresenterCanvasHelper.cxx index 7acdf86..8060cc2 100644 --- a/sdext/source/presenter/PresenterCanvasHelper.cxx +++ b/sdext/source/presenter/PresenterCanvasHelper.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -326,3 +327,5 @@ css::geometry::RealSize2D PresenterCanvasHelper::GetTextSize ( } } // end of namespace sdext::presenter + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/presenter/PresenterCanvasHelper.hxx b/sdext/source/presenter/PresenterCanvasHelper.hxx index f7543c1..b1d39e2 100644 --- a/sdext/source/presenter/PresenterCanvasHelper.hxx +++ b/sdext/source/presenter/PresenterCanvasHelper.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -117,3 +118,5 @@ private: } } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/presenter/PresenterClock.cxx b/sdext/source/presenter/PresenterClock.cxx index 47a03c4..6cc84e9 100644 --- a/sdext/source/presenter/PresenterClock.cxx +++ b/sdext/source/presenter/PresenterClock.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -49,7 +50,7 @@ #include <osl/mutex.hxx> #include <osl/time.h> #include <rtl/ref.hxx> -#include <vos/timer.hxx> +#include <salhelper/timer.hxx> #include <boost/bind.hpp> #include <cmath> @@ -63,7 +64,7 @@ namespace sdext { namespace presenter { /** Wrapper around a library timer. */ -class PresenterClock::Timer : public vos::OTimer +class PresenterClock::Timer : public salhelper::Timer { public: explicit Timer (const ::rtl::Reference<PresenterClock>& rpClock); @@ -349,7 +350,6 @@ void PresenterClock::LateInit (void) void SAL_CALL PresenterClock::disposing (void) { - // osl::MutexGuard aGuard (m_aMutex); if (mpTimer != NULL) { mpTimer->Stop(); @@ -397,9 +397,6 @@ void PresenterClock::UpdateTime (void) void SAL_CALL PresenterClock::disposing (const lang::EventObject& rEventObject) throw (RuntimeException) { - // ::osl::MutexGuard aSolarGuard (::osl::Mutex::getGlobalMutex()); - // osl::MutexGuard aGuard (m_aMutex); - if (rEventObject.Source == mxWindow) { mxWindow = NULL; @@ -416,9 +413,7 @@ void SAL_CALL PresenterClock::disposing (const lang::EventObject& rEventObject) void SAL_CALL PresenterClock::windowPaint (const awt::PaintEvent& rEvent) throw (RuntimeException) { - (void)rEvent; ThrowIfDisposed(); - ::osl::MutexGuard aSolarGuard (::osl::Mutex::getGlobalMutex()); Paint(rEvent.UpdateRect); } @@ -471,7 +466,6 @@ void SAL_CALL PresenterClock::windowHidden (const lang::EventObject& rEvent) void SAL_CALL PresenterClock::mousePressed (const css::awt::MouseEvent& rEvent) throw (css::uno::RuntimeException) { - (void)rEvent; if (rEvent.Buttons == awt::MouseButton::LEFT) { SetMode(mnMode+1); @@ -634,7 +628,7 @@ void PresenterClock::SetMode (const sal_Int32 nMode) mpClockPainter.reset( new AnalogBitmapPainter( mxComponentContext, - OUString::createFromAscii("ClockTheme"))); + OUString(RTL_CONSTASCII_USTRINGPARAM("ClockTheme")))); mpClockPainter2.reset(); break; @@ -652,7 +646,7 @@ void PresenterClock::SetMode (const sal_Int32 nMode) mpClockPainter.reset( new AnalogBitmapPainter( mxComponentContext, - OUString::createFromAscii("ClockTheme"))); + OUString(RTL_CONSTASCII_USTRINGPARAM("ClockTheme")))); mpClockPainter2.reset(new AnalogDefaultPainter()); break; } @@ -680,7 +674,7 @@ void PresenterClock::ThrowIfDisposed (void) //===== Timer ================================================================= PresenterClock::Timer::Timer (const ::rtl::Reference<PresenterClock>& rpClock) - : OTimer(vos::TTimeValue(10), vos::TTimeValue(100/*ms*/)), + : salhelper::Timer(salhelper::TTimeValue(10), salhelper::TTimeValue(100/*ms*/)), mpClock(rpClock) { acquire(); @@ -1040,7 +1034,7 @@ void AnalogBitmapPainter::PrepareBitmaps (const Reference<rendering::XCanvas>& r // Get access to the clock bitmaps in the configuration. PresenterConfigurationAccess aConfiguration ( mxComponentContext, - OUString::createFromAscii("org.openoffice.Office.extension.PresenterScreen"), + OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.extension.PresenterScreen")), PresenterConfigurationAccess::READ_ONLY); Reference<container::XNameAccess> xTheme (GetTheme(aConfiguration)); @@ -1064,20 +1058,20 @@ Reference<container::XNameAccess> AnalogBitmapPainter::GetTheme ( // Get root of clock themes. Reference<container::XHierarchicalNameAccess> xClock ( rConfiguration.GetConfigurationNode( - OUString::createFromAscii("PresenterScreenSettings/AnalogBitmapClock")), + OUString(RTL_CONSTASCII_USTRINGPARAM("PresenterScreenSettings/AnalogBitmapClock"))), UNO_QUERY); // Determine the name of the theme to use. - OUString sCurrentThemeName (OUString::createFromAscii("DefaultTheme")); + OUString sCurrentThemeName (RTL_CONSTASCII_USTRINGPARAM("DefaultTheme")); rConfiguration.GetConfigurationNode( xClock, - OUString::createFromAscii("CurrentTheme")) >>= sCurrentThemeName; + OUString(RTL_CONSTASCII_USTRINGPARAM("CurrentTheme"))) >>= sCurrentThemeName; // Load the clock theme. Reference<container::XNameAccess> xThemes ( rConfiguration.GetConfigurationNode( xClock, - OUString::createFromAscii("Themes")), + OUString(RTL_CONSTASCII_USTRINGPARAM("Themes"))), UNO_QUERY); if (xThemes.is()) { @@ -1104,7 +1098,7 @@ bool AnalogBitmapPainter::ThemeNameComparator ( if (rxCandidate.is()) { OUString sThemeName; - if (rxCandidate->getByName(OUString::createFromAscii("ThemeName")) >>= sThemeName) + if (rxCandidate->getByName(OUString(RTL_CONSTASCII_USTRINGPARAM("ThemeName"))) >>= sThemeName) { return sThemeName == rsCurrentThemeName; } @@ -1125,13 +1119,13 @@ void AnalogBitmapPainter::LoadBitmaps ( // Get base path to bitmaps. Reference<deployment::XPackageInformationProvider> xInformationProvider ( - mxComponentContext->getValueByName(OUString::createFromAscii( - "/singletons/com.sun.star.deployment.PackageInformationProvider")), + mxComponentContext->getValueByName(OUString(RTL_CONSTASCII_USTRINGPARAM( + "/singletons/com.sun.star.deployment.PackageInformationProvider"))), UNO_QUERY); OUString sLocation; if (xInformationProvider.is()) sLocation = xInformationProvider->getPackageLocation(gsExtensionIdentifier); - sLocation += OUString::createFromAscii("/"); + sLocation += OUString(RTL_CONSTASCII_USTRINGPARAM("/")); // Create the bitmap loader. Reference<lang::XMultiComponentFactory> xFactory ( @@ -1142,7 +1136,7 @@ void AnalogBitmapPainter::LoadBitmaps ( aArguments[0] <<= rxCanvas; Reference<container::XNameAccess> xBitmapLoader( xFactory->createInstanceWithArgumentsAndContext( - OUString::createFromAscii("com.sun.star.drawing.PresenterWorkaroundService"), + OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.PresenterWorkaroundService")), aArguments, mxComponentContext), UNO_QUERY); @@ -1152,12 +1146,12 @@ void AnalogBitmapPainter::LoadBitmaps ( // Iterate over all entries in the bitmap list and load the bitmaps. Reference<container::XNameAccess> xBitmaps ( - rxClockTheme->getByName(OUString::createFromAscii("Bitmaps")), + rxClockTheme->getByName(OUString(RTL_CONSTASCII_USTRINGPARAM("Bitmaps"))), UNO_QUERY); ::std::vector<rtl::OUString> aBitmapProperties (3); - aBitmapProperties[0] = OUString::createFromAscii("FileName"); - aBitmapProperties[1] = OUString::createFromAscii("XOffset"); - aBitmapProperties[2] = OUString::createFromAscii("YOffset"); + aBitmapProperties[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("FileName")); + aBitmapProperties[1] = OUString(RTL_CONSTASCII_USTRINGPARAM("XOffset")); + aBitmapProperties[2] = OUString(RTL_CONSTASCII_USTRINGPARAM("YOffset")); PresenterConfigurationAccess::ForAll( xBitmaps, aBitmapProperties, @@ -1181,11 +1175,11 @@ void AnalogBitmapPainter::LoadBitmap ( if (rValues.size() == 3) { BitmapDescriptor* pDescriptor = NULL; - if (rsKey == OUString::createFromAscii("Face")) + if (rsKey == OUString(RTL_CONSTASCII_USTRINGPARAM("Face"))) pDescriptor = &maFace; - else if (rsKey == OUString::createFromAscii("HourHand")) + else if (rsKey == OUString(RTL_CONSTASCII_USTRINGPARAM("HourHand"))) pDescriptor = &maHourHand; - else if (rsKey == OUString::createFromAscii("MinuteHand")) + else if (rsKey == OUString(RTL_CONSTASCII_USTRINGPARAM("MinuteHand"))) pDescriptor = &maMinuteHand; if (pDescriptor == NULL) @@ -1290,12 +1284,12 @@ void DigitalDefaultPainter::Paint ( { sText = OUString::valueOf(nHour>12 ? nHour-12 : nHour); } - sText += OUString::createFromAscii(":"); + sText += OUString(RTL_CONSTASCII_USTRINGPARAM(":")); const OUString sMinutes (OUString::valueOf(nMinute)); switch (sMinutes.getLength()) { case 1 : - sText += OUString::createFromAscii("0") + sMinutes; + sText += OUString(RTL_CONSTASCII_USTRINGPARAM("0")) + sMinutes; break; case 2: sText += sMinutes; @@ -1306,12 +1300,12 @@ void DigitalDefaultPainter::Paint ( } if (bIsShowSeconds) { - sText += OUString::createFromAscii(":"); + sText += OUString(RTL_CONSTASCII_USTRINGPARAM(":")); const OUString sSeconds (OUString::valueOf(nSecond)); switch (sSeconds.getLength()) { case 1 : - sText += OUString::createFromAscii("0") + sSeconds; + sText += OUString(RTL_CONSTASCII_USTRINGPARAM("0")) + sSeconds; break; case 2: sText += sSeconds; @@ -1387,13 +1381,13 @@ void DigitalDefaultPainter::CreateFont ( // For the case that not all digits have the same width, create // different templates for 12 and 24 hour mode. if (mbIs24HourFormat) - sTimeTemplate = OUString::createFromAscii("20"); + sTimeTemplate = OUString(RTL_CONSTASCII_USTRINGPARAM("20")); else - sTimeTemplate = OUString::createFromAscii("10"); + sTimeTemplate = OUString(RTL_CONSTASCII_USTRINGPARAM("10")); if (bIsShowSeconds) - sTimeTemplate += OUString::createFromAscii(":00:00"); + sTimeTemplate += OUString(RTL_CONSTASCII_USTRINGPARAM(":00:00")); else - sTimeTemplate += OUString::createFromAscii(":00"); + sTimeTemplate += OUString(RTL_CONSTASCII_USTRINGPARAM(":00")); rendering::StringContext aContext ( sTimeTemplate, @@ -1447,3 +1441,5 @@ void DigitalDefaultPainter::CreateFont ( } } // end of namespace ::sdext::presenter + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/presenter/PresenterClock.hxx b/sdext/source/presenter/PresenterClock.hxx index a4f7397..169f4cf 100644 --- a/sdext/source/presenter/PresenterClock.hxx +++ b/sdext/source/presenter/PresenterClock.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -197,3 +198,5 @@ private: } } // end of namespace ::sdext::presenter #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/presenter/PresenterComponent.cxx b/sdext/source/presenter/PresenterComponent.cxx index 82490da..b4dc2d9 100644 --- a/sdext/source/presenter/PresenterComponent.cxx +++ b/sdext/source/presenter/PresenterComponent.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -148,3 +149,5 @@ extern "C" } } } // end of namespace sdext::presenter + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/presenter/PresenterComponent.hxx b/sdext/source/presenter/PresenterComponent.hxx index acfca17..5184659 100644 --- a/sdext/source/presenter/PresenterComponent.hxx +++ b/sdext/source/presenter/PresenterComponent.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -53,3 +54,5 @@ public: } } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/presenter/PresenterConfigurationAccess.cxx b/sdext/source/presenter/PresenterConfigurationAccess.cxx index d54463b..005a488 100644 --- a/sdext/source/presenter/PresenterConfigurationAccess.cxx +++ b/sdext/source/presenter/PresenterConfigurationAccess.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -408,3 +409,4 @@ Any PresenterConfigurationAccess::GetProperty ( } } // end of namespace sdext::tools +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/presenter/PresenterConfigurationAccess.hxx b/sdext/source/presenter/PresenterConfigurationAccess.hxx index 9322a05..3a8d872 100644 --- a/sdext/source/presenter/PresenterConfigurationAccess.hxx +++ b/sdext/source/presenter/PresenterConfigurationAccess.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -203,3 +204,5 @@ private: } } // end of namespace sdext::tools #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/presenter/PresenterController.cxx b/sdext/source/presenter/PresenterController.cxx index 80f1905..573f640 100644 --- a/sdext/source/presenter/PresenterController.cxx +++ b/sdext/source/presenter/PresenterController.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -998,7 +999,6 @@ void SAL_CALL PresenterController::keyReleased (const awt::KeyEvent& rEvent) } break; - case awt::Key::LEFT: case awt::Key::PAGEUP: if (mxSlideShowController.is()) { @@ -1009,6 +1009,7 @@ void SAL_CALL PresenterController::keyReleased (const awt::KeyEvent& rEvent) } break; + case awt::Key::LEFT: case awt::Key::UP: case awt::Key::P: case awt::Key::BACKSPACE: @@ -1310,8 +1311,8 @@ double PresenterController::GetSlideAspectRatio (void) const Reference<beans::XPropertySet> xProperties(xSlides->getByIndex(0),UNO_QUERY_THROW); sal_Int32 nWidth (28000); sal_Int32 nHeight (21000); - if ((xProperties->getPropertyValue(OUString::createFromAscii("Width")) >>= nWidth) - && (xProperties->getPropertyValue(OUString::createFromAscii("Height")) >>= nHeight) + if ((xProperties->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("Width"))) >>= nWidth) + && (xProperties->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("Height"))) >>= nHeight) && nHeight > 0) { nSlideAspectRatio = double(nWidth) / double(nHeight); @@ -1376,3 +1377,4 @@ void PresenterController::ThrowIfDisposed (void) const } } // end of namespace ::sdext::presenter +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/presenter/PresenterController.hxx b/sdext/source/presenter/PresenterController.hxx index ac3ae7a..06795bc 100644 --- a/sdext/source/presenter/PresenterController.hxx +++ b/sdext/source/presenter/PresenterController.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -265,3 +266,5 @@ private: } } // end of namespace ::sdext::presenter #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/presenter/PresenterCurrentSlideObserver.cxx b/sdext/source/presenter/PresenterCurrentSlideObserver.cxx index 894f732..c471fa2 100644 --- a/sdext/source/presenter/PresenterCurrentSlideObserver.cxx +++ b/sdext/source/presenter/PresenterCurrentSlideObserver.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -152,3 +153,5 @@ void SAL_CALL PresenterCurrentSlideObserver::disposing ( } } } // end of namespace ::sdext::presenter + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/presenter/PresenterCurrentSlideObserver.hxx b/sdext/source/presenter/PresenterCurrentSlideObserver.hxx index 6a976d5..94c4cf3 100644 --- a/sdext/source/presenter/PresenterCurrentSlideObserver.hxx +++ b/sdext/source/presenter/PresenterCurrentSlideObserver.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -35,7 +36,7 @@ #include <cppuhelper/compbase1.hxx> #include <cppuhelper/basemutex.hxx> #include <rtl/ref.hxx> -#include <vos/timer.hxx> +#include <salhelper/timer.hxx> namespace css = ::com::sun::star; @@ -50,7 +51,7 @@ namespace { /** Check periodically the slide show controller and the frame::XController whether the current slide has changed. If so, then inform the presenter controller about it. - + Objects of this class have their own lifetime control and destroy themselves when the presenter controller is diposed. */ @@ -93,3 +94,5 @@ private: } } // end of namespace ::sdext::presenter #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/presenter/PresenterExtensionIdentifier.txx b/sdext/source/presenter/PresenterExtensionIdentifier.txx index aae3b82..e505fd0 100644 --- a/sdext/source/presenter/PresenterExtensionIdentifier.txx +++ b/sdext/source/presenter/PresenterExtensionIdentifier.txx @@ -34,7 +34,7 @@ namespace sdext { namespace presenter { makefile.mk with the actual, platform specific, extension identifier. */ const ::rtl::OUString PresenterComponent::gsExtensionIdentifier( - ::rtl::OUString::createFromAscii("com.sun.PresenterScreen-UPDATED_PLATFORM")); + RTL_CONSTASCII_USTRINGPARAM("com.sun.PresenterScreen-UPDATED_PLATFORM")); } } diff --git a/sdext/source/presenter/PresenterFrameworkObserver.cxx b/sdext/source/presenter/PresenterFrameworkObserver.cxx index 11536c2..0e6819d 100644 --- a/sdext/source/presenter/PresenterFrameworkObserver.cxx +++ b/sdext/source/presenter/PresenterFrameworkObserver.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -211,3 +212,5 @@ void SAL_CALL PresenterFrameworkObserver::notifyConfigurationChange ( } } } // end of namespace ::sdext::presenter + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/presenter/PresenterFrameworkObserver.hxx b/sdext/source/presenter/PresenterFrameworkObserver.hxx index 09e6256..3c59a80 100644 --- a/sdext/source/presenter/PresenterFrameworkObserver.hxx +++ b/sdext/source/presenter/PresenterFrameworkObserver.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -128,3 +129,5 @@ private: } } // end of namespace ::sdext::presenter #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/presenter/PresenterGeometryHelper.cxx b/sdext/source/presenter/PresenterGeometryHelper.cxx index 3112961..4d00b9c 100644 --- a/sdext/source/presenter/PresenterGeometryHelper.cxx +++ b/sdext/source/presenter/PresenterGeometryHelper.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -332,3 +333,5 @@ Reference<rendering::XPolyPolygon2D> PresenterGeometryHelper::CreatePolygon( } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/presenter/PresenterGeometryHelper.hxx b/sdext/source/presenter/PresenterGeometryHelper.hxx index e1b5a2d..3ed7c6f 100644 --- a/sdext/source/presenter/PresenterGeometryHelper.hxx +++ b/sdext/source/presenter/PresenterGeometryHelper.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -129,3 +130,5 @@ public: } } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/presenter/PresenterHelpView.cxx b/sdext/source/presenter/PresenterHelpView.cxx index f742944..e0732e3 100644 --- a/sdext/source/presenter/PresenterHelpView.cxx +++ b/sdext/source/presenter/PresenterHelpView.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -389,7 +390,7 @@ void PresenterHelpView::ReadHelpStrings (void) mpTextContainer.reset(new TextContainer()); PresenterConfigurationAccess aConfiguration ( mxComponentContext, - OUString::createFromAscii("/org.openoffice.Office.extension.PresenterScreen/"), + OUString(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Office.extension.PresenterScreen/")), PresenterConfigurationAccess::READ_ONLY); Reference<container::XNameAccess> xStrings ( aConfiguration.GetConfigurationNode(A2S("PresenterScreenSettings/HelpView/HelpStrings")), @@ -821,3 +822,4 @@ void Block::Update ( } } // end of namespace ::sdext::presenter +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/presenter/PresenterHelpView.hxx b/sdext/source/presenter/PresenterHelpView.hxx index 10589d5..dca6ded 100644 --- a/sdext/source/presenter/PresenterHelpView.hxx +++ b/sdext/source/presenter/PresenterHelpView.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -141,3 +142,5 @@ private: } } // end of namespace ::sdext::presenter #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/presenter/PresenterHelper.cxx b/sdext/source/presenter/PresenterHelper.cxx index ec71985..4231ed6 100644 --- a/sdext/source/presenter/PresenterHelper.cxx +++ b/sdext/source/presenter/PresenterHelper.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -43,28 +44,28 @@ using ::rtl::OUString; namespace sdext { namespace presenter { const OUString PresenterHelper::msPaneURLPrefix( - OUString::createFromAscii("private:resource/pane/")); + RTL_CONSTASCII_USTRINGPARAM("private:resource/pane/")); const OUString PresenterHelper::msCenterPaneURL( - msPaneURLPrefix + OUString::createFromAscii("CenterPane")); + msPaneURLPrefix + OUString(RTL_CONSTASCII_USTRINGPARAM("CenterPane"))); const OUString PresenterHelper::msFullScreenPaneURL( - msPaneURLPrefix + OUString::createFromAscii("FullScreenPane")); + msPaneURLPrefix + OUString(RTL_CONSTASCII_USTRINGPARAM("FullScreenPane"))); const OUString PresenterHelper::msViewURLPrefix( - OUString::createFromAscii("private:resource/view/")); + RTL_CONSTASCII_USTRINGPARAM("private:resource/view/")); const OUString PresenterHelper::msPresenterScreenURL( - msViewURLPrefix + OUString::createFromAscii("PresenterScreen")); + msViewURLPrefix + OUString(RTL_CONSTASCII_USTRINGPARAM("PresenterScreen"))); const OUString PresenterHelper::msSlideSorterURL( - msViewURLPrefix + OUString::createFromAscii("SlideSorter")); + msViewURLPrefix + OUString(RTL_CONSTASCII_USTRINGPARAM("SlideSorter"))); const OUString PresenterHelper::msResourceActivationEvent( - OUString::createFromAscii("ResourceActivation")); + RTL_CONSTASCII_USTRINGPARAM("ResourceActivation")); const OUString PresenterHelper::msResourceDeactivationEvent( - OUString::createFromAscii("ResourceDeactivation")); + RTL_CONSTASCII_USTRINGPARAM("ResourceDeactivation")); const OUString PresenterHelper::msDefaultPaneStyle ( - OUString::createFromAscii("DefaultPaneStyle")); + RTL_CONSTASCII_USTRINGPARAM("DefaultPaneStyle")); const OUString PresenterHelper::msDefaultViewStyle ( - OUString::createFromAscii("DefaultViewStyle")); + RTL_CONSTASCII_USTRINGPARAM("DefaultViewStyle")); Reference<presentation::XSlideShowController> PresenterHelper::GetSlideShowController ( @@ -91,3 +92,5 @@ Reference<presentation::XSlideShowController> PresenterHelper::GetSlideShowContr } } // end of namespace ::sdext::presenter + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/presenter/PresenterHelper.hxx b/sdext/source/presenter/PresenterHelper.hxx index 5590c2a..54c6d7b 100644 --- a/sdext/source/presenter/PresenterHelper.hxx +++ b/sdext/source/presenter/PresenterHelper.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -75,3 +76,5 @@ private: } } // end of namespace presenter #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/presenter/PresenterNotesView.cxx b/sdext/source/presenter/PresenterNotesView.cxx index 7348999..a7cbc5e 100644 --- a/sdext/source/presenter/PresenterNotesView.cxx +++ b/sdext/source/presenter/PresenterNotesView.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -805,3 +806,5 @@ void PresenterNotesView::ThrowIfDisposed (void) } } // end of namespace ::sdext::presenter + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/presenter/PresenterNotesView.hxx b/sdext/source/presenter/PresenterNotesView.hxx index a9e956b..b0c313f 100644 --- a/sdext/source/presenter/PresenterNotesView.hxx +++ b/sdext/source/presenter/PresenterNotesView.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -195,3 +196,5 @@ private: } } // end of namespace ::sdext::presenter #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/presenter/PresenterPaintManager.cxx b/sdext/source/presenter/PresenterPaintManager.cxx index 51c4ac1..643db9f 100644 --- a/sdext/source/presenter/PresenterPaintManager.cxx +++ b/sdext/source/presenter/PresenterPaintManager.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -173,3 +174,5 @@ void PresenterPaintManager::Invalidate ( } } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/presenter/PresenterPaintManager.hxx b/sdext/source/presenter/PresenterPaintManager.hxx index ea1ecd8..3797888 100644 --- a/sdext/source/presenter/PresenterPaintManager.hxx +++ b/sdext/source/presenter/PresenterPaintManager.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -94,3 +95,5 @@ private: } } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/presenter/PresenterPane.cxx b/sdext/source/presenter/PresenterPane.cxx index f0b3ff9..089c067 100644 --- a/sdext/source/presenter/PresenterPane.cxx +++ b/sdext/source/presenter/PresenterPane.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -56,7 +57,7 @@ PresenterPane::PresenterPane ( mxComponentContext->getServiceManager(), UNO_QUERY_THROW); mxPresenterHelper = Reference<drawing::XPresenterHelper>( xFactory->createInstanceWithContext( - OUString::createFromAscii("com.sun.star.comp.Draw.PresenterHelper"), + OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Draw.PresenterHelper")), mxComponentContext), UNO_QUERY_THROW); } @@ -232,3 +233,5 @@ void PresenterPane::UpdateBoundingBox (void) } } // end of namespace ::sd::presenter + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/presenter/PresenterPane.hxx b/sdext/source/presenter/PresenterPane.hxx index a0c0c34..456ead7 100644 --- a/sdext/source/presenter/PresenterPane.hxx +++ b/sdext/source/presenter/PresenterPane.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -116,3 +117,5 @@ private: } } // end of namespace ::sd::presenter #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/presenter/PresenterPaneAnimator.cxx b/sdext/source/presenter/PresenterPaneAnimator.cxx index 4ad652f..443e73b 100644 --- a/sdext/source/presenter/PresenterPaneAnimator.cxx +++ b/sdext/source/presenter/PresenterPaneAnimator.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -209,7 +210,7 @@ namespace { void CreateSubstitution (const Reference<rendering::XSpriteCanvas>& rxCanvas); void ThawPanes (void); void Restore (void); - ::boost::shared_ptr<PresenterSprite> GetSubstitution (void); + ::boost::shared_ptr<PresenterSprite> GetSubstitution (void) const; css::geometry::RealRectangle2D GetOriginalBoundingBox (void) const; css::geometry::RealRectangle2D GetCurrentBoundingBox (void) const; void MovePanes ( @@ -1132,8 +1133,7 @@ void PaneGroup::Restore (void) - -::boost::shared_ptr<PresenterSprite> PaneGroup::GetSubstitution (void) +::boost::shared_ptr<PresenterSprite> PaneGroup::GetSubstitution (void) const { return mpSubstitution; } @@ -1422,3 +1422,5 @@ geometry::RealSize2D GetSize (const geometry::RealRectangle2D& rBox) } } // end of namespace ::sdext::presenter + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/presenter/PresenterPaneAnimator.hxx b/sdext/source/presenter/PresenterPaneAnimator.hxx index 8733a5b..9ab5dc6 100644 --- a/sdext/source/presenter/PresenterPaneAnimator.hxx +++ b/sdext/source/presenter/PresenterPaneAnimator.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -92,3 +93,5 @@ typedef ::std::vector< ::boost::function<void()> > EndActions; } } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/presenter/PresenterPaneBase.cxx b/sdext/source/presenter/PresenterPaneBase.cxx index 8f7a516..448d136 100644 --- a/sdext/source/presenter/PresenterPaneBase.cxx +++ b/sdext/source/presenter/PresenterPaneBase.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -220,7 +221,7 @@ void SAL_CALL PresenterPaneBase::initialize (const Sequence<Any>& rArguments) if ( ! mxComponentContext.is()) { throw RuntimeException( - OUString::createFromAscii("PresenterSpritePane: missing component context"), + OUString(RTL_CONSTASCII_USTRINGPARAM("PresenterSpritePane: missing component context")), static_cast<XWeak*>(this)); } @@ -232,7 +233,7 @@ void SAL_CALL PresenterPaneBase::initialize (const Sequence<Any>& rArguments) if ( ! (rArguments[0] >>= mxPaneId)) { throw lang::IllegalArgumentException( - OUString::createFromAscii("PresenterPane: invalid pane id"), + OUString(RTL_CONSTASCII_USTRINGPARAM("PresenterPane: invalid pane id")), static_cast<XWeak*>(this), 0); } @@ -240,7 +241,7 @@ void SAL_CALL PresenterPaneBase::initialize (const Sequence<Any>& rArguments) if ( ! (rArguments[1] >>= mxParentWindow)) { throw lang::IllegalArgumentException( - OUString::createFromAscii("PresenterPane: invalid parent window"), + OUString(RTL_CONSTASCII_USTRINGPARAM("PresenterPane: invalid parent window")), static_cast<XWeak*>(this), 1); } @@ -249,7 +250,7 @@ void SAL_CALL PresenterPaneBase::initialize (const Sequence<Any>& rArguments) if ( ! (rArguments[2] >>= xParentCanvas)) { throw lang::IllegalArgumentException( - OUString::createFromAscii("PresenterPane: invalid parent canvas"), + OUString(RTL_CONSTASCII_USTRINGPARAM("PresenterPane: invalid parent canvas")), static_cast<XWeak*>(this), 2); } @@ -257,7 +258,7 @@ void SAL_CALL PresenterPaneBase::initialize (const Sequence<Any>& rArguments) if ( ! (rArguments[3] >>= msTitle)) { throw lang::IllegalArgumentException( - OUString::createFromAscii("PresenterPane: invalid title"), + OUString(RTL_CONSTASCII_USTRINGPARAM("PresenterPane: invalid title")), static_cast<XWeak*>(this), 3); } @@ -265,7 +266,7 @@ void SAL_CALL PresenterPaneBase::initialize (const Sequence<Any>& rArguments) if ( ! (rArguments[4] >>= mxBorderPainter)) { throw lang::IllegalArgumentException( - OUString::createFromAscii("PresenterPane: invalid border painter"), + OUString(RTL_CONSTASCII_USTRINGPARAM("PresenterPane: invalid border painter")), static_cast<XWeak*>(this), 4); } @@ -274,7 +275,7 @@ void SAL_CALL PresenterPaneBase::initialize (const Sequence<Any>& rArguments) if (rArguments.getLength()>5 && ! (rArguments[5] >>= bIsWindowVisibleOnCreation)) { throw lang::IllegalArgumentException( - OUString::createFromAscii("PresenterPane: invalid window visibility flag"), + OUString(RTL_CONSTASCII_USTRINGPARAM("PresenterPane: invalid window visibility flag")), static_cast<XWeak*>(this), 5); } @@ -302,7 +303,7 @@ void SAL_CALL PresenterPaneBase::initialize (const Sequence<Any>& rArguments) else { throw RuntimeException( - OUString::createFromAscii("PresenterSpritePane: invalid number of arguments"), + OUString(RTL_CONSTASCII_USTRINGPARAM("PresenterSpritePane: invalid number of arguments")), static_cast<XWeak*>(this)); } } @@ -556,3 +557,5 @@ void PresenterPaneBase::ThrowIfDisposed (void) } } // end of namespace ::sd::presenter + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/presenter/PresenterPaneBase.hxx b/sdext/source/presenter/PresenterPaneBase.hxx index 310ee5c..1b64eae 100644 --- a/sdext/source/presenter/PresenterPaneBase.hxx +++ b/sdext/source/presenter/PresenterPaneBase.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -171,3 +172,5 @@ protected: } } // end of namespace ::sd::presenter #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/presenter/PresenterPaneBorderManager.cxx b/sdext/source/presenter/PresenterPaneBorderManager.cxx index 4160d11..fa4a39f 100644 --- a/sdext/source/presenter/PresenterPaneBorderManager.cxx +++ b/sdext/source/presenter/PresenterPaneBorderManager.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -59,7 +60,7 @@ namespace sdext { namespace presenter { OUString PresenterPaneBorderManager::getImplementationName_static (void) { - return OUString::createFromAscii("com.sun.star.comp.Draw.PresenterPaneBorderManager"); + return OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Draw.PresenterPaneBorderManager")); } @@ -68,7 +69,7 @@ OUString PresenterPaneBorderManager::getImplementationName_static (void) Sequence<OUString> PresenterPaneBorderManager::getSupportedServiceNames_static (void) { static const ::rtl::OUString sServiceName( - ::rtl::OUString::createFromAscii("com.sun.star.drawing.PresenterPaneBorderManager")); + RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.PresenterPaneBorderManager")); return Sequence<rtl::OUString>(&sServiceName, 1); } @@ -107,13 +108,13 @@ PresenterPaneBorderManager::PresenterPaneBorderManager ( { mxPointer = Reference<awt::XPointer>( xFactory->createInstanceWithContext( - OUString::createFromAscii("com.sun.star.awt.Pointer"), + OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.Pointer")), rxContext), UNO_QUERY_THROW); mxPresenterHelper = Reference<drawing::XPresenterHelper>( xFactory->createInstanceWithContext( - OUString::createFromAscii("com.sun.star.comp.Draw.PresenterHelper"), + OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Draw.PresenterHelper")), rxContext), UNO_QUERY_THROW); } @@ -281,7 +282,7 @@ void SAL_CALL PresenterPaneBorderManager::initialize (const Sequence<Any>& rArgu else { throw RuntimeException( - OUString::createFromAscii("PresenterPane: invalid number of arguments"), + OUString(RTL_CONSTASCII_USTRINGPARAM("PresenterPane: invalid number of arguments")), static_cast<XWeak*>(this)); } } @@ -580,3 +581,5 @@ void PresenterPaneBorderManager::ThrowIfDisposed (void) } } // end of namespace ::sd::presenter #endif // ENABLE_PANE_RESIZING + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/presenter/PresenterPaneBorderManager.hxx b/sdext/source/presenter/PresenterPaneBorderManager.hxx index f6e0962..cb73ebe 100644 --- a/sdext/source/presenter/PresenterPaneBorderManager.hxx +++ b/sdext/source/presenter/PresenterPaneBorderManager.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -172,3 +173,4 @@ private: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/presenter/PresenterPaneBorderPainter.cxx b/sdext/source/presenter/PresenterPaneBorderPainter.cxx index 65e645e..6222e0c 100644 --- a/sdext/source/presenter/PresenterPaneBorderPainter.cxx +++ b/sdext/source/presenter/PresenterPaneBorderPainter.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -476,7 +477,7 @@ PresenterPaneBorderPainter::Renderer::Renderer ( { mxPresenterHelper = Reference<drawing::XPresenterHelper>( xFactory->createInstanceWithContext( - OUString::createFromAscii("com.sun.star.comp.Draw.PresenterHelper"), + OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Draw.PresenterHelper")), rxContext), UNO_QUERY_THROW); } @@ -693,7 +694,7 @@ void PresenterPaneBorderPainter::Renderer::PaintTitle ( RendererPaneStyleContainer::const_iterator iStyle (maRendererPaneStyles.find(rsResourceURL)); if (iStyle == maRendererPaneStyles.end()) { - OUString sPaneStyleName (OUString::createFromAscii("DefaultRendererPaneStyle")); + OUString sPaneStyleName (RTL_CONSTASCII_USTRINGPARAM("DefaultRendererPaneStyle")); // Get pane layout name for resource URL. const OUString sStyleName (mpTheme->GetStyleName(rsResourceURL)); @@ -954,7 +955,7 @@ RendererPaneStyle::RendererPaneStyle ( // Get font description. mpFont = rpTheme->GetFont(rsStyleName); - OUString sAnchor (OUString::createFromAscii("Left")); + OUString sAnchor (RTL_CONSTASCII_USTRINGPARAM("Left")); if (mpFont.get() != NULL) { sAnchor = mpFont->msAnchor; @@ -962,11 +963,11 @@ RendererPaneStyle::RendererPaneStyle ( mnFontYOffset = mpFont->mnYOffset; } - if (sAnchor == OUString::createFromAscii("Left")) + if (sAnchor == OUString(RTL_CONSTASCII_USTRINGPARAM("Left"))) meFontAnchor = AnchorLeft; - else if (sAnchor == OUString::createFromAscii("Right")) + else if (sAnchor == OUString(RTL_CONSTASCII_USTRINGPARAM("Right"))) meFontAnchor = AnchorRight; - else if (sAnchor == OUString::createFromAscii("Center")) + else if (sAnchor == OUString(RTL_CONSTASCII_USTRINGPARAM("Center"))) meFontAnchor = AnchorCenter; else meFontAnchor = AnchorCenter; @@ -1099,3 +1100,5 @@ SharedBitmapDescriptor RendererPaneStyle::GetBitmap( } } // end of namespace ::sd::presenter + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/presenter/PresenterPaneBorderPainter.hxx b/sdext/source/presenter/PresenterPaneBorderPainter.hxx index 7e60fb2..1428654 100644 --- a/sdext/source/presenter/PresenterPaneBorderPainter.hxx +++ b/sdext/source/presenter/PresenterPaneBorderPainter.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -161,3 +162,5 @@ private: } } // end of namespace ::sd::presenter #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/presenter/PresenterPaneContainer.cxx b/sdext/source/presenter/PresenterPaneContainer.cxx index 4180d34..1e71f5b 100644 --- a/sdext/source/presenter/PresenterPaneContainer.cxx +++ b/sdext/source/presenter/PresenterPaneContainer.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -54,7 +55,7 @@ PresenterPaneContainer::PresenterPaneContainer ( { mxPresenterHelper = Reference<drawing::XPresenterHelper>( xFactory->createInstanceWithContext( - OUString::createFromAscii("com.sun.star.comp.Draw.PresenterHelper"), + OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Draw.PresenterHelper")), rxContext), UNO_QUERY_THROW); } @@ -445,3 +446,5 @@ void PresenterPaneContainer::PaneDescriptor::SetActivationState (const bool bIsA } } } // end of namespace ::sdext::presenter + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/presenter/PresenterPaneContainer.hxx b/sdext/source/presenter/PresenterPaneContainer.hxx index 9bdd494..c016b39 100644 --- a/sdext/source/presenter/PresenterPaneContainer.hxx +++ b/sdext/source/presenter/PresenterPaneContainer.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -195,3 +196,5 @@ private: } } // end of namespace ::sdext::presenter #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/presenter/PresenterPaneFactory.cxx b/sdext/source/presenter/PresenterPaneFactory.cxx index 1410b44..ecd75ae 100644 --- a/sdext/source/presenter/PresenterPaneFactory.cxx +++ b/sdext/source/presenter/PresenterPaneFactory.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -52,20 +53,20 @@ using ::rtl::OUString; namespace sdext { namespace presenter { const ::rtl::OUString PresenterPaneFactory::msCurrentSlidePreviewPaneURL( - OUString::createFromAscii("private:resource/pane/Presenter/Pane1")); + RTL_CONSTASCII_USTRINGPARAM("private:resource/pane/Presenter/Pane1")); const ::rtl::OUString PresenterPaneFactory::msNextSlidePreviewPaneURL( - OUString::createFromAscii("private:resource/pane/Presenter/Pane2")); + RTL_CONSTASCII_USTRINGPARAM("private:resource/pane/Presenter/Pane2")); const ::rtl::OUString PresenterPaneFactory::msNotesPaneURL( - OUString::createFromAscii("private:resource/pane/Presenter/Pane3")); + RTL_CONSTASCII_USTRINGPARAM("private:resource/pane/Presenter/Pane3")); const ::rtl::OUString PresenterPaneFactory::msToolBarPaneURL( - OUString::createFromAscii("private:resource/pane/Presenter/Pane4")); + RTL_CONSTASCII_USTRINGPARAM("private:resource/pane/Presenter/Pane4")); const ::rtl::OUString PresenterPaneFactory::msSlideSorterPaneURL( - OUString::createFromAscii("private:resource/pane/Presenter/Pane5")); + RTL_CONSTASCII_USTRINGPARAM("private:resource/pane/Presenter/Pane5")); const ::rtl::OUString PresenterPaneFactory::msHelpPaneURL( - OUString::createFromAscii("private:resource/pane/Presenter/Pane6")); + RTL_CONSTASCII_USTRINGPARAM("private:resource/pane/Presenter/Pane6")); const ::rtl::OUString PresenterPaneFactory::msOverlayPaneURL( - OUString::createFromAscii("private:resource/pane/Presenter/Overlay")); + RTL_CONSTASCII_USTRINGPARAM("private:resource/pane/Presenter/Overlay")); @@ -116,7 +117,7 @@ void PresenterPaneFactory::Register (const Reference<frame::XController>& rxCont else { xCC->addResourceFactory( - OUString::createFromAscii("private:resource/pane/Presenter/*"), + OUString(RTL_CONSTASCII_USTRINGPARAM("private:resource/pane/Presenter/*")), this); } } @@ -376,3 +377,5 @@ void PresenterPaneFactory::ThrowIfDisposed (void) const } } // end of namespace sdext::presenter + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/presenter/PresenterPaneFactory.hxx b/sdext/source/presenter/PresenterPaneFactory.hxx index ec507dd..6e381fd 100644 --- a/sdext/source/presenter/PresenterPaneFactory.hxx +++ b/sdext/source/presenter/PresenterPaneFactory.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -137,3 +138,5 @@ private: } } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/presenter/PresenterProtocolHandler.cxx b/sdext/source/presenter/PresenterProtocolHandler.cxx index c03be48..0b87adf 100644 --- a/sdext/source/presenter/PresenterProtocolHandler.cxx +++ b/sdext/source/presenter/PresenterProtocolHandler.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -999,3 +1000,5 @@ Any NotesFontSizeCommand::GetState (void) const } } // end of namespace ::sdext::presenter + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/presenter/PresenterProtocolHandler.hxx b/sdext/source/presenter/PresenterProtocolHandler.hxx index e88f1a8..4d1a69d 100644 --- a/sdext/source/presenter/PresenterProtocolHandler.hxx +++ b/sdext/source/presenter/PresenterProtocolHandler.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -34,7 +35,7 @@ #include <com/sun/star/frame/XDispatch.hpp> #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/uno/XComponentContext.hpp> -#include <hash_map> +#include <boost/unordered_map.hpp> #include <rtl/ref.hxx> #include <boost/scoped_ptr.hpp> @@ -101,3 +102,5 @@ private: } } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/presenter/PresenterScreen.cxx b/sdext/source/presenter/PresenterScreen.cxx index 3642ee5..8f9e9c5 100644 --- a/sdext/source/presenter/PresenterScreen.cxx +++ b/sdext/source/presenter/PresenterScreen.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -172,7 +173,7 @@ Any SAL_CALL PresenterScreenJob::execute( const beans::NamedValue* p = Arguments.getConstArray(); for (i=0; i<c; ++i) { - if (p[i].Name.equalsAscii("Environment")) + if (p[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Environment"))) { p[i].Value >>= lEnv; break; @@ -184,7 +185,7 @@ Any SAL_CALL PresenterScreenJob::execute( p = lEnv.getConstArray(); for (i=0; i<c; ++i) { - if (p[i].Name.equalsAscii("Model")) + if (p[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Model"))) { p[i].Value >>= xModel; break; @@ -538,11 +539,11 @@ sal_Int32 PresenterScreen::GetScreenNumber ( // is set. PresenterConfigurationAccess aConfiguration ( xContext, - OUString::createFromAscii("/org.openoffice.Office.extension.PresenterScreen/"), + OUString(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Office.extension.PresenterScreen/")), PresenterConfigurationAccess::READ_ONLY); bool bStartAlways (false); if (aConfiguration.GetConfigurationNode( - OUString::createFromAscii("Presenter/StartAlways")) >>= bStartAlways) + OUString(RTL_CONSTASCII_USTRINGPARAM("Presenter/StartAlways"))) >>= bStartAlways) { if (bStartAlways) return nScreenNumber; @@ -701,13 +702,13 @@ void PresenterScreen::SetupConfiguration ( { PresenterConfigurationAccess aConfiguration ( rxContext, - OUString::createFromAscii("org.openoffice.Office.extension.PresenterScreen"), + OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.extension.PresenterScreen")), PresenterConfigurationAccess::READ_ONLY); maViewDescriptors.clear(); ProcessViewDescriptions(aConfiguration); - OUString sLayoutName (OUString::createFromAscii("DefaultLayout")); + OUString sLayoutName (RTL_CONSTASCII_USTRINGPARAM("DefaultLayout")); aConfiguration.GetConfigurationNode( - OUString::createFromAscii("Presenter/CurrentLayout")) >>= sLayoutName; + OUString(RTL_CONSTASCII_USTRINGPARAM("Presenter/CurrentLayout"))) >>= sLayoutName; ProcessLayout(aConfiguration, sLayoutName, rxContext, rxAnchorId); } catch (RuntimeException&) @@ -728,14 +729,14 @@ void PresenterScreen::ProcessLayout ( { Reference<container::XHierarchicalNameAccess> xLayoutNode ( rConfiguration.GetConfigurationNode( - OUString::createFromAscii("Presenter/Layouts/")+rsLayoutName), + OUString(RTL_CONSTASCII_USTRINGPARAM("Presenter/Layouts/"))+rsLayoutName), UNO_QUERY_THROW); // Read the parent layout first, if one is referenced. OUString sParentLayout; rConfiguration.GetConfigurationNode( xLayoutNode, - OUString::createFromAscii("ParentLayout")) >>= sParentLayout; + OUString(RTL_CONSTASCII_USTRINGPARAM("ParentLayout"))) >>= sParentLayout; if (sParentLayout.getLength() > 0) { // Prevent infinite recursion. @@ -747,16 +748,16 @@ void PresenterScreen::ProcessLayout ( Reference<container::XNameAccess> xList ( rConfiguration.GetConfigurationNode( xLayoutNode, - OUString::createFromAscii("Layout")), + OUString(RTL_CONSTASCII_USTRINGPARAM("Layout"))), UNO_QUERY_THROW); ::std::vector<rtl::OUString> aProperties (6); - aProperties[0] = OUString::createFromAscii("PaneURL"); - aProperties[1] = OUString::createFromAscii("ViewURL"); - aProperties[2] = OUString::createFromAscii("RelativeX"); - aProperties[3] = OUString::createFromAscii("RelativeY"); - aProperties[4] = OUString::createFromAscii("RelativeWidth"); - aProperties[5] = OUString::createFromAscii("RelativeHeight"); + aProperties[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("PaneURL")); + aProperties[1] = OUString(RTL_CONSTASCII_USTRINGPARAM("ViewURL")); + aProperties[2] = OUString(RTL_CONSTASCII_USTRINGPARAM("RelativeX")); + aProperties[3] = OUString(RTL_CONSTASCII_USTRINGPARAM("RelativeY")); + aProperties[4] = OUString(RTL_CONSTASCII_USTRINGPARAM("RelativeWidth")); + aProperties[5] = OUString(RTL_CONSTASCII_USTRINGPARAM("RelativeHeight")); mnComponentIndex = 1; PresenterConfigurationAccess::ForAll( xList, @@ -785,10 +786,10 @@ void PresenterScreen::ProcessViewDescriptions ( UNO_QUERY_THROW); ::std::vector<rtl::OUString> aProperties (4); - aProperties[0] = OUString::createFromAscii("ViewURL"); - aProperties[1] = OUString::createFromAscii("Title"); - aProperties[2] = OUString::createFromAscii("AccessibleTitle"); - aProperties[3] = OUString::createFromAscii("IsOpaque"); + aProperties[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("ViewURL")); + aProperties[1] = OUString(RTL_CONSTASCII_USTRINGPARAM("Title")); + aProperties[2] = OUString(RTL_CONSTASCII_USTRINGPARAM("AccessibleTitle")); + aProperties[3] = OUString(RTL_CONSTASCII_USTRINGPARAM("IsOpaque")); mnComponentIndex = 1; PresenterConfigurationAccess::ForAll( xViewDescriptionsNode, @@ -925,3 +926,5 @@ void PresenterScreen::SetupView( } } // end of namespace ::sdext::presenter + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/presenter/PresenterScreen.hxx b/sdext/source/presenter/PresenterScreen.hxx index 0aa22b6..457a2ba 100644 --- a/sdext/source/presenter/PresenterScreen.hxx +++ b/sdext/source/presenter/PresenterScreen.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -245,3 +246,5 @@ private: } } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/presenter/PresenterScrollBar.cxx b/sdext/source/presenter/PresenterScrollBar.cxx index 0d0bb87..2e89c7b 100644 --- a/sdext/source/presenter/PresenterScrollBar.cxx +++ b/sdext/source/presenter/PresenterScrollBar.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -128,7 +129,7 @@ PresenterScrollBar::PresenterScrollBar ( mxPresenterHelper = Reference<drawing::XPresenterHelper>( xFactory->createInstanceWithContext( - OUString::createFromAscii("com.sun.star.comp.Draw.PresenterHelper"), + OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Draw.PresenterHelper")), rxComponentContext), UNO_QUERY_THROW); @@ -330,7 +331,7 @@ void PresenterScrollBar::SetCanvas (const Reference<css::rendering::XCanvas>& rx try { mpBitmaps.reset(new PresenterBitmapContainer( - OUString::createFromAscii("PresenterScreenSettings/ScrollBar/Bitmaps"), + OUString(RTL_CONSTASCII_USTRINGPARAM("PresenterScreenSettings/ScrollBar/Bitmaps")), ::boost::shared_ptr<PresenterBitmapContainer>(), mxComponentContext, mxCanvas, @@ -1343,3 +1344,5 @@ void PresenterScrollBar::MousePressRepeater::Execute (void) } } // end of namespace ::sdext::presenter + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/presenter/PresenterScrollBar.hxx b/sdext/source/presenter/PresenterScrollBar.hxx index e95bfba..b0b0567 100644 --- a/sdext/source/presenter/PresenterScrollBar.hxx +++ b/sdext/source/presenter/PresenterScrollBar.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -335,3 +336,5 @@ private: } } // end of namespace ::sdext::presenter #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/presenter/PresenterSlidePreview.cxx b/sdext/source/presenter/PresenterSlidePreview.cxx index 6bfff2f..e38853b 100644 --- a/sdext/source/presenter/PresenterSlidePreview.cxx +++ b/sdext/source/presenter/PresenterSlidePreview.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -78,8 +79,8 @@ PresenterSlidePreview::PresenterSlidePreview ( || ! rpPresenterController.is()) { throw RuntimeException( - OUString::createFromAscii( - "PresenterSlidePreview can not be constructed due to empty argument"), + OUString(RTL_CONSTASCII_USTRINGPARAM( + "PresenterSlidePreview can not be constructed due to empty argument")), static_cast<XWeak*>(this)); } @@ -105,7 +106,7 @@ PresenterSlidePreview::PresenterSlidePreview ( if (xFactory.is()) mxPreviewRenderer = Reference<drawing::XSlideRenderer>( xFactory->createInstanceWithContext( - OUString::createFromAscii("com.sun.star.drawing.SlideRenderer"), + OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.SlideRenderer")), rxContext), UNO_QUERY); @@ -277,9 +278,9 @@ void PresenterSlidePreview::SetSlide (const Reference<drawing::XDrawPage>& rxPag try { xPropertySet->getPropertyValue( - OUString::createFromAscii("Width")) >>= aSlideSize.Width; + OUString(RTL_CONSTASCII_USTRINGPARAM("Width"))) >>= aSlideSize.Width; xPropertySet->getPropertyValue( - OUString::createFromAscii("Height")) >>= aSlideSize.Height; + OUString(RTL_CONSTASCII_USTRINGPARAM("Height"))) >>= aSlideSize.Height; } catch (beans::UnknownPropertyException&) { @@ -425,3 +426,4 @@ void PresenterSlidePreview::ThrowIfDisposed (void) } } // end of namespace ::sd::presenter +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/presenter/PresenterSlidePreview.hxx b/sdext/source/presenter/PresenterSlidePreview.hxx index bc0ede3..f38f2e7 100644 --- a/sdext/source/presenter/PresenterSlidePreview.hxx +++ b/sdext/source/presenter/PresenterSlidePreview.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -171,3 +172,5 @@ private: } } // end of namespace ::sd::presenter #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/presenter/PresenterSlideShowView.cxx b/sdext/source/presenter/PresenterSlideShowView.cxx index 52eca92..00412a7 100644 --- a/sdext/source/presenter/PresenterSlideShowView.cxx +++ b/sdext/source/presenter/PresenterSlideShowView.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -115,7 +116,7 @@ void PresenterSlideShowView::LateInit (void) Reference<lang::XMultiComponentFactory> xFactory ( mxComponentContext->getServiceManager(), UNO_QUERY_THROW); mxPresenterHelper.set (xFactory->createInstanceWithContext( - OUString::createFromAscii("com.sun.star.comp.Draw.PresenterHelper"), + OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Draw.PresenterHelper")), mxComponentContext), UNO_QUERY_THROW); @@ -544,7 +545,7 @@ void SAL_CALL PresenterSlideShowView::setMouseCursor(::sal_Int16 nPointerShape) mxComponentContext, UNO_QUERY); if (xFactory.is()) mxPointer = Reference<awt::XPointer>( - xFactory->createInstance(OUString::createFromAscii("com.sun.star.awt.Pointer")), + xFactory->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.Pointer"))), UNO_QUERY); } @@ -972,7 +973,7 @@ Reference<awt::XWindow> PresenterSlideShowView::CreateViewWindow ( Reference<awt::XToolkit> xToolkit ( xFactory->createInstanceWithContext( - OUString::createFromAscii("com.sun.star.awt.Toolkit"), + OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.Toolkit")), mxComponentContext), UNO_QUERY_THROW); awt::WindowDescriptor aWindowDescriptor ( @@ -1147,10 +1148,12 @@ void PresenterSlideShowView::ThrowIfDisposed (void) if (rBHelper.bDisposed || rBHelper.bInDispose) { throw lang::DisposedException ( - OUString::createFromAscii("PresenterSlideShowView object has already been disposed"), + OUString(RTL_CONSTASCII_USTRINGPARAM("PresenterSlideShowView object has already been disposed")), static_cast<uno::XWeak*>(this)); } } } } // end of namespace ::sd::presenter + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/presenter/PresenterSlideShowView.hxx b/sdext/source/presenter/PresenterSlideShowView.hxx index 1a38bfb..494c76c 100644 --- a/sdext/source/presenter/PresenterSlideShowView.hxx +++ b/sdext/source/presenter/PresenterSlideShowView.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -295,3 +296,5 @@ private: } } // end of namespace ::sd::presenter #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/presenter/PresenterSlideSorter.cxx b/sdext/source/presenter/PresenterSlideSorter.cxx index bd8ce28..f6f999e 100644 --- a/sdext/source/presenter/PresenterSlideSorter.cxx +++ b/sdext/source/presenter/PresenterSlideSorter.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -374,7 +375,7 @@ PresenterSlideSorter::PresenterSlideSorter ( // Create the preview cache. mxPreviewCache = Reference<drawing::XSlidePreviewCache>( xFactory->createInstanceWithContext( - OUString::createFromAscii("com.sun.star.drawing.PresenterPreviewCache"), + OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.PresenterPreviewCache")), mxComponentContext), UNO_QUERY_THROW); Reference<container::XIndexAccess> xSlides (mxSlideShowController, UNO_QUERY); @@ -395,7 +396,7 @@ PresenterSlideSorter::PresenterSlideSorter ( // Listen for changes of the current slide. Reference<beans::XPropertySet> xControllerProperties (rxController, UNO_QUERY_THROW); xControllerProperties->addPropertyChangeListener( - OUString::createFromAscii("CurrentPage"), + OUString(RTL_CONSTASCII_USTRINGPARAM("CurrentPage")), this); // Move the current slide in the center of the window. @@ -982,8 +983,8 @@ double PresenterSlideSorter::GetSlideAspectRatio (void) const Reference<beans::XPropertySet> xProperties(xSlides->getByIndex(0),UNO_QUERY_THROW); sal_Int32 nWidth (28000); sal_Int32 nHeight (21000); - if ((xProperties->getPropertyValue(OUString::createFromAscii("Width")) >>= nWidth) - && (xProperties->getPropertyValue(OUString::createFromAscii("Height")) >>= nHeight) + if ((xProperties->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("Width"))) >>= nWidth) + && (xProperties->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("Height"))) >>= nHeight) && nHeight > 0) { nSlideAspectRatio = double(nWidth) / double(nHeight); @@ -2065,7 +2066,7 @@ PresenterSlideSorter::CurrentSlideFrameRenderer::CurrentSlideFrameRenderer ( { PresenterConfigurationAccess aConfiguration ( rxContext, - OUString::createFromAscii("/org.openoffice.Office.extension.PresenterScreen/"), + OUString(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Office.extension.PresenterScreen/")), PresenterConfigurationAccess::READ_ONLY); Reference<container::XHierarchicalNameAccess> xBitmaps ( aConfiguration.GetConfigurationNode( @@ -2319,3 +2320,5 @@ void PresenterSlideSorter::CurrentSlideFrameRenderer::PaintBitmapTiled( } } } // end of namespace ::sdext::presenter + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/presenter/PresenterSlideSorter.hxx b/sdext/source/presenter/PresenterSlideSorter.hxx index 0f3aed0..01a28eb 100644 --- a/sdext/source/presenter/PresenterSlideSorter.hxx +++ b/sdext/source/presenter/PresenterSlideSorter.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -231,3 +232,5 @@ private: } } // end of namespace ::sdext::presenter #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/presenter/PresenterSprite.cxx b/sdext/source/presenter/PresenterSprite.cxx index 33563a1..09d5cb0 100644 --- a/sdext/source/presenter/PresenterSprite.cxx +++ b/sdext/source/presenter/PresenterSprite.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -287,3 +288,5 @@ void PresenterSprite::DisposeSprite (void) } } //end of namespace sdext::presenter + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/presenter/PresenterSprite.hxx b/sdext/source/presenter/PresenterSprite.hxx index 567701f..cc266e9 100644 --- a/sdext/source/presenter/PresenterSprite.hxx +++ b/sdext/source/presenter/PresenterSprite.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -97,3 +98,5 @@ private: } } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/presenter/PresenterSpritePane.cxx b/sdext/source/presenter/PresenterSpritePane.cxx index ded73fa..b7c46d5 100644 --- a/sdext/source/presenter/PresenterSpritePane.cxx +++ b/sdext/source/presenter/PresenterSpritePane.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -54,7 +55,7 @@ PresenterSpritePane::PresenterSpritePane (const Reference<XComponentContext>& rx mxComponentContext->getServiceManager(), UNO_QUERY_THROW); mxPresenterHelper = Reference<drawing::XPresenterHelper>( xFactory->createInstanceWithContext( - OUString::createFromAscii("com.sun.star.comp.Draw.PresenterHelper"), + OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Draw.PresenterHelper")), mxComponentContext), UNO_QUERY_THROW); } @@ -258,3 +259,5 @@ void PresenterSpritePane::CreateCanvases ( } } // end of namespace ::sd::presenter + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/presenter/PresenterSpritePane.hxx b/sdext/source/presenter/PresenterSpritePane.hxx index 74c696a..4056928 100644 --- a/sdext/source/presenter/PresenterSpritePane.hxx +++ b/sdext/source/presenter/PresenterSpritePane.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -124,3 +125,5 @@ private: } } // end of namespace ::sd::presenter #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/presenter/PresenterTextView.cxx b/sdext/source/presenter/PresenterTextView.cxx index 74a540f..8b1f5a3 100755..100644 --- a/sdext/source/presenter/PresenterTextView.cxx +++ b/sdext/source/presenter/PresenterTextView.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -915,12 +916,8 @@ void PresenterTextParagraph::AddWord ( const PresenterTheme::SharedFontDescriptor& rpFont) { sal_Int32 nLineStart (0); - sal_Int32 nLineEnd (0); if ( ! maLines.empty()) - { nLineStart = rCurrentLine.startPos; - nLineEnd = rCurrentLine.endPos; - } const ::rtl::OUString sLineCandidate ( msParagraphText.copy(nLineStart, nWordBoundary-nLineStart)); @@ -1185,14 +1182,12 @@ awt::Rectangle PresenterTextParagraph::GetCharacterBounds ( { // Find the line that contains the requested character and accumulate // the previous line heights. - sal_Int32 nFirstCharacterIndex (0); - sal_Int32 nEndCharacterIndex (0); double nX (mnXOrigin); double nY (mnYOrigin + mnVerticalOffset + mnAscent); const sal_Int8 nTextDirection (GetTextDirection()); for (sal_Int32 nLineIndex=0,nLineCount=maLines.size(); nLineIndex<nLineCount; - ++nLineIndex, nFirstCharacterIndex=nEndCharacterIndex, nY+=mnLineHeight) + ++nLineIndex, nY+=mnLineHeight) { Line& rLine (maLines[nLineIndex]); // Skip lines before the indexed character. @@ -1595,3 +1590,5 @@ bool PresenterTextParagraph::Line::IsEmpty (void) const } } // end of namespace ::sdext::presenter + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/presenter/PresenterTextView.hxx b/sdext/source/presenter/PresenterTextView.hxx index 533f10e..6805d4c 100755..100644 --- a/sdext/source/presenter/PresenterTextView.hxx +++ b/sdext/source/presenter/PresenterTextView.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -317,3 +318,5 @@ private: } } // end of namespace ::sdext::presenter #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/presenter/PresenterTheme.cxx b/sdext/source/presenter/PresenterTheme.cxx index 7a4f3f4..f3d7dcb 100644 --- a/sdext/source/presenter/PresenterTheme.cxx +++ b/sdext/source/presenter/PresenterTheme.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -340,7 +341,7 @@ void SAL_CALL PresenterTheme::disposing (void) PresenterConfigurationAccess aConfiguration ( mxContext, - OUString::createFromAscii("/org.openoffice.Office.extension.PresenterScreen/"), + OUString(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Office.extension.PresenterScreen/")), PresenterConfigurationAccess::READ_ONLY); return aReadContext.ReadTheme(aConfiguration, msThemeName); @@ -450,7 +451,7 @@ bool PresenterTheme::ConvertToColor ( ::boost::shared_ptr<PresenterConfigurationAccess> pConfiguration ( new PresenterConfigurationAccess( mxContext, - OUString::createFromAscii("/org.openoffice.Office.extension.PresenterScreen/"), + OUString(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Office.extension.PresenterScreen/")), PresenterConfigurationAccess::READ_WRITE)); // Get configuration node for the view style container of the current @@ -602,7 +603,7 @@ PresenterTheme::FontDescriptor::FontDescriptor (void) msStyleName(), mnSize(12), mnColor(0x00000000), - msAnchor(OUString::createFromAscii("Left")), + msAnchor(OUString(RTL_CONSTASCII_USTRINGPARAM("Left"))), mnXOffset(0), mnYOffset(0) { @@ -617,7 +618,7 @@ PresenterTheme::FontDescriptor::FontDescriptor ( msStyleName(), mnSize(12), mnColor(0x00000000), - msAnchor(OUString::createFromAscii("Left")), + msAnchor(OUString(RTL_CONSTASCII_USTRINGPARAM("Left"))), mnXOffset(0), mnYOffset(0) { @@ -868,7 +869,7 @@ ReadContext::ReadContext ( { mxPresenterHelper = Reference<drawing::XPresenterHelper>( xFactory->createInstanceWithContext( - OUString::createFromAscii("com.sun.star.comp.Draw.PresenterHelper"), + OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Draw.PresenterHelper")), rxContext), UNO_QUERY_THROW); } @@ -1412,3 +1413,5 @@ void StyleAssociationContainer::ProcessStyleAssociation( } // end of anonymous namespace } } // end of namespace ::sdext::presenter + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/presenter/PresenterTheme.hxx b/sdext/source/presenter/PresenterTheme.hxx index 20b541a..b2b6aad 100644 --- a/sdext/source/presenter/PresenterTheme.hxx +++ b/sdext/source/presenter/PresenterTheme.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -155,3 +156,5 @@ private: } } // end of namespace ::sd::presenter #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/presenter/PresenterTimer.cxx b/sdext/source/presenter/PresenterTimer.cxx index da3a501..af4598a 100644 --- a/sdext/source/presenter/PresenterTimer.cxx +++ b/sdext/source/presenter/PresenterTimer.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -67,7 +68,7 @@ typedef ::boost::shared_ptr<TimerTask> SharedTimerTask; class TimerTaskComparator { public: - bool operator() (const SharedTimerTask& rpTask1, const SharedTimerTask& rpTask2) + bool operator() (const SharedTimerTask& rpTask1, const SharedTimerTask& rpTask2) const { return rpTask1->maDueTime.Seconds < rpTask2->maDueTime.Seconds || (rpTask1->maDueTime.Seconds == rpTask2->maDueTime.Seconds @@ -676,3 +677,5 @@ void SAL_CALL PresenterClockTimer::notify (const css::uno::Any& rUserData) } } // end of namespace ::sdext::presenter + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/presenter/PresenterTimer.hxx b/sdext/source/presenter/PresenterTimer.hxx index 2e04265..c79760c 100644 --- a/sdext/source/presenter/PresenterTimer.hxx +++ b/sdext/source/presenter/PresenterTimer.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -141,3 +142,5 @@ private: } } // end of namespace ::sdext::presenter #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/presenter/PresenterToolBar.cxx b/sdext/source/presenter/PresenterToolBar.cxx index d0ccd32..cf51005 100644 --- a/sdext/source/presenter/PresenterToolBar.cxx +++ b/sdext/source/presenter/PresenterToolBar.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -777,7 +778,7 @@ void PresenterToolBar::CreateControls ( // Expand the macro in the bitmap file names. PresenterConfigurationAccess aConfiguration ( mxComponentContext, - OUString::createFromAscii("/org.openoffice.Office.extension.PresenterScreen/"), + OUString(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Office.extension.PresenterScreen/")), PresenterConfigurationAccess::READ_ONLY); const OUString sBasePath (PresenterComponent::GetBasePath(mxComponentContext)); @@ -839,19 +840,19 @@ void PresenterToolBar::ProcessEntry ( // Create new element. ::rtl::Reference<Element> pElement; - if (sType.equalsAscii("Button")) + if (sType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Button"))) pElement = Button::Create(this); - else if (sType.equalsAscii("CurrentTimeLabel")) + else if (sType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("CurrentTimeLabel"))) pElement = CurrentTimeLabel::Create(this); - else if (sType.equalsAscii("PresentationTimeLabel")) + else if (sType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("PresentationTimeLabel"))) pElement = PresentationTimeLabel::Create(this); - else if (sType.equalsAscii("VerticalSeparator")) + else if (sType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("VerticalSeparator"))) pElement = ::rtl::Reference<Element>(new VerticalSeparator(this)); - else if (sType.equalsAscii("HorizontalSeparator")) + else if (sType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("HorizontalSeparator"))) pElement = ::rtl::Reference<Element>(new HorizontalSeparator(this)); - else if (sType.equalsAscii("Label")) + else if (sType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Label"))) pElement = ::rtl::Reference<Element>(new Label(this)); - else if (sType.equalsAscii("ChangeOrientation")) + else if (sType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ChangeOrientation"))) { mpCurrentContainerPart.reset(new ElementContainerPart()); maElementContainer.push_back(mpCurrentContainerPart); @@ -2091,7 +2092,7 @@ void ProgressLabel::CurrentSlideHasChanged (void) if (nCurrentSlideIndex >= 0 && nSlideCount > 0) SetText( OUString::valueOf(nCurrentSlideIndex) - + OUString::createFromAscii(" / ") + + OUString(RTL_CONSTASCII_USTRINGPARAM(" / ")) + OUString::valueOf(nSlideCount)); else SetText(A2S("")); @@ -2456,3 +2457,5 @@ bool HorizontalSeparator::IsFilling (void) const } } // end of namespace ::sdext::presenter + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/presenter/PresenterToolBar.hxx b/sdext/source/presenter/PresenterToolBar.hxx index e0a8b87..eb6a526 100644 --- a/sdext/source/presenter/PresenterToolBar.hxx +++ b/sdext/source/presenter/PresenterToolBar.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -313,3 +314,5 @@ private: } } // end of namespace ::sdext::presenter #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/presenter/PresenterUIPainter.cxx b/sdext/source/presenter/PresenterUIPainter.cxx index f3b3845..0b5b90d 100644 --- a/sdext/source/presenter/PresenterUIPainter.cxx +++ b/sdext/source/presenter/PresenterUIPainter.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -254,3 +255,5 @@ void PresenterUIPainter::PaintVerticalBitmapComposite ( } } // end of namespace sdext::presenter + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/presenter/PresenterUIPainter.hxx b/sdext/source/presenter/PresenterUIPainter.hxx index d50e0de..e640a35 100644 --- a/sdext/source/presenter/PresenterUIPainter.hxx +++ b/sdext/source/presenter/PresenterUIPainter.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -68,3 +69,5 @@ public: } } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/presenter/PresenterViewFactory.cxx b/sdext/source/presenter/PresenterViewFactory.cxx index 900f7ae..44c06ad 100644 --- a/sdext/source/presenter/PresenterViewFactory.cxx +++ b/sdext/source/presenter/PresenterViewFactory.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -651,3 +652,5 @@ void CachablePresenterView::ReleaseView (void) } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/presenter/PresenterViewFactory.hxx b/sdext/source/presenter/PresenterViewFactory.hxx index fb2cf89..b38fbca 100644 --- a/sdext/source/presenter/PresenterViewFactory.hxx +++ b/sdext/source/presenter/PresenterViewFactory.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -184,3 +185,5 @@ private: } } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/presenter/PresenterWindowManager.cxx b/sdext/source/presenter/PresenterWindowManager.cxx index a63dc4a..d302063 100644 --- a/sdext/source/presenter/PresenterWindowManager.cxx +++ b/sdext/source/presenter/PresenterWindowManager.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -452,7 +453,7 @@ void SAL_CALL PresenterWindowManager::windowPaint (const awt::PaintEvent& rEvent } catch (RuntimeException&) { - OSL_ASSERT(sal_False); + OSL_FAIL("paint failed!"); } } } @@ -600,7 +601,7 @@ bool PresenterWindowManager::PaintChildren (const awt::PaintEvent& rEvent) const } catch (RuntimeException&) { - OSL_ASSERT(sal_False); + OSL_FAIL("paint children failed!"); } } @@ -753,7 +754,7 @@ void PresenterWindowManager::RestoreViewMode (void) sal_Int32 nMode (0); PresenterConfigurationAccess aConfiguration ( mxComponentContext, - OUString::createFromAscii("/org.openoffice.Office.extension.PresenterScreen/"), + OUString(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Office.extension.PresenterScreen/")), PresenterConfigurationAccess::READ_ONLY); aConfiguration.GetConfigurationNode(A2S("Presenter/InitialViewMode")) >>= nMode; switch (nMode) @@ -782,7 +783,7 @@ void PresenterWindowManager::StoreViewMode (const ViewMode eViewMode) { PresenterConfigurationAccess aConfiguration ( mxComponentContext, - OUString::createFromAscii("/org.openoffice.Office.extension.PresenterScreen/"), + OUString(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Office.extension.PresenterScreen/")), PresenterConfigurationAccess::READ_WRITE); aConfiguration.GoToChild(A2S("Presenter")); Any aValue; @@ -1639,3 +1640,5 @@ void SAL_CALL ModeChangeAnimationStarter::disposing ( } } // end of namespace ::sdext::presenter + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/presenter/PresenterWindowManager.hxx b/sdext/source/presenter/PresenterWindowManager.hxx index 8cc8dfa..828b72b 100644 --- a/sdext/source/presenter/PresenterWindowManager.hxx +++ b/sdext/source/presenter/PresenterWindowManager.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -257,3 +258,5 @@ private: } } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/presenter/description.xml b/sdext/source/presenter/description.xml index 19fefec..85393f7 100644 --- a/sdext/source/presenter/description.xml +++ b/sdext/source/presenter/description.xml @@ -11,12 +11,6 @@ <OpenOffice.org-minimal-version value="3.3" dep:name="OpenOffice.org 3.3"/> </dependencies> - <registration> - <simple-license accept-by="admin" default-license-id="lic-en-US" suppress-if-required="true" > - <license-text xlink:href="licensefile" lang="isocode" license-id="lic-isocode"/> - </simple-license> - </registration> - <version value="1.1.0" /> <platform value="UPDATED_PLATFORM" /> @@ -31,7 +25,6 @@ <icon> <default xlink:href="bitmaps/extension_32.png" /> - <high-contrast xlink:href="bitmaps/extension_32_h.png" /> </icon> </description> diff --git a/sdext/source/presenter/makefile.mk b/sdext/source/presenter/makefile.mk index e751a6e..3c93866 100644 --- a/sdext/source/presenter/makefile.mk +++ b/sdext/source/presenter/makefile.mk @@ -33,7 +33,7 @@ EXTNAME=PresenterScreen ENABLE_EXCEPTIONS=TRUE # survive zip dependencies -MAXLINELENGTH:=80000 +MAXLINELENGTH:=100000 # --- Settings ---------------------------------- @@ -42,14 +42,14 @@ MAXLINELENGTH:=80000 PACKAGE=com.sun.PresenterScreen-$(PLATFORMID) -.IF "$(L10N_framework)"=="" -.INCLUDE : $(PRJ)$/util$/makefile.pmk - .IF "$(ENABLE_PRESENTER_SCREEN)" == "NO" @all: @echo "Presenter Screen build disabled." .ELSE +.IF "$(L10N_framework)"=="" +.INCLUDE : $(PRJ)$/util$/makefile.pmk + DLLPRE= common_build_zip= @@ -126,12 +126,6 @@ ZIP1LIST= * DESCRIPTION:=$(ZIP1DIR)$/description.xml -.IF "$(GUI)" == "WIN" || "$(GUI)" == "WNT" -PACKLICS:=$(foreach,i,$(alllangiso) $(ZIP1DIR)$/registry$/license_$i) -.ELSE -PACKLICS:=$(foreach,i,$(alllangiso) $(ZIP1DIR)$/registry$/LICENSE_$i) -.ENDIF - .IF "$(WITH_LANG)"=="" FIND_XCU=registry/data .ELSE # "$(WITH_LANG)"=="" @@ -144,9 +138,6 @@ COMPONENT_FILES= \ $(ZIP1DIR)$/registry$/schema/org$/openoffice$/Office$/extension$/PresenterScreen.xcs \ $(ZIP1DIR)$/registry$/data/$/org$/openoffice$/Office$/extension$/PresenterScreen.xcu -#COMPONENT_MERGED_XCU= \ -# $(FIND_XCU)$/org$/openoffice$/Office$/extension$/PresenterScreen.xcu - COMPONENT_BITMAPS= \ $(ZIP1DIR)$/bitmaps$/BorderTop.png \ $(ZIP1DIR)$/bitmaps$/BorderTopLeft.png \ @@ -245,8 +236,7 @@ COMPONENT_BITMAPS= \ $(ZIP1DIR)$/bitmaps$/LabelMouseOverRight.png COMPONENT_IMAGES=\ - $(ZIP1DIR)$/bitmaps$/extension_32.png \ - $(ZIP1DIR)$/bitmaps$/extension_32_h.png + $(ZIP1DIR)$/bitmaps$/extension_32.png COMPONENT_MANIFEST= \ $(ZIP1DIR)$/META-INF$/manifest.xml @@ -261,7 +251,6 @@ COMPONENT_HELP= \ $(foreach,l,$(alllangiso) $(ZIP1DIR)$/help$/$l$/com.sun.PresenterScreen-$(PLATFORMID)$/presenter.xhp) ZIP1DEPS= \ - $(PACKLICS) \ $(DESCRIPTION) \ $(COMPONENT_MANIFEST) \ $(COMPONENT_FILES) \ @@ -270,9 +259,6 @@ ZIP1DEPS= \ $(COMPONENT_LIBRARY) \ $(COMPONENT_HELP) -# $(COMPONENT_MERGED_XCU) \ - - LINKNAME:=help XHPLINKSRC:=$(ZIP1DIR)/help @@ -323,7 +309,7 @@ $(COMPONENT_IMAGES) : $(SOLARSRC)$/$(RSCDEFIMG)$/desktop$/res$/$$(@:f) $(COMPONENT_LIBRARY) : $(DLLDEST)$/$$(@:f) @-$(MKDIRHIER) $(@:d) +$(COPY) $< $@ -.IF "$(OS)$(CPU)"=="WNTI" +.IF "$(OS)$(CPU)"=="WNTI" && "$(WITH_EXTENSION_INTEGRATION)"!="YES" .IF "$(COM)"=="GCC" $(GNUCOPY) $(SOLARBINDIR)$/mingwm10.dll $(ZIP1DIR) .ELSE @@ -363,19 +349,9 @@ $(COMPONENT_LIBRARY) : $(DLLDEST)$/$$(@:f) .ENDIF .ENDIF # "$(PACKMS)"!="" .ENDIF #"$(COM)"=="GCC" -.ENDIF +.ENDIF #"$(OS)$(CPU)"=="WNTI" && "$(WITH_EXTENSION_INTEGRATION)"!="YES" -.IF "$(GUI)" == "WIN" || "$(GUI)" == "WNT" -$(PACKLICS) : $(SOLARBINDIR)$/osl$/license$$(@:b:s/_/./:e:s/./_/)$$(@:e).txt - @@-$(MKDIRHIER) $(@:d) - $(GNUCOPY) $< $@ -.ELSE -$(PACKLICS) : $(SOLARBINDIR)$/osl$/LICENSE$$(@:b:s/_/./:e:s/./_/)$$(@:e) - @@-$(MKDIRHIER) $(@:d) - $(GNUCOPY) $< $@ -.ENDIF - $(ZIP1DIR)/%.xcu : %.xcu @@-$(MKDIRHIER) $(@:d) @@ -385,24 +361,18 @@ $(ZIP1DIR)$/%.xcs : %.xcs @@-$(MKDIRHIER) $(@:d) $(GNUCOPY) $< $@ -# Temporary file that is used to replace some placeholders in description.xml. -DESCRIPTION_TMP:=$(ZIP1DIR)$/description.xml.tmp - .INCLUDE .IGNORE : $(ZIP1DIR)_lang_track.mk .IF "$(LAST_WITH_LANG)"!="$(WITH_LANG)" PHONYDESC=.PHONY .ENDIF # "$(LAST_WITH_LANG)"!="$(WITH_LANG)" $(DESCRIPTION) $(PHONYDESC) : $$(@:f) @-$(MKDIRHIER) $(@:d) - $(PERL) $(SOLARENV)$/bin$/licinserter.pl description.xml registry/LICENSE_xxx $(DESCRIPTION_TMP) @echo LAST_WITH_LANG=$(WITH_LANG) > $(ZIP1DIR)_lang_track.mk - $(TYPE) $(DESCRIPTION_TMP) | sed s/UPDATED_PLATFORM/$(PLATFORMID)/ > $@ - @@-$(RM) $(DESCRIPTION_TMP) - + $(TYPE) description.xml | sed s/UPDATED_PLATFORM/$(PLATFORMID)/ > $@ -.ENDIF # "$(ENABLE_PRESENTER_SCREEN)" != "NO" .ELSE ivo: $(ECHO) .ENDIF # L10N_framework +.ENDIF # "$(ENABLE_PRESENTER_SCREEN)" != "NO" diff --git a/swext/mediawiki/build.xml b/swext/mediawiki/build.xml index d39331e..94ce827 100644 --- a/swext/mediawiki/build.xml +++ b/swext/mediawiki/build.xml @@ -130,16 +130,15 @@ <zip destfile="${dist}/${name}.${ext}"> <fileset dir="${out}/misc/${target}/package_tmp" casesensitive="yes"/> <fileset dir="${dist}" includes="${target}.jar" casesensitive="yes"/> - <file file="${commons-codec-jar}"/> - <file file="${commons-httpclient-jar}"/> - <file file="${commons-lang-jar}"/> - <file file="${commons-logging-jar}"/> + <fileset file="${commons-codec-jar}" casesensitive="yes"/> + <fileset file="${commons-httpclient-jar}" casesensitive="yes"/> + <fileset file="${commons-lang-jar}" casesensitive="yes"/> + <fileset file="${commons-logging-jar}" casesensitive="yes"/> <zipfileset file="src/filter/odt2mediawiki.xsl" casesensitive="yes" fullpath="filter/odt2mediawiki.xsl"/> <zipfileset file="src/filter/mediawiki.ott" casesensitive="yes" fullpath="templates/MediaWiki/mediawiki.ott"/> <zipfileset dir="${solar.bin}/xslt/export/xsltml" casesensitive="yes" prefix="filter/math"/> <zipfileset dir="src" includes="uno-extension-manifest.xml" casesensitive="yes" fullpath="META-INF/manifest.xml"/> <zipfileset dir="dialogs" includes="**/*.xdl,**/*.xba,**/*.xlb" casesensitive="yes" prefix="WikiEditor"/> - <zipfileset dir="${out}/misc/${target}/license" includes="LICENSE*" casesensitive="yes" prefix="license"/> <zipfileset dir="${out}/misc/${target}/help" includes="**/*.idxl/*,**/*.*_,**/*.jar" casesensitive="yes" prefix="help"/> <zipfileset dir="${out}/misc/${target}/help" includes="**/*.xhp" casesensitive="yes" prefix="help"/> <zipfileset dir="src" includes="THIRDPARTYLICENSEREADME.html" casesensitive="yes" prefix="license"/> @@ -165,7 +164,6 @@ <zipfileset dir="${out}/misc/${target}_merge/help" includes="**/*.xhp" casesensitive="yes" prefix="help" filemode="664" dirmode="775"/> <zipfileset dir="dialogs" includes="**/*.xdl,**/*.xba,**/*.xlb" casesensitive="yes" prefix="WikiEditor" filemode="664" dirmode="775"/> <zipfileset dir="src" includes="uno-extension-manifest.xml" casesensitive="yes" fullpath="META-INF/manifest.xml" filemode="664" dirmode="775"/> - <zipfileset dir="${out}/misc/${target}/license" includes="LICENSE*" casesensitive="yes" prefix="license" filemode="664" dirmode="775"/> <zipfileset dir="src" includes="THIRDPARTYLICENSEREADME.html" casesensitive="yes" prefix="license" filemode="664" dirmode="775"/> </zip> </target> diff --git a/swext/mediawiki/src/description.xml b/swext/mediawiki/src/description.xml index 369efc1..7f533d9 100644 --- a/swext/mediawiki/src/description.xml +++ b/swext/mediawiki/src/description.xml @@ -5,11 +5,6 @@ <display-name> <name lang="en-US">@WIKIEXTENSIONPRODUCTNAME@</name> </display-name> - <registration> - <simple-license accept-by="admin" default-license-id="lic-en-US"> - <license-text xlink:href="licensefile" lang="isocode" license-id="lic-isocode"/> - </simple-license> - </registration> <dependencies> <OpenOffice.org-minimal-version value="3.0" d:name="OpenOffice.org 3.0 or StarOffice 9"/> </dependencies> diff --git a/swext/mediawiki/src/makefile.mk b/swext/mediawiki/src/makefile.mk index ab656fe..8d920ab 100644 --- a/swext/mediawiki/src/makefile.mk +++ b/swext/mediawiki/src/makefile.mk @@ -38,27 +38,11 @@ ENABLE_EXCEPTIONS=TRUE DESCRIPTION:=$(MISC)$/$(TARGET)$/description.xml -# .IF "$(GUI)" == "WIN" || "$(GUI)" == "WNT" -# PACKLICS:=$(foreach,i,$(alllangiso) $(MISC)$/$(TARGET)$/license$/license_$i) -# .ELSE -PACKLICS:=$(foreach,i,$(alllangiso) $(MISC)$/$(TARGET)$/license$/LICENSE_$i) -# .ENDIF - common_build_zip= .INCLUDE : target.mk -.IF "$(GUI)" == "WIN" || "$(GUI)" == "WNT" -$(PACKLICS) : $(SOLARBINDIR)$/osl$/license$$(@:b:s/_/./:e:s/./_/)$$(@:e).txt - @@-$(MKDIRHIER) $(@:d) - $(GNUCOPY) $< $@ -.ELSE -$(PACKLICS) : $(SOLARBINDIR)$/osl$/LICENSE$$(@:b:s/_/./:e:s/./_/)$$(@:e) - @@-$(MKDIRHIER) $(@:d) - $(GNUCOPY) $< $@ -.ENDIF - -ALLTAR: $(PACKLICS) $(DESCRIPTION) +ALLTAR: $(DESCRIPTION) .INCLUDE .IGNORE : $(MISC)$/$(TARGET)_lang_track.mk .IF "$(LAST_WITH_LANG)"!="$(WITH_LANG)" diff --git a/swext/prj/build.lst b/swext/prj/build.lst index 143351e..34e56e5 100644 --- a/swext/prj/build.lst +++ b/swext/prj/build.lst @@ -1,4 +1,4 @@ -swext swext : officecfg L10N:l10n javaunohelper ridljar unoil jurt APACHE_COMMONS:apache-commons readlicense_oo xsltml xmlhelp NULL +swext swext : officecfg TRANSLATIONS:translations l10ntools javaunohelper ridljar unoil jurt APACHE_COMMONS:apache-commons readlicense_oo xsltml xmlhelp NULL swext swext usr1 - all swext_mkout NULL swext swext\mediawiki\help nmake - all swext_mwhelp NULL swext swext\mediawiki\src\registry\schema\org\openoffice\Office\Custom nmake - all swext_mwschema NULL diff --git a/swext/prj/d.lst b/swext/prj/d.lst index 108d9cd..0624f50 100644 --- a/swext/prj/d.lst +++ b/swext/prj/d.lst @@ -1,4 +1,5 @@ mkdir: %_DEST%\bin%_EXT%\swext ..\%__SRC%\bin\wiki-publisher.oxt %_DEST%\bin%_EXT%\swext\wiki-publisher.oxt +..\%__SRC%\bin\wiki-publisher.oxt %_DEST%\bin%_EXT%\wiki-publisher.oxt ..\%__SRC%\bin\mediawiki_develop.zip %_DEST%\bin%_EXT%\swext\mediawiki_develop.zip diff --git a/tomcat/makefile.mk b/tomcat/makefile.mk index a4d8236..9bdae76 100755 --- a/tomcat/makefile.mk +++ b/tomcat/makefile.mk @@ -44,12 +44,16 @@ TARFILE_MD5=2a177023f9ea8ec8bd00837605c5df1b TARFILE_ROOTDIR=jakarta-tomcat-5.0.30-src ADDITIONAL_FILES = jakarta-servletapi-5/build.xml -#CONVERTFILES=build$/build.xml PATCH_FILES=tomcat.patch BUILD_DIR=jakarta-servletapi-5 + +.IF "$(JAVACISGCJ)"=="yes" BUILD_ACTION=$(ANT) +.ELSE +BUILD_ACTION=$(ANT) -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) +.ENDIF # --- Targets ------------------------------------------------------ diff --git a/tomcat/prj/build.lst b/tomcat/prj/build.lst index 184f6dd..184f6dd 100755..100644 --- a/tomcat/prj/build.lst +++ b/tomcat/prj/build.lst diff --git a/tomcat/prj/d.lst b/tomcat/prj/d.lst index 825601e..825601e 100755..100644 --- a/tomcat/prj/d.lst +++ b/tomcat/prj/d.lst |