[Libreoffice-commits] core.git: 20 commits - basic/source configure.ac connectivity/source dictionaries i18nlangtag/README icon-themes/galaxy include/basic instsetoo_native/CustomTarget_setup.mk instsetoo_native/util lotuswordpro/source sal/osl sc/inc scp2/inc scp2/source sc/source sd/source solenv/bin unotools/source wizards/source
Michael Stahl
mstahl at redhat.com
Wed Sep 11 16:09:15 PDT 2013
basic/source/classes/propacc.cxx | 9
basic/source/classes/sbunoobj.cxx | 11
basic/source/classes/sbxmod.cxx | 3
basic/source/inc/date.hxx | 15
basic/source/runtime/methods.cxx | 200 +++++++++-
basic/source/runtime/methods1.cxx | 4
basic/source/runtime/rtlproto.hxx | 6
basic/source/runtime/stdobj.cxx | 12
basic/source/sbx/sbxvalue.cxx | 2
configure.ac | 8
connectivity/source/drivers/firebird/Connection.cxx | 6
connectivity/source/drivers/firebird/DatabaseMetaData.cxx | 37 -
connectivity/source/drivers/firebird/PreparedStatement.cxx | 1
connectivity/source/drivers/firebird/Table.cxx | 8
dictionaries | 2
i18nlangtag/README | 6
icon-themes/galaxy/sc/res/icon-set-negative-red-smilie.png |binary
icon-themes/galaxy/sc/res/icon-set-negative-yellow-smilie.png |binary
icon-themes/galaxy/sc/res/icon-set-neutral-yellow-smilie.png |binary
icon-themes/galaxy/sc/res/icon-set-positive-green-smilie.png |binary
icon-themes/galaxy/sc/res/icon-set-positive-yellow-smilie.png |binary
include/basic/sbuno.hxx | 6
include/basic/sbxvar.hxx | 2
instsetoo_native/CustomTarget_setup.mk | 4
instsetoo_native/util/openoffice.lst.in | 12
lotuswordpro/source/filter/tocread.cxx | 2
sal/osl/unx/time.c | 4
sc/inc/colorscale.hxx | 2
sc/source/core/data/colorscale.cxx | 12
sc/source/ui/inc/iconsets.hrc | 5
sc/source/ui/src/condformatdlg.src | 2
sc/source/ui/src/iconsets.src | 20 +
scp2/inc/macros.inc | 2
scp2/source/base/postgresqlsdbc.scp | 2
scp2/source/extensions/file_extensions.scp | 12
scp2/source/ooo/file_ooo.scp | 12
scp2/source/ooo/ure.scp | 2
scp2/source/python/file_python.scp | 2
sd/source/filter/ppt/pptanimations.hxx | 9
solenv/bin/modules/installer.pm | 8
solenv/bin/modules/installer/environment.pm | 6
solenv/bin/modules/installer/scriptitems.pm | 16
solenv/bin/modules/installer/worker.pm | 76 ---
unotools/source/config/lingucfg.cxx | 3
wizards/source/depot/Depot.xba | 20 -
wizards/source/depot/Internet.xba | 8
46 files changed, 390 insertions(+), 189 deletions(-)
New commits:
commit 5bab11089f40919310eb9e469bcbc89193ae2a5f
Author: Michael Stahl <mstahl at redhat.com>
Date: Thu Sep 12 00:41:03 2013 +0200
put appropriate UserInstallation in bootstraprc on !ENABLE_RELEASE_BUILD
This used to be handled by the "LOCALUSERDIR $ORIGIN/.." line for
LibreOffice_Dev in openoffice.lst.in but that won't affect INSTDIR.
Change-Id: I1acd1ee7c08c98443e1cc425e1a6bb872d7c81f7
diff --git a/instsetoo_native/CustomTarget_setup.mk b/instsetoo_native/CustomTarget_setup.mk
index 6a077c4..a4c8893 100644
--- a/instsetoo_native/CustomTarget_setup.mk
+++ b/instsetoo_native/CustomTarget_setup.mk
@@ -34,7 +34,9 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_
&& echo '[Bootstrap]' \
&& echo 'InstallMode=<installmode>' \
&& echo 'ProductKey=$(PRODUCTNAME) $(PRODUCTVERSION)' \
- && echo 'UserInstallation=$$SYSUSERCONFIG/$(if $(filter-out MACOSX WNT,$(OS)),$(shell echo $(PRODUCTNAME) | tr "[:upper:]" "[:lower:]"),$(PRODUCTNAME))/$(LIBO_VERSION_MAJOR)' \
+ $(if $(ENABLE_RELEASE_BUILD),\
+ && echo 'UserInstallation=$$SYSUSERCONFIG/$(if $(filter-out MACOSX WNT,$(OS)),$(shell echo $(PRODUCTNAME) | tr "[:upper:]" "[:lower:]"),$(PRODUCTNAME))/$(LIBO_VERSION_MAJOR)', \
+ && echo 'UserInstallation=$$ORIGIN/..') \
) > $@
$(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_rcfile,fundamental) :
commit d7e72bef24b911ae2c5639535869c970c994878b
Author: Eike Rathke <erack at redhat.com>
Date: Thu Sep 12 00:39:25 2013 +0200
certainly it is enough to obtain the disables dictionaries once?
Change-Id: I323719e9c74d7c117062fb225a890a5e65c042ab
diff --git a/unotools/source/config/lingucfg.cxx b/unotools/source/config/lingucfg.cxx
index 47bcadc..ebed68e 100644
--- a/unotools/source/config/lingucfg.cxx
+++ b/unotools/source/config/lingucfg.cxx
@@ -1050,6 +1050,8 @@ std::vector< SvtLinguConfigDictionaryEntry > SvtLinguConfig::GetActiveDictionari
sal_Int32 nLen = aElementNames.getLength();
const OUString *pElementNames = aElementNames.getConstArray();
+ const uno::Sequence< OUString > aDisabledDics( GetDisabledDictionaries() );
+
SvtLinguConfigDictionaryEntry aDicEntry;
for (sal_Int32 i = 0; i < nLen; ++i)
{
@@ -1059,7 +1061,6 @@ std::vector< SvtLinguConfigDictionaryEntry > SvtLinguConfig::GetActiveDictionari
{
// check if it is active or not
bool bDicIsActive = true;
- const uno::Sequence< OUString > aDisabledDics( GetDisabledDictionaries() );
for (sal_Int32 k = 0; bDicIsActive && k < aDisabledDics.getLength(); ++k)
{
if (aDisabledDics[k] == pElementNames[i])
commit c24aa1e41cb58c206b4f702ef6737d9449b97e42
Author: Eike Rathke <erack at redhat.com>
Date: Thu Sep 12 00:17:40 2013 +0200
added dictionary change description
Change-Id: I3271f79a4e3570cc909b6a1e568edfcd07b4ceac
diff --git a/i18nlangtag/README b/i18nlangtag/README
index edb8dc8..338fd31 100644
--- a/i18nlangtag/README
+++ b/i18nlangtag/README
@@ -65,3 +65,9 @@ If locale data exists:
* i18npool/Library_localedata_*.mk for example i18npool/Library_localedata_euro.mk
** change the entry for the changed .xml file, for example CustomTarget/i18npool/localedata/localedata_sh_RS to CustomTarget/i18npool/localedata/localedata_sr_Latn_RS, sort the list alphabetically
+
+If dictionary exists:
+
+* dictionaries/*/dictionaries.xcu for example dictionaries/sr/dictionaries.xcu
+** change the affected <node oor:name="..."> elements to something corresponding, for example <node oor:name="HunSpellDic_sh" ...> to <node oor:name="HunSpellDic_sr_Latn" ...>
+** in the "Locales" properties change the <value> element, for example <value>sh-RS</value> to <value>sr-Latn-RS</value>
commit f89cce877cc0480e00ee226780dec887f9d0063a
Author: Michael Stahl <mstahl at redhat.com>
Date: Thu Sep 12 00:04:39 2013 +0200
installer: search files in INSTDIR
INSTDIR has everything that will be installed anyway, so ideally the
file search patch should only be INSTDIR + whatever is needed to get the
Package file lists; especially WORKDIR seems inappropriate there.
The exception is extension .oxt files which apparently are not in
INSTDIR; not sure what to do about those.
Change-Id: I2477c25ab9fcf953fae9c219e76c467e14729cda
diff --git a/instsetoo_native/util/openoffice.lst.in b/instsetoo_native/util/openoffice.lst.in
index 50ec864..8c995cb 100644
--- a/instsetoo_native/util/openoffice.lst.in
+++ b/instsetoo_native/util/openoffice.lst.in
@@ -82,7 +82,7 @@ LibreOffice
downloadname LibreOffice_{productversion}_{os}_install_{languages}
langpackdownloadname LibreOffice_{productversion}_languagepack_{os}_install_{languages}
helppackdownloadname LibreOffice_{productversion}_helppack_{os}_install_{languages}
- include {solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor}/desktop-integration/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor},{solarpath}/xml.{minor},{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{filelistpath},{shlxthdlpath}
+ include {solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor}/desktop-integration/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor},{solarpath}/xml.{minor},{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{shlxthdlpath},{instdir},{extensionsdir}
}
}
@@ -138,7 +138,7 @@ LibreOffice_Dev
downloadname LibreOfficeDev_{productversion}_{os}_install_{languages}
langpackdownloadname LibreOfficeDev_{productversion}_languagepack_{os}_install_{languages}
helppackdownloadname LibreOfficeDev_{productversion}_helppack_{os}_install_{languages}
- include {solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor}/desktop-integration/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/openoffice_dev,{solarpath}/pck.{minor},{solarpath}/xml.{minor},{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{filelistpath},{shlxthdlpath}
+ include {solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor}/desktop-integration/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/openoffice_dev,{solarpath}/pck.{minor},{solarpath}/xml.{minor},{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{shlxthdlpath},{instdir},{extensionsdir}
}
}
@@ -177,7 +177,7 @@ LibreOffice_SDK
active 1
compression 5
script sdkoo
- include {solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor},{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{filelistpath}
+ include {solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor},{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{instdir}
}
}
@@ -223,7 +223,7 @@ LibreOffice_Dev_SDK
active 1
compression 5
script sdkoo
- include {solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor},{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{filelistpath}
+ include {solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor},{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{instdir}
}
}
@@ -262,7 +262,7 @@ LibreOffice_Test
active 1
compression 5
script test
- include {solarpath}/bin.{minor}/cppunit,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{filelistpath}
+ include {solarpath}/bin.{minor}/cppunit,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor}
}
}
@@ -308,6 +308,6 @@ LibreOffice_Dev_Test
active 1
compression 5
script test
- include {solarpath}/bin.{minor}/cppunit,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{filelistpath}
+ include {solarpath}/bin.{minor}/cppunit,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor}
}
}
diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc
index 3b34334..3b8740a 100755
--- a/scp2/inc/macros.inc
+++ b/scp2/inc/macros.inc
@@ -95,7 +95,7 @@
#define GID_DIR_URE_SHARE_MISC gid_Dir_Ure_Misc
#endif
-#define RESFILENAME(name,lang) STRING(CONCAT4(ResTarget/,name,lang,.res))
+#define RESFILENAME(name,lang) STRING(CONCAT3(name,lang,.res))
#define READMETXTFILENAME(name,lang,ext) STRING(CONCAT4(name,lang,.,ext))
#define READMEFILENAME(name,lang) STRING(CONCAT2(name,lang))
#define EXTRAFILENAME(name,lang) STRING(CONCAT3(name,lang,.zip))
diff --git a/scp2/source/base/postgresqlsdbc.scp b/scp2/source/base/postgresqlsdbc.scp
index 5cef251..172f7f3 100644
--- a/scp2/source/base/postgresqlsdbc.scp
+++ b/scp2/source/base/postgresqlsdbc.scp
@@ -39,7 +39,7 @@ End
File gid_File_PostgresqlSdbc_Rdb
TXT_FILE_BODY;
Dir = gid_Brand_Dir_Program_Services;
- Name = "Rdb/postgresql-sdbc.rdb";
+ Name = "postgresql-sdbc.rdb";
Styles = (PACKED);
End
diff --git a/scp2/source/extensions/file_extensions.scp b/scp2/source/extensions/file_extensions.scp
index aaca36a..3161490 100644
--- a/scp2/source/extensions/file_extensions.scp
+++ b/scp2/source/extensions/file_extensions.scp
@@ -30,7 +30,7 @@ File gid_File_Oxt_Presentation_Minimizer
TXT_FILE_BODY;
Styles = (PACKED, ARCHIVE);
Dir = gid_Brand_Dir_Share_Extensions_Presentation_Minimizer;
- Name = "Extension/presentation-minimizer.oxt";
+ Name = "presentation-minimizer.oxt";
End
#endif
@@ -43,7 +43,7 @@ File gid_File_Oxt_MediaWiki
TXT_FILE_BODY;
Styles = (PACKED, ARCHIVE);
Dir = gid_Brand_Dir_Share_Extensions_MediaWiki;
- Name = "Extension/wiki-publisher.oxt";
+ Name = "wiki-publisher.oxt";
End
#endif
@@ -173,7 +173,7 @@ File gid_File_Oxt_NLPSolver
TXT_FILE_BODY;
Styles = (PACKED, ARCHIVE);
Dir = gid_Brand_Dir_Share_Extensions_NLPSolver;
- Name = "Extension/nlpsolver.oxt";
+ Name = "nlpsolver.oxt";
End
#endif
@@ -199,7 +199,7 @@ File gid_File_Oxt_MySQLConnector
TXT_FILE_BODY;
Styles = (PACKED, ARCHIVE);
Dir = gid_Brand_Dir_Share_Extensions_MySQLConnector;
- Name = "Extension/mysql-connector-ooo.oxt";
+ Name = "mysql-connector-ooo.oxt";
End
#endif
@@ -234,7 +234,7 @@ STD_JAR_FILE( gid_File_Jar_Scriptproviderforbeanshell, ScriptProviderForBeanShel
File gid_File_Rdb_Scriptproviderforbeanshell
TXT_FILE_BODY;
- Name = "Rdb/scriptproviderforbeanshell.rdb";
+ Name = "scriptproviderforbeanshell.rdb";
Dir = gid_Brand_Dir_Program_Services;
Styles = (PACKED);
End
@@ -251,7 +251,7 @@ STD_JAR_FILE( gid_File_Jar_Scriptproviderforjavascript, ScriptProviderForJavaScr
File gid_File_Rdb_Scriptproviderforjavascript
TXT_FILE_BODY;
- Name = "Rdb/scriptproviderforjavascript.rdb";
+ Name = "scriptproviderforjavascript.rdb";
Dir = gid_Brand_Dir_Program_Services;
Styles = (PACKED);
End
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index 65d1e7f..994a1fc 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -646,35 +646,35 @@ File gid_File_Txt_Pagein_Calc
TXT_FILE_BODY;
Dir = gid_Brand_Dir_Program;
Styles = (PACKED);
- Name = "Pagein/pagein-calc";
+ Name = "pagein-calc";
End
File gid_File_Txt_Pagein_Common
TXT_FILE_BODY;
Dir = gid_Brand_Dir_Program;
Styles = (PACKED);
- Name = "Pagein/pagein-common";
+ Name = "pagein-common";
End
File gid_File_Txt_Pagein_Draw
TXT_FILE_BODY;
Dir = gid_Brand_Dir_Program;
Styles = (PACKED);
- Name = "Pagein/pagein-draw";
+ Name = "pagein-draw";
End
File gid_File_Txt_Pagein_Impress
TXT_FILE_BODY;
Dir = gid_Brand_Dir_Program;
Styles = (PACKED);
- Name = "Pagein/pagein-impress";
+ Name = "pagein-impress";
End
File gid_File_Txt_Pagein_Writer
TXT_FILE_BODY;
Dir = gid_Brand_Dir_Program;
Styles = (PACKED);
- Name = "Pagein/pagein-writer";
+ Name = "pagein-writer";
End
#endif
@@ -688,7 +688,7 @@ End
File gid_Starregistry_Services_Rdb
TXT_FILE_BODY;
- Name = "Rdb/services.rdb";
+ Name = "services.rdb";
Dir = gid_Brand_Dir_Program_Services;
Styles = (PACKED);
End
diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp
index 48807c9..a1f7646 100644
--- a/scp2/source/ooo/ure.scp
+++ b/scp2/source/ooo/ure.scp
@@ -574,7 +574,7 @@ End
File gid_File_Misc_ServicesRdb
TXT_FILE_BODY;
Dir = GID_DIR_URE_SHARE_MISC;
- Name = "Rdb/ure/services.rdb";
+ Name = "ure/services.rdb";
Styles = (PACKED);
End
diff --git a/scp2/source/python/file_python.scp b/scp2/source/python/file_python.scp
index 57f347d..e4d5336 100644
--- a/scp2/source/python/file_python.scp
+++ b/scp2/source/python/file_python.scp
@@ -52,7 +52,7 @@ STD_LIB_FILE( gid_File_Lib_Pythonloader, pythonloader )
File gid_File_Pyuno_Rdb
TXT_FILE_BODY;
Dir = gid_Brand_Dir_Program_Services;
- Name = "Rdb/pyuno.rdb";
+ Name = "pyuno.rdb";
Styles = (PACKED);
End
diff --git a/solenv/bin/modules/installer/environment.pm b/solenv/bin/modules/installer/environment.pm
index 7591fc0..e76037b 100644
--- a/solenv/bin/modules/installer/environment.pm
+++ b/solenv/bin/modules/installer/environment.pm
@@ -58,6 +58,12 @@ sub create_pathvariables
my $platformname = $environment->{'OUTPATH'};
$variables{'platformname'} = $platformname;
+ my $instdir = $ENV{'INSTDIR'};
+ $variables{'instdir'} = $instdir;
+
+ my $extensionsdir = $environment->{'WORKDIR'} . $installer::globals::separator . "Extension";
+ $variables{'extensionsdir'} = $extensionsdir;
+
my $filelistpath = $environment->{'WORKDIR'};
$variables{'filelistpath'} = $filelistpath;
diff --git a/solenv/bin/modules/installer/scriptitems.pm b/solenv/bin/modules/installer/scriptitems.pm
index bc1ac37a..6267638 100644
--- a/solenv/bin/modules/installer/scriptitems.pm
+++ b/solenv/bin/modules/installer/scriptitems.pm
@@ -1068,8 +1068,23 @@ sub get_Source_Directory_For_Files_From_Includepathlist
my $sourcepathref = "";
+ my $destination = $onefile->{'destination'};
+ my $instdirdestination;
+ if ($destination)
+ {
+ $instdirdestination = $ENV{'INSTDIR'} . $installer::globals::separator . $onefile->{'destination'};
+ }
+ if ($instdirdestination && -f $instdirdestination)
+ {
+ $infoline = "SUCCESS: INSTDIR Source for $onefilename: $instdirdestination\n";
+ push( @installer::globals::logfileinfo, $infoline);
+ $$sourcepathref = $instdirdestination;
+ }
+ else
+ {
if ( $file_can_miss ) { $sourcepathref = get_sourcepath_from_filename_and_includepath(\$onefilename, $includepatharrayref, 0); }
else { $sourcepathref = get_sourcepath_from_filename_and_includepath(\$onefilename, $includepatharrayref, 1); }
+ }
$onefile->{'sourcepath'} = $$sourcepathref; # This $$sourcepathref is empty, if no source was found
}
commit 80a672ecf3e537f1b29a1ae216510837846ceebf
Author: Michael Stahl <mstahl at redhat.com>
Date: Wed Sep 11 22:28:02 2013 +0200
installer: remove support for FILE_CAN_MISS style
The idea appears fundamentally error prone, and is unused.
Change-Id: I65e1c5b80d7101b8ba37c213fcb787d31e3b9d1d
diff --git a/solenv/bin/modules/installer/scriptitems.pm b/solenv/bin/modules/installer/scriptitems.pm
index 71f974e..bc1ac37a 100644
--- a/solenv/bin/modules/installer/scriptitems.pm
+++ b/solenv/bin/modules/installer/scriptitems.pm
@@ -1062,7 +1062,6 @@ sub get_Source_Directory_For_Files_From_Includepathlist
my $styles = "";
my $file_can_miss = 0;
if ( $onefile->{'Styles'} ) { $styles = $onefile->{'Styles'}; }
- if ( $styles =~ /\bFILE_CAN_MISS\b/ ) { $file_can_miss = 1; }
if (( $installer::globals::languagepack ) && ( ! $onefile->{'ismultilingual'} ) && ( ! ( $styles =~ /\bFORCELANGUAGEPACK\b/ ))) { $file_can_miss = 1; }
if (( $installer::globals::helppack ) && ( ! $onefile->{'ismultilingual'} ) && ( ! ( $styles =~ /\bFORCEHELPPACK\b/ ))) { $file_can_miss = 1; }
diff --git a/solenv/bin/modules/installer/worker.pm b/solenv/bin/modules/installer/worker.pm
index f511b54..b97dae2 100644
--- a/solenv/bin/modules/installer/worker.pm
+++ b/solenv/bin/modules/installer/worker.pm
@@ -513,10 +513,6 @@ sub put_scpactions_into_installset
my $sourcefile = $onescpaction->{'sourcepath'};
my $destfile = $destdir . $installer::globals::separator . $onescpaction->{'DestinationName'};
- my $styles = "";
- if ( $onescpaction->{'Styles'} ) { $styles = $onescpaction->{'Styles'}; }
- if (( $styles =~ /\bFILE_CAN_MISS\b/ ) && ( $sourcefile eq "" )) { next; }
-
if (( $subdir =~ /\// ) || ( $subdir =~ /\\/ ))
{
installer::systemactions::create_directory_structure($destdir);
commit 35698e8f703db5770c164c41f9c3169c50cee0ea
Author: Michael Stahl <mstahl at redhat.com>
Date: Wed Sep 11 22:18:16 2013 +0200
installer: remove resolving_hidden_flag
Fortunately such "tooling" appears to be extinct, and there are no
HIDDEN flags in scp2 anyway.
Change-Id: I33bd80e3e74cc1eaaab0fbc50d02090088ae4be4
diff --git a/solenv/bin/modules/installer.pm b/solenv/bin/modules/installer.pm
index f88402b..89e202f 100644
--- a/solenv/bin/modules/installer.pm
+++ b/solenv/bin/modules/installer.pm
@@ -648,14 +648,6 @@ sub run {
installer::scpzipfiles::resolving_scpzip_replace_flag($filesinproductlanguageresolvedarrayref, $allvariableshashref, "File", $languagestringref);
- #####################################
- # Files with flag HIDDEN
- #####################################
-
- installer::logger::print_message( "... analyzing files with flag HIDDEN ...\n" );
-
- installer::worker::resolving_hidden_flag($filesinproductlanguageresolvedarrayref, $allvariableshashref, "File", $languagestringref);
-
############################################
# Collecting directories for epm list file
############################################
diff --git a/solenv/bin/modules/installer/worker.pm b/solenv/bin/modules/installer/worker.pm
index 4d4b7eae..f511b54 100644
--- a/solenv/bin/modules/installer/worker.pm
+++ b/solenv/bin/modules/installer/worker.pm
@@ -770,78 +770,6 @@ sub generate_cygwin_paths
installer::logger::include_timestamp_into_logfile("Ending generating cygwin paths");
}
-################################################
-# Files with flag HIDDEN get a dot at the
-# beginning of the file name. This cannot be
-# defined in scp2 project, because tooling
-# cannot handle files with beginning dot
-# correctly.
-################################################
-
-sub resolving_hidden_flag
-{
- my ($filesarrayref, $variableshashref, $item, $languagestringref) = @_;
-
- my $diritem = lc($item);
- my $infoline = "";
-
- my $hiddendirbase = installer::systemactions::create_directories("hidden_$diritem", $languagestringref);
-
- installer::logger::include_header_into_logfile("$item with flag HIDDEN:");
-
- for ( my $i = 0; $i <= $#{$filesarrayref}; $i++ )
- {
- my $onefile = ${$filesarrayref}[$i];
- my $styles = "";
-
- if ( $onefile->{'Styles'} ) { $styles = $onefile->{'Styles'}; }
-
- if ( $styles =~ /\bHIDDEN\b/ )
- {
- # Language specific subdirectory
-
- my $onelanguage = $onefile->{'specificlanguage'};
-
- if ($onelanguage eq "")
- {
- $onelanguage = "00"; # files without language into directory "00"
- }
-
- my $hiddendir = $hiddendirbase . $installer::globals::separator . $onelanguage . $installer::globals::separator;
- installer::systemactions::create_directory($hiddendir); # creating language specific directories
-
- # copy files and edit them with the variables defined in the zip.lst
-
- my $onefilename = $onefile->{'Name'};
- my $newfilename = "\." . $onefilename;
- my $sourcefile = $onefile->{'sourcepath'};
- my $destfile = $hiddendir . $newfilename;
-
- my $copysuccess = installer::systemactions::copy_one_file($sourcefile, $destfile);
-
- if ( $copysuccess )
- {
- $onefile->{'sourcepath'} = $destfile;
- $destination = $onefile->{'destination'};
- installer::pathanalyzer::get_path_from_fullqualifiedname(\$destination);
- if ( $destination eq "" ) { $onefile->{'destination'} = $newfilename; }
- else { $onefile->{'destination'} = $destination . $installer::globals::separator . $newfilename; }
-
- $infoline = "Success: Using file with flag HIDDEN from \"$onefile->{'sourcepath'}\"!\n";
- push( @installer::globals::logfileinfo, $infoline);
- }
- else
- {
- $infoline = "Error: Failed to copy HIDDEN file from \"$sourcefile\" to \"$destfile\"!\n";
- push( @installer::globals::logfileinfo, $infoline);
- }
- }
- }
-
- $infoline = "\n";
- push( @installer::globals::logfileinfo, $infoline);
-}
-
######################################################
# Getting the first entry from a list of languages
######################################################
commit 40ff84cfdc56dd44e50d0fda34d5b97e6d2cafdc
Author: Eike Rathke <erack at redhat.com>
Date: Wed Sep 11 23:59:45 2013 +0200
Updated core
Project: dictionaries b07ae33b0d25e33bf890fab8fbcd3317506bbeae
diff --git a/dictionaries b/dictionaries
index a32a341..b07ae33 160000
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit a32a341efdbb9e53a7b832262a41f6fb6454bedf
+Subproject commit b07ae33b0d25e33bf890fab8fbcd3317506bbeae
commit b31f33bcc1e5b8d1f791867358b5b4ad1df6e71e
Author: Lionel Elie Mamane <lionel at mamane.lu>
Date: Mon Sep 9 20:00:48 2013 +0200
Easier conversion between Basic Date and UNO Date/Time
Utility functions to convert between Basic Date type
and the representations of Date and Time in UNO, namely:
- com.sun.star.util.Date
- com.sun.star.util.Time
- com.sun.star.util.DateTime
Name of new functions:
- CDateToUnoDate
- CDateFromUnoDate
- CDateToUnoTime
- CDateFromUnoTime
- CDateToUnoDateTime
- CDateFromUnoDateTime
Change-Id: I2b971df20df1c0351d071023e042169b548894f1
Reviewed-on: https://gerrit.libreoffice.org/5897
Reviewed-by: Noel Power <noel.power at suse.com>
Tested-by: Noel Power <noel.power at suse.com>
diff --git a/basic/source/classes/propacc.cxx b/basic/source/classes/propacc.cxx
index 9d62724..48e56c2 100644
--- a/basic/source/classes/propacc.cxx
+++ b/basic/source/classes/propacc.cxx
@@ -22,6 +22,7 @@
#include <basic/sbstar.hxx>
#include <sbunoobj.hxx>
+#include <basic/sbuno.hxx>
#include <limits.h> // USHRT_MAX
@@ -32,14 +33,6 @@ using namespace com::sun::star::lang;
using namespace com::sun::star::beans;
using namespace cppu;
-
-//========================================================================
-
-// Declaration conversion from Sbx to UNO with known target type
-Any sbxToUnoValue( SbxVariable* pVar, const Type& rType, Property* pUnoProperty = NULL );
-
-//========================================================================
-
#ifdef WNT
#define CDECL _cdecl
#endif
diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx
index c0b9c33..eba896f 100644
--- a/basic/source/classes/sbunoobj.cxx
+++ b/basic/source/classes/sbunoobj.cxx
@@ -897,7 +897,7 @@ Type getUnoTypeForSbxBaseType( SbxDataType eType )
}
// Converting of Sbx to Uno without a know target class for TypeClass_ANY
-Type getUnoTypeForSbxValue( SbxValue* pVal )
+Type getUnoTypeForSbxValue( const SbxValue* pVal )
{
Type aRetType = getCppuVoidType();
if( !pVal )
@@ -1026,11 +1026,8 @@ Type getUnoTypeForSbxValue( SbxValue* pVal )
return aRetType;
}
-// Declaration converting of Sbx to Uno with known target class
-Any sbxToUnoValue( SbxVariable* pVar, const Type& rType, Property* pUnoProperty = NULL );
-
// converting of Sbx to Uno without known target class for TypeClass_ANY
-Any sbxToUnoValueImpl( SbxVariable* pVar, bool bBlockConversionToSmallestType = false )
+Any sbxToUnoValueImpl( const SbxValue* pVar, bool bBlockConversionToSmallestType = false )
{
SbxDataType eBaseType = pVar->SbxValue::GetType();
if( eBaseType == SbxOBJECT )
@@ -1194,7 +1191,7 @@ static Any implRekMultiDimArrayToSequence( SbxDimArray* pArray,
}
// Map old interface
-Any sbxToUnoValue( SbxVariable* pVar )
+Any sbxToUnoValue( const SbxValue* pVar )
{
return sbxToUnoValueImpl( pVar );
}
@@ -1223,7 +1220,7 @@ static bool implGetTypeByName( const OUString& rName, Type& rRetType )
// converting of Sbx to Uno with known target class
-Any sbxToUnoValue( SbxVariable* pVar, const Type& rType, Property* pUnoProperty )
+Any sbxToUnoValue( const SbxValue* pVar, const Type& rType, Property* pUnoProperty )
{
Any aRetVal;
diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx
index 567d26f..b1e4b8f 100644
--- a/basic/source/classes/sbxmod.cxx
+++ b/basic/source/classes/sbxmod.cxx
@@ -25,6 +25,7 @@
#include <svl/brdcst.hxx>
#include <tools/shl.hxx>
#include <basic/sbx.hxx>
+#include <basic/sbuno.hxx>
#include "sbdiagnose.hxx"
#include "sb.hxx"
#include <sbjsmeth.hxx>
@@ -87,8 +88,6 @@ using namespace com::sun::star::uno;
typedef ::cppu::WeakImplHelper1< XInvocation > DocObjectWrapper_BASE;
typedef ::std::map< sal_Int16, Any, ::std::less< sal_Int16 > > OutParamMap;
-::com::sun::star::uno::Any sbxToUnoValue( SbxVariable* pVar );
-void unoToSbxValue( SbxVariable* pVar, const ::com::sun::star::uno::Any& aValue );
class DocObjectWrapper : public DocObjectWrapper_BASE
{
diff --git a/basic/source/inc/date.hxx b/basic/source/inc/date.hxx
index cd38c89..cb70702 100644
--- a/basic/source/inc/date.hxx
+++ b/basic/source/inc/date.hxx
@@ -20,7 +20,15 @@
#ifndef _SBDATE_HXX
#define _SBDATE_HXX
+#include <com/sun/star/util/Date.hpp>
+#include <com/sun/star/util/Time.hpp>
+#include <com/sun/star/util/DateTime.hpp>
+
bool implDateSerial( sal_Int16 nYear, sal_Int16 nMonth, sal_Int16 nDay, double& rdRet );
+double implTimeSerial( sal_Int16 nHour, sal_Int16 nMinute, sal_Int16 nSecond);
+bool implDateTimeSerial( sal_Int16 nYear, sal_Int16 nMonth, sal_Int16 nDay,
+ sal_Int16 nHour, sal_Int16 nMinute, sal_Int16 nSecond,
+ double& rdRet );
sal_Int16 implGetWeekDay( double aDate, bool bFirstDayParam = false, sal_Int16 nFirstDay = 0 );
@@ -32,6 +40,13 @@ sal_Int16 implGetHour( double dDate );
sal_Int16 implGetMinute( double dDate );
sal_Int16 implGetSecond( double dDate );
+::com::sun::star::util::Date SbxDateToUNODate( const SbxValue* );
+void SbxDateFromUNODate( SbxValue*, const ::com::sun::star::util::Date& );
+::com::sun::star::util::Time SbxDateToUNOTime( const SbxValue* );
+void SbxDateFromUNOTime( SbxValue*, const ::com::sun::star::util::Time& );
+::com::sun::star::util::DateTime SbxDateToUNODateTime( const SbxValue* );
+void SbxDateFromUNODateTime( SbxValue*, const ::com::sun::star::util::DateTime& );
+
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index fb01bdb..048ca0c 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -19,6 +19,7 @@
#include <tools/date.hxx>
#include <basic/sbxvar.hxx>
+#include <basic/sbuno.hxx>
#include <osl/process.h>
#include <vcl/dibtools.hxx>
#include <vcl/svapp.hxx>
@@ -1857,6 +1858,177 @@ sal_Int16 implGetDateMonth( double aDate )
return nRet;
}
+::com::sun::star::util::Date SbxDateToUNODate( const SbxValue* const pVal )
+{
+ double aDate = pVal->GetDate();
+
+ com::sun::star::util::Date aUnoDate;
+ aUnoDate.Day = implGetDateDay ( aDate );
+ aUnoDate.Month = implGetDateMonth( aDate );
+ aUnoDate.Year = implGetDateYear ( aDate );
+
+ return aUnoDate;
+}
+
+void SbxDateFromUNODate( SbxValue *pVal, const ::com::sun::star::util::Date& aUnoDate)
+{
+ double dDate;
+ if( implDateSerial( aUnoDate.Year, aUnoDate.Month, aUnoDate.Day, dDate ) )
+ {
+ pVal->PutDate( dDate );
+ }
+}
+
+// Function to convert date to UNO date (com.sun.star.util.Date)
+RTLFUNC(CDateToUnoDate)
+{
+ (void)pBasic;
+ (void)bWrite;
+
+ if ( rPar.Count() != 2 )
+ {
+ StarBASIC::Error( SbERR_BAD_ARGUMENT );
+ return;
+ }
+
+ unoToSbxValue(rPar.Get(0), Any(SbxDateToUNODate(rPar.Get(1))));
+}
+
+// Function to convert date from UNO date (com.sun.star.util.Date)
+RTLFUNC(CDateFromUnoDate)
+{
+ (void)pBasic;
+ (void)bWrite;
+
+ if ( rPar.Count() != 2 || rPar.Get(1)->GetType() != SbxOBJECT )
+ {
+ StarBASIC::Error( SbERR_BAD_ARGUMENT );
+ return;
+ }
+
+ Any aAny (sbxToUnoValue(rPar.Get(1), ::getCppuType( (com::sun::star::util::Date*)0 )));
+ com::sun::star::util::Date aUnoDate;
+ if(aAny >>= aUnoDate)
+ SbxDateFromUNODate(rPar.Get(0), aUnoDate);
+ else
+ SbxBase::SetError( SbxERR_CONVERSION );
+}
+
+::com::sun::star::util::Time SbxDateToUNOTime( const SbxValue* const pVal )
+{
+ double aDate = pVal->GetDate();
+
+ com::sun::star::util::Time aUnoTime;
+ aUnoTime.Hours = implGetHour ( aDate );
+ aUnoTime.Minutes = implGetMinute ( aDate );
+ aUnoTime.Seconds = implGetSecond ( aDate );
+ aUnoTime.NanoSeconds = 0;
+
+ return aUnoTime;
+}
+
+void SbxDateFromUNOTime( SbxValue *pVal, const ::com::sun::star::util::Time& aUnoTime)
+{
+ pVal->PutDate( implTimeSerial(aUnoTime.Hours, aUnoTime.Minutes, aUnoTime.Seconds) );
+}
+
+// Function to convert date to UNO time (com.sun.star.util.Time)
+RTLFUNC(CDateToUnoTime)
+{
+ (void)pBasic;
+ (void)bWrite;
+
+ if ( rPar.Count() != 2 )
+ {
+ StarBASIC::Error( SbERR_BAD_ARGUMENT );
+ return;
+ }
+
+ unoToSbxValue(rPar.Get(0), Any(SbxDateToUNOTime(rPar.Get(1))));
+}
+
+// Function to convert date from UNO time (com.sun.star.util.Time)
+RTLFUNC(CDateFromUnoTime)
+{
+ (void)pBasic;
+ (void)bWrite;
+
+ if ( rPar.Count() != 2 || rPar.Get(1)->GetType() != SbxOBJECT )
+ {
+ StarBASIC::Error( SbERR_BAD_ARGUMENT );
+ return;
+ }
+
+ Any aAny (sbxToUnoValue(rPar.Get(1), ::getCppuType( (com::sun::star::util::Time*)0 )));
+ com::sun::star::util::Time aUnoTime;
+ if(aAny >>= aUnoTime)
+ SbxDateFromUNOTime(rPar.Get(0), aUnoTime);
+ else
+ SbxBase::SetError( SbxERR_CONVERSION );
+}
+
+::com::sun::star::util::DateTime SbxDateToUNODateTime( const SbxValue* const pVal )
+{
+ double aDate = pVal->GetDate();
+
+ com::sun::star::util::DateTime aUnoDT;
+ aUnoDT.Day = implGetDateDay ( aDate );
+ aUnoDT.Month = implGetDateMonth( aDate );
+ aUnoDT.Year = implGetDateYear ( aDate );
+ aUnoDT.Hours = implGetHour ( aDate );
+ aUnoDT.Minutes = implGetMinute ( aDate );
+ aUnoDT.Seconds = implGetSecond ( aDate );
+ aUnoDT.NanoSeconds = 0;
+
+ return aUnoDT;
+}
+
+void SbxDateFromUNODateTime( SbxValue *pVal, const ::com::sun::star::util::DateTime& aUnoDT)
+{
+ double dDate;
+ if( implDateTimeSerial( aUnoDT.Year, aUnoDT.Month, aUnoDT.Day,
+ aUnoDT.Hours, aUnoDT.Minutes, aUnoDT.Seconds,
+ dDate ) )
+ {
+ pVal->PutDate( dDate );
+ }
+}
+
+// Function to convert date to UNO date (com.sun.star.util.Date)
+RTLFUNC(CDateToUnoDateTime)
+{
+ (void)pBasic;
+ (void)bWrite;
+
+ if ( rPar.Count() != 2 )
+ {
+ StarBASIC::Error( SbERR_BAD_ARGUMENT );
+ return;
+ }
+
+ unoToSbxValue(rPar.Get(0), Any(SbxDateToUNODateTime(rPar.Get(1))));
+}
+
+// Function to convert date from UNO date (com.sun.star.util.Date)
+RTLFUNC(CDateFromUnoDateTime)
+{
+ (void)pBasic;
+ (void)bWrite;
+
+ if ( rPar.Count() != 2 || rPar.Get(1)->GetType() != SbxOBJECT )
+ {
+ StarBASIC::Error( SbERR_BAD_ARGUMENT );
+ return;
+ }
+
+ Any aAny (sbxToUnoValue(rPar.Get(1), ::getCppuType( (com::sun::star::util::DateTime*)0 )));
+ com::sun::star::util::DateTime aUnoDT;
+ if(aAny >>= aUnoDT)
+ SbxDateFromUNODateTime(rPar.Get(0), aUnoDT);
+ else
+ SbxBase::SetError( SbxERR_CONVERSION );
+}
+
// Function to convert date to ISO 8601 date format
RTLFUNC(CDateToIso)
{
@@ -1954,12 +2126,7 @@ RTLFUNC(TimeSerial)
return;
}
- sal_Int32 nSeconds = nHour;
- nSeconds *= 3600;
- nSeconds += nMinute * 60;
- nSeconds += nSecond;
- double nDays = ((double)nSeconds) / (double)(86400.0);
- rPar.Get(0)->PutDate( nDays ); // JSM
+ rPar.Get(0)->PutDate( implTimeSerial(nHour, nMinute, nSecond) ); // JSM
}
RTLFUNC(DateValue)
@@ -4809,6 +4976,27 @@ bool implDateSerial( sal_Int16 nYear, sal_Int16 nMonth, sal_Int16 nDay, double&
return true;
}
+double implTimeSerial( sal_Int16 nHours, sal_Int16 nMinutes, sal_Int16 nSeconds )
+{
+ return
+ static_cast<double>( nHours * ::Time::secondPerHour +
+ nMinutes * ::Time::secondPerMinute +
+ nSeconds)
+ /
+ static_cast<double>( ::Time::secondPerDay );
+}
+
+bool implDateTimeSerial( sal_Int16 nYear, sal_Int16 nMonth, sal_Int16 nDay,
+ sal_Int16 nHour, sal_Int16 nMinute, sal_Int16 nSecond,
+ double& rdRet )
+{
+ double dDate;
+ if(!implDateSerial(nYear, nMonth, nDay, dDate))
+ return false;
+ rdRet += dDate + implTimeSerial(nHour, nMinute, nSecond);
+ return true;
+}
+
sal_Int16 implGetMinute( double dDate )
{
if( dDate < 0.0 )
diff --git a/basic/source/runtime/methods1.cxx b/basic/source/runtime/methods1.cxx
index 7b7ea19..de275d7 100644
--- a/basic/source/runtime/methods1.cxx
+++ b/basic/source/runtime/methods1.cxx
@@ -33,6 +33,7 @@
#include <osl/file.hxx>
#include <vcl/jobset.hxx>
#include <basic/sbobjmod.hxx>
+#include <basic/sbuno.hxx>
#include "date.hxx"
#include "sbintern.hxx"
@@ -60,9 +61,6 @@ using namespace com::sun::star::lang;
using namespace com::sun::star::sheet;
using namespace com::sun::star::uno;
-void unoToSbxValue( SbxVariable* pVar, const Any& aValue );
-Any sbxToUnoValue( SbxVariable* pVar, const Type& rType, com::sun::star::beans::Property* pUnoProperty = NULL );
-
static Reference< XCalendar3 > getLocaleCalendar( void )
{
static Reference< XCalendar3 > xCalendar;
diff --git a/basic/source/runtime/rtlproto.hxx b/basic/source/runtime/rtlproto.hxx
index ccf0a3b..7a6a9d8 100644
--- a/basic/source/runtime/rtlproto.hxx
+++ b/basic/source/runtime/rtlproto.hxx
@@ -347,6 +347,12 @@ extern RTLFUNC(GlobalScope);
extern RTLFUNC(FileExists);
extern RTLFUNC(ConvertToUrl);
extern RTLFUNC(ConvertFromUrl);
+extern RTLFUNC(CDateToUnoDate);
+extern RTLFUNC(CDateFromUnoDate);
+extern RTLFUNC(CDateToUnoTime);
+extern RTLFUNC(CDateFromUnoTime);
+extern RTLFUNC(CDateToUnoDateTime);
+extern RTLFUNC(CDateFromUnoDateTime);
extern RTLFUNC(CDateToIso);
extern RTLFUNC(CDateFromIso);
extern RTLFUNC(CompatibilityMode);
diff --git a/basic/source/runtime/stdobj.cxx b/basic/source/runtime/stdobj.cxx
index 0815804..34d4582 100644
--- a/basic/source/runtime/stdobj.cxx
+++ b/basic/source/runtime/stdobj.cxx
@@ -108,6 +108,18 @@ static Methods aMethods[] = {
{ "expression", SbxVARIANT, 0,NULL,0 },
{ "CDate", SbxDATE, 1 | _FUNCTION, RTLNAME(CDate),0 },
{ "expression", SbxVARIANT, 0,NULL,0 },
+{ "CDateFromUnoDate", SbxDATE, 1 | _FUNCTION, RTLNAME(CDateFromUnoDate),0 },
+ { "UnoDate", SbxOBJECT, 0,NULL,0 },
+{ "CDateToUnoDate", SbxOBJECT, 1 | _FUNCTION, RTLNAME(CDateToUnoDate),0 },
+ { "Date", SbxDATE, 0,NULL,0 },
+{ "CDateFromUnoTime", SbxDATE, 1 | _FUNCTION, RTLNAME(CDateFromUnoTime),0 },
+ { "UnoTime", SbxOBJECT, 0,NULL,0 },
+{ "CDateToUnoTime", SbxOBJECT, 1 | _FUNCTION, RTLNAME(CDateToUnoTime),0 },
+ { "Time", SbxDATE, 0,NULL,0 },
+{ "CDateFromUnoDateTime", SbxDATE, 1 | _FUNCTION, RTLNAME(CDateFromUnoDateTime),0 },
+ { "UnoDateTime", SbxOBJECT, 0,NULL,0 },
+{ "CDateToUnoDateTime", SbxOBJECT, 1 | _FUNCTION, RTLNAME(CDateToUnoDateTime),0 },
+ { "DateTime", SbxDATE, 0,NULL,0 },
{ "CDateFromIso", SbxDATE, 1 | _FUNCTION, RTLNAME(CDateFromIso),0 },
{ "IsoDate", SbxSTRING, 0,NULL,0 },
{ "CDateToIso", SbxSTRING, 1 | _FUNCTION, RTLNAME(CDateToIso),0 },
diff --git a/basic/source/sbx/sbxvalue.cxx b/basic/source/sbx/sbxvalue.cxx
index 1921c51..3deced1 100644
--- a/basic/source/sbx/sbxvalue.cxx
+++ b/basic/source/sbx/sbxvalue.cxx
@@ -661,7 +661,7 @@ sal_Bool SbxValue::PutDecimal( com::sun::star::bridge::oleautomation::Decimal& r
}
sal_Bool SbxValue::fillAutomationDecimal
- ( com::sun::star::bridge::oleautomation::Decimal& rAutomationDec )
+ ( com::sun::star::bridge::oleautomation::Decimal& rAutomationDec ) const
{
SbxDecimal* pDecimal = GetDecimal();
if( pDecimal != NULL )
diff --git a/include/basic/sbuno.hxx b/include/basic/sbuno.hxx
index 55d487a..3014869 100644
--- a/include/basic/sbuno.hxx
+++ b/include/basic/sbuno.hxx
@@ -20,6 +20,9 @@
#ifndef _SB_SBUNO_HXX
#define _SB_SBUNO_HXX
+#include <com/sun/star/beans/Property.hpp>
+#include <com/sun/star/uno/Any.hxx>
+#include <com/sun/star/uno/Type.hxx>
#include <basic/sbxobj.hxx>
#include "basicdllapi.h"
@@ -33,7 +36,8 @@ BASIC_DLLPUBLIC SbxObjectRef GetSbUnoObject( const OUString& aName, const com::s
BASIC_DLLPUBLIC void createAllObjectProperties( SbxObject* pObj );
BASIC_DLLPUBLIC void SetSbUnoObjectDfltPropName( SbxObject* pObj );
-BASIC_DLLPUBLIC ::com::sun::star::uno::Any sbxToUnoValue( SbxVariable* pVar );
+BASIC_DLLPUBLIC ::com::sun::star::uno::Any sbxToUnoValue( const SbxValue* pVar );
+BASIC_DLLPUBLIC ::com::sun::star::uno::Any sbxToUnoValue( const SbxValue* pVar, const ::com::sun::star::uno::Type& rType, com::sun::star::beans::Property* pUnoProperty = NULL );
BASIC_DLLPUBLIC void unoToSbxValue( SbxVariable* pVar, const ::com::sun::star::uno::Any& aValue );
diff --git a/include/basic/sbxvar.hxx b/include/basic/sbxvar.hxx
index 4d4a8b6..a81836f 100644
--- a/include/basic/sbxvar.hxx
+++ b/include/basic/sbxvar.hxx
@@ -189,7 +189,7 @@ public:
// Special methods
sal_Bool PutDecimal( com::sun::star::bridge::oleautomation::Decimal& rAutomationDec );
sal_Bool PutDecimal( SbxDecimal* pDecimal ); // This function is needed for Windows build, don't remove
- sal_Bool fillAutomationDecimal( com::sun::star::bridge::oleautomation::Decimal& rAutomationDec );
+ sal_Bool fillAutomationDecimal( com::sun::star::bridge::oleautomation::Decimal& rAutomationDec ) const;
sal_Bool PutCurrency( const sal_Int64& );
// Interface for CDbl in Basic
static SbxError ScanNumIntnl( const OUString& rSrc, double& nVal, bool bSingle = false );
diff --git a/wizards/source/depot/Depot.xba b/wizards/source/depot/Depot.xba
index 73f81a1..6a8b141 100644
--- a/wizards/source/depot/Depot.xba
+++ b/wizards/source/depot/Depot.xba
@@ -129,7 +129,7 @@ Dim LocStockName as String
End If
End If
CurRate = TransactModel.txtRate.Value
- TransactDate = CDateFromISO(TransactModel.txtDate.Date)
+ TransactDate = CDateFromUNODate(TransactModel.txtDate.Date)
DlgTransaction.EndExecute()
UnprotectSheets(oSheets)
@@ -148,7 +148,7 @@ Dim LocStockName as String
oMovementSheet.GetCellByPosition(SBCOLUMNQUANTITY2, iNewRow).Value = -TransactModel.txtQuantity.Value
End If
- oMovementSheet.GetCellByPosition(SBCOLUMNDATE2, iNewRow).Value = CDateFromISO(TransactModel.txtDate.Date)
+ oMovementSheet.GetCellByPosition(SBCOLUMNDATE2, iNewRow).Value = CDateFromUNODate(TransactModel.txtDate.Date)
oMovementSheet.GetCellByPosition(SBCOLUMNRATE2, iNewRow).Value = TransactModel.txtRate.Value
oMovementSheet.GetCellByPosition(SBCOLUMNPROVPERCENT2, iNewRow).Value = TransactModel.txtCommission.EffectiveValue
oMovementSheet.GetCellByPosition(SBCOLUMNPROVMIN2, iNewRow).Value = TransactModel.txtMinimum.Value
@@ -290,7 +290,7 @@ Dim oModel as Object
' Store entered values in variables
OldNumber = oModel.txtOldRate.Value
NewNumber = oModel.txtNewRate.Value
- SplitDate = CDateFromISO(oModel.txtDate.Date)
+ SplitDate = CDateFromUNODate(oModel.txtDate.Date)
iRow = SBROWFIRSTTRANSACT2
NoteText = cSplit & SplitDate & ", " & oModel.txtOldRate.Value & oModel.lblColon.Label & oModel.txtNewRate.Value
Do
@@ -398,8 +398,8 @@ End Sub
Sub SetupTransactionControls(CurStep as Integer)
DlgReference = DlgTransaction
With TransactModel
- .txtDate.Date = CDateToISO(Date())
- .txtDate.DateMax = CDateToISO(Date())
+ .txtDate.Date = CDateToUNODate(Date())
+ .txtDate.DateMax = CDateToUNODate(Date())
.txtStockID.Enabled = False
.lblStockID.Enabled = False
.lblStockID.Label = sCurStockIDLabel
@@ -504,12 +504,12 @@ Sub InitializeStockRatesControls(CurStep as Integer)
Case 2
.txtOldRate.Value = 1
.txtNewRate.Value = 1
- .txtDate.Date = CDateToISO(Date())
+ .txtDate.Date = CDateToUNODate(Date())
Case 3
- .txtStartDate.DateMax = CDateToISO(CDate(Date())-1)
- .txtEndDate.DateMax = CDateToISO(CDate(Date())-1)
- .txtStartDate.Date = CDateToISO(CDate(Date())-8)
- .txtEndDate.Date = CDateToISO(CDate(Date())-1)
+ .txtStartDate.DateMax = CDateToUNODate(CDate(Date())-1)
+ .txtEndDate.DateMax = CDateToUNODate(CDate(Date())-1)
+ .txtStartDate.Date = CDateToUNODate(CDate(Date())-8)
+ .txtEndDate.Date = CDateToUNODate(CDate(Date())-1)
.optDaily.State = 1
End Select
End With
diff --git a/wizards/source/depot/Internet.xba b/wizards/source/depot/Internet.xba
index 3e57f0a..b4bcf57 100644
--- a/wizards/source/depot/Internet.xba
+++ b/wizards/source/depot/Internet.xba
@@ -25,8 +25,8 @@ Function CheckHistoryControls()
Dim bLocGoOn as Boolean
Dim Firstdate as Date
Dim LastDate as Date
- LastDate = CDateFromISO(StockRatesModel.txtEndDate.Date)
- FirstDate = CDateFromISO(StockRatesModel.txtStartDate.Date)
+ LastDate = CDateFromUNODate(StockRatesModel.txtEndDate.Date)
+ FirstDate = CDateFromUNODate(StockRatesModel.txtStartDate.Date)
bLocGoOn = FirstDate <> 0 And LastDate <> 0
If bLocGoOn Then
If FirstDate >= LastDate Then
@@ -47,8 +47,8 @@ Dim oCell as Object
Dim sStockID as String
Dim ChartSource as String
If CheckHistoryControls() Then
- StartDate = CDateFromISO(StockRatesModel.txtStartDate.Date)
- EndDate = CDateFromISO(StockRatesModel.txtEndDate.Date)
+ StartDate = CDateFromUNODate(StockRatesModel.txtStartDate.Date)
+ EndDate = CDateFromUNODate(StockRatesModel.txtEndDate.Date)
DlgStockRates.EndExecute()
If StockRatesModel.optDaily.State = 1 Then
sInterval = "d"
commit 20238b8fa63b8754d14b69467842f8c49fe3bb2b
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Sep 11 21:01:24 2013 +0100
CID#707531 silence coverity
Change-Id: I7fd4b5684cd5d54860c60fdb00ac2431943eece3
diff --git a/sal/osl/unx/time.c b/sal/osl/unx/time.c
index 1afaaf6..14d4ec0 100644
--- a/sal/osl/unx/time.c
+++ b/sal/osl/unx/time.c
@@ -155,6 +155,10 @@ sal_Bool SAL_CALL osl_getTimeValueFromDateTime( const oslDateTime* pDateTime, Ti
aTime.tm_wday = 0;
aTime.tm_yday = 0;
+#if defined(STRUCT_TM_HAS_GMTOFF)
+ aTime.tm_gmtoff = 0;
+#endif
+
/* Convert time to calendar value */
nSeconds = mktime( &aTime );
commit fbd001f3502cd71ba2b31536eba3826d846fba95
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Sep 11 20:56:32 2013 +0100
CID#707537 unitialized scalars
Change-Id: I68c81f46002ad07196ba357c41687ceb56d9663c
diff --git a/sd/source/filter/ppt/pptanimations.hxx b/sd/source/filter/ppt/pptanimations.hxx
index 04abeee..eca157f 100644
--- a/sd/source/filter/ppt/pptanimations.hxx
+++ b/sd/source/filter/ppt/pptanimations.hxx
@@ -203,6 +203,15 @@ public:
sal_Int32 mnU1, mnU3, mnU4;
+ AnimationNode()
+ : mnGroupType(0)
+ , mnRestart(0)
+ , mnFill(0)
+ , mnNodeType(0)
+ , mnDuration(0)
+ , mnU1(0), mnU3(0), mnU4(0)
+ {
+ }
public:
friend SvStream& operator>>(SvStream& rIn, AnimationNode& rAtom);
commit b2b7d591bd447de612b01a58406a25f3a3a8d91c
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Sep 11 20:34:17 2013 +0100
CID#738545 uninitialized scalar
Change-Id: I111ce1b7c8d6dc8e19b2f13a1897a66dec0417f8
diff --git a/lotuswordpro/source/filter/tocread.cxx b/lotuswordpro/source/filter/tocread.cxx
index 2a6f289e..c27909c 100644
--- a/lotuswordpro/source/filter/tocread.cxx
+++ b/lotuswordpro/source/filter/tocread.cxx
@@ -141,7 +141,7 @@ CBenTOCReader::SearchForLabel(BenByte * pLabel)
unsigned long CurrOffset = Length - BEN_LABEL_SIZE + BEN_MAGIC_BYTES_SIZE -
1;
- char Buffer[LABEL_READ_BUFFER_SIZE];
+ char Buffer[LABEL_READ_BUFFER_SIZE] = {0};
unsigned long BufferStartOffset = Length; // Init to big value
commit e31a1b736a3c51351f9216246307916ba6c6d3a6
Author: Andrzej J.R. Hunt <andrzej at ahunt.org>
Date: Wed Sep 11 19:44:13 2013 +0100
Sanitize and quote index identifiers for rebuildIndexes. (firebird-sdbc)
Otherwise firebird won't recognise mixed case index names.
Change-Id: Ib581a592d03b12ad0944375d9eec8da9d680487e
diff --git a/connectivity/source/drivers/firebird/Connection.cxx b/connectivity/source/drivers/firebird/Connection.cxx
index dd5d525..c00d621 100644
--- a/connectivity/source/drivers/firebird/Connection.cxx
+++ b/connectivity/source/drivers/firebird/Connection.cxx
@@ -830,11 +830,11 @@ void Connection::rebuildIndexes() throw(SQLException)
// and its ResultSet become invalidated) hence we use the native api.
while (xCharIndices->next())
{
- OUString sIndexName(xRow->getString(1));
+ OUString sIndexName(sanitizeIdentifier(xRow->getString(1)));
SAL_INFO("connectivity.firebird", "rebuilding index " + sIndexName);
- OString sAlterIndex = "ALTER INDEX "
+ OString sAlterIndex = "ALTER INDEX \""
+ OUStringToOString(sIndexName, RTL_TEXTENCODING_UTF8)
- + " ACTIVE";
+ + "\" ACTIVE";
ISC_STATUS_ARRAY aStatusVector;
ISC_STATUS aErr;
commit 68e2a4e41d6e81a6e95a296d775c9ac8f5c97e8b
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Sep 11 18:05:13 2013 +0200
Revert "Visibility doesn't seem to work as we want in Apple's Clang"
This reverts commit e5143062887093037cab8f936288af8408576ea8; not sure what
problems exactly it was supposed to work around, but at least a "make check"
against Apple's Clang "Apple LLVM version 4.2 (clang-425.0.28) (based on LLVM
3.2svn)" on Mac OS X 10.8 works flawlessly.
Conflicts:
configure.in
Change-Id: Ib7c80dd29e9e7a92b90be3919cd097b7e64883a1
diff --git a/configure.ac b/configure.ac
index 3989683..b23cc0e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5786,14 +5786,6 @@ if test "$GCC" = "yes"; then
AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[ return 0; ]])],[ HAVE_GCC_VISIBILITY_FEATURE=TRUE ],[])
CFLAGS=$save_CFLAGS
- if test "$COM_GCC_IS_CLANG" = TRUE -a $_os = Darwin; then
- # It seems that with Apple's Clang, visibility doesn't work as
- # we would want at least in the connectivity and dbaccess
- # modules. This might be because of something peculiar in
- # those modules? Whatever.
- HAVE_GCC_VISIBILITY_FEATURE=
- fi
-
if test "$HAVE_GCC_VISIBILITY_FEATURE" = "TRUE"; then
AC_MSG_RESULT([yes])
else
commit 4db25c3e85ac3f30a9f6e1440ad440160edbb56e
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date: Wed Sep 11 20:04:19 2013 +0200
add yellow smilies to icon sets
Change-Id: I32d3290d333c6bac34b2ef58d2a63c4470b2e462
diff --git a/icon-themes/galaxy/sc/res/icon-set-negative-yellow-smilie.png b/icon-themes/galaxy/sc/res/icon-set-negative-yellow-smilie.png
new file mode 100644
index 0000000..63405bf
Binary files /dev/null and b/icon-themes/galaxy/sc/res/icon-set-negative-yellow-smilie.png differ
diff --git a/icon-themes/galaxy/sc/res/icon-set-positive-yellow-smilie.png b/icon-themes/galaxy/sc/res/icon-set-positive-yellow-smilie.png
new file mode 100644
index 0000000..646655b
Binary files /dev/null and b/icon-themes/galaxy/sc/res/icon-set-positive-yellow-smilie.png differ
diff --git a/sc/inc/colorscale.hxx b/sc/inc/colorscale.hxx
index b250aee..9dcce78 100644
--- a/sc/inc/colorscale.hxx
+++ b/sc/inc/colorscale.hxx
@@ -178,7 +178,8 @@ enum ScIconSetType
IconSet_3Signs,
IconSet_3Symbols,
IconSet_3Symbols2,
- IconSet_ColorSmilies,
+ IconSet_3Smilies,
+ IconSet_3ColorSmilies,
IconSet_4Arrows,
IconSet_4ArrowsGray,
IconSet_4RedToBlack,
diff --git a/sc/source/core/data/colorscale.cxx b/sc/source/core/data/colorscale.cxx
index 65cda1c..8a1d0df 100644
--- a/sc/source/core/data/colorscale.cxx
+++ b/sc/source/core/data/colorscale.cxx
@@ -1165,7 +1165,8 @@ ScIconSetMap* ScIconSetFormat::getIconSetMap()
{ "3Signs", IconSet_3Signs, 3 },
{ "3Symbols", IconSet_3Symbols, 3 },
{ "3Symbols2", IconSet_3Symbols2, 3 },
- { "ColorSmilies", IconSet_ColorSmilies, 3 },
+ { "3Smilies", IconSet_3Smilies, 3 },
+ { "3ColorSmilies", IconSet_3ColorSmilies, 3 },
{ "4Arrows", IconSet_4Arrows, 4 },
{ "4ArrowsGray", IconSet_4ArrowsGray, 4 },
{ "4RedToBlack", IconSet_4RedToBlack, 4 },
@@ -1203,6 +1204,10 @@ const sal_Int32 a3Flags[] = {
BMP_ICON_SET_FLAGS_RED, BMP_ICON_SET_FLAGS_YELLOW, BMP_ICON_SET_FLAGS_GREEN
};
+const sal_Int32 a3Smilies[] {
+ BMP_ICON_SET_POSITIVE_YELLOW_SMILIE, BMP_ICON_SET_NEUTRAL_YELLOW_SMILIE, BMP_ICON_SET_NEGATIVE_YELLOW_SMILIE
+};
+
const sal_Int32 a3ColorSmilies[] {
BMP_ICON_SET_POSITIVE_GREEN_SMILIE, BMP_ICON_SET_NEUTRAL_YELLOW_SMILIE, BMP_ICON_SET_NEGATIVE_RED_SMILIE
};
@@ -1272,7 +1277,8 @@ static const ScIconSetBitmapMap aBitmapMap[] = {
{ IconSet_3Symbols2, a3Symbols1 },
{ IconSet_3TrafficLights1, a3TrafficLights1 },
{ IconSet_3TrafficLights2, a3TrafficLights2 },
- { IconSet_ColorSmilies, a3ColorSmilies },
+ { IconSet_3Smilies, a3Smilies },
+ { IconSet_3ColorSmilies, a3ColorSmilies },
{ IconSet_4Arrows, a4Arrows },
{ IconSet_4ArrowsGray, a4ArrowsGray },
{ IconSet_4Rating, a4Ratings },
diff --git a/sc/source/ui/inc/iconsets.hrc b/sc/source/ui/inc/iconsets.hrc
index 80a2fd6..07ae417 100644
--- a/sc/source/ui/inc/iconsets.hrc
+++ b/sc/source/ui/inc/iconsets.hrc
@@ -61,5 +61,7 @@
#define BMP_ICON_SET_POSITIVE_GREEN_SMILIE 948
#define BMP_ICON_SET_NEUTRAL_YELLOW_SMILIE 947
#define BMP_ICON_SET_NEGATIVE_RED_SMILIE 946
+#define BMP_ICON_SET_POSITIVE_YELLOW_SMILIE 945
+#define BMP_ICON_SET_NEGATIVE_YELLOW_SMILIE 944
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/src/condformatdlg.src b/sc/source/ui/src/condformatdlg.src
index cf06d18..0594c5b 100644
--- a/sc/source/ui/src/condformatdlg.src
+++ b/sc/source/ui/src/condformatdlg.src
@@ -343,6 +343,7 @@ Control RID_COND_ENTRY
"3 Signs";
"3 Symbols 1";
"3 Symbols 2";
+ "3 Smilies";
"3 Colored Smilies";
"4 Arrows";
"4 Gray Arrows";
diff --git a/sc/source/ui/src/iconsets.src b/sc/source/ui/src/iconsets.src
index f464ce4..4fb56fd 100644
--- a/sc/source/ui/src/iconsets.src
+++ b/sc/source/ui/src/iconsets.src
@@ -225,5 +225,13 @@ Bitmap BMP_ICON_SET_NEGATIVE_RED_SMILIE
{
File = "icon-set-negative-red-smilie.png";
};
+Bitmap BMP_ICON_SET_POSITIVE_YELLOW_SMILIE
+{
+ File = "icon-set-positive-yellow-smilie.png";
+};
+Bitmap BMP_ICON_SET_NEGATIVE_YELLOW_SMILIE
+{
+ File = "icon-set-negative-yellow-smilie.png";
+};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 166e231940c12a3a5a518004fa34d2bf3fe9b349
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date: Wed Sep 11 19:36:59 2013 +0200
add colored smilies to the icon sets, fdo#60107
Change-Id: I5a1de90912ea74be9c60f95e2aa3588fd8113a07
Reviewed-on: https://gerrit.libreoffice.org/5914
Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
Tested-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
diff --git a/icon-themes/galaxy/sc/res/icon-set-negative-red-smilie.png b/icon-themes/galaxy/sc/res/icon-set-negative-red-smilie.png
new file mode 100644
index 0000000..464fd10
Binary files /dev/null and b/icon-themes/galaxy/sc/res/icon-set-negative-red-smilie.png differ
diff --git a/icon-themes/galaxy/sc/res/icon-set-neutral-yellow-smilie.png b/icon-themes/galaxy/sc/res/icon-set-neutral-yellow-smilie.png
new file mode 100644
index 0000000..6578efc
Binary files /dev/null and b/icon-themes/galaxy/sc/res/icon-set-neutral-yellow-smilie.png differ
diff --git a/icon-themes/galaxy/sc/res/icon-set-positive-green-smilie.png b/icon-themes/galaxy/sc/res/icon-set-positive-green-smilie.png
new file mode 100644
index 0000000..e4ecd16
Binary files /dev/null and b/icon-themes/galaxy/sc/res/icon-set-positive-green-smilie.png differ
diff --git a/sc/inc/colorscale.hxx b/sc/inc/colorscale.hxx
index 1264f27..b250aee 100644
--- a/sc/inc/colorscale.hxx
+++ b/sc/inc/colorscale.hxx
@@ -178,6 +178,7 @@ enum ScIconSetType
IconSet_3Signs,
IconSet_3Symbols,
IconSet_3Symbols2,
+ IconSet_ColorSmilies,
IconSet_4Arrows,
IconSet_4ArrowsGray,
IconSet_4RedToBlack,
diff --git a/sc/source/core/data/colorscale.cxx b/sc/source/core/data/colorscale.cxx
index 91f096e..65cda1c 100644
--- a/sc/source/core/data/colorscale.cxx
+++ b/sc/source/core/data/colorscale.cxx
@@ -1165,6 +1165,7 @@ ScIconSetMap* ScIconSetFormat::getIconSetMap()
{ "3Signs", IconSet_3Signs, 3 },
{ "3Symbols", IconSet_3Symbols, 3 },
{ "3Symbols2", IconSet_3Symbols2, 3 },
+ { "ColorSmilies", IconSet_ColorSmilies, 3 },
{ "4Arrows", IconSet_4Arrows, 4 },
{ "4ArrowsGray", IconSet_4ArrowsGray, 4 },
{ "4RedToBlack", IconSet_4RedToBlack, 4 },
@@ -1202,6 +1203,10 @@ const sal_Int32 a3Flags[] = {
BMP_ICON_SET_FLAGS_RED, BMP_ICON_SET_FLAGS_YELLOW, BMP_ICON_SET_FLAGS_GREEN
};
+const sal_Int32 a3ColorSmilies[] {
+ BMP_ICON_SET_POSITIVE_GREEN_SMILIE, BMP_ICON_SET_NEUTRAL_YELLOW_SMILIE, BMP_ICON_SET_NEGATIVE_RED_SMILIE
+};
+
const sal_Int32 a4Arrows[] = {
BMP_ICON_SET_COLORARROWS_DOWN, BMP_ICON_SET_COLORARROWS_SLIGHTLY_DOWN, BMP_ICON_SET_COLORARROWS_SLIGHTLY_UP, BMP_ICON_SET_COLORARROWS_UP
};
@@ -1267,6 +1272,7 @@ static const ScIconSetBitmapMap aBitmapMap[] = {
{ IconSet_3Symbols2, a3Symbols1 },
{ IconSet_3TrafficLights1, a3TrafficLights1 },
{ IconSet_3TrafficLights2, a3TrafficLights2 },
+ { IconSet_ColorSmilies, a3ColorSmilies },
{ IconSet_4Arrows, a4Arrows },
{ IconSet_4ArrowsGray, a4ArrowsGray },
{ IconSet_4Rating, a4Ratings },
diff --git a/sc/source/ui/inc/iconsets.hrc b/sc/source/ui/inc/iconsets.hrc
index f4761c0..80a2fd6 100644
--- a/sc/source/ui/inc/iconsets.hrc
+++ b/sc/source/ui/inc/iconsets.hrc
@@ -58,5 +58,8 @@
#define BMP_ICON_SET_TRIANGLES_DOWN 951
#define BMP_ICON_SET_TRIANGLES_SAME 950
#define BMP_ICON_SET_TRIANGLES_UP 949
+#define BMP_ICON_SET_POSITIVE_GREEN_SMILIE 948
+#define BMP_ICON_SET_NEUTRAL_YELLOW_SMILIE 947
+#define BMP_ICON_SET_NEGATIVE_RED_SMILIE 946
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/src/condformatdlg.src b/sc/source/ui/src/condformatdlg.src
index e0f13a1..cf06d18 100644
--- a/sc/source/ui/src/condformatdlg.src
+++ b/sc/source/ui/src/condformatdlg.src
@@ -343,6 +343,7 @@ Control RID_COND_ENTRY
"3 Signs";
"3 Symbols 1";
"3 Symbols 2";
+ "3 Colored Smilies";
"4 Arrows";
"4 Gray Arrows";
"4 Circles Red to Black";
diff --git a/sc/source/ui/src/iconsets.src b/sc/source/ui/src/iconsets.src
index da3c350..f464ce4 100644
--- a/sc/source/ui/src/iconsets.src
+++ b/sc/source/ui/src/iconsets.src
@@ -213,5 +213,17 @@ Bitmap BMP_ICON_SET_TRIANGLES_UP
{
File = "icon-set-triangles-up.png";
};
+Bitmap BMP_ICON_SET_POSITIVE_GREEN_SMILIE
+{
+ File = "icon-set-positive-green-smilie.png";
+};
+Bitmap BMP_ICON_SET_NEUTRAL_YELLOW_SMILIE
+{
+ File = "icon-set-neutral-yellow-smilie.png";
+};
+Bitmap BMP_ICON_SET_NEGATIVE_RED_SMILIE
+{
+ File = "icon-set-negative-red-smilie.png";
+};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit bc09772b407b29cbc66c76f35f74a5548acc0e91
Author: Andrzej J.R. Hunt <andrzej at ahunt.org>
Date: Wed Sep 11 10:55:22 2013 +0100
Change of precision is equivalent to type change. (firebird-sdbc)
Change-Id: I5f8c80b01917028fe80d468f5e96de56b917bd7e
diff --git a/connectivity/source/drivers/firebird/Table.cxx b/connectivity/source/drivers/firebird/Table.cxx
index 2b9d578..85ff068 100644
--- a/connectivity/source/drivers/firebird/Table.cxx
+++ b/connectivity/source/drivers/firebird/Table.cxx
@@ -145,8 +145,11 @@ void SAL_CALL Table::alterColumnByName(const OUString& rColName,
getConnection()->createStatement()->execute(sSql);
}
- if (bTypeChanged || bTypeNameChanged)
+ if (bTypeChanged || bTypeNameChanged || bPrecisionChanged || bScaleChanged)
{
+ // If bPrecisionChanged this will only succeed if we have increased the
+ // precision, otherwise an exception is thrown -- however the base
+ // gui then offers to delete and recreate the column.
OUString sSql(getAlterTableColumn(rColName) + "TYPE " +
::dbtools::createStandardTypePart(rDescriptor, getConnection()));
getConnection()->createStatement()->execute(sSql);
@@ -192,7 +195,7 @@ void SAL_CALL Table::alterColumnByName(const OUString& rColName,
}
}
- if (bPrecisionChanged || bScaleChanged || bIsAutoIncrementChanged)
+ if (bIsAutoIncrementChanged)
{
// TODO: changeType
}
@@ -213,7 +216,6 @@ void SAL_CALL Table::alterColumnByName(const OUString& rColName,
}
m_pColumns->refresh();
- // TODO: implement me
}
// ----- XRename --------------------------------------------------------------
commit c461cc8473e17f239aa1a7acacb850d3e5ed571f
Author: Andrzej J.R. Hunt <andrzej at ahunt.org>
Date: Wed Sep 11 10:15:17 2013 +0100
Remove redundant comment. (firebird-sdbc)
Change-Id: I17105f474dea07a1a980252309a3ccd88a558db9
diff --git a/connectivity/source/drivers/firebird/DatabaseMetaData.cxx b/connectivity/source/drivers/firebird/DatabaseMetaData.cxx
index 647d15b..b9d2395 100644
--- a/connectivity/source/drivers/firebird/DatabaseMetaData.cxx
+++ b/connectivity/source/drivers/firebird/DatabaseMetaData.cxx
@@ -885,8 +885,6 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTypeInfo()
aRow[17] = new ORowSetValueDecorator(); // Unused
aRow[18] = new ORowSetValueDecorator(sal_Int16(10));// Radix
- // TODO: sort by DATA_TYPE
-
// SQL_TEXT
aRow[1] = new ORowSetValueDecorator(OUString("CHAR"));
aRow[2] = new ORowSetValueDecorator(getColumnTypeFromFBType(SQL_TEXT));
commit 2a9c0cb864b1a8886d18447e8b00565426a91e2c
Author: Andrzej J.R. Hunt <andrzej at ahunt.org>
Date: Wed Sep 11 10:06:30 2013 +0100
Remove unnecessary sal_Bool(bool) casting. (firebird-sdbc)
Change-Id: I3d9cf598404d137e0f13667ea8f0dc7be6253f7a
diff --git a/connectivity/source/drivers/firebird/DatabaseMetaData.cxx b/connectivity/source/drivers/firebird/DatabaseMetaData.cxx
index 0c113b4..647d15b 100644
--- a/connectivity/source/drivers/firebird/DatabaseMetaData.cxx
+++ b/connectivity/source/drivers/firebird/DatabaseMetaData.cxx
@@ -871,9 +871,9 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTypeInfo()
// Common data
aRow[4] = ODatabaseMetaDataResultSet::getQuoteValue(); // Literal quote marks
aRow[5] = ODatabaseMetaDataResultSet::getQuoteValue(); // Literal quote marks
- aRow[7] = new ORowSetValueDecorator(sal_Bool(true)); // Nullable
- aRow[8] = new ORowSetValueDecorator(sal_Bool(true)); // Case sensitive
- aRow[10] = new ORowSetValueDecorator(sal_Bool(false)); // Is unsigned
+ aRow[7] = new ORowSetValueDecorator(sal_True); // Nullable
+ aRow[8] = new ORowSetValueDecorator(sal_True); // Case sensitive
+ aRow[10] = new ORowSetValueDecorator(sal_False); // Is unsigned
// FIXED_PREC_SCALE: docs state "can it be a money value? " however
// in reality this causes Base to treat all numbers as money formatted
// by default which is wrong (and formatting as money value is still
@@ -894,7 +894,7 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTypeInfo()
aRow[6] = new ORowSetValueDecorator(OUString("length")); // Create Params
aRow[9] = new ORowSetValueDecorator(
sal_Int16(ColumnSearch::FULL)); // Searchable
- aRow[12] = new ORowSetValueDecorator(sal_Bool(false)); // Autoincrement
+ aRow[12] = new ORowSetValueDecorator(sal_False); // Autoincrement
aRow[14] = ODatabaseMetaDataResultSet::get0Value(); // Minimum scale
aRow[15] = ODatabaseMetaDataResultSet::get0Value(); // Max scale
aResults.push_back(aRow);
@@ -906,7 +906,7 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTypeInfo()
aRow[6] = new ORowSetValueDecorator(OUString("length")); // Create Params
aRow[9] = new ORowSetValueDecorator(
sal_Int16(ColumnSearch::FULL)); // Searchable
- aRow[12] = new ORowSetValueDecorator(sal_Bool(false)); // Autoincrement
+ aRow[12] = new ORowSetValueDecorator(sal_False); // Autoincrement
aRow[14] = ODatabaseMetaDataResultSet::get0Value(); // Minimum scale
aRow[15] = ODatabaseMetaDataResultSet::get0Value(); // Max scale
aResults.push_back(aRow);
@@ -916,7 +916,7 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTypeInfo()
aRow[6] = new ORowSetValueDecorator(); // Create Params
aRow[9] = new ORowSetValueDecorator(
sal_Int16(ColumnSearch::FULL)); // Searchable
- aRow[12] = new ORowSetValueDecorator(sal_Bool(true)); // Autoincrement
+ aRow[12] = new ORowSetValueDecorator(sal_True); // Autoincrement
aRow[14] = ODatabaseMetaDataResultSet::get0Value(); // Minimum scale
aRow[15] = ODatabaseMetaDataResultSet::get0Value(); // Max scale
}
@@ -941,7 +941,7 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTypeInfo()
aRow[6] = new ORowSetValueDecorator(); // Create Params
aRow[9] = new ORowSetValueDecorator(
sal_Int16(ColumnSearch::FULL)); // Searchable
- aRow[12] = new ORowSetValueDecorator(sal_Bool(true)); // Autoincrement
+ aRow[12] = new ORowSetValueDecorator(sal_True); // Autoincrement
}
// SQL_FLOAT
aRow[1] = new ORowSetValueDecorator(OUString("FLOAT"));
@@ -974,7 +974,7 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTypeInfo()
aRow[6] = new ORowSetValueDecorator(); // Create Params
aRow[9] = new ORowSetValueDecorator(
sal_Int16(ColumnSearch::FULL)); // Searchable
- aRow[12] = new ORowSetValueDecorator(sal_Bool(false)); // Autoincrement
+ aRow[12] = new ORowSetValueDecorator(sal_False); // Autoincrement
aRow[14] = ODatabaseMetaDataResultSet::get0Value(); // Minimum scale
aRow[15] = ODatabaseMetaDataResultSet::get0Value(); // Max scale
aResults.push_back(aRow);
@@ -987,7 +987,7 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTypeInfo()
aRow[6] = new ORowSetValueDecorator(); // Create Params
aRow[9] = new ORowSetValueDecorator(
sal_Int16(ColumnSearch::FULL)); // Searchable
- aRow[12] = new ORowSetValueDecorator(sal_Bool(false)); // Autoincrement
+ aRow[12] = new ORowSetValueDecorator(sal_False); // Autoincrement
aRow[14] = ODatabaseMetaDataResultSet::get0Value(); // Minimum scale
aRow[15] = ODatabaseMetaDataResultSet::get0Value(); // Max scale
aResults.push_back(aRow);
@@ -1000,7 +1000,7 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTypeInfo()
aRow[6] = new ORowSetValueDecorator(); // Create Params
aRow[9] = new ORowSetValueDecorator(
sal_Int16(ColumnSearch::FULL)); // Searchable
- aRow[12] = new ORowSetValueDecorator(sal_Bool(false)); // Autoincrement
+ aRow[12] = new ORowSetValueDecorator(sal_False); // Autoincrement
aRow[14] = ODatabaseMetaDataResultSet::get0Value(); // Minimum scale
aRow[15] = ODatabaseMetaDataResultSet::get0Value(); // Max scale
aResults.push_back(aRow);
@@ -1013,7 +1013,7 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTypeInfo()
aRow[6] = new ORowSetValueDecorator(); // Create Params
aRow[9] = new ORowSetValueDecorator(
sal_Int16(ColumnSearch::NONE)); // Searchable
- aRow[12] = new ORowSetValueDecorator(sal_Bool(false)); // Autoincrement
+ aRow[12] = new ORowSetValueDecorator(sal_False); // Autoincrement
aRow[14] = ODatabaseMetaDataResultSet::get0Value(); // Minimum scale
aRow[15] = ODatabaseMetaDataResultSet::get0Value(); // Max scale
aResults.push_back(aRow);
commit 00d3a96936acba0032caaf01b4eb466849564708
Author: Andrzej J.R. Hunt <andrzej at ahunt.org>
Date: Wed Sep 11 10:03:58 2013 +0100
Don't format integers as currency by default. (firebird-sdbc)
Change-Id: I228bb9f5d1121c1e328daa3d677cc54254255beb
diff --git a/connectivity/source/drivers/firebird/DatabaseMetaData.cxx b/connectivity/source/drivers/firebird/DatabaseMetaData.cxx
index b7e1a5c..0c113b4 100644
--- a/connectivity/source/drivers/firebird/DatabaseMetaData.cxx
+++ b/connectivity/source/drivers/firebird/DatabaseMetaData.cxx
@@ -874,6 +874,11 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTypeInfo()
aRow[7] = new ORowSetValueDecorator(sal_Bool(true)); // Nullable
aRow[8] = new ORowSetValueDecorator(sal_Bool(true)); // Case sensitive
aRow[10] = new ORowSetValueDecorator(sal_Bool(false)); // Is unsigned
+ // FIXED_PREC_SCALE: docs state "can it be a money value? " however
+ // in reality this causes Base to treat all numbers as money formatted
+ // by default which is wrong (and formatting as money value is still
+ // possible for all values).
+ aRow[11] = new ORowSetValueDecorator(sal_False);
// Localised Type Name -- TODO: implement (but can be null):
aRow[13] = new ORowSetValueDecorator();
aRow[16] = new ORowSetValueDecorator(); // Unused
@@ -889,7 +894,6 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTypeInfo()
aRow[6] = new ORowSetValueDecorator(OUString("length")); // Create Params
aRow[9] = new ORowSetValueDecorator(
sal_Int16(ColumnSearch::FULL)); // Searchable
- aRow[11] = new ORowSetValueDecorator(sal_Bool(true)); // Can be money value
aRow[12] = new ORowSetValueDecorator(sal_Bool(false)); // Autoincrement
aRow[14] = ODatabaseMetaDataResultSet::get0Value(); // Minimum scale
aRow[15] = ODatabaseMetaDataResultSet::get0Value(); // Max scale
@@ -902,7 +906,6 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTypeInfo()
aRow[6] = new ORowSetValueDecorator(OUString("length")); // Create Params
aRow[9] = new ORowSetValueDecorator(
sal_Int16(ColumnSearch::FULL)); // Searchable
- aRow[11] = new ORowSetValueDecorator(sal_Bool(true)); // Can be money value
aRow[12] = new ORowSetValueDecorator(sal_Bool(false)); // Autoincrement
aRow[14] = ODatabaseMetaDataResultSet::get0Value(); // Minimum scale
aRow[15] = ODatabaseMetaDataResultSet::get0Value(); // Max scale
@@ -913,7 +916,6 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTypeInfo()
aRow[6] = new ORowSetValueDecorator(); // Create Params
aRow[9] = new ORowSetValueDecorator(
sal_Int16(ColumnSearch::FULL)); // Searchable
- aRow[11] = new ORowSetValueDecorator(sal_Bool(true)); // Can be money value
aRow[12] = new ORowSetValueDecorator(sal_Bool(true)); // Autoincrement
aRow[14] = ODatabaseMetaDataResultSet::get0Value(); // Minimum scale
aRow[15] = ODatabaseMetaDataResultSet::get0Value(); // Max scale
@@ -939,7 +941,6 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTypeInfo()
aRow[6] = new ORowSetValueDecorator(); // Create Params
aRow[9] = new ORowSetValueDecorator(
sal_Int16(ColumnSearch::FULL)); // Searchable
- aRow[11] = new ORowSetValueDecorator(sal_Bool(true)); // Can be money value
aRow[12] = new ORowSetValueDecorator(sal_Bool(true)); // Autoincrement
}
// SQL_FLOAT
@@ -973,7 +974,6 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTypeInfo()
aRow[6] = new ORowSetValueDecorator(); // Create Params
aRow[9] = new ORowSetValueDecorator(
sal_Int16(ColumnSearch::FULL)); // Searchable
- aRow[11] = new ORowSetValueDecorator(sal_Bool(false)); // Can be money value
aRow[12] = new ORowSetValueDecorator(sal_Bool(false)); // Autoincrement
aRow[14] = ODatabaseMetaDataResultSet::get0Value(); // Minimum scale
aRow[15] = ODatabaseMetaDataResultSet::get0Value(); // Max scale
@@ -987,7 +987,6 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTypeInfo()
aRow[6] = new ORowSetValueDecorator(); // Create Params
aRow[9] = new ORowSetValueDecorator(
sal_Int16(ColumnSearch::FULL)); // Searchable
- aRow[11] = new ORowSetValueDecorator(sal_Bool(false)); // Can be money value
aRow[12] = new ORowSetValueDecorator(sal_Bool(false)); // Autoincrement
aRow[14] = ODatabaseMetaDataResultSet::get0Value(); // Minimum scale
aRow[15] = ODatabaseMetaDataResultSet::get0Value(); // Max scale
@@ -1001,7 +1000,6 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTypeInfo()
aRow[6] = new ORowSetValueDecorator(); // Create Params
aRow[9] = new ORowSetValueDecorator(
sal_Int16(ColumnSearch::FULL)); // Searchable
- aRow[11] = new ORowSetValueDecorator(sal_Bool(false)); // Can be money value
aRow[12] = new ORowSetValueDecorator(sal_Bool(false)); // Autoincrement
aRow[14] = ODatabaseMetaDataResultSet::get0Value(); // Minimum scale
aRow[15] = ODatabaseMetaDataResultSet::get0Value(); // Max scale
@@ -1015,7 +1013,6 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTypeInfo()
aRow[6] = new ORowSetValueDecorator(); // Create Params
aRow[9] = new ORowSetValueDecorator(
sal_Int16(ColumnSearch::NONE)); // Searchable
- aRow[11] = new ORowSetValueDecorator(sal_Bool(false)); // Can be money value
aRow[12] = new ORowSetValueDecorator(sal_Bool(false)); // Autoincrement
aRow[14] = ODatabaseMetaDataResultSet::get0Value(); // Minimum scale
aRow[15] = ODatabaseMetaDataResultSet::get0Value(); // Max scale
commit 9ae206996dfdc4ec229db37622a362121b39abe4
Author: Andrzej J.R. Hunt <andrzej at ahunt.org>
Date: Wed Sep 11 09:36:21 2013 +0100
Ensure we have prepared the statement before modify null.
Currently if the first set* method to be called is setNull, then
we segfault since we try to access m_pInSqlda which doesn't exist
yet.
Change-Id: I4ad9c0a7d68da11b2260a596dd95c4c2cb5bcd4c
diff --git a/connectivity/source/drivers/firebird/PreparedStatement.cxx b/connectivity/source/drivers/firebird/PreparedStatement.cxx
index d60fa28..eb2fc17 100644
--- a/connectivity/source/drivers/firebird/PreparedStatement.cxx
+++ b/connectivity/source/drivers/firebird/PreparedStatement.cxx
@@ -315,6 +315,7 @@ void SAL_CALL OPreparedStatement::setNull(sal_Int32 nIndex, sal_Int32 /*nSqlType
{
MutexGuard aGuard( m_aMutex );
checkDisposed(OStatementCommonBase_Base::rBHelper.bDisposed);
+ ensurePrepared();
setParameterNull(nIndex, true);
}
More information about the Libreoffice-commits
mailing list